Fix up build errors

EngineHub · Dec 11, 2023 · b3d001c · b3d001c
1 parent 66ed93a
commit b3d001c
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 2 deletions.
diff --git 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"
+      ]
+    }
+  ]
 }
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
@@ -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
@@ -35,4 +35,4 @@ public record BlockManifest(String defaultstate, Map<String, BlockProperty> prop
 
     public record BlockProperty(List<String> values, String type) {
     }
-}
+}
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
@@ -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)) {
-Original file line number
+Diff line change
@@ Expand Up @@
         public record BlockProperty(List<String> values, String type) {
         }
-    }
+    }