Merge pull request PolyhedralDev#441 from PolyhedralDev/ver/6.4.2

Ver/6.4.2

.gitignore

@@ -249,3 +249,5 @@ nbdist/
 
 platforms/**/run/**
 
+#Vale Config File
+**/.vale.ini

build.gradle.kts

@@ -1,8 +1,8 @@
 preRelease(true)
 
-versionProjects(":common:api", version("6.4.1"))
-versionProjects(":common:implementation", version("6.4.1"))
-versionProjects(":platforms", version("6.4.1"))
+versionProjects(":common:api", version("6.4.2"))
+versionProjects(":common:implementation", version("6.4.2"))
+versionProjects(":platforms", version("6.4.2"))
 
 
 allprojects {

buildSrc/build.gradle.kts

@@ -17,10 +17,10 @@ repositories {
 dependencies {
     //TODO Allow pulling from Versions.kt
     implementation("com.github.johnrengelman", "shadow", "8.1.1")
-    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.6")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.11")
 
-    implementation("org.ow2.asm", "asm", "9.5")
-    implementation("org.ow2.asm", "asm-tree", "9.5")
-    implementation("com.dfsek.tectonic", "common", "4.2.0")
+    implementation("org.ow2.asm", "asm", "9.6")
+    implementation("org.ow2.asm", "asm-tree", "9.6")
+    implementation("com.dfsek.tectonic", "common", "4.2.1")
     implementation("org.yaml", "snakeyaml", "2.2")
 }

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -48,17 +48,14 @@ fun Project.configureDependencies() {
         maven("https://jitpack.io") {
             name = "JitPack"
         }
-        maven("https://nexuslite.gcnt.net/repos/other/") {
-            name = "GCNT"
-        }
     }
 
     dependencies {
-        testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-        testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0")
-        compileOnly("org.jetbrains:annotations:23.0.0")
+        testImplementation("org.junit.jupiter", "junit-jupiter-api", Versions.Libraries.Internal.junit)
+        testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.Libraries.Internal.junit)
+        compileOnly("org.jetbrains", "annotations", Versions.Libraries.Internal.jetBrainsAnnotations)
 
-        compileOnly("com.google.guava:guava:30.0-jre")
-        testImplementation("com.google.guava:guava:30.0-jre")
+        compileOnly("com.google.guava", "guava", Versions.Libraries.Internal.guava)
+        testImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava)
     }
 }

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -27,7 +27,7 @@ fun Project.configureDistribution() {
         group = "terra"
         doFirst {
             file("${buildDir}/resources/main/packs/").deleteRecursively()
-            val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/latest/default.zip")
+            val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip")
             downloadPack(defaultPackUrl, project)
         }
     }

buildSrc/src/main/kotlin/Versions.kt

@@ -1,26 +1,34 @@
 object Versions {
+    object Terra {
+        const val overworldConfig = "v1.3.4"
+    }
+
     object Libraries {
         const val tectonic = "4.2.1"
         const val paralithic = "0.7.1"
         const val strata = "1.3.2"
 
         const val cloud = "1.8.4"
 
+        const val caffeine = "3.1.8"
+
         const val slf4j = "2.0.9"
         const val log4j_slf4j_impl = "2.20.0"
 
         object Internal {
             const val shadow = "8.1.1"
-            const val apacheText = "1.10.0"
-            const val apacheIO = "2.14.0"
+            const val apacheText = "1.11.0"
+            const val apacheIO = "2.15.1"
             const val guava = "32.1.3-jre"
-            const val asm = "9.5"
+            const val asm = "9.6"
             const val snakeYml = "2.2"
+            const val jetBrainsAnnotations = "24.1.0"
+            const val junit = "5.10.1"
         }
     }
 
     object Fabric {
-        const val fabricAPI = "0.90.0+${Mod.minecraft}"
+        const val fabricAPI = "0.91.2+${Mod.minecraft}"
     }
 //
 //    object Quilt {
@@ -31,30 +39,28 @@ object Versions {
     object Mod {
         const val mixin = "0.12.5+mixin.0.8.5"
 
-        const val minecraft = "1.20.2"
-        const val yarn = "$minecraft+build.4"
-        const val fabricLoader = "0.14.23"
-
-        const val architecuryLoom = "1.3.357"
-        const val architecturyPlugin = "3.4.146"
+        const val minecraft = "1.20.4"
+        const val yarn = "$minecraft+build.1"
+        const val fabricLoader = "0.15.1"
 
-        const val loomVineflower = "1.11.0"
-    }
-
-    object Forge {
-        const val forge = "${Mod.minecraft}-48.0.13"
-        const val burningwave = "12.63.0"
+        const val architecuryLoom = "1.4.369"
+        const val architecturyPlugin = "3.4.151"
     }
+//
+//    object Forge {
+//        const val forge = "${Mod.minecraft}-48.0.13"
+//        const val burningwave = "12.63.0"
+//    }
 
     object Bukkit {
-        const val paper = "1.18.2-R0.1-SNAPSHOT"
-        const val paperLib = "1.0.5"
-        const val foliaLib = "0.2.5"
-        const val minecraft = "1.20.2"
-        const val reflectionRemapper = "0.1.0-SNAPSHOT"
-        const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT"
-        const val runPaper = "2.2.0"
-        const val paperWeight = "1.5.6"
+        const val minecraft = "1.20.4"
+        const val paperBuild = "$minecraft-R0.1-20231209.173338-2"
+        const val paper = paperBuild
+        const val paperLib = "1.0.8"
+        const val reflectionRemapper = "0.1.0"
+        const val paperDevBundle = paperBuild
+        const val runPaper = "2.2.2"
+        const val paperWeight = "1.5.11"
     }
 
     //
@@ -66,6 +72,6 @@ object Versions {
 //
     object CLI {
         const val nbt = "6.1"
-        const val logback = "1.4.11"
+        const val logback = "1.4.14"
     }
 }

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/ReplaceExtrusion.java

@@ -1,5 +1,9 @@
 package com.dfsek.terra.addons.biome.extrusion.extrusions;
 
+import java.util.Collection;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
 import com.dfsek.terra.addons.biome.query.api.BiomeQueries;
@@ -8,10 +12,6 @@
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.Biome;
 
-import java.util.Collection;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 
 /**
  * Sets biomes at locations based on a sampler.

common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProvider.java

@@ -7,13 +7,13 @@
 
 package com.dfsek.terra.addons.biome.image.v2;
 
+import java.util.Optional;
+
 import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
-import java.util.Optional;
-
 
 public class ImageBiomeProvider implements BiomeProvider {
     private final int resolution;

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/BiomeChunkImpl.java

@@ -14,22 +14,23 @@ public class BiomeChunkImpl implements BiomeChunk {
     private final SeededVector worldOrigin;
     private final int chunkOriginArrayIndex;
     private final int worldCoordinateScale;
-    private PipelineBiome[][] biomes;
+    private final int size;
+    private PipelineBiome[] biomes;
 
     public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
 
         this.worldOrigin = worldOrigin;
         this.chunkOriginArrayIndex = pipeline.getChunkOriginArrayIndex();
         this.worldCoordinateScale = pipeline.getResolution();
 
-        int size = pipeline.getArraySize();
+        this.size = pipeline.getArraySize();
 
         int expanderCount = pipeline.getExpanderCount();
         int expansionsApplied = 0;
 
         // Allocate working arrays
-        this.biomes = new PipelineBiome[size][size];
-        PipelineBiome[][] lookupArray = new PipelineBiome[size][size];
+        this.biomes = new PipelineBiome[size * size];
+        PipelineBiome[] lookupArray = new PipelineBiome[size * size];
         // A second lookup array is required such that stage application doesn't affect lookups, otherwise application may cascade
 
         // Construct working grid
@@ -43,7 +44,7 @@ public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
             for(int gridZ = 0; gridZ < gridSize; gridZ++) {
                 int xIndex = gridOrigin + gridX * gridInterval;
                 int zIndex = gridOrigin + gridZ * gridInterval;
-                biomes[xIndex][zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex),
+                biomes[(xIndex * size) + zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex),
                     zIndexToWorldCoordinate(zIndex));
             }
         }
@@ -65,7 +66,7 @@ public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
 
             // Cycle arrays, the previously populated array is swapped to be used for lookups, and the result of the stage application
             // overwrites the previous lookup array. This saves having to allocate a new array copy each time
-            PipelineBiome[][] tempArray = biomes;
+            PipelineBiome[] tempArray = biomes;
             biomes = lookupArray;
             lookupArray = tempArray;
 
@@ -74,7 +75,8 @@ public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
                 for(int gridX = 0; gridX < gridSize; gridX = gridX + 1) {
                     int xIndex = gridOrigin + gridX * gridInterval;
                     int zIndex = gridOrigin + gridZ * gridInterval;
-                    biomes[xIndex][zIndex] = stage.apply(new ViewPoint(this, gridInterval, gridX, gridZ, xIndex, zIndex, lookupArray));
+                    biomes[(xIndex * size) + zIndex] = stage.apply(
+                        new ViewPoint(this, gridInterval, gridX, gridZ, xIndex, zIndex, lookupArray, size));
                 }
             }
         }
@@ -133,7 +135,7 @@ private static int calculateGridInterval(int totalExpansions, int expansionsAppl
     public PipelineBiome get(int xInChunk, int zInChunk) {
         int xIndex = xInChunk + chunkOriginArrayIndex;
         int zIndex = zInChunk + chunkOriginArrayIndex;
-        return biomes[xIndex][zIndex];
+        return biomes[(xIndex * size) + zIndex];
     }
 
     private int xIndexToWorldCoordinate(int xIndex) {
@@ -159,24 +161,26 @@ public static class ViewPoint {
         private final int gridZ;
         private final int xIndex;
         private final int zIndex;
-        private final PipelineBiome[][] lookupArray;
+        private final PipelineBiome[] lookupArray;
+        private final int size;
 
         private ViewPoint(BiomeChunkImpl chunk, int gridInterval, int gridX, int gridZ, int xIndex, int zIndex,
-                          PipelineBiome[][] lookupArray) {
+                          PipelineBiome[] lookupArray, int size) {
             this.chunk = chunk;
             this.gridInterval = gridInterval;
             this.gridX = gridX;
             this.gridZ = gridZ;
             this.xIndex = xIndex;
             this.zIndex = zIndex;
             this.lookupArray = lookupArray;
-            this.biome = lookupArray[xIndex][zIndex];
+            this.size = size;
+            this.biome = lookupArray[(this.xIndex * this.size) + this.zIndex];
         }
 
         public PipelineBiome getRelativeBiome(int x, int z) {
             int lookupXIndex = this.xIndex + x * gridInterval;
             int lookupZIndex = this.zIndex + z * gridInterval;
-            return lookupArray[lookupXIndex][lookupZIndex];
+            return lookupArray[(lookupXIndex * this.size) + lookupZIndex];
         }
 
         public PipelineBiome getBiome() {

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java

@@ -10,8 +10,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
@@ -32,7 +32,7 @@ public class BlockFunction implements Function<Void> {
     protected final Returnable<Number> x, y, z;
     protected final Returnable<String> blockData;
     protected final Platform platform;
-    private final Map<String, BlockState> data = new HashMap<>();
+    private final Map<String, BlockState> data = new ConcurrentHashMap<>();
     private final Returnable<Boolean> overwrite;
     private final Returnable<Boolean> physics;
     private final Position position;

common/api/build.gradle.kts

@@ -6,6 +6,6 @@ dependencies {
 
     api("com.dfsek.tectonic", "common", Versions.Libraries.tectonic)
 
-    api("com.github.ben-manes.caffeine:caffeine:3.1.0")
+    api("com.github.ben-manes.caffeine", "caffeine", Versions.Libraries.caffeine)
 
 }

common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java

@@ -26,6 +26,33 @@
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
 import com.dfsek.tectonic.yaml.YamlConfiguration;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimaps;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
@@ -56,28 +83,16 @@
 import com.dfsek.terra.config.fileloaders.ZIPLoader;
 import com.dfsek.terra.config.loaders.GenericTemplateSupplierLoader;
 import com.dfsek.terra.config.loaders.config.BufferedImageLoader;
-import com.dfsek.terra.config.preprocessor.*;
+import com.dfsek.terra.config.preprocessor.MetaListLikePreprocessor;
+import com.dfsek.terra.config.preprocessor.MetaMapPreprocessor;
+import com.dfsek.terra.config.preprocessor.MetaNumberPreprocessor;
+import com.dfsek.terra.config.preprocessor.MetaStringPreprocessor;
+import com.dfsek.terra.config.preprocessor.MetaValuePreprocessor;
 import com.dfsek.terra.config.prototype.ProtoConfig;
 import com.dfsek.terra.registry.CheckedRegistryImpl;
 import com.dfsek.terra.registry.OpenRegistryImpl;
 import com.dfsek.terra.registry.ShortcutHolder;
 
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Multimaps;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
 
 /**
  * Represents a Terra configuration pack.