Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup WorldEdit-CLI data version systems #2347

Merged
merged 7 commits into from
Apr 2, 2024
+101 −86
Merged

Cleanup WorldEdit-CLI data version systems #2347

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
825d5de
Start cleanup of WorldEdit-CLI data versions
me4502 Jun 25, 2023
4d00e54
Use a record for the data file
me4502 Jul 2, 2023
347a9b2
Use cassette-deck to download data files rather than bundling
me4502 Jul 29, 2023
898b600
Fix up build errors
me4502 Dec 11, 2023
ab1fed8
Review changes
me4502 Apr 2, 2024
c3b13aa
Fix a potential race condition
me4502 Apr 2, 2024
2673a15
Disable verification for -cli
me4502 Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Fix up build errors
@me4502
me4502 committed Apr 2, 2024
commit 898b6009caf8649b8581810c1d2f2ad78f89aac7
4 changes: 4 additions & 0 deletions worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java
View file
Original file line number Diff line number Diff line change
@@ -45,6 +45,10 @@ public class CLICommandSender implements Actor {

private final Logger sender;

public CLICommandSender(CLIWorldEdit cliWorldEdit, Logger sender) {
this(sender);
}

public CLICommandSender(Logger sender) {
checkNotNull(sender);

2 changes: 1 addition & 1 deletion worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/DataFile.java
View file
Original file line number Diff line number Diff line change
@@ -35,4 +35,4 @@ public record BlockManifest(String defaultstate, Map<String, BlockProperty> prop

public record BlockProperty(List<String> values, String type) {
}
}
}
2 changes: 1 addition & 1 deletion worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/FileRegistries.java
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ public void loadDataFiles() {
Path outputFolder = WorldEdit.getInstance().getWorkingDirectoryPath("cli-data");
Path checkPath = outputFolder.resolve(app.getPlatform().getDataVersion() + "_" + CLI_DATA_VERSION + ".json");

try(Closer closer = Closer.create()) {
try (Closer closer = Closer.create()) {
Files.createDirectories(outputFolder);

if (!Files.exists(checkPath)) {