increased supported blockids to 65792 (#25)

Co-authored-by: Martin Robertz <[email protected]>
GTNewHorizons · Jan 18, 2025 · f49af4d · f49af4d
1 parent a0cd5bd
commit f49af4d
Show file tree

Hide file tree

Showing 7 changed files with 344 additions and 148 deletions.
diff --git a/src/main/java/com/github/lunatrius/schematica/FileFilterSchematic.java b/src/main/java/com/github/lunatrius/schematica/FileFilterSchematic.java
@@ -3,6 +3,8 @@
 import java.io.File;
 import java.io.FileFilter;
 
+import com.github.lunatrius.schematica.handler.ConfigurationHandler;
+
 public class FileFilterSchematic implements FileFilter {
 
     private final boolean directory;
@@ -16,9 +18,14 @@ public boolean accept(File file) {
         if (this.directory) {
             return file.isDirectory();
         }
-
-        return file.getName()
-            .toLowerCase()
-            .endsWith(".schematic");
+        if (ConfigurationHandler.useSchematicplusFormat) {
+            return file.getName()
+                .toLowerCase()
+                .endsWith(".schemplus");
+        } else {
+            return file.getName()
+                .toLowerCase()
+                .endsWith(".schematic");
+        }
     }
 }
diff --git a/src/main/java/com/github/lunatrius/schematica/client/gui/save/GuiSchematicSave.java b/src/main/java/com/github/lunatrius/schematica/client/gui/save/GuiSchematicSave.java
@@ -168,7 +168,12 @@ protected void actionPerformed(GuiButton guiButton) {
                 this.btnEnable.displayString = ClientProxy.isRenderingGuide ? this.strOn : this.strOff;
                 this.btnSave.enabled = ClientProxy.isRenderingGuide;
             } else if (guiButton.id == this.btnSave.id) {
-                String path = this.tfFilename.getText() + ".schematic";
+                String path;
+                if (ConfigurationHandler.useSchematicplusFormat) {
+                    path = this.tfFilename.getText() + ".schemplus";
+                } else {
+                    path = this.tfFilename.getText() + ".schematic";
+                }
                 if (Schematica.proxy.saveSchematic(
                     this.mc.thePlayer,
                     ConfigurationHandler.schematicDirectory,

diff --git a/src/main/java/com/github/lunatrius/schematica/client/world/SchematicWorld.java b/src/main/java/com/github/lunatrius/schematica/client/world/SchematicWorld.java
@@ -21,6 +21,7 @@
 import com.github.lunatrius.core.util.vector.Vector3f;
 import com.github.lunatrius.core.util.vector.Vector3i;
 import com.github.lunatrius.schematica.api.ISchematic;
+import com.github.lunatrius.schematica.handler.ConfigurationHandler;
 import com.github.lunatrius.schematica.reference.Reference;
 import com.github.lunatrius.schematica.world.chunk.ChunkProviderSchematic;
 import com.github.lunatrius.schematica.world.storage.SaveHandlerSchematic;
@@ -64,7 +65,11 @@ public SchematicWorld(ISchematic schematic) {
 
     public SchematicWorld(ISchematic schematic, String filename) {
         this(schematic);
-        this.name = filename.replace(".schematic", "");
+        if (ConfigurationHandler.useSchematicplusFormat) {
+            this.name = filename.replace(".schemplus", "");
+        } else {
+            this.name = filename.replace(".schematic", "");
+        }
     }
 
     @Override

diff --git a/src/main/java/com/github/lunatrius/schematica/command/CommandSchematicaDownload.java b/src/main/java/com/github/lunatrius/schematica/command/CommandSchematicaDownload.java
@@ -16,6 +16,7 @@
 import com.github.lunatrius.schematica.FileFilterSchematic;
 import com.github.lunatrius.schematica.Schematica;
 import com.github.lunatrius.schematica.api.ISchematic;
+import com.github.lunatrius.schematica.handler.ConfigurationHandler;
 import com.github.lunatrius.schematica.handler.DownloadHandler;
 import com.github.lunatrius.schematica.network.transfer.SchematicTransfer;
 import com.github.lunatrius.schematica.reference.Names;
@@ -69,7 +70,13 @@ public void processCommand(ICommandSender sender, String[] args) {
             throw new CommandException(Names.Command.Download.Message.PLAYERS_ONLY);
         }
 
-        final String filename = args[0] + ".schematic";
+        final String filename;
+        if (ConfigurationHandler.useSchematicplusFormat) {
+            filename = args[0] + ".schemplus";
+        } else {
+            filename = args[0] + ".schematic";
+        }
+
         final File directory = Schematica.proxy.getPlayerSchematicDirectory(player, true);
         if (!FileUtils.contains(directory, filename)) {
             Reference.logger.error("{} has tried to download the file {}", player.getDisplayName(), filename);

diff --git a/src/main/java/com/github/lunatrius/schematica/handler/ConfigurationHandler.java b/src/main/java/com/github/lunatrius/schematica/handler/ConfigurationHandler.java
@@ -29,6 +29,7 @@ public class ConfigurationHandler {
     public static Configuration configuration;
 
     public static final boolean SHOW_DEBUG_INFO_DEFAULT = true;
+    public static final boolean EXTENDED_ID_FORMAT_DEFAULT = false;
     public static final boolean ENABLE_ALPHA_DEFAULT = false;
     public static final double ALPHA_DEFAULT = 1.0;
     public static final boolean HIGHLIGHT_DEFAULT = true;
@@ -57,6 +58,7 @@ public class ConfigurationHandler {
     public static final boolean SERVERSIDE_SCHEMATICS_ENABLED_DEFAULT = true;
 
     public static boolean showDebugInfo = SHOW_DEBUG_INFO_DEFAULT;
+    public static boolean useSchematicplusFormat = EXTENDED_ID_FORMAT_DEFAULT;
     public static boolean enableAlpha = ENABLE_ALPHA_DEFAULT;
     public static float alpha = (float) ALPHA_DEFAULT;
     public static boolean highlight = HIGHLIGHT_DEFAULT;
@@ -82,6 +84,7 @@ public class ConfigurationHandler {
     public static boolean serversideSchematicsEnabled = SERVERSIDE_SCHEMATICS_ENABLED_DEFAULT;
 
     public static Property propShowDebugInfo = null;
+    public static Property propUseSchematicplusFormat = null;
     public static Property propEnableAlpha = null;
     public static Property propAlpha = null;
     public static Property propHighlight = null;
@@ -284,6 +287,14 @@ public static void loadConfiguration() {
             }
         }
 
+        propUseSchematicplusFormat = configuration.get(
+            Names.Config.Category.GENERAL,
+            Names.Config.EXTENDED_ID_FORMAT,
+            EXTENDED_ID_FORMAT_DEFAULT,
+            Names.Config.EXTENDED_ID_FORMAT_DESC);
+        propUseSchematicplusFormat.setLanguageKey(Names.Config.LANG_PREFIX + "." + Names.Config.EXTENDED_ID_FORMAT);
+        useSchematicplusFormat = propUseSchematicplusFormat.getBoolean(EXTENDED_ID_FORMAT_DEFAULT);
+
         propSortType = configuration
             .get(Names.Config.Category.GENERAL, Names.Config.SORT_TYPE, SORT_TYPE_DEFAULT, Names.Config.SORT_TYPE_DESC);
         propSortType.setShowInGui(false);

diff --git a/src/main/java/com/github/lunatrius/schematica/reference/Names.java b/src/main/java/com/github/lunatrius/schematica/reference/Names.java
@@ -18,6 +18,8 @@ public static final class Category {
 
         public static final String SHOW_DEBUG_INFO = "showDebugInfo";
         public static final String SHOW_DEBUG_INFO_DESC = "Display extra information on the debug screen (F3).";
+        public static final String EXTENDED_ID_FORMAT = "useSchematicplusFormat";
+        public static final String EXTENDED_ID_FORMAT_DESC = "Save and load schematics with a different format that supports a much higher number of block ids. Only schematics in schemplus format will be loaded.";
         public static final String ALPHA_ENABLED = "alphaEnabled";
         public static final String ALPHA_ENABLED_DESC = "Enable transparent textures.";
         public static final String ALPHA = "alpha";