From b3d001c727d5049669ede548d10b8da3d6eada25 Mon Sep 17 00:00:00 2001 From: Madeline Miller Date: Mon, 11 Dec 2023 21:45:58 +1000 Subject: [PATCH] Fix up build errors --- .../accepted-cli-public-api-changes.json | 137 ++++++++++++++++++ .../sk89q/worldedit/cli/CLICommandSender.java | 4 + .../sk89q/worldedit/cli/data/DataFile.java | 2 +- .../worldedit/cli/data/FileRegistries.java | 2 +- 4 files changed, 143 insertions(+), 2 deletions(-) diff --git a/verification/src/changes/accepted-cli-public-api-changes.json b/verification/src/changes/accepted-cli-public-api-changes.json index 7a73a41bfd..bddb2ffdf1 100644 --- a/verification/src/changes/accepted-cli-public-api-changes.json +++ b/verification/src/changes/accepted-cli-public-api-changes.json @@ -1,2 +1,139 @@ { + "Removed overridden method": [ + { + "type": "com.sk89q.worldedit.cli.CLIConfiguration", + "member": "Method com.sk89q.worldedit.cli.CLIConfiguration.loadExtra()", + "changes": [ + "METHOD_REMOVED" + ] + } + ], + "Data File changes for downloadability": [ + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries", + "member": "Method com.sk89q.worldedit.cli.data.FileRegistries.getDataFile()", + "changes": [ + "METHOD_RETURN_TYPE_CHANGED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$BlockManifest", + "member": "Class com.sk89q.worldedit.cli.data.FileRegistries$BlockManifest", + "changes": [ + "CLASS_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$BlockManifest", + "member": "Field defaultstate", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$BlockManifest", + "member": "Field properties", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$BlockManifest", + "member": "Constructor com.sk89q.worldedit.cli.data.FileRegistries$BlockManifest()", + "changes": [ + "CONSTRUCTOR_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$BlockProperty", + "member": "Class com.sk89q.worldedit.cli.data.FileRegistries$BlockProperty", + "changes": [ + "CLASS_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$BlockProperty", + "member": "Field values", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$BlockProperty", + "member": "Field type", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$BlockProperty", + "member": "Constructor com.sk89q.worldedit.cli.data.FileRegistries$BlockProperty()", + "changes": [ + "CONSTRUCTOR_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "member": "Class com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "changes": [ + "CLASS_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "member": "Field itemtags", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "member": "Field entitytags", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "member": "Field entities", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "member": "Field biomes", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "member": "Field blocks", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "member": "Field blocktags", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "member": "Field items", + "changes": [ + "FIELD_REMOVED" + ] + }, + { + "type": "com.sk89q.worldedit.cli.data.FileRegistries$DataFile", + "member": "Constructor com.sk89q.worldedit.cli.data.FileRegistries$DataFile()", + "changes": [ + "CONSTRUCTOR_REMOVED" + ] + } + ] } \ No newline at end of file diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java index 7e22ff442a..0d1c76fdb0 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java @@ -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); diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/DataFile.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/DataFile.java index 48388e8375..258d0c6751 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/DataFile.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/DataFile.java @@ -35,4 +35,4 @@ public record BlockManifest(String defaultstate, Map prop public record BlockProperty(List values, String type) { } -} \ No newline at end of file +} diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/FileRegistries.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/FileRegistries.java index 8f2d89059e..f6b96603b3 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/FileRegistries.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/FileRegistries.java @@ -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)) {