[1.12] Performance improvements, bug fixes and clean up

build.gradle

@@ -18,6 +18,12 @@ allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
+        exclusiveContent {
+            forRepository {
+                maven { url "https://cursemaven.com" }
+            }
+            filter { includeGroup "curse.maven" }
+        }
     }
 
     version = "${minecraft_version}-${mod_version}"

common/build.gradle

@@ -11,6 +11,8 @@ dependencies {
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jackson_version}"
     implementation "com.fasterxml.jackson.core:jackson-databind:${jackson_version}"
     implementation "org.yaml:snakeyaml:${snakeyaml_version}"
+    implementation 'it.unimi.dsi:fastutil:7.1.0'
+    implementation 'org.apache.commons:commons-lang3:3.5'
 }
 
 shadowJar {

common/src/main/java/com/pg85/otg/OTG.java

@@ -17,19 +17,22 @@
 import com.pg85.otg.generator.resource.Resource;
 import com.pg85.otg.logging.LogMarker;
 import com.pg85.otg.util.ChunkCoordinate;
+import com.pg85.otg.util.CompressionUtils;
 
-import java.io.ByteArrayOutputStream;
+import java.io.BufferedOutputStream;
 import java.io.DataOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class OTG
 {		
 	// Used to determine if a new world is being created or if a world save already exists
@@ -366,49 +369,29 @@ public static boolean IsInAreaBeingPopulated(int blockX, int blockZ, ChunkCoordi
 
     public static boolean bo4DataExists(BO4Config config)
     {
-		String filePath = 
-			config.getFile().getAbsolutePath().endsWith(".BO4") ? config.getFile().getAbsolutePath().replace(".BO4", ".BO4Data") :
-			config.getFile().getAbsolutePath().endsWith(".bo4") ? config.getFile().getAbsolutePath().replace(".bo4", ".BO4Data") :
-			config.getFile().getAbsolutePath().endsWith(".BO3") ? config.getFile().getAbsolutePath().replace(".BO3", ".BO4Data") :
-			config.getFile().getAbsolutePath().endsWith(".bo3") ? config.getFile().getAbsolutePath().replace(".bo3", ".BO4Data") :
-			config.getFile().getAbsolutePath();
-
-        File file = new File(filePath);
-        return file.exists();
+        return Files.exists(getBO4DataFile(config));
     }
 
     public static void generateBO4Data(BO4Config config)
     {
-        //write to disk
-		String filePath = 
-			config.getFile().getAbsolutePath().endsWith(".BO4") ? config.getFile().getAbsolutePath().replace(".BO4", ".BO4Data") :
-			config.getFile().getAbsolutePath().endsWith(".bo4") ? config.getFile().getAbsolutePath().replace(".bo4", ".BO4Data") :
-			config.getFile().getAbsolutePath().endsWith(".BO3") ? config.getFile().getAbsolutePath().replace(".BO3", ".BO4Data") :
-			config.getFile().getAbsolutePath().endsWith(".bo3") ? config.getFile().getAbsolutePath().replace(".bo3", ".BO4Data") :
-			config.getFile().getAbsolutePath();
-
-        File file = new File(filePath);
-        if(!file.exists())
+        try(DataOutputStream out = new DataOutputStream(new BufferedOutputStream(CompressionUtils.newDeflaterOutputStream(getBO4DataFile(config)))))
         {
-            try {
-				ByteArrayOutputStream bos = new ByteArrayOutputStream();
-				DataOutputStream dos = new DataOutputStream(bos);
-				config.writeToStream(dos);
-				byte[] compressedBytes = com.pg85.otg.util.CompressionUtils.compress(bos.toByteArray());
-				dos.close();
-				FileOutputStream fos = new FileOutputStream(file);
-				DataOutputStream dos2 = new DataOutputStream(fos);
-				dos2.write(compressedBytes, 0, compressedBytes.length);
-				dos2.close();
-            }
-            catch (FileNotFoundException e)
-            {
-                e.printStackTrace();
-            }
-            catch (IOException e)
-            {
-                e.printStackTrace();
-            }
+            config.writeToStream(out);
+        }
+        catch(IOException e)
+        {
+            e.printStackTrace();
+        }
+    }
+
+    private static Path getBO4DataFile(BO4Config config)
+    {
+        Path file = config.getFile().toPath();
+        String name = file.getFileName().toString();
+        if(StringUtils.endsWithIgnoreCase(name, ".BO4") || StringUtils.endsWithIgnoreCase(name, ".BO3"))
+        {
+            return file.resolveSibling(name.substring(0, name.length() - 4) + ".BO4Data");
         }
+        return file;
     }
 }

common/src/main/java/com/pg85/otg/common/BlockContainer.java

@@ -0,0 +1,156 @@
+package com.pg85.otg.common;
+
+import java.nio.file.Path;
+import java.util.Objects;
+
+import com.pg85.otg.util.bo3.NamedBinaryTag;
+import com.pg85.otg.util.bo3.Rotation;
+
+import it.unimi.dsi.fastutil.objects.Reference2ReferenceMap;
+import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
+
+public abstract class BlockContainer
+{
+    protected final LocalMaterialData material;
+
+    protected BlockContainer(LocalMaterialData material)
+    {
+        this.material = Objects.requireNonNull(material);
+    }
+
+    public static BlockContainer of(LocalMaterialData material)
+    {
+        return WithoutTag.of(material);
+    }
+
+    public static BlockContainer of(LocalMaterialData material, Path directory, String relativePath)
+    {
+        return WithTag.of(material, directory, relativePath);
+    }
+
+    public LocalMaterialData material()
+    {
+        return material;
+    }
+
+    public abstract boolean hasTag();
+
+    public abstract NamedBinaryTag tag();
+
+    public abstract String tagPath();
+
+    public BlockContainer withMaterial(BlockContainer other)
+    {
+        return withMaterial(other.material);
+    }
+
+    public abstract BlockContainer withMaterial(LocalMaterialData material);
+
+    public abstract BlockContainer rotate(Rotation rotation);
+
+    public static class WithoutTag extends BlockContainer
+    {
+        private static final Reference2ReferenceMap<LocalMaterialData, WithoutTag> INSTANCES = new Reference2ReferenceOpenHashMap<>();
+
+        private WithoutTag(LocalMaterialData material)
+        {
+            super(material);
+        }
+
+        public static BlockContainer of(LocalMaterialData material)
+        {
+            return INSTANCES.computeIfAbsent(material.withBlockData(), WithoutTag::new);
+        }
+
+        @Override
+        public boolean hasTag()
+        {
+            return false;
+        }
+
+        @Override
+        public NamedBinaryTag tag()
+        {
+            return null;
+        }
+
+        @Override
+        public String tagPath()
+        {
+            return null;
+        }
+
+        @Override
+        public BlockContainer withMaterial(LocalMaterialData material)
+        {
+            if(material == this.material)
+                return this;
+            return of(material);
+        }
+
+        @Override
+        public BlockContainer rotate(Rotation rotation)
+        {
+            LocalMaterialData rotatedMaterial;
+            if((rotatedMaterial = material.rotate(rotation)) == material)
+            {
+                return this;
+            }
+            return of(rotatedMaterial);
+        }
+    }
+
+    public static class WithTag extends BlockContainer
+    {
+        private final TagContainer tagContainer;
+
+        private WithTag(LocalMaterialData material, TagContainer tagContainer)
+        {
+            super(material);
+            this.tagContainer = Objects.requireNonNull(tagContainer);
+        }
+
+        public static BlockContainer of(LocalMaterialData material, Path directory, String tagFileName)
+        {
+            // TODO implement cache?
+            return new WithTag(material, TagContainer.of(directory, tagFileName));
+        }
+
+        @Override
+        public boolean hasTag()
+        {
+            return true;
+        }
+
+        @Override
+        public NamedBinaryTag tag()
+        {
+            return tagContainer.getTag();
+        }
+
+        @Override
+        public String tagPath()
+        {
+            return tagContainer.getRelativePath();
+        }
+
+        @Override
+        public BlockContainer withMaterial(LocalMaterialData material)
+        {
+            if(material == this.material)
+                return this;
+            return new WithTag(material, tagContainer);
+        }
+
+        @Override
+        public BlockContainer rotate(Rotation rotation)
+        {
+            LocalMaterialData rotatedMaterial;
+            if((rotatedMaterial = material.rotate(rotation)) == material)
+            {
+                return this;
+            }
+            return new WithTag(rotatedMaterial, tagContainer);
+        }
+    }
+}