Added NMSAddon override for BukkitAddon

Made grass colour use default if none is defined
Started adding more biome settings to bukkit
2026-05-20 16:50:28 +00:00 · 2024-10-29 19:38:59 +00:00 · 2024-10-29 18:31:37 +00:00 · 2024-10-26 10:02:32 +01:00 · 2024-10-25 14:03:27 -06:00 · 2024-10-25 13:58:33 -06:00
653 changed files with 4056 additions and 2782 deletions
@@ -1,13 +1,14 @@
 # Global owners, automatically request review when pull request is submitted
-*                   @dfsek @solonovamax @duplexsystem @Astrashh @justaureus
+*                   @dfsek @solonovamax @duplexsystem @astrsh @justaureus

 # Platforms
 /platforms/         @dfsek @solonovamax @duplexsystem @justaureus
+/platforms/bukkit   @dfsek @solonovamax @duplexsystem @justaureus @OakLoaf

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

 # Gradle Stuff
 /buildSrc/          @dfsek @solonovamax @duplexsystem
 *.gradle.kts        @dfsek @solonovamax @duplexsystem
-/gradle/            @dfsek @solonovamax @duplexsystem
+/gradle/            @dfsek @solonovamax @duplexsystem
@@ -18,10 +18,10 @@ jobs:

    steps:
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - name: Set up JDK 17
+      - name: Set up JDK 21
        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
        with:
-          java-version: '17'
+          java-version: '21'
          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
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -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.6.0"))
+versionProjects(":common:implementation", version("6.6.0"))
+versionProjects(":platforms", version("6.6.0"))


 allprojects {
@@ -15,6 +15,7 @@ allprojects {
    tasks.withType<JavaCompile>().configureEach {
        options.isFork = true
        options.isIncremental = true
+        options.release.set(21)
    }

    tasks.withType<Test>().configureEach {
@@ -44,7 +45,7 @@ afterEvaluate {
    }
    project(":platforms:bukkit:common").configureDistribution()
    forSubProjects(":common:addons") {
-        apply(plugin = "com.github.johnrengelman.shadow")
+        apply(plugin = "com.gradleup.shadow")

        tasks.named("build") {
            finalizedBy(tasks.named("shadowJar"))
@@ -9,18 +9,18 @@ repositories {
    maven("https://repo.codemc.org/repository/maven-public") {
        name = "CodeMC"
    }
-    maven("https://papermc.io/repo/repository/maven-public/") {
+    maven("https://repo.papermc.io/repository/maven-public/") {
        name = "PaperMC"
    }
 }

 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.11")
+    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.1")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.7.2")

-    implementation("org.ow2.asm", "asm", "9.6")
-    implementation("org.ow2.asm", "asm-tree", "9.6")
+    implementation("org.ow2.asm", "asm", "9.7")
+    implementation("org.ow2.asm", "asm-tree", "9.7")
    implementation("com.dfsek.tectonic", "common", "4.2.1")
-    implementation("org.yaml", "snakeyaml", "2.2")
+    implementation("org.yaml", "snakeyaml", "2.3")
 }
@@ -22,8 +22,8 @@ fun Project.configureCompilation() {
    apply<TectonicDocPlugin>()
    
    configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
    }
    
    tasks.withType<JavaCompile> {
@@ -36,7 +36,7 @@ fun Project.configureDependencies() {
        maven("https://repo.codemc.org/repository/maven-public") {
            name = "CodeMC"
        }
-        maven("https://papermc.io/repo/repository/maven-public/") {
+        maven("https://repo.papermc.io/repository/maven-public/") {
            name = "PaperMC"
        }
        maven("https://files.minecraftforge.net/maven/") {
@@ -48,6 +48,9 @@ fun Project.configureDependencies() {
        maven("https://jitpack.io") {
            name = "JitPack"
        }
+        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
+            name = "Sonatype Snapshots"
+        }
    }
    
    dependencies {
@@ -21,7 +21,7 @@ import kotlin.io.path.exists


 fun Project.configureDistribution() {
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "com.gradleup.shadow")
    
    val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
        group = "terra"
@@ -8,27 +8,28 @@ object Versions {
        const val paralithic = "0.7.1"
        const val strata = "1.3.2"
        
-        const val cloud = "1.8.4"
+        const val cloud = "2.0.0"
        
        const val caffeine = "3.1.8"
        
-        const val slf4j = "2.0.9"
-        const val log4j_slf4j_impl = "2.20.0"
-        
+        const val slf4j = "2.0.16"
+
        object Internal {
-            const val shadow = "8.1.1"
-            const val apacheText = "1.11.0"
-            const val apacheIO = "2.15.1"
-            const val guava = "32.1.3-jre"
-            const val asm = "9.6"
-            const val snakeYml = "2.2"
-            const val jetBrainsAnnotations = "24.1.0"
-            const val junit = "5.10.1"
+            const val shadow = "8.3.3"
+            const val apacheText = "1.12.0"
+            const val apacheIO = "2.17.0"
+            const val guava = "33.3.1-jre"
+            const val asm = "9.7.1"
+            const val snakeYml = "2.3"
+            const val jetBrainsAnnotations = "26.0.1"
+            const val junit = "5.11.3"
+            const val nbt = "6.1"
        }
    }
    
    object Fabric {
-        const val fabricAPI = "0.91.2+${Mod.minecraft}"
+        const val fabricAPI = "0.106.1+${Mod.minecraft}"
+        const val cloud = "2.0.0-beta.9"
    }
 //
 //    object Quilt {
@@ -37,14 +38,15 @@ object Versions {
 //    }
    
    object Mod {
-        const val mixin = "0.12.5+mixin.0.8.5"
+        const val mixin = "0.15.3+mixin.0.8.7"
        
-        const val minecraft = "1.20.4"
-        const val yarn = "$minecraft+build.1"
-        const val fabricLoader = "0.15.1"
+        const val minecraft = "1.21.3"
+        const val yarn = "$minecraft+build.2"
+        const val fabricLoader = "0.16.7"
        
-        const val architecuryLoom = "1.4.369"
-        const val architecturyPlugin = "3.4.151"
+        const val architecuryLoom = "1.7.413"
+        const val architecturyPlugin = "3.4.159"
+
    }
 //
 //    object Forge {
@@ -53,14 +55,15 @@ object Versions {
 //    }
    
    object Bukkit {
-        const val minecraft = "1.20.4"
-        const val paperBuild = "$minecraft-R0.1-20231209.173338-2"
+        const val minecraft = "1.21.3"
+        const val paperBuild = "$minecraft-R0.1-20241025.163321-1"
        const val paper = paperBuild
        const val paperLib = "1.0.8"
-        const val reflectionRemapper = "0.1.0"
+        const val reflectionRemapper = "0.1.1"
        const val paperDevBundle = paperBuild
-        const val runPaper = "2.2.2"
-        const val paperWeight = "1.5.11"
+        const val runPaper = "2.3.1"
+        const val paperWeight = "1.7.2"
+        const val cloud = "2.0.0-beta.10"
    }
    
    //
@@ -71,7 +74,7 @@ object Versions {
 //    }
 //
    object CLI {
-        const val nbt = "6.1"
-        const val logback = "1.4.14"
+        const val logback = "1.5.8"
+        const val picocli = "4.7.6"
    }
 }
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.extrusion.api;

-import java.util.Collection;
-
 import com.dfsek.terra.api.world.biome.Biome;

+import java.util.Collection;
+

 public interface Extrusion {
    Biome extrude(Biome original, int x, int y, int z, long seed);
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2;

+import com.dfsek.terra.api.util.cache.SeededVector2Key;
+
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;

@@ -11,7 +13,6 @@ import java.util.stream.StreamSupport;

 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.api.noise.NoiseSampler;
@@ -23,7 +24,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

 public class PipelineBiomeProvider implements BiomeProvider {

-    private final LoadingCache<SeededVector, BiomeChunk> biomeChunkCache;
+    private final LoadingCache<SeededVector2Key, BiomeChunk> biomeChunkCache;
    private final int chunkSize;
    private final int resolution;
    private final NoiseSampler mutator;
@@ -90,7 +91,7 @@ public class PipelineBiomeProvider implements BiomeProvider {
        int xInChunk = x - chunkWorldX;
        int zInChunk = z - chunkWorldZ;

-        return biomeChunkCache.get(new SeededVector(seed, chunkWorldX, chunkWorldZ)).get(xInChunk, zInChunk).getBiome();
+        return biomeChunkCache.get(new SeededVector2Key(chunkWorldX, chunkWorldZ, seed)).get(xInChunk, zInChunk).getBiome();
    }

    @Override
@@ -1,10 +1,12 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api;

+import com.dfsek.terra.api.util.cache.SeededVector2Key;
+
 import java.util.List;


 public interface Pipeline {
-    BiomeChunk generateChunk(SeededVector worldCoordinates);
+    BiomeChunk generateChunk(SeededVector2Key worldCoordinates);

    int getChunkSize();

@@ -1,19 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.v2.api;
-
-public record SeededVector(long seed, int x, int z) {
-
-    @Override
-    public boolean equals(Object obj) {
-        if(obj instanceof SeededVector that) {
-            return this.z == that.z && this.x == that.x && this.seed == that.seed;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        int code = x;
-        code = 31 * code + z;
-        return 31 * code + ((int) (seed ^ (seed >>> 32)));
-    }
-}
@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;

-import com.dfsek.terra.api.world.biome.Biome;
-
 import java.util.Set;

+import com.dfsek.terra.api.world.biome.Biome;
+

 public final class DelegatedPipelineBiome implements PipelineBiome {
    private final Biome biome;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -29,7 +29,7 @@ public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
    @Default
    @Description("""
                 The resolution at which to sample biomes.
-                                  
+                 
                 Larger values are quadratically faster, but produce lower quality results.
                 For example, a value of 3 would sample every 3 blocks.""")
    protected @Meta int resolution = 1;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -4,20 +4,20 @@ import java.util.List;

 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.api.util.cache.SeededVector2Key;


 public class BiomeChunkImpl implements BiomeChunk {

-    private final SeededVector worldOrigin;
+    private final SeededVector2Key worldOrigin;
    private final int chunkOriginArrayIndex;
    private final int worldCoordinateScale;
    private final int size;
    private PipelineBiome[] biomes;

-    public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
+    public BiomeChunkImpl(SeededVector2Key worldOrigin, PipelineImpl pipeline) {

        this.worldOrigin = worldOrigin;
        this.chunkOriginArrayIndex = pipeline.getChunkOriginArrayIndex();
@@ -44,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 * size) + zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex),
+                biomes[(xIndex * size) + zIndex] = pipeline.getSource().get(worldOrigin.seed, xIndexToWorldCoordinate(xIndex),
                    zIndexToWorldCoordinate(zIndex));
            }
        }
@@ -139,14 +139,14 @@ public class BiomeChunkImpl implements BiomeChunk {
    }

    private int xIndexToWorldCoordinate(int xIndex) {
-        return (worldOrigin.x() + xIndex - chunkOriginArrayIndex) * worldCoordinateScale;
+        return (worldOrigin.x + xIndex - chunkOriginArrayIndex) * worldCoordinateScale;
    }

    private int zIndexToWorldCoordinate(int zIndex) {
-        return (worldOrigin.z() + zIndex - chunkOriginArrayIndex) * worldCoordinateScale;
+        return (worldOrigin.z + zIndex - chunkOriginArrayIndex) * worldCoordinateScale;
    }

-    private SeededVector getOrigin() {
+    private SeededVector2Key getOrigin() {
        return worldOrigin;
    }

@@ -216,7 +216,7 @@ public class BiomeChunkImpl implements BiomeChunk {
        }

        public long worldSeed() {
-            return chunk.getOrigin().seed();
+            return chunk.getOrigin().seed;
        }
    }
 }
@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.pipeline;

+import com.dfsek.terra.api.util.cache.SeededVector2Key;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -8,7 +10,6 @@ import java.util.List;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;

@@ -55,7 +56,7 @@ public class PipelineImpl implements Pipeline {
    }

    @Override
-    public BiomeChunk generateChunk(SeededVector worldCoordinates) {
+    public BiomeChunk generateChunk(SeededVector2Key worldCoordinates) {
        return new BiomeChunkImpl(worldCoordinates, this);
    }

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -7,17 +7,17 @@

 package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators;

+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Stream;
-

 public class ReplaceListStage implements Stage {
    private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -28,7 +28,7 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate {
    @Description("""
                 The initial size of biome chunks. This value must be at least 2.
                 <b>This is not the final size of biome chunks. Final chunks will be much larger</b>.
-                                  
+                 
                 It is recommended to keep biome chunks' final size in the range of [50, 300]
                 to prevent performance issues. To calculate the size of biome chunks, simply
                 take initial-size and for each expand stage, multiply the running value by 2
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -22,7 +22,7 @@ public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvi
    @Default
    @Description("""
                 The resolution at which to sample biomes.
-                                  
+                 
                 Larger values are quadratically faster, but produce lower quality results.
                 For example, a value of 3 would sample every 3 blocks.""")
    protected @Meta int resolution = 1;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -58,7 +58,8 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
                        pack -> new NoiseChunkGenerator3D(pack, platform, config.getElevationBlend(),
                            config.getHorizontalRes(),
                            config.getVerticalRes(), noisePropertiesPropertyKey,
-                            paletteInfoPropertyKey, config.getSlantCalculationMethod()));
+                            paletteInfoPropertyKey, config.getSlantCalculationMethod(),
+                            config.isSlantPalettesEnabled()));
                event.getPack()
                    .applyLoader(SlantHolder.Layer.class, SlantLayerTemplate::new);
            })
@@ -26,6 +26,10 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate, Pr
    @Default
    private @Meta SlantCalculationMethod slantCalculationMethod = SlantCalculationMethod.Derivative;

+    @Value("slant.disable-palettes")
+    @Default
+    private @Meta boolean disableSlantPalettes = false;
+
    public int getElevationBlend() {
        return elevationBlend;
    }
@@ -41,4 +45,8 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate, Pr
    public SlantCalculationMethod getSlantCalculationMethod() {
        return slantCalculationMethod;
    }
+
+    public boolean isSlantPalettesEnabled() {
+        return !disableSlantPalettes;
+    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -8,17 +8,15 @@
 package com.dfsek.terra.addons.chunkgenerator.generation;


-import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
-
-import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
-
 import org.jetbrains.annotations.NotNull;

 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.LazilyEvaluatedInterpolator;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider;
 import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
@@ -47,10 +45,13 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {

    private final SlantCalculationMethod slantCalculationMethod;

+    private final boolean useSlantPalettes;
+
    public NoiseChunkGenerator3D(ConfigPack pack, Platform platform, int elevationBlend, int carverHorizontalResolution,
                                 int carverVerticalResolution,
                                 PropertyKey<BiomeNoiseProperties> noisePropertiesKey,
-                                 PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey, SlantCalculationMethod slantCalculationMethod) {
+                                 PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey,
+                                 SlantCalculationMethod slantCalculationMethod, boolean useSlantPalettes) {
        this.platform = platform;
        this.air = platform.getWorldHandle().air();
        this.carverHorizontalResolution = carverHorizontalResolution;
@@ -58,6 +59,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
        this.paletteInfoPropertyKey = paletteInfoPropertyKey;
        this.noisePropertiesKey = noisePropertiesKey;
        this.slantCalculationMethod = slantCalculationMethod;
+        this.useSlantPalettes = useSlantPalettes;
        int maxBlend = pack
            .getBiomeProvider()
            .stream()
@@ -71,7 +73,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {

    private Palette paletteAt(int x, int y, int z, Sampler3D sampler, BiomePaletteInfo paletteInfo, int depth) {
        SlantHolder slantHolder = paletteInfo.slantHolder();
-        if(slantHolder.isAboveDepth(depth)) {
+        if(useSlantPalettes && slantHolder.isAboveDepth(depth)) {
            double slant = slantCalculationMethod.slant(sampler, x, y, z);
            if(slantHolder.isInSlantThreshold(slant)) {
                return slantHolder.getPalette(slant).getPalette(y);
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.commands.addons;

-import cloud.commandframework.ArgumentDescription;
-import cloud.commandframework.CommandManager;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.description.Description;

 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
@@ -30,7 +30,7 @@ public class AddonsCommandAddon implements AddonInitializer {
                CommandManager<CommandSender> manager = event.getCommandManager();

                manager.command(
-                        manager.commandBuilder("addons", ArgumentDescription.of("List installed Terra addons"))
+                        manager.commandBuilder("addons", Description.of("List installed Terra addons"))
                            .permission("terra.addons")
                            .handler(context -> {
                                StringBuilder addons = new StringBuilder("Installed addons:\n");
@@ -41,7 +41,7 @@ public class AddonsCommandAddon implements AddonInitializer {
                                        .append('@')
                                        .append(addon.getVersion().getFormatted())
                                        .append('\n'));
-                                context.getSender().sendMessage(addons.toString());
+                                context.sender().sendMessage(addons.toString());
                            })
                    )
                    .command(
@@ -61,7 +61,7 @@ public class AddonsCommandAddon implements AddonInitializer {
                                    .append('@')
                                    .append(versions.getFormatted())
                                    .append('\n'));
-                                context.getSender().sendMessage(addonInfo.toString());
+                                context.sender().sendMessage(addonInfo.toString());
                            })
                    );
            });
@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.commands.packs;

-import cloud.commandframework.ArgumentDescription;
-import cloud.commandframework.CommandManager;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.description.Description;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -35,7 +35,7 @@ public class PacksCommandAddon implements AddonInitializer {
                CommandManager<CommandSender> manager = event.getCommandManager();

                manager.command(
-                        manager.commandBuilder("packs", ArgumentDescription.of("List installed config packs"))
+                        manager.commandBuilder("packs", Description.of("List installed config packs"))
                            .permission("terra.packs")
                            .handler(context -> {
                                StringBuilder packs = new StringBuilder("Installed packs:\n");
@@ -43,12 +43,12 @@ public class PacksCommandAddon implements AddonInitializer {
                                    .append(pack.getID())
                                    .append('@')
                                    .append(pack.getVersion().getFormatted()));
-                                context.getSender().sendMessage(packs.toString());
+                                context.sender().sendMessage(packs.toString());
                            })
                    )
                    .command(
                        manager.commandBuilder("packs")
-                            .literal("info", ArgumentDescription.of("Get information about a pack"))
+                            .literal("info", Description.of("Get information about a pack"))
                            .permission("terra.packs.info")
                            .argument(RegistryArgument.of("pack", platform.getConfigRegistry()))
                            .handler(context -> {
@@ -65,21 +65,21 @@ public class PacksCommandAddon implements AddonInitializer {
                                    .append('@')
                                    .append(versions.getFormatted())
                                    .append('\n'));
-                                context.getSender().sendMessage(packInfo.toString());
+                                context.sender().sendMessage(packInfo.toString());
                            }))
                    .command(
                        manager.commandBuilder("packs")
-                            .literal("reload", ArgumentDescription.of("Reload config packs"))
+                            .literal("reload", Description.of("Reload config packs"))
                            .permission("terra.packs.reload")
                            .handler(context -> {
-                                context.getSender().sendMessage("Reloading Terra...");
+                                context.sender().sendMessage("Reloading Terra...");
                                logger.info("Reloading Terra...");
                                if(platform.reload()) {
                                    logger.info("Terra reloaded successfully.");
-                                    context.getSender().sendMessage("Terra reloaded successfully.");
+                                    context.sender().sendMessage("Terra reloaded successfully.");
                                } else {
                                    logger.error("Terra failed to reload.");
-                                    context.getSender().sendMessage(
+                                    context.sender().sendMessage(
                                        "Terra failed to reload. See logs for more information.");
                                }
                            }));
@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.commands.profiler;

-import cloud.commandframework.ArgumentDescription;
-import cloud.commandframework.CommandManager;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.description.Description;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -33,24 +33,24 @@ public class ProfilerCommandAddon implements AddonInitializer {
                CommandManager<CommandSender> manager = event.getCommandManager();
                manager
                    .command(
-                        manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
-                            .literal("start", ArgumentDescription.of("Start profiling"), "st")
+                        manager.commandBuilder("profiler", Description.of("Access the profiler"))
+                            .literal("start", Description.of("Start profiling"), "st")
                            .permission("terra.profiler.start")
                            .handler(context -> {
                                platform.getProfiler().start();
-                                context.getSender().sendMessage("Profiling started.");
+                                context.sender().sendMessage("Profiling started.");
                            }))
                    .command(
-                        manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
-                            .literal("stop", ArgumentDescription.of("Stop profiling"), "s")
+                        manager.commandBuilder("profiler", Description.of("Access the profiler"))
+                            .literal("stop", Description.of("Stop profiling"), "s")
                            .permission("terra.profiler.stop")
                            .handler(context -> {
                                platform.getProfiler().stop();
-                                context.getSender().sendMessage("Profiling stopped.");
+                                context.sender().sendMessage("Profiling stopped.");
                            }))
                    .command(
-                        manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
-                            .literal("query", ArgumentDescription.of("Query profiler results"), "q")
+                        manager.commandBuilder("profiler", Description.of("Access the profiler"))
+                            .literal("query", Description.of("Query profiler results"), "q")
                            .permission("terra.profiler.query")
                            .handler(context -> {
                                StringBuilder data = new StringBuilder("Terra Profiler data: \n");
@@ -59,15 +59,15 @@ public class ProfilerCommandAddon implements AddonInitializer {
                                    .append(timings.toString())
                                    .append('\n'));
                                logger.info(data.toString());
-                                context.getSender().sendMessage("Profiling data dumped to console.");
+                                context.sender().sendMessage("Profiling data dumped to console.");
                            }))
                    .command(
-                        manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
-                            .literal("reset", ArgumentDescription.of("Reset the profiler"), "r")
+                        manager.commandBuilder("profiler", Description.of("Access the profiler"))
+                            .literal("reset", Description.of("Reset the profiler"), "r")
                            .permission("terra.profiler.reset")
                            .handler(context -> {
                                platform.getProfiler().reset();
-                                context.getSender().sendMessage("Profiler reset.");
+                                context.sender().sendMessage("Profiler reset.");
                            }));
            });
    }
@@ -1,13 +1,13 @@
 package com.dfsek.terra.addons.commands.structure;

-import cloud.commandframework.ArgumentDescription;
-import cloud.commandframework.CommandManager;
-import cloud.commandframework.arguments.standard.EnumArgument;
-import cloud.commandframework.arguments.standard.LongArgument;
-import cloud.commandframework.context.CommandContext;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.component.DefaultValue;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.description.Description;
+import org.incendo.cloud.parser.standard.EnumParser;
+import org.incendo.cloud.parser.standard.LongParser;

-import java.util.random.RandomGenerator;
-import java.util.random.RandomGeneratorFactory;
+import java.util.Random;

 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
@@ -32,7 +32,7 @@ public class StructureCommandAddon implements AddonInitializer {
    private BaseAddon addon;

    private static Registry<Structure> getStructureRegistry(CommandContext<CommandSender> sender) {
-        return sender.getSender().getEntity().orElseThrow().world().getPack().getRegistry(Structure.class);
+        return sender.sender().getEntity().orElseThrow().world().getPack().getRegistry(Structure.class);
    }

    @Override
@@ -44,24 +44,20 @@ public class StructureCommandAddon implements AddonInitializer {
                CommandManager<CommandSender> manager = event.getCommandManager();

                manager.command(
-                    manager.commandBuilder("structures", ArgumentDescription.of("Manage or generate structures"))
+                    manager.commandBuilder("structures", Description.of("Manage or generate structures"))
                        .literal("generate")
-                        .argument(RegistryArgument.builder("structure",
+                        .optional(RegistryArgument.builder("structure",
                            StructureCommandAddon::getStructureRegistry,
                            TypeKey.of(Structure.class)))
-                        .argument(LongArgument.optional("seed", 0))
-                        .argument(EnumArgument.optional(Rotation.class, "rotation", Rotation.NONE))
+                        .optional("seed", LongParser.longParser(), DefaultValue.constant(0L))
+                        .optional("rotation", EnumParser.enumParser(Rotation.class), DefaultValue.constant(Rotation.NONE))
                        .handler(context -> {
                            Structure structure = context.get("structure");
-                            Entity sender = context.getSender().getEntity().orElseThrow();
+                            Entity sender = context.sender().getEntity().orElseThrow();
                            structure.generate(
                                sender.position().toInt(),
                                sender.world(),
-                                ((Long) context.get("seed") == 0)
-                                ? RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus")
-                                    .create()
-                                : RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus")
-                                    .create(context.get("seed")),
+                                ((Long) context.get("seed") == 0) ? new Random() : new Random(context.get("seed")),
                                context.get("rotation")
                            );
                        })
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2023 Polyhedral Development
+Copyright (c) 2020-2024 Polyhedral Development

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2024 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
OakLoaf	8df3a4dd02	Added NMSAddon override for BukkitAddon	2024-10-29 19:38:59 +00:00
OakLoaf	afd2c81b19	Made grass colour use default if none is defined	2024-10-29 18:31:37 +00:00
OakLoaf	8de4f1198a	Started adding more biome settings to bukkit	2024-10-26 10:02:32 +01:00
Zoe Gidiere	640645b96b	fix version	2024-10-25 14:03:27 -06:00
Zoe Gidiere	a70738eda5	Version updates	2024-10-25 13:58:33 -06:00
OakLoaf	62756d2784	Updated Bukkit to support 1.21.3	2024-10-25 19:36:18 +01:00
Zoe Gidiere	32f8907cb1	Merge branch 'ver/6.6.0' into dev/1.21.2	2024-10-25 12:28:03 -06:00
Astrash	b75e9c152e	Refactor palette addon	2024-10-18 19:29:48 +11:00
Astrash	c190485dbe	Use more appropriate names in probability collection loader	2024-10-18 17:50:41 +11:00
Astrash	e756953828	Use singleton impl for map based probability collections	2024-10-18 17:49:07 +11:00
Zoe Gidiere	053ec39b7b	Merge branch 'master' into ver/6.6.0	2024-10-13 16:32:26 -06:00
Zoe Gidiere	0a952cff4c	bump build number	2024-10-13 16:06:35 -06:00
Zoe Gidiere	12faae8fd5	Use reflection remapper for worldGenContext on bukkit How this even worked before astounds me	2024-10-13 15:55:29 -06:00
Zoe Gidiere	4be2390294	Small cache fix	2024-10-12 15:43:23 -06:00
Zoe Gidiere	65d026a130	Fix Cache Deadlock	2024-10-12 15:38:51 -06:00
Zoe Gidiere	1e5a1e20c2	Merge remote-tracking branch 'origin/master' into ver/6.6.0	2024-10-12 14:29:42 -06:00
Zoë Gidiere	592788450c	Update CODEOWNERS	2024-10-12 13:45:55 -06:00
Zoë Gidiere	060cbfd0c4	Update CODEOWNERS	2024-10-12 13:44:02 -06:00
Zoe Gidiere	b9c2f4e63b	Update Licence year	2024-10-12 02:03:43 -06:00
Zoe Gidiere	87674aa0ba	fix cellular sampler	2024-10-12 02:02:28 -06:00
Zoe Gidiere	40ccf80c7f	Optimization when Terra Profiler is not running Do not set Profiler SAFE Threadlocal var when profiler is not running but ensure it is set to false after the profiler stops to ensure consistent behavior	2024-10-12 00:58:08 -06:00
Zoe Gidiere	6946755e31	Minor Cellular opt	2024-10-12 00:56:37 -06:00
Zoë Gidiere	3b9962662e	Merge pull request #471 from PolyhedralDev/dev/caching Dev/caching	2024-10-12 00:22:43 -06:00
Zoe Gidiere	7ca61f82b2	Some API clean up	2024-10-12 00:22:18 -06:00
Zoe Gidiere	6851999926	Some refactoring	2024-10-11 19:45:12 -06:00
Zoe Gidiere	585967157d	1.21.2-pre3	2024-10-11 18:40:59 -06:00
Zoe Gidiere	305255511d	More cache improvements	2024-10-11 18:27:37 -06:00
Zoe Gidiere	819be16d83	Merge branch 'dev/cli' into dev/caching	2024-10-11 16:40:26 -06:00
Zoe Gidiere	8a028b193a	Add no save option	2024-10-11 16:35:26 -06:00
Zoe Gidiere	d31679e6be	remove stuff from example	2024-10-11 16:06:40 -06:00
Zoe Gidiere	9d328b12b3	More cache improvements	2024-10-11 16:06:23 -06:00
Zoe Gidiere	a743e9c015	Merge branch 'dev/cli' into dev/caching	2024-10-11 15:16:20 -06:00
Zoe Gidiere	43d52e4bc1	CLI Improvements	2024-10-11 15:16:04 -06:00
Zoe Gidiere	accc07fa07	Bump Version	2024-10-11 15:15:38 -06:00
Zoe Gidiere	c1d3155ddd	Cache Improvements	2024-10-11 15:15:10 -06:00
Zoe Gidiere	9a01a6c6a0	more WIP on cache	2024-10-11 00:20:46 -06:00
Zoe Gidiere	3033fbbf29	Fix a ton of fabric impl bugs	2024-10-10 16:49:40 -06:00
Zoe Gidiere	c78a984a11	Update to pre2	2024-10-10 14:02:53 -06:00
Zoe Gidiere	1ae0d1f867	WIP Caching Hints and Caching Sampler	2024-10-09 23:36:12 -06:00
Zoe Gidiere	be7e10c30c	Fix runtime errors	2024-10-09 16:41:04 -06:00
Zoe Gidiere	2ccf8a8805	1.21.2-pre1 builds	2024-10-09 16:18:47 -06:00
Zoe Gidiere	197cb12be2	Update fabric versions to 1.21.2-pre1	2024-10-09 15:28:52 -06:00
Zoe Gidiere	adb43dcaa8	Gradle update	2024-10-09 15:17:09 -06:00
Zoe Gidiere	b03d128913	Addon dependency updates	2024-10-09 14:01:24 -06:00
Zoe Gidiere	725fa88466	Remap fabric	2024-10-09 14:01:12 -06:00
Zoe Gidiere	370b2e0122	Fix import	2024-10-09 13:01:54 -06:00
Zoe Gidiere	331075e54d	Refractor name	2024-10-09 12:59:19 -06:00
Zoë Gidiere	973590f5fd	Add parameter to turn off salting cellular lookup another updated astrash commit	2024-10-09 12:42:24 -06:00
Astrash	1a5ab6b505	Add meta annotations	2024-10-09 12:42:13 -06:00
Astrash	14732328cd	Add default 'from' values for linear map template	2024-10-09 12:41:55 -06:00
Zoë Gidiere	6c7974c302	Implement linear map normalizer Updated astrash commit	2024-10-09 12:41:40 -06:00
Zoe Gidiere	1204b7a8c1	ArithmeticSampler Derivatives	2024-10-09 12:37:50 -06:00
Astrash	fbe1c76e26	Forgot to include 4th derivative array index for 3D FBM	2024-10-09 21:50:08 +11:00
Astrash	add7803e65	Simplify isDifferentiable static method impl	2024-10-09 20:56:37 +11:00
Astrash	4393a16b2f	Use proper static isDifferentiable method	2024-10-09 20:56:11 +11:00
Astrash	b4fa635455	Ensure throw with incorrect use of SimplexStyle derivatives This should ensure that in the case an implementation fails to correctly check isDifferentiable then performs a subsequent derivative based sample, an error is thrown, rather than potentially missing a logic bug due to noise of 0 and derivative of 0 being returned which could otherwise be hard to narrow down.	2024-10-09 20:45:25 +11:00
Astrash	9f425c6159	Add support for derivatives in FBM	2024-10-09 20:39:45 +11:00
Astrash	158ffba2a5	Make FractalNoiseFunction impls support derivatives	2024-10-09 20:39:13 +11:00
Zoë Gidiere	b7326c0ff6	Merge pull request #469 from PolyhedralDev/dev/fix-bukkit-spawner fix spawners on bukkit	2024-09-24 23:27:44 -06:00
Zoe Gidiere	f70a83aec3	fix spawners on bukkit	2024-09-24 23:26:49 -06:00
astrsh	589cf83c38	Flip comparison As per request from @duplexsystem	2024-09-25 14:08:19 +10:00
Zoë Gidiere	c374c2d5ef	Merge pull request #467 from PolyhedralDev/ver/6.5.0 Ver/6.5.0	2024-09-24 09:41:58 -06:00
Zoe Gidiere	13782bb51e	Remforamt	2024-09-24 09:11:43 -06:00
Zoe Gidiere	1aa3ef813c	add default sampler to pseudoerosion	2024-09-24 09:05:33 -06:00
Zoe Gidiere	6cc53beecb	Fix Sin/Cos	2024-09-23 23:14:35 -06:00
Zoe Gidiere	2c45ba91aa	Fix up commit	2024-09-23 22:40:37 -06:00
Zoe Gidiere	6244ffca63	Revert "Sin/Cos Opts" This reverts commit `1d05f95f74`.	2024-09-23 22:38:45 -06:00
Zoe Gidiere	59d943b3ea	Revert "Fix build" This reverts commit `10d723372d`.	2024-09-23 22:38:17 -06:00
Zoe Gidiere	f605ee1937	Remove Final from psuedoerosion template	2024-09-23 22:35:01 -06:00
Zoe Gidiere	f87b7c07d9	Reformat	2024-09-23 22:27:53 -06:00
Zoe Gidiere	f1124aae6b	Update platform mod file versions and authors	2024-09-23 21:18:47 -06:00
Zoe Gidiere	9c8298fe53	convert pseudoerosion to double	2024-09-23 21:09:19 -06:00
Zoe Gidiere	d69b0dba90	reformat 2	2024-09-23 21:06:07 -06:00
Zoe Gidiere	42166d5239	bump version number	2024-09-23 20:59:02 -06:00
Zoe Gidiere	d6772f51ea	Reformat	2024-09-23 20:56:13 -06:00
Zoe Gidiere	f469193909	Make seed affect pseudoerosion hasing	2024-09-23 20:51:00 -06:00
Zoe Gidiere	10d723372d	Fix build	2024-09-23 20:45:47 -06:00
Zoe Gidiere	1d05f95f74	Sin/Cos Opts	2024-09-23 20:38:22 -06:00
Zoe Gidiere	bd73427072	OpenSimplex 2 Derivative Impl	2024-09-23 20:29:41 -06:00
Zoe Gidiere	017b4608bc	Fix build	2024-09-23 19:49:16 -06:00
Zoe Gidiere	5f340f8ffd	slight open simplex 2s op\pt	2024-09-23 19:48:22 -06:00
Zoe Gidiere	5b35eb041b	Remove temp DerivativeFractl nose	2024-09-23 19:43:56 -06:00
Zoe Gidiere	699d5d1d62	Derivable OpenSimplex2S Impl baased on https://gist.github.com/KdotJPG/882f36b2ae5ae56a8fc91627ec1c87f4	2024-09-23 19:42:50 -06:00
Zoe Gidiere	07e3d0058d	Refractor PseudoErosion	2024-09-23 16:46:48 -06:00
Zoe Gidiere	b1ad820e1c	Move pseudoerosion to NoiseFunction	2024-09-23 16:37:42 -06:00
Zoe Gidiere	3644ee7fca	Implement DerivateNoiseFunction	2024-09-23 16:28:34 -06:00
Zoe Gidiere	b14b355c6f	Merge branch 'dev/fractal-gavoro-pseudoerosion' into ver/6.5.0	2024-09-21 17:22:47 -06:00
Zoe Gidiere	06457bf3ce	some fixes	2024-09-18 15:43:31 -06:00
Zoe Gidiere	b63f5f4a8f	Reformat	2024-09-18 12:43:41 -06:00
Zoë Gidiere	8cf766e77b	Merge pull request #455 from pumken/seasoned-samplers-2 Add salted version of sampler functions in EXPRESSION samplers	2024-09-17 17:59:26 -06:00
Zoe Gidiere	a23d624ab9	Merge branch 'dev/1.21.1' into ver/6.5.0	2024-09-17 17:41:25 -06:00
Zoe Gidiere	15a298304e	working 1.21.1	2024-09-17 17:40:56 -06:00
Zoe Gidiere	664d1a3191	working 1.20.6	2024-09-17 16:34:30 -06:00
Zoë Gidiere	73047284c8	Merge pull request #461 from OakLoaf/dev/1.21/bukkit Updated Bukkit to 1.21/1.21.1	2024-09-17 09:43:05 -06:00
OakLoaf	3bef7d8572	Resolved errors when tab completing	2024-08-26 12:34:08 +01:00
OakLoaf	08df5fc278	Added 1.21.1 support	2024-08-26 11:24:04 +01:00
OakLoaf	922cd35e84	Updated Cloud dependency to v2	2024-08-16 11:07:03 +01:00
Oak	44d23573b3	Updated dependencies to Paper 1.21 snapshot	2024-07-20 20:17:25 +01:00
Oak	e7cc275340	Corrected issues with worldGenContext not correctly being set (Ref: https://stackoverflow.com/questions/56039341/get-declared-fields-of-java-lang-reflect-fields-in-jdk12/56043252#56043252 )	2024-06-23 14:16:50 +01:00
Oak	fddc9a52b9	Temporarily disabled commands whilst awaiting Cloud Framework update	2024-06-19 13:34:35 +01:00
Oak	0758e13bc7	Made patch version optional as not all Minecraft versions have a patch number	2024-06-19 13:33:55 +01:00
Oak	d810cad8d0	Adjusted code for Spigot compatibility	2024-06-17 15:50:06 +01:00
Oak	4e7de501c0	Updated bukkit platform to 1.21	2024-06-16 19:21:34 +01:00
Oak	9e60db4b0d	Updated MinecraftVersionInfo	2024-06-10 11:07:24 +01:00
Oak	4536767794	Updated to 1.20.6	2024-06-03 11:36:50 +01:00
Oak	3fa4b21247	Attempted to fix paper versions	2024-06-02 21:27:07 +01:00
Oak	17acde09a3	Updated Bukkit to 1.20.6	2024-05-31 12:11:07 +01:00
Zoe Gidiere	dd272bce64	WIP 1.20.6	2024-05-01 17:04:34 -06:00
Gavin Tran	c20b1eaf10	Apply code style fixes	2024-04-21 15:39:48 -04:00
Gavin Tran	72f761678a	Add SaltedNoiseFunctions in sampler conversion	2024-04-21 14:54:45 -04:00
Gavin Tran	62317a2f3f	Add SaltedNoiseFunctions	2024-04-21 14:48:46 -04:00
Astrash	823afd592b	Reduce number of erosion impulses A reduction of impulse evaluations from 5^2 to 3^2, original algorithm used exponential falloff function which required evaluating impulses from further away to avoid artifacts. I've changed it to a parabolic falloff function which is exactly 0 at the largest possible distance from a cell origin, meaning any cells further than that will not have an effect, preventing said artifacting from occurring. The parabolic function could be replaced with an exponential function (or any other similar easing function) as long as it has an x-intercept at maxCellDistSq. In addition, an option to control whether averaging impulses has been added as it has more of a visual impact with the aforementioned changes.	2024-04-20 15:55:59 +10:00
Astrash	ff03b38b81	Derivative API documentation	2024-04-19 21:25:16 +10:00
Astrash	35246d65b9	Require implementing derivable check	2024-04-19 21:07:53 +10:00
Astrash	41652d29df	Use proper check for derivative sampler validation	2024-04-19 21:05:52 +10:00
Astrash	142d364682	WIP fractal-gavoro-pseudoerosion	2024-04-19 20:55:14 +10:00
Zoë Gidiere	01e011a9ed	UX tweaks to biome config	2024-03-28 14:47:12 -05:00
Zoë	94949c9120	Merge pull request #449 from Browsit/ver/6.5.0 Prevent exception with other world generators	2024-02-23 14:58:51 +00:00
Browsit	c52ad56ccc	Return null for empty generator IDs	2024-02-02 08:15:37 -05:00
Astrash	f3476c5cc8	Add feature stage blending	2024-01-07 17:02:08 +11:00
Astrash	9c181f7ee1	Add ability to disable slant palettes globally	2024-01-06 09:13:02 +11:00