fix typos

fix error on startup
spell check
2026-05-21 09:10:48 +00:00 · 2023-12-17 15:32:35 -07:00 · 2023-12-17 15:29:18 -07:00 · 2023-12-10 18:50:40 -07:00 · 2023-12-10 18:47:12 -07:00 · 2023-12-10 18:44:26 -07:00
75 changed files with 439 additions and 892 deletions
@@ -1,19 +1,13 @@
 # Global owners, automatically request review when pull request is submitted
-*                   @dfsek @solonovamax
+*                   @dfsek @solonovamax @duplexsystem @Astrashh @justaureus

 # Platforms
-## dfsek wrote the majority of the platform impls
-/platforms/bukkit/  @dfsek
-/platforms/fabric/  @dfsek
-/platforms/forge/   @dfsek
-/platforms/sponge/  @dfsek
-## solonovamax is working on the region generator (unless duplexsystem takes it over)
-/platforms/region/  @solonovamax
+/platforms/         @dfsek @solonovamax @duplexsystem @justaureus

 # Common
-/common/            @dfsek @solonovamax
+/common/            @dfsek @solonovamax @duplexsystem @Astrashh

 # Gradle Stuff
-## Most gradle stuff was written by solonovamax
-/buildSrc/           @solonovamax
-*.gradle.kts        @solonovamax
+/buildSrc/          @dfsek @solonovamax @duplexsystem
+*.gradle.kts        @dfsek @solonovamax @duplexsystem
+/gradle/            @dfsek @solonovamax @duplexsystem
@@ -0,0 +1,47 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
+
+name: Gradle Build
+
+on: [ pull_request ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - name: Set up JDK 17
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+      - uses: burrunan/gradle-cache-action@03c71a8ba93d670980695505f48f49daf43704a6
+        name: Build Terra
+        with:
+          # Specifies arguments for Gradle execution
+          # If arguments is missing or empty, then Gradle is not executed
+          arguments: build
+          # arguments can be multi-line for better readability
+          # arguments: |
+          #  --no-paralell
+          #  build
+          #  -x test
+          # Gradle version to use for execution:
+          #   wrapper (default), current, rc, nightly, release-nightly, or
+          #   versions like 6.6 (see https://services.gradle.org/versions/all)
+          gradle-version: wrapper
+          # Properties are passed as -Pname=value
+          properties: |
+            kotlin.js.compiler=ir
+            kotlin.parallel.tasks.in.project=true
@@ -249,3 +249,5 @@ nbdist/

 platforms/**/run/**

+#Vale Config File
+**/.vale.ini
@@ -1,8 +1,8 @@
 preRelease(true)

-versionProjects(":common:api", version("6.5.0"))
-versionProjects(":common:implementation", version("6.5.0"))
-versionProjects(":platforms", version("6.5.0"))
+versionProjects(":common:api", version("6.4.2"))
+versionProjects(":common:implementation", version("6.4.2"))
+versionProjects(":platforms", version("6.4.2"))


 allprojects {
@@ -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")
 }
@@ -18,7 +18,7 @@ fun Project.addonDir(dir: File, task: Task) {
            matchingAddons(dir) {
                it.name.startsWith("Terra-") // Assume everything that starts with Terra- is a core addon.
            }.forEach {
-                println("Deleting old addon: " + it.absolutePath)
+                logger.info("Deleting old addon: " + it.absolutePath)
                it.delete()
            }
            forSubProjects(":common:addons") {
@@ -29,7 +29,7 @@ fun Project.addonDir(dir: File, task: Task) {
                
                val base = "${jar.archiveBaseName.get()}-${version}"
                
-                println("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
+                logger.info("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
                
                jar.archiveFile.orNull?.asFile?.copyTo(target)
            }
@@ -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)
    }
 }
@@ -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)
        }
    }
@@ -53,7 +53,7 @@ fun Project.configureDistribution() {
                forSubProjects(":common:addons") {
                    val jar = getJarTask()
                    
-                    println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
+                    logger.info("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
                    
                    val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
                    val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
@@ -42,10 +42,10 @@ fun preRelease(preRelease: Boolean) {
 fun Project.versionProjects(project: String, version: String) {
    forSubProjects(project) {
        this.version = version
-        println("Setting version of $path to $version")
+        logger.info("Setting version of $path to $version")
    }
    project(project).version = version
-    println("Setting version of $project to $version")
+    logger.info("Setting version of $project to $version")
 }

 fun Project.version(version: String): String {
@@ -1,4 +1,8 @@
 object Versions {
+    object Terra {
+        const val overworldConfig = "v1.3.4"
+    }
+    
    object Libraries {
        const val tectonic = "4.2.1"
        const val paralithic = "0.7.1"
@@ -6,21 +10,25 @@ object Versions {
        
        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 minecraft = "1.20.4"
+        const val yarn = "$minecraft+build.1"
+        const val fabricLoader = "0.15.1"
        
-        const val architecuryLoom = "1.3.357"
-        const val architecturyPlugin = "3.4.146"
-        
-        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"
    }
 }
@@ -82,7 +82,7 @@ abstract class GenerateDocsTask : DefaultTask() {
                        }
                        
                        template.add(keyName.toString(), description.toString().ifBlank {
-                            println("No description provided for field " + field.name + " in class " + name)
+                            logger.info("No description provided for field " + field.name + " in class " + name)
                            "*No description provided.*"
                        })
                    }
@@ -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.Range;
 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.
@@ -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;
@@ -14,7 +14,8 @@ 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) {

@@ -22,14 +23,14 @@ public class BiomeChunkImpl implements BiomeChunk {
        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 class BiomeChunkImpl implements BiomeChunk {
            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 class BiomeChunkImpl implements BiomeChunk {

            // 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 class BiomeChunkImpl implements BiomeChunk {
                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 @@ public class BiomeChunkImpl implements BiomeChunk {
    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,10 +161,11 @@ public class BiomeChunkImpl implements BiomeChunk {
        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;
@@ -170,13 +173,14 @@ public class BiomeChunkImpl implements BiomeChunk {
            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() {
@@ -1,4 +1,4 @@
-version = version("1.1.0")
+version = version("1.1.1")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -8,31 +8,24 @@ import com.dfsek.terra.api.world.WritableWorld;


 public class VanillaOreUtils {
-    protected static boolean shouldNotDiscard(Random random, double chance) {
-        if(chance <= 0.0F) {
-            return true;
-        } else if(chance >= 1.0F) {
-            return false;
-        } else {
-            return random.nextFloat() >= chance;
-        }
+    private static boolean shouldExpose(Random random, double exposedChance) {
+        if(exposedChance >= 1.0F) return true;
+        if(exposedChance <= 0.0F) return false;
+        return random.nextFloat() < exposedChance;
    }

-    public static boolean shouldPlace(MaterialSet replaceable, BlockType type, Double exposed, Random random, WritableWorld world, int x,
+    public static boolean shouldPlace(MaterialSet replaceable, BlockType type, Double exposedChance, Random random, WritableWorld world,
+                                      int x,
                                      int y, int z) {
-        if(!replaceable.contains(type)) {
-            return false;
-        } else if(shouldNotDiscard(random, exposed)) {
-            return true;
-        } else {
-            return !(world.getBlockState(x, y, z - 1).isAir() ||
-                     world.getBlockState(x, y, z + 1).isAir() ||
-                     world.getBlockState(x, y - 1, z).isAir() ||
-                     world.getBlockState(x, y + 1, z).isAir() ||
-                     world.getBlockState(x - 1, y, z).isAir() ||
-                     world.getBlockState(x + 1, y, z).isAir());
-        }
+        if(!replaceable.contains(type)) return false;
+        if(shouldExpose(random, exposedChance)) return true; // Exposed blocks can be placed regardless of adjacency to air
+        // Adjacency is checked after determining not exposed rather than vice-versa, assuming block checks are more expensive
+        boolean adjacentAir = world.getBlockState(x, y, z - 1).isAir() ||
+                              world.getBlockState(x, y, z + 1).isAir() ||
+                              world.getBlockState(x, y - 1, z).isAir() ||
+                              world.getBlockState(x, y + 1, z).isAir() ||
+                              world.getBlockState(x - 1, y, z).isAir() ||
+                              world.getBlockState(x + 1, y, z).isAir();
+        return !adjacentAir; // Exposed check did not pass earlier so only blocks not adjacent air should place
    }
-
 }
-
@@ -10,8 +10,8 @@ package com.dfsek.terra.addons.terrascript.script.functions;
 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;
@@ -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)

 }
@@ -26,6 +26,33 @@ import com.dfsek.tectonic.api.loader.AbstractConfigLoader;
 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.FolderLoader;
 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.
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -10,14 +10,13 @@ repositories {

 dependencies {
    shaded(project(":platforms:bukkit:common"))
-    shaded(project(":platforms:bukkit:nms:v1_20_R2", configuration = "reobf"))
+    shaded(project(":platforms:bukkit:nms:v1_20_R3", configuration = "reobf"))
    shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }

 tasks {
    shadowJar {
        relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
-        relocate("com.tcoded.folialib", "com.dfsek.terra.lib.folialib")
        relocate("com.google.common", "com.dfsek.terra.lib.google.common")
        relocate("org.apache.logging.slf4j", "com.dfsek.terra.lib.slf4j-over-log4j")
        exclude("org/slf4j/**")
@@ -8,9 +8,7 @@ dependencies {
    compileOnly("io.papermc.paper", "paper-api", Versions.Bukkit.paper)

    shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
-    // TODO: 2023-11-08 When we drop support for 1.18 and 1.19, we can remove FoliaLib and instead use `RegionScheduler`,
-    //       AsyncScheduler, or GlobalRegionScheduler.
-    shadedApi("com.tcoded", "FoliaLib", Versions.Bukkit.foliaLib)
+
    shadedApi("com.google.guava", "guava", Versions.Libraries.Internal.guava)

    shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
@@ -84,8 +84,8 @@ public class PlatformImpl extends AbstractPlatform {
    }

    @Override
-    public void runPossiblyUnsafeTask(@NotNull Runnable task) {
-        plugin.getFoliaLib().getImpl().runAsync(task);
+    public void runPossiblyUnsafeTask(@NotNull Runnable runnable) {
+        plugin.getGlobalRegionScheduler().run(plugin, task -> runnable.run());
    }

    @Override
@@ -21,7 +21,8 @@ import cloud.commandframework.brigadier.CloudBrigadierManager;
 import cloud.commandframework.bukkit.CloudBukkitCapabilities;
 import cloud.commandframework.execution.CommandExecutionCoordinator;
 import cloud.commandframework.paper.PaperCommandManager;
-import com.tcoded.folialib.FoliaLib;
+import io.papermc.paper.threadedregions.scheduler.AsyncScheduler;
+import io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler;
 import org.bukkit.Bukkit;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -32,6 +33,7 @@ import org.slf4j.LoggerFactory;

 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;

 import com.dfsek.terra.api.command.CommandSender;
 import com.dfsek.terra.api.config.ConfigPack;
@@ -51,7 +53,9 @@ public class TerraBukkitPlugin extends JavaPlugin {
    private final PlatformImpl platform = new PlatformImpl(this);
    private final Map<String, com.dfsek.terra.api.world.chunk.generation.ChunkGenerator> generatorMap = new HashMap<>();

-    private final FoliaLib foliaLib = new FoliaLib(this);
+    private AsyncScheduler asyncScheduler = this.getServer().getAsyncScheduler();
+
+    private GlobalRegionScheduler globalRegionScheduler = this.getServer().getGlobalRegionScheduler();

    @Override
    public void onEnable() {
@@ -61,6 +65,10 @@ public class TerraBukkitPlugin extends JavaPlugin {

        platform.getEventManager().callEvent(new PlatformInitializationEvent());

+        if(!Initializer.init(platform)) {
+            Bukkit.getPluginManager().disablePlugin(this);
+            return;
+        }

        try {
            PaperCommandManager<CommandSender> commandManager = getCommandSenderPaperCommandManager();
@@ -80,8 +88,6 @@ public class TerraBukkitPlugin extends JavaPlugin {

        Bukkit.getPluginManager().registerEvents(new CommonListener(), this); // Register master event listener
        PaperUtil.checkPaper(this);
-
-        Initializer.init(platform);
    }

    @NotNull
@@ -116,6 +122,9 @@ public class TerraBukkitPlugin extends JavaPlugin {
        if(!VersionUtil.getSpigotVersionInfo().isSpigot())
            logger.error("YOU ARE RUNNING A CRAFTBUKKIT OR BUKKIT SERVER. PLEASE UPGRADE TO PAPER.");

+        if(!VersionUtil.getSpigotVersionInfo().isPaper())
+            logger.error("YOU ARE RUNNING A SPIGOT SERVER. PLEASE UPGRADE TO PAPER.");
+
        if(VersionUtil.getSpigotVersionInfo().isMohist()) {
            if(System.getProperty("IKnowMohistCausesLotsOfIssuesButIWillUseItAnyways") == null) {
                Runnable runnable = () -> { // scary big block of text
@@ -159,7 +168,7 @@ public class TerraBukkitPlugin extends JavaPlugin {
                                 """.strip());
                };
                runnable.run();
-                foliaLib.getImpl().runLaterAsync(runnable, 200L);
+                asyncScheduler.runDelayed(this, task -> runnable.run(), 200L, TimeUnit.SECONDS);
                // Bukkit.shutdown(); // we're not *that* evil
                Bukkit.getPluginManager().disablePlugin(this);
                return false;
@@ -187,7 +196,11 @@ public class TerraBukkitPlugin extends JavaPlugin {
        }), platform.getRawConfigRegistry().getByID(id).orElseThrow(), platform.getWorldHandle().air());
    }

-    public FoliaLib getFoliaLib() {
-        return foliaLib;
+    public AsyncScheduler getAsyncScheduler() {
+        return asyncScheduler;
+    }
+
+    public GlobalRegionScheduler getGlobalRegionScheduler() {
+        return globalRegionScheduler;
    }
 }
@@ -20,6 +20,8 @@ package com.dfsek.terra.bukkit.handles;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import java.util.Locale;

@@ -31,6 +33,7 @@ import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;


 public class BukkitWorldHandle implements WorldHandle {
+    private static final Logger logger = LoggerFactory.getLogger(BukkitWorldHandle.class);
    private final BlockState air;

    public BukkitWorldHandle() {
@@ -39,6 +42,13 @@ public class BukkitWorldHandle implements WorldHandle {

    @Override
    public synchronized @NotNull BlockState createBlockState(@NotNull String data) {
+        if(data.equals("minecraft:grass")) { //TODO: remove in 7.0
+            data = "minecraft:short_grass";
+            logger.warn(
+                "Translating minecraft:grass to minecraft:short_grass. In 1.20.3 minecraft:grass was renamed to minecraft:short_grass" +
+                ". You are advised to perform this rename in your config backs as this translation will be removed in the next major " +
+                "version of Terra.");
+        }
        org.bukkit.block.data.BlockData bukkitData = Bukkit.createBlockData(
            data); // somehow bukkit managed to make this not thread safe! :)
        return BukkitBlockState.newInstance(bukkitData);
@@ -51,6 +61,13 @@ public class BukkitWorldHandle implements WorldHandle {

    @Override
    public @NotNull EntityType getEntity(@NotNull String id) {
+        if (!id.contains(":")) { //TODO: remove in 7.0
+            String newid = "minecraft:" + id.toLowerCase();;
+            logger.warn(
+                "Translating " + id + " to " + newid + ". In 1.20.3 entity parsing was reworked" +
+                ". You are advised to perform this rename in your config backs as this translation will be removed in the next major " +
+                "version of Terra.");
+        }
        if(!id.startsWith("minecraft:")) throw new IllegalArgumentException("Invalid entity identifier " + id);
        String entityID = id.toUpperCase(Locale.ROOT).substring(10);

@@ -11,7 +11,7 @@ public interface Initializer {
    String NMS = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
    String TERRA_PACKAGE = Initializer.class.getPackageName();

-    static void init(PlatformImpl platform) {
+    static boolean init(PlatformImpl platform) {
        Logger logger = LoggerFactory.getLogger(Initializer.class);
        try {
            Class<?> initializerClass = Class.forName(TERRA_PACKAGE + "." + NMS + ".NMSInitializer");
@@ -24,16 +24,27 @@ public interface Initializer {
        } catch(ClassNotFoundException e) {
            logger.error("NMS bindings for version {} do not exist. Support for this version is limited.", NMS);
            logger.error("This is usually due to running Terra on an unsupported Minecraft version.");
-            logger.error("");
-            logger.error("");
-            for(int i = 0; i < 20; i++) {
-                logger.error("PROCEEDING WITH AN EXISTING TERRA WORLD WILL RESULT IN CORRUPTION!!!");
+            String bypassKey = "IKnowThereAreNoNMSBindingsFor" + NMS + "ButIWillProceedAnyway";
+            if(System.getProperty(bypassKey) == null) {
+                logger.error("Because of this **TERRA HAS BEEN DISABLED**.");
+                logger.error("Do not come ask us why it is not working.");
+                logger.error("If you wish to proceed anyways, you can add the JVM System Property \"{}\" to enable the plugin.", bypassKey);
+                return false;
+            } else {
+                logger.error("");
+                logger.error("");
+                for(int i = 0; i < 20; i++) {
+                    logger.error("PROCEEDING WITH AN EXISTING TERRA WORLD WILL RESULT IN CORRUPTION!!!");
+                }
+                logger.error("");
+                logger.error("");
+                logger.error("NMS bindings for version {} do not exist. Support for this version is limited.", NMS);
+                logger.error("This is usually due to running Terra on an unsupported Minecraft version.");
+                logger.error("We will not give you any support for issues that may arise.");
+                logger.error("Since you enabled the \"{}\" flag, we won't disable Terra. But be warned.", bypassKey);
            }
-            logger.error("");
-            logger.error("");
-            logger.error("NMS bindings for version {} do not exist. Support for this version is limited.", NMS);
-            logger.error("This is usually due to running Terra on an unsupported Minecraft version.");
        }
+        return true;
    }

    void initialize(PlatformImpl plugin);
@@ -19,6 +19,8 @@ package com.dfsek.terra.bukkit.util;

 import io.papermc.lib.PaperLib;

+import java.util.concurrent.TimeUnit;
+
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;

 import static io.papermc.lib.PaperLib.suggestPaper;
@@ -26,10 +28,10 @@ import static io.papermc.lib.PaperLib.suggestPaper;

 public final class PaperUtil {
    public static void checkPaper(TerraBukkitPlugin plugin) {
-        plugin.getFoliaLib().getImpl().runLaterAsync(() -> {
+        plugin.getAsyncScheduler().runDelayed(plugin, task -> {
            if(!PaperLib.isPaper()) {
                suggestPaper(plugin);
            }
-        }, 100L);
+        }, 100L, TimeUnit.SECONDS);
    }
 }
@@ -4,6 +4,6 @@ version: "@VERSION@"
 load: "STARTUP"
 author: dfsek
 website: "@WIKI@"
-api-version: "1.13"
+api-version: "1.20"
 description: "@DESCRIPTION@"
 folia-supported: true
@@ -1,28 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.level.biome.AmbientAdditionsSettings;
-
-
-public class BiomeAdditionsSoundTemplate implements ObjectTemplate<AmbientAdditionsSettings> {
-    @Value("sound")
-    @Default
-    private SoundEvent sound = null;
-    
-    @Value("sound-chance")
-    @Default
-    private Double soundChance = null;
-    
-    @Override
-    public AmbientAdditionsSettings get() {
-        if(sound == null || soundChance == null) {
-            return null;
-        } else {
-            return new AmbientAdditionsSettings(BuiltInRegistries.SOUND_EVENT.wrapAsHolder(sound), soundChance);
-        }
-    }
-}
@@ -1,36 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.level.biome.AmbientMoodSettings;
-
-
-public class BiomeMoodSoundTemplate implements ObjectTemplate<AmbientMoodSettings> {
-    @Value("sound")
-    @Default
-    private SoundEvent sound = null;
-    
-    @Value("cultivation-ticks")
-    @Default
-    private Integer soundCultivationTicks = null;
-    
-    @Value("spawn-range")
-    @Default
-    private Integer soundSpawnRange = null;
-    
-    @Value("extra-distance")
-    @Default
-    private Double soundExtraDistance = null;
-    
-    @Override
-    public AmbientMoodSettings get() {
-        if(sound == null || soundCultivationTicks == null || soundSpawnRange == null || soundExtraDistance == null) {
-            return null;
-        } else {
-            return new AmbientMoodSettings(BuiltInRegistries.SOUND_EVENT.wrapAsHolder(sound), soundCultivationTicks, soundSpawnRange, soundExtraDistance);
-        }
-    }
-}
@@ -1,34 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import com.mojang.brigadier.StringReader;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.commands.arguments.ParticleArgument;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.world.level.biome.AmbientParticleSettings;
-
-
-public class BiomeParticleConfigTemplate implements ObjectTemplate<AmbientParticleSettings> {
-    @Value("particle")
-    @Default
-    private String particle = null;
-    
-    @Value("probability")
-    @Default
-    private Integer probability = null;
-    
-    @Override
-    public AmbientParticleSettings get() {
-        if(particle == null || probability == null) {
-            return null;
-        }
-        
-        try {
-            return new AmbientParticleSettings(ParticleArgument.readParticle(new StringReader(particle), BuiltInRegistries.PARTICLE_TYPE.asLookup()), probability);
-        } catch(CommandSyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
@@ -1,21 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EntityType;
-
-
-public class EntityTypeTemplate implements ObjectTemplate<EntityType<?>> {
-    @Value("id")
-    @Default
-    private ResourceLocation id = null;
-    
-    @Override
-    public EntityType<?> get() {
-        return BuiltInRegistries.ENTITY_TYPE.get(id);
-    }
-}
@@ -1,36 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.sounds.Music;
-import net.minecraft.sounds.SoundEvent;
-
-
-public class MusicSoundTemplate implements ObjectTemplate<Music> {
-    @Value("sound")
-    @Default
-    private SoundEvent sound = null;
-    
-    @Value("min-delay")
-    @Default
-    private Integer minDelay = null;
-    
-    @Value("max-delay")
-    @Default
-    private Integer maxDelay = null;
-    
-    @Value("replace-current-music")
-    @Default
-    private Boolean replaceCurrentMusic = null;
-    
-    @Override
-    public Music get() {
-        if(sound == null || minDelay == null || maxDelay == null || replaceCurrentMusic == null) {
-            return null;
-        } else {
-            return new Music(BuiltInRegistries.SOUND_EVENT.wrapAsHolder(sound), minDelay, maxDelay, replaceCurrentMusic);
-        }
-    }
-}
@@ -1,29 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvent;
-
-
-public class SoundEventTemplate implements ObjectTemplate<SoundEvent> {
-    @Value("id")
-    @Default
-    private ResourceLocation id = null;
-    
-    @Value("distance-to-travel")
-    @Default
-    private Float distanceToTravel = null;
-    
-    @Override
-    public SoundEvent get() {
-        if(id == null) {
-            return null;
-        } else if(distanceToTravel == null) {
-            return SoundEvent.createVariableRangeEvent(id);
-        } else {
-            return SoundEvent.createFixedRangeEvent(id, distanceToTravel);
-        }
-    }
-}
@@ -1,38 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.world.entity.EntityType;
-
-
-public class SpawnCostConfig implements ObjectTemplate<SpawnCostConfig> {
-    @Value("type")
-    @Default
-    private EntityType<?> type = null;
-    
-    @Value("mass")
-    @Default
-    private Double mass = null;
-    
-    @Value("gravity")
-    @Default
-    private Double gravity = null;
-    
-    public EntityType<?> getType() {
-        return type;
-    }
-    
-    public Double getMass() {
-        return mass;
-    }
-    
-    public Double getGravity() {
-        return gravity;
-    }
-    
-    @Override
-    public SpawnCostConfig get() {
-        return this;
-    }
-}
@@ -1,31 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData;
-
-
-public class SpawnEntryTemplate implements ObjectTemplate<SpawnerData> {
-    @Value("type")
-    @Default
-    private EntityType<?> type = null;
-    
-    @Value("weight")
-    @Default
-    private Integer weight = null;
-    
-    @Value("min-group-size")
-    @Default
-    private Integer minGroupSize = null;
-    
-    @Value("max-group-size")
-    @Default
-    private Integer maxGroupSize = null;
-    
-    @Override
-    public SpawnerData get() {
-        return new SpawnerData(type, weight, minGroupSize, maxGroupSize);
-    }
-}
@@ -1,57 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import java.util.List;
-import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.biome.MobSpawnSettings;
-import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class SpawnSettingsTemplate implements ObjectTemplate<MobSpawnSettings> {
-
-    private static final Logger logger = LoggerFactory.getLogger(SpawnTypeConfig.class);
-    private static boolean used = false;
-
-    @Value("spawns")
-    @Default
-    private List<SpawnTypeConfig> spawns = null;
-    
-    @Value("costs")
-    @Default
-    private List<SpawnCostConfig> costs = null;
-    
-    @Value("probability")
-    @Default
-    private Float probability = null;
-    
-    @Override
-    public MobSpawnSettings get() {
-        MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder();
-        for(SpawnTypeConfig spawn : spawns) {
-            MobCategory group = spawn.getGroup();
-            if (spawn.getEntries() != null) {
-                for(SpawnerData entry : spawn.getEntries()) {
-                    builder.addSpawn(group, entry);
-                }
-            } else if (spawn.getEntry() != null) {
-                if(!used) {
-                    logger.warn("The entry sub-field of spawns is deprecated. " +
-                                "It is recommended to use the entries sub-field instead.");
-                    used = true;
-                }
-            }
-        }
-        for(SpawnCostConfig cost : costs) {
-            builder.addMobCharge(cost.getType(), cost.getMass(), cost.getGravity());
-        }
-        if(probability != null) {
-            builder.creatureGenerationProbability(probability);
-        }
-        
-        return builder.build();
-    }
-}
@@ -1,42 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import java.util.List;
-import net.minecraft.world.entity.MobCategory;
-import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData;
-
-
-public class SpawnTypeConfig implements ObjectTemplate<SpawnTypeConfig> {
-    @Value("group")
-    @Default
-    private MobCategory group = null;
-
-    @Value("entries")
-    @Default
-    private List<SpawnerData> entries = null;
-
-    @Value("entry")
-    @Default
-    @Deprecated
-    private SpawnerData entry = null;
-
-    public MobCategory getGroup() {
-        return group;
-    }
-
-    public List<SpawnerData> getEntries() {
-        return entries;
-    }
-
-    @Deprecated
-    public SpawnerData getEntry() {
-        return entry;
-    }
-
-    @Override
-    public SpawnTypeConfig get() {
-        return this;
-    }
-}
@@ -1,174 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.ConfigTemplate;
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import java.util.List;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.Music;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.entity.npc.VillagerType;
-import net.minecraft.world.level.biome.AmbientAdditionsSettings;
-import net.minecraft.world.level.biome.AmbientMoodSettings;
-import net.minecraft.world.level.biome.AmbientParticleSettings;
-import net.minecraft.world.level.biome.Biome.Precipitation;
-import net.minecraft.world.level.biome.Biome.TemperatureModifier;
-import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier;
-import net.minecraft.world.level.biome.MobSpawnSettings;
-import com.dfsek.terra.api.properties.Properties;
-
-
-public class VanillaBiomeProperties implements ConfigTemplate, Properties {
-
-    @Value("tags")
-    @Default
-    private List<ResourceLocation> tags = null;
-
-    @Value("colors.grass")
-    @Default
-    private Integer grassColor = null;
-
-    @Value("colors.fog")
-    @Default
-    private Integer fogColor = null;
-
-    @Value("colors.water")
-    @Default
-    private Integer waterColor = null;
-
-    @Value("colors.water-fog")
-    @Default
-    private Integer waterFogColor = null;
-
-    @Value("colors.foliage")
-    @Default
-    private Integer foliageColor = null;
-
-    @Value("colors.sky")
-    @Default
-    private Integer skyColor = null;
-
-    @Value("colors.modifier")
-    @Default
-    private GrassColorModifier grassColorModifier = null;
-
-    @Value("particles")
-    @Default
-    private AmbientParticleSettings particleConfig = null;
-
-    @Value("climate.precipitation")
-    @Default
-    private Boolean precipitation = null;
-
-    @Value("climate.temperature")
-    @Default
-    private Float temperature = null;
-
-    @Value("climate.temperature-modifier")
-    @Default
-    private TemperatureModifier temperatureModifier = null;
-
-    @Value("climate.downfall")
-    @Default
-    private Float downfall = null;
-
-    @Value("sound.loop-sound.sound")
-    @Default
-    private SoundEvent loopSound = null;
-
-    @Value("sound.mood-sound")
-    @Default
-    private AmbientMoodSettings moodSound = null;
-
-    @Value("sound.additions-sound")
-    @Default
-    private AmbientAdditionsSettings additionsSound = null;
-
-    @Value("sound.music")
-    @Default
-    private Music music = null;
-
-    @Value("spawning")
-    @Default
-    private MobSpawnSettings spawnSettings = null;
-
-    @Value("villager-type")
-    @Default
-    private VillagerType villagerType = null;
-    
-    public List<ResourceLocation> getTags() {
-        return tags;
-    }
-    
-    public Integer getGrassColor() {
-        return grassColor;
-    }
-    
-    public Integer getFogColor() {
-        return fogColor;
-    }
-    
-    public Integer getWaterColor() {
-        return waterColor;
-    }
-    
-    public Integer getWaterFogColor() {
-        return waterFogColor;
-    }
-    
-    public Integer getFoliageColor() {
-        return foliageColor;
-    }
-    
-    public Integer getSkyColor() {
-        return skyColor;
-    }
-    
-    public GrassColorModifier getGrassColorModifier() {
-        return grassColorModifier;
-    }
-    
-    public AmbientParticleSettings getParticleConfig() {
-        return particleConfig;
-    }
-    
-    public Boolean getPrecipitation() {
-        return precipitation;
-    }
-    
-    public Float getTemperature() {
-        return temperature;
-    }
-    
-    public TemperatureModifier getTemperatureModifier() {
-        return temperatureModifier;
-    }
-    
-    public Float getDownfall() {
-        return downfall;
-    }
-    
-    public SoundEvent getLoopSound() {
-        return loopSound;
-    }
-    
-    public AmbientMoodSettings getMoodSound() {
-        return moodSound;
-    }
-    
-    public AmbientAdditionsSettings getAdditionsSound() {
-        return additionsSound;
-    }
-    
-    public Music getMusic() {
-        return music;
-    }
-    
-    public MobSpawnSettings getSpawnSettings() {
-        return spawnSettings;
-    }
-    
-    public VillagerType getVillagerType() {
-        return villagerType;
-    }
-}
@@ -1,23 +0,0 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.core.Registry;
-import net.minecraft.core.RegistryCodecs;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.npc.VillagerType;
-
-
-public class VillagerTypeTemplate implements ObjectTemplate<VillagerType> {
-    @Value("id")
-    @Default
-    private ResourceLocation id = null;
-    
-    @Override
-    public VillagerType get() {
-        return BuiltInRegistries.VILLAGER_TYPE.get(id);
-    }
-}
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import com.google.common.collect.ImmutableMap;
 import com.mojang.serialization.Lifecycle;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import com.mojang.serialization.Codec;
 import net.minecraft.core.Holder;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import com.mojang.serialization.Codec;
 import net.minecraft.core.BlockPos;
@@ -19,7 +19,7 @@ import net.minecraft.world.level.levelgen.GenerationStep.Carving;
 import net.minecraft.world.level.levelgen.Heightmap.Types;
 import net.minecraft.world.level.levelgen.RandomState;
 import net.minecraft.world.level.levelgen.blending.Blender;
-import org.bukkit.craftbukkit.v1_20_R2.block.data.CraftBlockData;
+import org.bukkit.craftbukkit.v1_20_R3.block.data.CraftBlockData;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import org.bukkit.Bukkit;

@@ -1,9 +1,9 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldInitEvent;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import net.minecraft.world.level.LevelHeightAccessor;

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import net.minecraft.core.Holder;
 import net.minecraft.core.Holder.Reference;
@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R2;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;

 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
@@ -6,7 +6,7 @@ import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.dedicated.DedicatedServer;
 import net.minecraft.world.level.biome.Biome;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;


 public class RegistryFetcher {
@@ -3,7 +3,6 @@ import java.util.*
 plugins {
    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower
 }

 architectury {
@@ -26,9 +26,9 @@
        "terra.common.mixins.json"
    ],
    "depends": {
-        "fabricloader": ">=0.14.2",
+        "fabricloader": ">=0.15.1",
        "java": ">=17",
-        "minecraft": "1.20.x",
+        "minecraft": ">=1.20.4",
        "fabric": "*"
    }
 }
@@ -60,13 +60,13 @@ public final class BiomeUtil {
        } else {
            VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);

-            net.minecraft.world.biome.Biome minecraftBiome = com.dfsek.terra.mod.util.BiomeUtil.createBiome(biome,
+            net.minecraft.world.biome.Biome minecraftBiome = MinecraftUtil.createBiome(biome,
                ForgeRegistries.BIOMES.getDelegateOrThrow(
                        vanilla.getKey().orElseThrow())
                    .value(),
                vanillaBiomeProperties);

-            Identifier identifier = new Identifier("terra", com.dfsek.terra.mod.util.BiomeUtil.createBiomeID(pack, id));
+            Identifier identifier = new Identifier("terra", MinecraftUtil.createBiomeID(pack, id));

            if(ForgeRegistries.BIOMES.containsKey(identifier)) {
                ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(ForgeRegistries.BIOMES.getHolder(identifier)
@@ -83,7 +83,7 @@ public final class BiomeUtil {
                Objects.requireNonNullElse(vanillaBiomeProperties.getVillagerType(),
                    villagerMap.getOrDefault(vanilla.getKey().orElseThrow(), VillagerType.PLAINS)));

-            com.dfsek.terra.mod.util.BiomeUtil.TERRA_BIOME_MAP.computeIfAbsent(vanilla.getKey().orElseThrow().getValue(), i -> new ArrayList<>()).add(
+            MinecraftUtil.TERRA_BIOME_MAP.computeIfAbsent(vanilla.getKey().orElseThrow().getValue(), i -> new ArrayList<>()).add(
                identifier);
        }
    }
@@ -13,7 +13,7 @@ val dump = tasks.create("dumpDependents") {
    doFirst {
        taskSet.forEach {
            val resource = File(resourcesDir, it.archiveFileName.get())
-            println("Including archive " + it.archiveFileName.orNull + " in directory " + resource.absolutePath)
+            logger.info("Including archive " + it.archiveFileName.orNull + " in directory " + resource.absolutePath)
            it.archiveFile.get().asFile.copyTo(resource, true)
        }
    }
@@ -32,6 +32,6 @@ afterEvaluate {
        }
        tasks["dumpDependents"].dependsOn(task)
        taskSet.add(task)
-        println("Merged JAR will incorporate task ${task.name} from platform ${it.name}.")
+        logger.info("Merged JAR will incorporate task ${task.name} from platform ${it.name}.")
    }
 }
@@ -1,7 +1,6 @@
 plugins {
    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower
 }

 loom {
@@ -24,7 +23,7 @@ dependencies {
 }

 architectury {
-    common("fabric", "forge")
+    common("fabric")
    minecraft = Versions.Mod.minecraft
 }

@@ -44,6 +44,7 @@ import com.dfsek.terra.mod.config.ProtoPlatformBiome;
 import com.dfsek.terra.mod.config.SoundEventTemplate;
 import com.dfsek.terra.mod.config.SpawnCostConfig;
 import com.dfsek.terra.mod.config.SpawnEntryTemplate;
+import com.dfsek.terra.mod.config.SpawnGroupTemplate;
 import com.dfsek.terra.mod.config.SpawnSettingsTemplate;
 import com.dfsek.terra.mod.config.SpawnTypeConfig;
 import com.dfsek.terra.mod.config.VillagerTypeTemplate;
@@ -81,7 +82,6 @@ public abstract class ModPlatform extends AbstractPlatform {
            .registerLoader(GrassColorModifier.class,
                (type, o, loader, depthTracker) -> TemperatureModifier.valueOf(((String) o).toUpperCase(
                    Locale.ROOT)))
-            .registerLoader(SpawnGroup.class,(type, o, loader, depthTracker) ->  SpawnGroup.valueOf((String) o))
            .registerLoader(BiomeParticleConfig.class, BiomeParticleConfigTemplate::new)
            .registerLoader(SoundEvent.class, SoundEventTemplate::new)
            .registerLoader(BiomeMoodSound.class, BiomeMoodSoundTemplate::new)
@@ -90,6 +90,7 @@ public abstract class ModPlatform extends AbstractPlatform {
            .registerLoader(EntityType.class, EntityTypeTemplate::new)
            .registerLoader(SpawnCostConfig.class, SpawnCostConfig::new)
            .registerLoader(SpawnEntry.class, SpawnEntryTemplate::new)
+            .registerLoader(SpawnGroup.class, SpawnGroupTemplate::new)
            .registerLoader(SpawnTypeConfig.class, SpawnTypeConfig::new)
            .registerLoader(SpawnSettings.class, SpawnSettingsTemplate::new)
            .registerLoader(VillagerType.class, VillagerTypeTemplate::new);
@@ -0,0 +1,18 @@
+package com.dfsek.terra.mod.config;
+
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import net.minecraft.entity.SpawnGroup;
+
+
+public class SpawnGroupTemplate implements ObjectTemplate<SpawnGroup> {
+    @Value("group")
+    @Default
+    private String group = null;
+
+    @Override
+    public SpawnGroup get() {
+        return SpawnGroup.valueOf(group);
+    }
+}
@@ -3,20 +3,12 @@ package com.dfsek.terra.mod.config;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import net.minecraft.entity.SpawnGroup;
 import net.minecraft.world.biome.SpawnSettings;
-import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;

 import java.util.List;


 public class SpawnSettingsTemplate implements ObjectTemplate<SpawnSettings> {
-    
-    private static final Logger logger = LoggerFactory.getLogger(SpawnTypeConfig.class);
-    private static boolean used = false;
-
    @Value("spawns")
    @Default
    private List<SpawnTypeConfig> spawns = null;
@@ -33,19 +25,7 @@ public class SpawnSettingsTemplate implements ObjectTemplate<SpawnSettings> {
    public SpawnSettings get() {
        SpawnSettings.Builder builder = new SpawnSettings.Builder();
        for(SpawnTypeConfig spawn : spawns) {
-            SpawnGroup group = spawn.getGroup();
-            if (spawn.getEntries() != null) {
-                for (SpawnEntry entry : spawn.getEntries()) {
-                    builder.spawn(group, entry);
-                }
-            } else if (spawn.getEntry() != null) {
-                if(!used) {
-                    logger.warn("The entry sub-field of spawns is deprecated. " +
-                                "It is recommended to use the entries sub-field instead ");
-                    used = true;
-                }
-                builder.spawn(group, spawn.getEntry());
-            }
+            builder.spawn(spawn.getGroup(), spawn.getEntry());
        }
        for(SpawnCostConfig cost : costs) {
            builder.spawnCost(cost.getType(), cost.getMass(), cost.getGravity());
@@ -6,32 +6,20 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.world.biome.SpawnSettings.SpawnEntry;

-import java.util.List;
-

 public class SpawnTypeConfig implements ObjectTemplate<SpawnTypeConfig> {
    @Value("group")
    @Default
    private SpawnGroup group = null;
-    
-    @Value("entries")
-    @Default
-    private List<SpawnEntry> entries = null;
-    
+
    @Value("entry")
    @Default
-    @Deprecated
    private SpawnEntry entry = null;

    public SpawnGroup getGroup() {
        return group;
    }
-    
-    public List<SpawnEntry> getEntries() {
-        return entries;
-    }
-    
-    @Deprecated
+
    public SpawnEntry getEntry() {
        return entry;
    }
@@ -51,7 +51,7 @@ public class VanillaBiomeProperties implements ConfigTemplate, Properties {

    @Value("climate.precipitation")
    @Default
-    private Boolean precipitation = null;
+    private Boolean precipitation = true;

    @Value("climate.temperature")
    @Default
@@ -23,6 +23,8 @@ import net.minecraft.command.argument.BlockArgumentParser;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.entity.EntityType;
@@ -31,11 +33,21 @@ import com.dfsek.terra.api.handle.WorldHandle;

 public class MinecraftWorldHandle implements WorldHandle {

+
    private static final BlockState AIR = (BlockState) Blocks.AIR.getDefaultState();

+    private static final Logger logger = LoggerFactory.getLogger(MinecraftWorldHandle.class);
+
    @Override
    public @NotNull BlockState createBlockState(@NotNull String data) {
        try {
+            if(data.equals("minecraft:grass")) { //TODO: remove in 7.0
+                data = "minecraft:short_grass";
+                logger.warn(
+                    "Translating minecraft:grass to minecraft:short_grass. In 1.20.3 minecraft:grass was renamed to minecraft:short_grass" +
+                    ". You are advised to perform this rename in your config packs as this translation will be removed in the next major " +
+                    "version of Terra.");
+            }
            net.minecraft.block.BlockState state = BlockArgumentParser.block(Registries.BLOCK.getReadOnlyWrapper(), data, true)
                .blockState();
            if(state == null) throw new IllegalArgumentException("Invalid data: " + data);
@@ -52,6 +64,15 @@ public class MinecraftWorldHandle implements WorldHandle {

    @Override
    public @NotNull EntityType getEntity(@NotNull String id) {
+        if (!id.contains(":")) { //TODO: remove in 7.0
+            String newid = "minecraft:" + id.toLowerCase();;
+            logger.warn(
+                "Translating " + id + " to " + newid + ". In 1.20.3 entity parsing was reworked" +
+                ". You are advised to perform this rename in your config packs as this translation will be removed in the next major " +
+                "version of Terra.");
+            id = newid;
+        }
+        if(!id.contains(":")) throw new IllegalArgumentException("Invalid entity identifier " + id);
        Identifier identifier = Identifier.tryParse(id);
        if(identifier == null) identifier = Identifier.tryParse(id);
        return (EntityType) Registries.ENTITY_TYPE.get(identifier);
@@ -17,8 +17,8 @@

 package com.dfsek.terra.mod.mixin.access;

-import net.minecraft.world.MobSpawnerEntry;
-import net.minecraft.world.MobSpawnerLogic;
+import net.minecraft.block.spawner.MobSpawnerEntry;
+import net.minecraft.block.spawner.MobSpawnerLogic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

@@ -21,11 +21,11 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.MobSpawnerBlockEntity;
+import net.minecraft.block.spawner.MobSpawnerLogic;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.random.Random;
-import net.minecraft.world.MobSpawnerLogic;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
@@ -50,7 +50,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity {
    public abstract MobSpawnerLogic getLogic();

    @Shadow
-    public abstract void setEntityType(net.minecraft.entity.EntityType<?> entityType, Random random);
+    public abstract void method_46408(net.minecraft.entity.EntityType<?> entityType, Random random);

    public EntityType terra$getSpawnedType() {
        return (EntityType) Registries.ENTITY_TYPE.get(
@@ -58,7 +58,13 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity {
    }

    public void terra$setSpawnedType(@NotNull EntityType creatureType) {
-        setEntityType((net.minecraft.entity.EntityType<?>) creatureType, world.getRandom());
+        Random rand;
+        if (hasWorld()) {
+            rand = world.getRandom();
+        } else {
+            rand = Random.create();
+        }
+        method_46408((net.minecraft.entity.EntityType<?>) creatureType, rand);
    }

    public int terra$getDelay() {
@@ -1,108 +0,0 @@
-package com.dfsek.terra.mod.util;
-
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.mod.config.VanillaBiomeProperties;
-import com.dfsek.terra.mod.mixin.access.BiomeAccessor;
-
-import net.minecraft.registry.Registries;
-import net.minecraft.util.Identifier;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.Biome.Builder;
-import net.minecraft.world.biome.BiomeEffects;
-import net.minecraft.world.biome.GenerationSettings;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-
-
-public class BiomeUtil {
-    public static final Map<Identifier, List<Identifier>>
-        TERRA_BIOME_MAP = new HashMap<>();
-    public static Biome createBiome(com.dfsek.terra.api.world.biome.Biome biome, Biome vanilla,
-                                    VanillaBiomeProperties vanillaBiomeProperties) {
-        GenerationSettings.Builder generationSettings = new GenerationSettings.Builder();
-
-        BiomeEffects.Builder effects = new BiomeEffects.Builder();
-
-        net.minecraft.world.biome.Biome.Builder builder = new Builder();
-
-        effects.waterColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterColor(), vanilla.getWaterColor()))
-            .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor()))
-            .fogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getFogColor(), vanilla.getFogColor()))
-            .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor()))
-            .grassColorModifier(
-                Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColorModifier(),
-                    vanilla.getEffects().getGrassColorModifier()));
-
-        if(vanillaBiomeProperties.getFoliageColor() == null) {
-            vanilla.getEffects().getFoliageColor().ifPresent(effects::foliageColor);
-        } else {
-            effects.foliageColor(vanillaBiomeProperties.getFoliageColor());
-        }
-
-        if(vanillaBiomeProperties.getGrassColor() == null) {
-            vanilla.getEffects().getGrassColor().ifPresent(effects::grassColor);
-        } else {
-            effects.grassColor(vanillaBiomeProperties.getGrassColor());
-        }
-
-        if(vanillaBiomeProperties.getParticleConfig() == null) {
-            vanilla.getEffects().getParticleConfig().ifPresent(effects::particleConfig);
-        } else {
-            effects.particleConfig(vanillaBiomeProperties.getParticleConfig());
-        }
-
-        if(vanillaBiomeProperties.getLoopSound() == null) {
-            vanilla.getEffects().getLoopSound().ifPresent(effects::loopSound);
-        } else {
-            effects.loopSound(Registries.SOUND_EVENT.getEntry(vanillaBiomeProperties.getLoopSound()));
-        }
-
-        if(vanillaBiomeProperties.getMoodSound() == null) {
-            vanilla.getEffects().getMoodSound().ifPresent(effects::moodSound);
-        } else {
-            effects.moodSound(vanillaBiomeProperties.getMoodSound());
-        }
-
-        if(vanillaBiomeProperties.getAdditionsSound() == null) {
-            vanilla.getEffects().getAdditionsSound().ifPresent(effects::additionsSound);
-        } else {
-            effects.additionsSound(vanillaBiomeProperties.getAdditionsSound());
-        }
-
-        if(vanillaBiomeProperties.getMusic() == null) {
-            vanilla.getEffects().getMusic().ifPresent(effects::music);
-        } else {
-            effects.music(vanillaBiomeProperties.getMusic());
-        }
-
-        builder.precipitation(Objects.requireNonNullElse(vanillaBiomeProperties.getPrecipitation(), vanilla.hasPrecipitation()));
-
-        builder.temperature(Objects.requireNonNullElse(vanillaBiomeProperties.getTemperature(), vanilla.getTemperature()));
-
-        builder.downfall(Objects.requireNonNullElse(vanillaBiomeProperties.getDownfall(),
-            ((BiomeAccessor) ((Object) vanilla)).getWeather().downfall()));
-
-        builder.temperatureModifier(Objects.requireNonNullElse(vanillaBiomeProperties.getTemperatureModifier(),
-            ((BiomeAccessor) ((Object) vanilla)).getWeather().temperatureModifier()));
-
-        builder.spawnSettings(Objects.requireNonNullElse(vanillaBiomeProperties.getSpawnSettings(), vanilla.getSpawnSettings()));
-
-        return builder
-            .effects(effects.build())
-            .generationSettings(generationSettings.build())
-            .build();
-    }
-
-    public static String createBiomeID(ConfigPack pack, com.dfsek.terra.api.registry.key.RegistryKey biomeID) {
-        return pack.getID()
-                   .toLowerCase() + "/" + biomeID.getNamespace().toLowerCase(Locale.ROOT) + "/" + biomeID.getID().toLowerCase(Locale.ROOT);
-    }
-
-    public static Map<Identifier, List<Identifier>> getTerraBiomeMap() {
-        return Map.copyOf(TERRA_BIOME_MAP);
-    }
-}
@@ -38,6 +38,8 @@ import com.dfsek.terra.mod.mixin_ifaces.FloraFeatureHolder;

 public final class MinecraftUtil {
    public static final Logger logger = LoggerFactory.getLogger(MinecraftUtil.class);
+    public static final Map<Identifier, List<Identifier>>
+        TERRA_BIOME_MAP = new HashMap<>();

    private MinecraftUtil() {

@@ -63,7 +65,7 @@ public final class MinecraftUtil {

    public static void registerFlora(Registry<net.minecraft.world.biome.Biome> biomes) {
        logger.info("Injecting flora into Terra biomes...");
-        BiomeUtil.TERRA_BIOME_MAP
+        TERRA_BIOME_MAP
            .forEach((vb, terraBiomes) ->
                biomes.getOrEmpty(vb)
                    .ifPresentOrElse(vanilla -> terraBiomes
@@ -86,7 +88,92 @@ public final class MinecraftUtil {

    }

+    public static Map<Identifier, List<Identifier>> getTerraBiomeMap() {
+        return Map.copyOf(TERRA_BIOME_MAP);
+    }
+
    public static RegistryKey<Biome> registerKey(Identifier identifier) {
        return RegistryKey.of(RegistryKeys.BIOME, identifier);
    }
+
+    public static Biome createBiome(com.dfsek.terra.api.world.biome.Biome biome, Biome vanilla,
+                                    VanillaBiomeProperties vanillaBiomeProperties) {
+        GenerationSettings.Builder generationSettings = new GenerationSettings.Builder();
+
+        BiomeEffects.Builder effects = new BiomeEffects.Builder();
+
+        net.minecraft.world.biome.Biome.Builder builder = new Builder();
+
+        effects.waterColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterColor(), vanilla.getWaterColor()))
+            .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor()))
+            .fogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getFogColor(), vanilla.getFogColor()))
+            .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor()))
+            .grassColorModifier(
+                Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColorModifier(),
+                    vanilla.getEffects().getGrassColorModifier()));
+
+        if(vanillaBiomeProperties.getFoliageColor() == null) {
+            vanilla.getEffects().getFoliageColor().ifPresent(effects::foliageColor);
+        } else {
+            effects.foliageColor(vanillaBiomeProperties.getFoliageColor());
+        }
+
+        if(vanillaBiomeProperties.getGrassColor() == null) {
+            vanilla.getEffects().getGrassColor().ifPresent(effects::grassColor);
+        } else {
+            effects.grassColor(vanillaBiomeProperties.getGrassColor());
+        }
+
+        if(vanillaBiomeProperties.getParticleConfig() == null) {
+            vanilla.getEffects().getParticleConfig().ifPresent(effects::particleConfig);
+        } else {
+            effects.particleConfig(vanillaBiomeProperties.getParticleConfig());
+        }
+
+        if(vanillaBiomeProperties.getLoopSound() == null) {
+            vanilla.getEffects().getLoopSound().ifPresent(effects::loopSound);
+        } else {
+            effects.loopSound(Registries.SOUND_EVENT.getEntry(vanillaBiomeProperties.getLoopSound()));
+        }
+
+        if(vanillaBiomeProperties.getMoodSound() == null) {
+            vanilla.getEffects().getMoodSound().ifPresent(effects::moodSound);
+        } else {
+            effects.moodSound(vanillaBiomeProperties.getMoodSound());
+        }
+
+        if(vanillaBiomeProperties.getAdditionsSound() == null) {
+            vanilla.getEffects().getAdditionsSound().ifPresent(effects::additionsSound);
+        } else {
+            effects.additionsSound(vanillaBiomeProperties.getAdditionsSound());
+        }
+
+        if(vanillaBiomeProperties.getMusic() == null) {
+            vanilla.getEffects().getMusic().ifPresent(effects::music);
+        } else {
+            effects.music(vanillaBiomeProperties.getMusic());
+        }
+
+        builder.precipitation(Objects.requireNonNullElse(vanillaBiomeProperties.getPrecipitation(), vanilla.hasPrecipitation()));
+
+        builder.temperature(Objects.requireNonNullElse(vanillaBiomeProperties.getTemperature(), vanilla.getTemperature()));
+
+        builder.downfall(Objects.requireNonNullElse(vanillaBiomeProperties.getDownfall(),
+            ((BiomeAccessor) ((Object) vanilla)).getWeather().downfall()));
+
+        builder.temperatureModifier(Objects.requireNonNullElse(vanillaBiomeProperties.getTemperatureModifier(),
+            ((BiomeAccessor) ((Object) vanilla)).getWeather().temperatureModifier()));
+
+        builder.spawnSettings(Objects.requireNonNullElse(vanillaBiomeProperties.getSpawnSettings(), vanilla.getSpawnSettings()));
+
+        return builder
+            .effects(effects.build())
+            .generationSettings(generationSettings.build())
+            .build();
+    }
+
+    public static String createBiomeID(ConfigPack pack, com.dfsek.terra.api.registry.key.RegistryKey biomeID) {
+        return pack.getID()
+                   .toLowerCase() + "/" + biomeID.getNamespace().toLowerCase(Locale.ROOT) + "/" + biomeID.getID().toLowerCase(Locale.ROOT);
+    }
 }
@@ -54,7 +54,7 @@ public final class TagUtil {
        logger.info("Doing biome tag garbage....");
        Map<TagKey<Biome>, List<RegistryEntry<Biome>>> collect = tagsToMutableMap(registry);

-        BiomeUtil
+        MinecraftUtil
            .getTerraBiomeMap()
            .forEach((vb, terraBiomes) ->
                MinecraftUtil
@@ -1,7 +1,6 @@
 plugins {
    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower
 }

 dependencies {
@@ -22,7 +22,7 @@ import java.util.stream.Stream;

 import com.dfsek.terra.addon.EphemeralAddon;
 import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.lifecycle.util.LifecycleBiomeUtil;
+import com.dfsek.terra.lifecycle.util.BiomeUtil;
 import com.dfsek.terra.mod.CommonPlatform;
 import com.dfsek.terra.mod.ModPlatform;
 import com.dfsek.terra.mod.generation.MinecraftChunkGeneratorWrapper;
@@ -68,7 +68,7 @@ public abstract class LifecyclePlatform extends ModPlatform {


        if(server != null) {
-            LifecycleBiomeUtil.registerBiomes(server.getRegistryManager().get(RegistryKeys.BIOME));
+            BiomeUtil.registerBiomes(server.getRegistryManager().get(RegistryKeys.BIOME));
            server.reloadResources(server.getDataPackManager().getNames()).exceptionally(throwable -> {
                LOGGER.warn("Failed to execute reload", throwable);
                return null;
@@ -1,7 +1,5 @@
 package com.dfsek.terra.lifecycle.util;

-import com.dfsek.terra.mod.util.BiomeUtil;
-
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
@@ -24,10 +22,10 @@ import com.dfsek.terra.mod.mixin.access.VillagerTypeAccessor;
 import com.dfsek.terra.mod.util.MinecraftUtil;


-public final class LifecycleBiomeUtil {
-    private static final Logger logger = LoggerFactory.getLogger(LifecycleBiomeUtil.class);
+public final class BiomeUtil {
+    private static final Logger logger = LoggerFactory.getLogger(BiomeUtil.class);

-    private LifecycleBiomeUtil() {
+    private BiomeUtil() {

    }

@@ -57,10 +55,10 @@ public final class LifecycleBiomeUtil {
        } else {
            VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);

-            net.minecraft.world.biome.Biome minecraftBiome = BiomeUtil.createBiome(biome, Objects.requireNonNull(registry.get(vanilla)),
+            net.minecraft.world.biome.Biome minecraftBiome = MinecraftUtil.createBiome(biome, Objects.requireNonNull(registry.get(vanilla)),
                vanillaBiomeProperties);

-            Identifier identifier = new Identifier("terra", BiomeUtil.createBiomeID(pack, id));
+            Identifier identifier = new Identifier("terra", MinecraftUtil.createBiomeID(pack, id));

            if(registry.containsId(identifier)) {
                ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(MinecraftUtil.getEntry(registry, identifier)
@@ -78,7 +76,7 @@ public final class LifecycleBiomeUtil {
                Objects.requireNonNullElse(vanillaBiomeProperties.getVillagerType(),
                    villagerMap.getOrDefault(vanilla, VillagerType.PLAINS)));

-            BiomeUtil.TERRA_BIOME_MAP.computeIfAbsent(vanilla.getValue(), i -> new ArrayList<>()).add(identifier);
+            MinecraftUtil.TERRA_BIOME_MAP.computeIfAbsent(vanilla.getValue(), i -> new ArrayList<>()).add(identifier);
        }
    }

@@ -18,7 +18,7 @@ public final class LifecycleUtil {

    public static void initialize(MutableRegistry<Biome> biomeMutableRegistry, MutableRegistry<WorldPreset> worldPresetMutableRegistry) {
        CommonPlatform.get().getEventManager().callEvent(new PlatformInitializationEvent());
-        LifecycleBiomeUtil.registerBiomes(biomeMutableRegistry);
+        BiomeUtil.registerBiomes(biomeMutableRegistry);
        CommonPlatform.get().registerWorldTypes(
            (id, preset) -> Registry.register(worldPresetMutableRegistry, RegistryKey.of(RegistryKeys.WORLD_PRESET, id), preset));
    }
@@ -5,7 +5,7 @@ fun includeImmediateChildren(dir: File, type: String) {
    dir.walkTopDown().maxDepth(1).forEach {
        if (!it.isDirectory || !File(it, "build.gradle.kts").exists()) return@forEach
        val addonDir = it.relativeTo(file(".")).path.replace("/", ":").replace("\\", ":")
-        println("Including $type directory \"$addonDir\" as subproject.")
+        logger.info("Including $type directory \"$addonDir\" as subproject.")
        include(addonDir)
    }
 }
@@ -39,3 +39,12 @@ pluginManagement {
        }
    }
 }
+
+// settings.gradle.kts
+val isCiServer = System.getenv().containsKey("CI")
+// Cache build artifacts, so expensive operations do not need to be re-computed
+buildCache {
+    local {
+        isEnabled = !isCiServer
+    }
+}
Author	SHA1	Message	Date
Zoë Gidiere	3745c3e947	fix typos	2023-12-17 15:32:35 -07:00
Zoë Gidiere	fd20837b55	fix error on startup	2023-12-17 15:29:18 -07:00
Zoë Gidiere	0091e5b785	spell check	2023-12-10 18:50:40 -07:00
Zoë Gidiere	41045ae8aa	literally forgor the most important part	2023-12-10 18:47:12 -07:00
Zoë Gidiere	4a83f01c1f	fix incase mods are used	2023-12-10 18:44:26 -07:00
Zoë Gidiere	fc764a0fb3	fix issues with spawners and entity parsing	2023-12-10 18:40:43 -07:00
Zoë Gidiere	22c46f2f80	Pin OWConfig Version	2023-12-10 17:45:52 -07:00
Zoë Gidiere	f408faaa80	reformat	2023-12-10 17:07:18 -07:00
Zoë Gidiere	0ad7ee4f9f	fix CME	2023-12-10 16:57:27 -07:00
Zoë Gidiere	1e55074cfa	Enforce NMS bindings	2023-12-10 15:46:00 -07:00
Zoë	2a92d76276	Merge pull request #437 from PolyhedralDev/dev/1.20.3 Dev/1.20.3	2023-12-09 15:13:11 -07:00
Zoë Gidiere	687ad5db59	Final dep update confirmed working on paper and fabric	2023-12-09 15:00:46 -07:00
Zoë Gidiere	f9c9789016	remove unused maven repo	2023-12-09 01:16:38 -07:00
Zoë Gidiere	3142c2a4f0	update paper to 1.20.4	2023-12-08 22:57:01 -07:00
Zoë Gidiere	b5532b7679	Merge branch 'ver/6.4.2' into dev/1.20.3	2023-12-08 22:31:12 -07:00
Zoë Gidiere	8af299d09c	fix path of vale ignore	2023-12-08 22:31:04 -07:00
Zoë Gidiere	5cf8a5061d	Merge branch 'ver/6.4.2' into dev/1.20.3	2023-12-08 22:11:57 -07:00
Zoë Gidiere	017876475e	Add Vale config to gitignore	2023-12-08 22:11:48 -07:00
Zoë Gidiere	d88e4f1f9b	fix stupid error thank you caffeine mc peeps	2023-12-08 19:57:05 -07:00
Zoë Gidiere	17eac505a0	Merge branch 'ver/6.4.2' into dev/1.20.3	2023-12-07 11:29:31 -07:00
Zoë Gidiere	8043814138	pull up version range of fabric	2023-12-07 11:29:19 -07:00
Zoë Gidiere	554887ab54	build fabric against 1.20.4	2023-12-07 11:27:06 -07:00
Zoë Gidiere	2f46a01adc	Merge remote-tracking branch 'origin/master' into ver/6.4.2	2023-12-07 00:34:00 -07:00
Zoë Gidiere	a1db0574e9	Merge branch 'ver/6.4.2' into dev/1.20.3	2023-12-07 00:33:45 -07:00
Zoë	fd6decc706	Merge pull request #439 from PolyhedralDev/dev/github-actions Create gradle-build.yml	2023-12-06 23:11:33 -07:00
Zoë Gidiere	0ba0d472e6	seems arch loom auto uses vineflower now	2023-12-06 22:47:35 -07:00
Zoë Gidiere	11b03eb93d	actually bump bukkit version	2023-12-06 22:27:26 -07:00
Zoë Gidiere	46ca45cb1d	fix bukkit build	2023-12-06 22:25:53 -07:00
Zoë Gidiere	4e5b066b91	add bukkit grass workaround	2023-12-06 22:24:55 -07:00
Zoë Gidiere	db8df9741f	bukkit 1.20.3	2023-12-06 22:22:18 -07:00
Zoë Gidiere	80c52870f5	add additional spigot warning	2023-12-06 12:00:03 -07:00
Zoë Gidiere	5048bc8ede	Remove folialib	2023-12-06 10:52:31 -07:00
Zoë Gidiere	fc0d7374e4	remove old bukkit versions	2023-12-06 10:14:43 -07:00
Zoë Gidiere	e4c3affb9f	pull up version range	2023-12-05 20:11:00 -07:00
Zoë Gidiere	e160cae3d8	reformat	2023-12-05 20:04:08 -07:00
Zoë Gidiere	cb9aa4f167	fix permissions	2023-12-05 19:53:05 -07:00
Zoë Gidiere	b612d1c7aa	fix name	2023-12-05 19:52:50 -07:00
Zoë Gidiere	e4df8dce1d	proper gradle cache	2023-12-05 19:52:12 -07:00
Zoë Gidiere	601d174720	pin versions and remove dead lines	2023-12-05 19:44:00 -07:00
Zoë	3339d08e11	Create gradle-build.yml	2023-12-05 19:35:23 -07:00
Zoë Gidiere	bc65015af0	update gradle	2023-12-05 18:53:19 -07:00
Zoë Gidiere	913637b0a5	update deps	2023-12-05 18:29:43 -07:00
Zoë	55d09818f7	Merge pull request #436 from PolyhedralDev/dev/flatten-biome-array Dev/flatten biome array	2023-11-27 17:54:38 -07:00
Zoë Gidiere	aecdcd578c	initial 1.20.3 also disable forge. we're not publishing it anyway	2023-11-27 13:35:48 -07:00
Zoë Gidiere	382069b094	Bump Version to 6.4.2	2023-11-27 11:35:06 -07:00
Zoë Gidiere	734d4bfb94	reformat	2023-11-27 11:31:20 -07:00
Zoë Gidiere	c82e015559	flatten array for pipeline biomes	2023-11-27 11:31:11 -07:00
Astrashh	3aef977384	Patch version 6.4.1 (#435 ) * Bump version to 6.4.1 * fix fabric dev env * Invert exposed ore logic (#433) * Invert exposed ore logic * Bump ore addon version * Use logger in Gradle over println (#434) * Log info instead of println in gradle scripts * Missed buildSrc printlns --------- Co-authored-by: Zoë <duplexsys@protonmail.com>	2023-11-25 01:02:45 +00:00
Zoë	6060ceae57	Merge pull request #432 from PolyhedralDev/dev/codeowners update condeowners	2023-11-18 10:05:10 +00:00
Zoë Gidiere	e499ddebd4	update condeowners	2023-11-17 13:34:56 -07:00