Revert "Move neoforge to lifecycle"

This reverts commit 32c835bc8f.

build.gradle.kts

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

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -39,9 +39,6 @@ fun Project.configureDependencies() {
         maven("https://repo.papermc.io/repository/maven-public/") {
             name = "PaperMC"
         }
-        maven("https://files.minecraftforge.net/maven/") {
-            name = "Forge"
-        }
         maven("https://maven.quiltmc.org/repository/release/") {
             name = "Quilt"
         }
@@ -51,6 +48,9 @@ fun Project.configureDependencies() {
         maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
             name = "Sonatype Snapshots"
         }
+        maven ("https://maven.neoforged.net/releases/") {
+            name = "Neoforged"
+        }
     }
     
     dependencies {

buildSrc/src/main/kotlin/Versions.kt

@@ -9,8 +9,6 @@ object Versions {
         const val strata = "1.3.2"
         
         const val cloud = "2.0.0"
-        const val cloudPaper = "2.0.0-beta.10"
-        const val cloudFabric = "2.0.0-beta.9"
         
         const val caffeine = "3.1.8"
         
@@ -28,15 +26,6 @@ object Versions {
         }
     }
     
-    object Fabric {
-        const val fabricAPI = "0.104.0+${Mod.minecraft}"
-    }
-//
-//    object Quilt {
-//        const val quiltLoader = "0.20.2"
-//        const val fabricApi = "7.3.1+0.89.3-1.20.1"
-//    }
-    
     object Mod {
         const val mixin = "0.15.3+mixin.0.8.7"
         
@@ -47,11 +36,18 @@ object Versions {
         const val architecuryLoom = "1.7.413"
         const val architecturyPlugin = "3.4.159"
     }
-//
-//    object Forge {
-//        const val forge = "${Mod.minecraft}-48.0.13"
-//        const val burningwave = "12.63.0"
-//    }
+    
+    object Fabric {
+        const val cloud = "2.0.0-beta.9"
+        const val fabricAPI = "0.104.0+${Mod.minecraft}"
+    }
+    
+    object NeoForge {
+        const val cloud = "2.0.0-beta.9"
+        const val neoForge = "21.1.56"
+        const val burningwave = "12.65.2"
+        const val yarnPatch = "1.21+build.4"
+    }
     
     object Bukkit {
         const val minecraft = "1.21.1"
@@ -61,6 +57,7 @@ object Versions {
         const val reflectionRemapper = "0.1.1"
         const val paperDevBundle = paperBuild
         const val runPaper = "2.3.1"
+        const val cloud = "2.0.0-beta.10"
         const val paperWeight = "1.7.2"
     }
     
@@ -74,6 +71,5 @@ object Versions {
     object CLI {
         const val nbt = "6.1"
         const val logback = "1.5.8"
-        const val picocli = "4.7.6"
     }
 }

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/api/Extrusion.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.extrusion.api;
 
-import com.dfsek.terra.api.world.biome.Biome;
-
 import java.util.Collection;
 
+import com.dfsek.terra.api.world.biome.Biome;
+
 
 public interface Extrusion {
     Biome extrude(Biome original, int x, int y, int z, long seed);

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.addons.biome.pipeline.api.delegate;
 
+import com.dfsek.terra.api.world.biome.Biome;
+
 import java.util.Collections;
 import java.util.Set;
 
-import com.dfsek.terra.api.world.biome.Biome;
-
 
 final class SelfDelegate implements BiomeDelegate {
     public static final SelfDelegate INSTANCE = new SelfDelegate();

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderBuilder.java

@@ -7,11 +7,11 @@
 
 package com.dfsek.terra.addons.biome.holder;
 
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
 import java.util.Map;
 import java.util.TreeMap;
 
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;
+
 
 public class PaletteHolderBuilder {
     private final TreeMap<Integer, Palette> paletteMap = new TreeMap<>();

common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PointSetDistributor.java

@@ -7,11 +7,11 @@
 
 package com.dfsek.terra.addons.feature.distributor.distributors;
 
+import java.util.Set;
+
 import com.dfsek.terra.addons.feature.distributor.util.Point;
 import com.dfsek.terra.api.structure.feature.Distributor;
 
-import java.util.Set;
-
 
 public class PointSetDistributor implements Distributor {
     private final Set<Point> points;

common/addons/config-noise-function/build.gradle.kts

@@ -1,4 +1,4 @@
-version = version("1.2.0")
+version = version("1.1.0")
 
 dependencies {
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java

@@ -9,48 +9,17 @@ package com.dfsek.terra.addons.noise;
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.function.Supplier;
-
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.addons.noise.config.CubicSplinePointTemplate;
 import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
-import com.dfsek.terra.addons.noise.config.templates.BinaryArithmeticTemplate;
-import com.dfsek.terra.addons.noise.config.templates.CacheSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.DerivativeNoiseSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.DomainWarpTemplate;
-import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
-import com.dfsek.terra.addons.noise.config.templates.ImageSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.KernelTemplate;
-import com.dfsek.terra.addons.noise.config.templates.LinearHeightmapSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.TranslateSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.CellularNoiseTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.ConstantNoiseTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.DistanceSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.ExpressionFunctionTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.GaborNoiseTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.PseudoErosionTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.SimpleNoiseTemplate;
+import com.dfsek.terra.addons.noise.config.templates.*;
+import com.dfsek.terra.addons.noise.config.templates.noise.*;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.BrownianMotionTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.PingPongTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.RidgedFractalTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.ClampNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.CubicSplineNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.ExpressionNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearMapNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.NormalNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.PosterizationNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.ProbabilityNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.ScaleNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.*;
 import com.dfsek.terra.addons.noise.math.CubicSpline;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.AdditionSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.DivisionSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.MaxSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.MinSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.MultiplicationSampler;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.SubtractionSampler;
+import com.dfsek.terra.addons.noise.samplers.arithmetic.*;
 import com.dfsek.terra.addons.noise.samplers.noise.CellularSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.DistanceSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.GaussianNoiseSampler;
@@ -67,11 +36,14 @@ import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
 
 public class NoiseAddon implements AddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<NoiseSampler>>> NOISE_SAMPLER_TOKEN = new TypeKey<>() {
@@ -99,11 +71,9 @@ public class NoiseAddon implements AddonInitializer {
                         (type, o, loader, depthTracker) -> DistanceSampler.DistanceFunction.valueOf((String) o))
                     .applyLoader(DimensionApplicableNoiseSampler.class, DimensionApplicableNoiseSampler::new)
                     .applyLoader(FunctionTemplate.class, FunctionTemplate::new)
-                    .applyLoader(CubicSpline.Point.class, CubicSplinePointTemplate::new)
-                    .applyLoader(DerivativeNoiseSampler.class, DerivativeNoiseSamplerTemplate::new);
+                    .applyLoader(CubicSpline.Point.class, CubicSplinePointTemplate::new);
 
                 noiseRegistry.register(addon.key("LINEAR"), LinearNormalizerTemplate::new);
-                noiseRegistry.register(addon.key("LINEAR_MAP"), LinearMapNormalizerTemplate::new);
                 noiseRegistry.register(addon.key("NORMAL"), NormalNormalizerTemplate::new);
                 noiseRegistry.register(addon.key("CLAMP"), ClampNormalizerTemplate::new);
                 noiseRegistry.register(addon.key("PROBABILITY"), ProbabilityNormalizerTemplate::new);
@@ -124,7 +94,7 @@ public class NoiseAddon implements AddonInitializer {
                 noiseRegistry.register(addon.key("PERLIN"), () -> new SimpleNoiseTemplate(PerlinSampler::new));
                 noiseRegistry.register(addon.key("SIMPLEX"), () -> new SimpleNoiseTemplate(SimplexSampler::new));
                 noiseRegistry.register(addon.key("GABOR"), GaborNoiseTemplate::new);
-                noiseRegistry.register(addon.key("PSEUDOEROSION"), PseudoErosionTemplate::new);
+
 
                 noiseRegistry.register(addon.key("VALUE"), () -> new SimpleNoiseTemplate(ValueSampler::new));
                 noiseRegistry.register(addon.key("VALUE_CUBIC"), () -> new SimpleNoiseTemplate(ValueCubicSampler::new));
@@ -151,8 +121,6 @@ public class NoiseAddon implements AddonInitializer {
                 noiseRegistry.register(addon.key("MAX"), () -> new BinaryArithmeticTemplate<>(MaxSampler::new));
                 noiseRegistry.register(addon.key("MIN"), () -> new BinaryArithmeticTemplate<>(MinSampler::new));
 
-                noiseRegistry.register(addon.key("CACHE"), () -> new CacheSamplerTemplate(plugin.getGenerationThreads()));
-
 
                 Map<String, DimensionApplicableNoiseSampler> packSamplers = new LinkedHashMap<>();
                 Map<String, FunctionTemplate> packFunctions = new LinkedHashMap<>();

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java

@@ -11,14 +11,14 @@ 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.LinkedHashMap;
+import java.util.Map;
+
 import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
 import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.properties.Properties;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 
 @SuppressWarnings("FieldMayBeFinal")
 public class NoiseConfigPackTemplate implements ConfigTemplate, Properties {

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/CacheSamplerTemplate.java

@@ -1,26 +0,0 @@
-package com.dfsek.terra.addons.noise.config.templates;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.noise.samplers.CacheSampler;
-import com.dfsek.terra.addons.noise.samplers.LinearHeightmapSampler;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public class CacheSamplerTemplate extends SamplerTemplate<LinearHeightmapSampler> {
-    @Value("sampler")
-    @Default
-    private NoiseSampler sampler;
-
-    private final int generationThreads;
-
-    public CacheSamplerTemplate(int generationThreads) {
-        this.generationThreads = generationThreads;
-    }
-
-    @Override
-    public NoiseSampler get() {
-        return new CacheSampler(sampler, getDimensions(), generationThreads);
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DerivativeNoiseSamplerTemplate.java

@@ -1,26 +0,0 @@
-package com.dfsek.terra.addons.noise.config.templates;
-
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.exception.ValidationException;
-
-import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public class DerivativeNoiseSamplerTemplate extends SamplerTemplate<DerivativeNoiseSampler> {
-
-    @Value(".")
-    private NoiseSampler sampler;
-
-    @Override
-    public boolean validate() throws ValidationException {
-        if(!DerivativeNoiseSampler.isDifferentiable(sampler)) throw new ValidationException(
-            "Provided sampler does not support calculating a derivative");
-        return super.validate();
-    }
-
-    @Override
-    public DerivativeNoiseSampler get() {
-        return (DerivativeNoiseSampler) sampler;
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/ImageSamplerTemplate.java

@@ -8,15 +8,16 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.awt.image.BufferedImage;
 
 import com.dfsek.terra.addons.noise.samplers.ImageSampler;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.image.BufferedImage;
+
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })
 public class ImageSamplerTemplate extends SamplerTemplate<ImageSampler> {

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java

@@ -34,11 +34,7 @@ public class CellularNoiseTemplate extends NoiseTemplate<CellularSampler> {
     @Value("lookup")
     @Default
     private @Meta NoiseSampler lookup = new OpenSimplex2Sampler();
-    
-    @Value("salt-lookup")
-    @Default
-    private @Meta boolean saltLookup = true;
-    
+
     @Override
     public NoiseSampler get() {
         CellularSampler sampler = new CellularSampler();
@@ -48,7 +44,6 @@ public class CellularNoiseTemplate extends NoiseTemplate<CellularSampler> {
         sampler.setReturnType(cellularReturnType);
         sampler.setDistanceFunction(cellularDistanceFunction);
         sampler.setSalt(salt);
-        sampler.setSaltLookup(saltLookup);
         return sampler;
     }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/DerivativeNoiseTemplate.java

@@ -1,8 +0,0 @@
-package com.dfsek.terra.addons.noise.config.templates.noise;
-
-import com.dfsek.terra.addons.noise.samplers.noise.DerivativeNoiseFunction;
-
-
-public abstract class DerivativeNoiseTemplate<T extends DerivativeNoiseFunction> extends NoiseTemplate<T> {
-
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java

@@ -1,79 +0,0 @@
-package com.dfsek.terra.addons.noise.config.templates.noise;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.noise.samplers.noise.PseudoErosionSampler;
-import com.dfsek.terra.addons.noise.samplers.noise.simplex.OpenSimplex2Sampler;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
-
-
-public class PseudoErosionTemplate extends NoiseTemplate<PseudoErosionSampler> {
-    @Value("frequency")
-    @Default
-    protected @Meta double frequency = 1d;
-
-    @Value("octaves")
-    @Default
-    private int octaves = 4;
-
-    @Value("lacunarity")
-    @Default
-    private double lacunarity = 2.0;
-
-    @Value("gain")
-    @Default
-    private double gain = 0.5;
-
-    @Value("slope-strength")
-    @Default
-    private double slopeStrength = 1.0;
-
-
-    @Value("branch-strength")
-    @Default
-    private double branchStrength = 1.0;
-
-    @Value("strength")
-    @Default
-    private double strength = 0.04;
-
-    @Value("erosion-frequency")
-    @Default
-    private double erosionFrequency = 0.02;
-
-    @Value("sampler")
-    @Default
-    private DerivativeNoiseSampler heightSampler = new OpenSimplex2Sampler();
-
-    @Value("slope-mask.enable")
-    @Default
-    private boolean slopeMask = true;
-
-    @Value("slope-mask.none")
-    @Default
-    private double slopeMaskNone = -0.5;
-
-    @Value("slope-mask.full")
-    @Default
-    private double slopeMaskFull = 1;
-
-    @Value("jitter")
-    @Default
-    private double jitterModifier = 1;
-
-    @Value("average-impulses")
-    @Default
-    private boolean averageErosionImpulses = true;
-
-    @Override
-    public PseudoErosionSampler get() {
-        PseudoErosionSampler pseudoErosion = new PseudoErosionSampler(octaves, gain, lacunarity,
-            slopeStrength, branchStrength, strength,
-            erosionFrequency, heightSampler, slopeMask, slopeMaskFull, slopeMaskNone, jitterModifier, averageErosionImpulses);
-        pseudoErosion.setFrequency(frequency);
-        pseudoErosion.setSalt(salt);
-        return pseudoErosion;
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearMapNormalizerTemplate.java

@@ -1,31 +0,0 @@
-package com.dfsek.terra.addons.noise.config.templates.normalizer;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.noise.normalizer.LinearMapNormalizer;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public class LinearMapNormalizerTemplate extends NormalizerTemplate<LinearMapNormalizer> {
-    
-    @Value("from.a")
-    @Default
-    private @Meta double aFrom = -1;
-    
-    @Value("from.b")
-    @Default
-    private @Meta double bFrom = 1;
-    
-    @Value("to.a")
-    private @Meta double aTo;
-    
-    @Value("to.b")
-    private @Meta double bTo;
-    
-    @Override
-    public NoiseSampler get() {
-        return new LinearMapNormalizer(function, aFrom, aTo, bFrom, bTo);
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/LinearMapNormalizer.java

@@ -1,28 +0,0 @@
-package com.dfsek.terra.addons.noise.normalizer;
-
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public class LinearMapNormalizer extends Normalizer {
-    
-    private final double aFrom;
-    
-    private final double aTo;
-    
-    private final double bFrom;
-    
-    private final double bTo;
-    
-    public LinearMapNormalizer(NoiseSampler sampler, double aFrom, double aTo, double bFrom, double bTo) {
-        super(sampler);
-        this.aFrom = aFrom;
-        this.aTo = aTo;
-        this.bFrom = bFrom;
-        this.bTo = bTo;
-    }
-    
-    @Override
-    public double normalize(double in) {
-        return (in - aFrom) * (aTo - bTo) / (aFrom - bFrom) + aTo;
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/CacheSampler.java

@@ -1,125 +0,0 @@
-package com.dfsek.terra.addons.noise.samplers;
-
-import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
-
-
-public class CacheSampler implements DerivativeNoiseSampler {
-
-    private final NoiseSampler sampler;
-    private final LoadingCache<DoubleSeededVector2, Double> cache2D;
-    private final LoadingCache<DoubleSeededVector3, Double> cache3D;
-    private final LoadingCache<DoubleSeededVector2, double[]> cache2DDirv;
-    private final LoadingCache<DoubleSeededVector3, double[]> cache3DDirv;
-
-    public CacheSampler(NoiseSampler sampler, int dimensions, int generationThreads) {
-        this.sampler = sampler;
-        if (dimensions == 2) {
-            this.cache2D = Caffeine
-                .newBuilder()
-                .initialCapacity(0)
-                .maximumSize(256L * generationThreads) // 1 full chunk (high res)
-                .build(vec -> sampler.noise(vec.seed, vec.x, vec.z));
-            cache3D = null;
-            cache3DDirv = null;
-            if (DerivativeNoiseSampler.isDifferentiable(sampler)) {
-                this.cache2DDirv = Caffeine
-                    .newBuilder()
-                    .initialCapacity(0)
-                    .maximumSize(256L * generationThreads) // 1 full chunk (high res)
-                    .build(vec -> ((DerivativeNoiseSampler) sampler).noised(vec.seed, vec.x, vec.z));
-            } else  {
-                cache2DDirv = null;
-            }
-        } else {
-            this.cache3D = Caffeine
-                .newBuilder()
-                .initialCapacity(0)
-                .maximumSize(256L * generationThreads) // 1 full chunk (high res)
-                .build(vec -> sampler.noise(vec.seed, vec.x, vec.y, vec.z));
-            cache2D = null;
-            cache2DDirv = null;
-            if (DerivativeNoiseSampler.isDifferentiable(sampler)) {
-                this.cache3DDirv = Caffeine
-                    .newBuilder()
-                    .initialCapacity(0)
-                    .maximumSize(256L * generationThreads) // 1 full chunk (high res)
-                    .build(vec -> ((DerivativeNoiseSampler) sampler).noised(vec.seed, vec.x, vec.y, vec.z));
-            } else {
-                cache3DDirv = null;
-            }
-        }
-    }
-
-    @Override
-    public boolean isDifferentiable() {
-        return DerivativeNoiseSampler.isDifferentiable(sampler);
-    }
-
-    @Override
-    public double[] noised(long seed, double x, double y) {
-        return cache2DDirv.get(new DoubleSeededVector2(x, y, seed));
-    }
-
-    @Override
-    public double[] noised(long seed, double x, double y, double z) {
-        return cache3DDirv.get(new DoubleSeededVector3(x, y, z, seed));
-    }
-
-    @Override
-    public double noise(long seed, double x, double y) {
-        DoubleSeededVector2 vec = new DoubleSeededVector2(x, y, seed);
-        if (cache2DDirv != null && cache2DDirv.estimatedSize() != 0) {
-            return cache2DDirv.get(vec)[0];
-        }
-        return cache2D.get(vec);
-    }
-
-    @Override
-    public double noise(long seed, double x, double y, double z) {
-        DoubleSeededVector3 vec = new DoubleSeededVector3(x, y, z, seed);
-        if (cache3DDirv != null && cache3DDirv.estimatedSize() != 0) {
-            return cache3DDirv.get(vec)[0];
-        }
-        return cache3D.get(vec);
-    }
-
-    private record DoubleSeededVector3(double x, double y, double z, long seed) {
-        @Override
-        public boolean equals(Object obj) {
-            if(obj instanceof DoubleSeededVector3 that) {
-                return this.y == that.y && this.z == that.z && this.x == that.x && this.seed == that.seed;
-            }
-            return false;
-        }
-
-        @Override
-        public int hashCode() {
-            int code = (int) Double.doubleToLongBits(x);
-            code = 31 * code + (int) Double.doubleToLongBits(y);
-            code = 31 * code + (int) Double.doubleToLongBits(z);
-            return 31 * code + (Long.hashCode(seed));
-        }
-    }
-
-
-    private record DoubleSeededVector2(double x, double z, long seed) {
-        @Override
-        public boolean equals(Object obj) {
-            if(obj instanceof DoubleSeededVector2 that) {
-                return this.z == that.z && this.x == that.x && this.seed == that.seed;
-            }
-            return false;
-        }
-
-        @Override
-        public int hashCode() {
-            int code = (int) Double.doubleToLongBits(x);
-            code = 31 * code + (int) Double.doubleToLongBits(z);
-            return 31 * code + (Long.hashCode(seed));
-        }
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/arithmetic/AdditionSampler.java

@@ -12,14 +12,4 @@ public class AdditionSampler extends BinaryArithmeticSampler {
     public double operate(double left, double right) {
         return left + right;
     }
-
-    @Override
-    public double[] operateDerivative(double[] left, double[] right) {
-        int dimensions = left.length;
-        double[] out = new double[dimensions];
-        for(int i = 0; i < dimensions; i++) {
-            out[i] = left[i] + right[i];
-        }
-        return out;
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/arithmetic/BinaryArithmeticSampler.java

@@ -1,10 +1,9 @@
 package com.dfsek.terra.addons.noise.samplers.arithmetic;
 
-import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 
-public abstract class BinaryArithmeticSampler implements DerivativeNoiseSampler {
+public abstract class BinaryArithmeticSampler implements NoiseSampler {
     private final NoiseSampler left;
     private final NoiseSampler right;
 
@@ -13,11 +12,6 @@ public abstract class BinaryArithmeticSampler implements DerivativeNoiseSampler
         this.right = right;
     }
 
-    @Override
-    public boolean isDifferentiable() {
-        return DerivativeNoiseSampler.isDifferentiable(left) && DerivativeNoiseSampler.isDifferentiable(right);
-    }
-
     @Override
     public double noise(long seed, double x, double y) {
         return operate(left.noise(seed, x, y), right.noise(seed, x, y));
@@ -28,17 +22,5 @@ public abstract class BinaryArithmeticSampler implements DerivativeNoiseSampler
         return operate(left.noise(seed, x, y, z), right.noise(seed, x, y, z));
     }
 
-    @Override
-    public double[] noised(long seed, double x, double y) {
-        return operateDerivative(((DerivativeNoiseSampler)left).noised(seed, x, y), ((DerivativeNoiseSampler)right).noised(seed, x, y));
-    }
-
-    @Override
-    public double[] noised(long seed, double x, double y, double z) {
-        return operateDerivative(((DerivativeNoiseSampler)left).noised(seed, x, y, z), ((DerivativeNoiseSampler)right).noised(seed, x, y, z));
-    }
-
     public abstract double operate(double left, double right);
-
-    public abstract double[] operateDerivative(double[] left, double[] right);
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/arithmetic/DivisionSampler.java

@@ -12,15 +12,4 @@ public class DivisionSampler extends BinaryArithmeticSampler {
     public double operate(double left, double right) {
         return left / right;
     }
-
-    @Override
-    public double[] operateDerivative(double[] left, double[] right) {
-        int dimensions = left.length;
-        double[] out = new double[dimensions];
-        out[0] = left[0] / right[0];
-        for(int i = 1; i < dimensions; i++) {
-            out[i] = (left[i] * right[0] - left[0] * right[i]) / (right[0] * right[0]);
-        }
-        return out;
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/arithmetic/MaxSampler.java

@@ -12,11 +12,4 @@ public class MaxSampler extends BinaryArithmeticSampler {
     public double operate(double left, double right) {
         return Math.max(left, right);
     }
-
-    @Override
-    public double[] operateDerivative(double[] left, double[] right) {
-        double leftValue = left[0];
-        double rightValue = right[0];
-        return leftValue > rightValue ? left : right;
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/arithmetic/MinSampler.java

@@ -12,11 +12,4 @@ public class MinSampler extends BinaryArithmeticSampler {
     public double operate(double left, double right) {
         return Math.min(left, right);
     }
-
-    @Override
-    public double[] operateDerivative(double[] left, double[] right) {
-        double leftValue = left[0];
-        double rightValue = right[0];
-        return leftValue < rightValue ? left : right;
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/arithmetic/MultiplicationSampler.java

@@ -12,15 +12,4 @@ public class MultiplicationSampler extends BinaryArithmeticSampler {
     public double operate(double left, double right) {
         return left * right;
     }
-
-    @Override
-    public double[] operateDerivative(double[] left, double[] right) {
-        int dimensions = left.length;
-        double[] out = new double[dimensions];
-        out[0] = left[0] * right[0];
-        for(int i = 1; i < dimensions; i++) {
-            out[i] = left[i] * right[0] + left[0] * right[i];
-        }
-        return out;
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/arithmetic/SubtractionSampler.java

@@ -12,14 +12,4 @@ public class SubtractionSampler extends BinaryArithmeticSampler {
     public double operate(double left, double right) {
         return left - right;
     }
-
-    @Override
-    public double[] operateDerivative(double[] left, double[] right) {
-        int dimensions = left.length;
-        double[] out = new double[dimensions];
-        for(int i = 0; i < dimensions; i++) {
-            out[i] = left[i] - right[i];
-        }
-        return out;
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java

@@ -197,9 +197,7 @@ public class CellularSampler extends NoiseFunction {
     private double jitterModifier = 1.0;
 
     private NoiseSampler noiseLookup;
-    
-    private boolean saltLookup;
-    
+
     public CellularSampler() {
         noiseLookup = new OpenSimplex2Sampler();
     }
@@ -219,11 +217,7 @@ public class CellularSampler extends NoiseFunction {
     public void setReturnType(ReturnType returnType) {
         this.returnType = returnType;
     }
-    
-    public void setSaltLookup(boolean saltLookup) {
-        this.saltLookup = saltLookup;
-    }
-    
+
     @Override
     public double getNoiseRaw(long sl, double x, double y) {
         int seed = (int) sl;
@@ -292,8 +286,8 @@ public class CellularSampler extends NoiseFunction {
             case Distance2Sub -> distance1 - distance0 - 1;
             case Distance2Mul -> distance1 * distance0 * 0.5 - 1;
             case Distance2Div -> distance0 / distance1 - 1;
-            case NoiseLookup -> noiseLookup.noise(sl - (saltLookup ? 0 : salt), centerX, centerY);
-            case LocalNoiseLookup -> noiseLookup.noise(sl - (saltLookup ? 0 : salt), x / frequency - centerX, y / frequency - centerY);
+            case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY);
+            case LocalNoiseLookup -> noiseLookup.noise(sl, x / frequency - centerX, y / frequency - centerY);
             case Distance3 -> distance2 - 1;
             case Distance3Add -> (distance2 + distance0) * 0.5 - 1;
             case Distance3Sub -> distance2 - distance0 - 1;
@@ -383,8 +377,8 @@ public class CellularSampler extends NoiseFunction {
             case Distance2Sub -> distance1 - distance0 - 1;
             case Distance2Mul -> distance1 * distance0 * 0.5 - 1;
             case Distance2Div -> distance0 / distance1 - 1;
-            case NoiseLookup -> noiseLookup.noise(sl - (saltLookup ? 0 : salt), centerX, centerY, centerZ);
-            case LocalNoiseLookup -> noiseLookup.noise(sl - (saltLookup ? 0 : salt), x / frequency - centerX, y / frequency - centerY, z / frequency - centerZ);
+            case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY, centerZ);
+            case LocalNoiseLookup -> noiseLookup.noise(sl, x / frequency - centerX, y / frequency - centerY, z / frequency - centerZ);
             case Distance3 -> distance2 - 1;
             case Distance3Add -> (distance2 + distance0) * 0.5 - 1;
             case Distance3Sub -> distance2 - distance0 - 1;

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/DerivativeNoiseFunction.java

@@ -1,25 +0,0 @@
-package com.dfsek.terra.addons.noise.samplers.noise;
-
-import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
-
-
-public abstract class DerivativeNoiseFunction extends NoiseFunction implements DerivativeNoiseSampler {
-    @Override
-    public boolean isDifferentiable() {
-        return true;
-    }
-
-    @Override
-    public double[] noised(long seed, double x, double y) {
-        return getNoiseDerivativeRaw(seed + salt, x * frequency, y * frequency);
-    }
-
-    @Override
-    public double[] noised(long seed, double x, double y, double z) {
-        return getNoiseDerivativeRaw(seed + salt, x * frequency, y * frequency, z * frequency);
-    }
-
-    public abstract double[] getNoiseDerivativeRaw(long seed, double x, double y);
-
-    public abstract double[] getNoiseDerivativeRaw(long seed, double x, double y, double z);
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/PseudoErosionSampler.java

@@ -1,173 +0,0 @@
-package com.dfsek.terra.addons.noise.samplers.noise;
-
-
-import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
-import com.dfsek.terra.api.util.MathUtil;
-
-
-public class PseudoErosionSampler extends NoiseFunction {
-    public static final double TAU = 2.0 * Math.PI;
-    private static final double HASH_X = 0.3183099f;
-    private static final double HASH_Y = 0.3678794f;
-    public final double gain;
-    public final double lacunarity;
-    public final double slopeStrength;
-    public final double branchStrength;
-    public final double erosionStrength;
-    private final int octaves;
-    private final double erosionFrequency;
-    private final DerivativeNoiseSampler sampler;
-    private final boolean slopeMask;
-    private final double slopeMaskFullSq;
-    private final double slopeMaskNoneSq;
-    private final double jitter;
-    private final double maxCellDistSq;
-    private final double maxCellDistSqRecip;
-    private final boolean averageErosionImpulses;
-
-    public PseudoErosionSampler(int octaves, double gain, double lacunarity, double slopeStrength, double branchStrength,
-                                double erosionStrength, double erosionFrequency, DerivativeNoiseSampler sampler,
-                                boolean slopeMask, double slopeMaskFull, double slopeMaskNone, double jitterModifier,
-                                boolean averageErosionImpulses) {
-        this.octaves = octaves;
-        this.gain = gain;
-        this.lacunarity = lacunarity;
-        this.slopeStrength = slopeStrength;
-        this.branchStrength = branchStrength;
-        this.erosionStrength = erosionStrength;
-        this.erosionFrequency = erosionFrequency;
-        this.sampler = sampler;
-        this.slopeMask = slopeMask;
-        // Square these values and maintain sign since they're compared to a
-        // squared value, otherwise a sqrt would need to be used
-        this.slopeMaskFullSq = slopeMaskFull * slopeMaskFull * Math.signum(slopeMaskFull);
-        this.slopeMaskNoneSq = slopeMaskNone * slopeMaskNone * Math.signum((slopeMaskNone));
-        this.jitter = 0.43701595 * jitterModifier;
-        this.averageErosionImpulses = averageErosionImpulses;
-        this.maxCellDistSq = 1 + jitter * jitter;
-        this.maxCellDistSqRecip = 1 / maxCellDistSq;
-    }
-
-    public static double hashX(double seed, double n) {
-        // Swapped the components here
-        double nx = HASH_X * n * seed;
-        return -1.0f + 2.0f * fract(nx);
-    }
-
-    public static double hashY(double seed, double n) {
-        double ny = HASH_Y * n * seed;
-        return -1.0f + 2.0f * fract(ny);
-    }
-
-    public static double fract(double x) {
-        return (x - Math.floor(x));
-    }
-
-    public static double smoothstep(double edge0, double edge1, double x) {
-        // Scale, bias and saturate x to 0..1 range
-        x = clamp((x - edge0) / (edge1 - edge0), 0.0f, 1.0f);
-        // Evaluate polynomial
-        return x * x * (3 - 2 * x);
-    }
-
-    public static double clamp(double x, double minVal, double maxVal) {
-        return Math.max(minVal, Math.min(maxVal, x));
-    }
-
-    public static double dot(double x1, double y1, double x2, double y2) {
-        return x1 * x2 + y1 * y2;
-    }
-
-    public double[] erosion(int seed, double x, double y, double dirX, double dirY) {
-        int gridX = (int) Math.round(x);
-        int gridY = (int) Math.round(y);
-        double noise = 0.0f;
-        double dirOutX = 0.0f;
-        double dirOutY = 0.0f;
-        double cumAmp = 0.0f;
-
-        for(int cellX = gridX - 1; cellX <= gridX + 1; cellX++) {
-            for(int cellY = gridY - 1; cellY <= gridY + 1; cellY++) {
-                double cellHash = hash(seed, cellX, cellY);
-                double cellOffsetX = hashX(seed, cellHash) * jitter;
-                double cellOffsetY = hashY(seed, cellHash) * jitter;
-                double cellOriginDeltaX = (x - cellX) + cellOffsetX;
-                double cellOriginDeltaY = (y - cellY) + cellOffsetY;
-                double cellOriginDistSq = cellOriginDeltaX * cellOriginDeltaX + cellOriginDeltaY * cellOriginDeltaY;
-                if(cellOriginDistSq > maxCellDistSq) continue; // Skip calculating cells too far away
-                double ampTmp = (cellOriginDistSq * maxCellDistSqRecip) - 1;
-                double amp = ampTmp * ampTmp; // Decrease cell amplitude further away
-                cumAmp += amp;
-                double directionalStrength = dot(cellOriginDeltaX, cellOriginDeltaY, dirX, dirY) * TAU;
-                noise += MathUtil.cos(directionalStrength) * amp;
-                double sinAngle = MathUtil.sin(directionalStrength) * amp;
-                dirOutX -= sinAngle * (cellOriginDeltaX + dirX);
-                dirOutY -= sinAngle * (cellOriginDeltaY + dirY);
-            }
-        }
-        if(averageErosionImpulses && cumAmp != 0) {
-            noise /= cumAmp;
-            dirOutX /= cumAmp;
-            dirOutY /= cumAmp;
-        }
-        return new double[]{ noise, dirOutX, dirOutY };
-    }
-
-    public double heightMap(long seed, double x, double y) {
-        double[] sample = sampler.noised(seed, x, y);
-        double height = sample[0];
-        double heightDirX = sample[1];
-        double heightDirY = sample[2];
-
-        // Take the curl of the normal to get the gradient facing down the slope
-        double baseDirX = heightDirY * slopeStrength;
-        double baseDirY = -heightDirX * slopeStrength;
-
-        double erosion = 0.0f;
-        double dirX = 0.0f;
-        double dirY = 0.0f;
-        double amp = 1.0f;
-        double cumAmp = 0.0f;
-        double freq = 1.0f;
-
-        // Stack erosion octaves
-        for(int i = 0; i < octaves; i++) {
-            double[] erosionResult = erosion((int) seed,
-                x * freq * erosionFrequency,
-                y * freq * erosionFrequency,
-                baseDirX + dirY * branchStrength,
-                baseDirY - dirX * branchStrength);
-            erosion += erosionResult[0] * amp;
-            dirX += erosionResult[1] * amp * freq;
-            dirY += erosionResult[2] * amp * freq;
-            cumAmp += amp;
-            amp *= gain;
-            freq *= lacunarity;
-        }
-
-        // Normalize erosion noise
-        erosion /= cumAmp;
-        // [-1, 1] -> [0, 1]
-        erosion = erosion * 0.5F + 0.5F;
-
-        // Without masking, erosion noise in areas with small gradients tend to produce mounds,
-        // this reduces erosion amplitude towards smaller gradients to avoid this
-        if(slopeMask) {
-            double dirMagSq = dot(baseDirX, baseDirY, baseDirX, baseDirY);
-            double flatness = smoothstep((double) slopeMaskNoneSq, slopeMaskFullSq, dirMagSq);
-            erosion *= flatness;
-        }
-
-        return height + erosion * erosionStrength;
-    }
-
-    @Override
-    public double getNoiseRaw(long seed, double x, double y) {
-        return heightMap(seed, x, y);
-    }
-
-    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z) {
-        return getNoiseRaw(seed, x, z);
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/BrownianMotionSampler.java

@@ -7,7 +7,6 @@
 
 package com.dfsek.terra.addons.noise.samplers.noise.fractal;
 
-import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.MathUtil;
 
@@ -53,60 +52,4 @@ public class BrownianMotionSampler extends FractalNoiseFunction {
 
         return sum;
     }
-
-    @Override
-    public boolean isDifferentiable() {
-        return DerivativeNoiseSampler.isDifferentiable(input);
-    }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long seed, double x, double y) {
-        double[] sum = {0, 0, 0};
-        double amp = fractalBounding;
-
-        for(int i = 0; i < octaves; i++) {
-            // This should only be called after `input` is verified as a `DerivativeNoiseSampler`
-            // so this should be a safe cast
-            double[] noise = ((DerivativeNoiseSampler) input).noised(seed++, x, y);
-            sum[0] += noise[0] * amp;
-
-            // Directional derivative of each octave can be subject to the same addition and product
-            // as per derivative sum and product rules in order to produce the correct final derivative
-            sum[1] += noise[1] * amp;
-            sum[2] += noise[2] * amp;
-
-            amp *= MathUtil.lerp(weightedStrength, 1.0, Math.min(noise[0] + 1, 2) * 0.5);
-
-            x *= lacunarity;
-            y *= lacunarity;
-            amp *= gain;
-        }
-
-        return sum;
-    }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long seed, double x, double y, double z) {
-        double[] sum = {0, 0, 0, 0};
-        double amp = fractalBounding;
-
-        for(int i = 0; i < octaves; i++) {
-            double[] noise = ((DerivativeNoiseSampler) input).noised(seed++, x, y, z);
-            sum[0] += noise[0] * amp;
-
-            // See comment in 2D version
-            sum[1] += noise[1] * amp;
-            sum[2] += noise[2] * amp;
-            sum[3] += noise[3] * amp;
-
-            amp *= MathUtil.lerp(weightedStrength, 1.0, (noise[0] + 1) * 0.5);
-
-            x *= lacunarity;
-            y *= lacunarity;
-            z *= lacunarity;
-            amp *= gain;
-        }
-
-        return sum;
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/FractalNoiseFunction.java

@@ -7,11 +7,11 @@
 
 package com.dfsek.terra.addons.noise.samplers.noise.fractal;
 
-import com.dfsek.terra.addons.noise.samplers.noise.DerivativeNoiseFunction;
+import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 
-public abstract class FractalNoiseFunction extends DerivativeNoiseFunction {
+public abstract class FractalNoiseFunction extends NoiseFunction {
     protected final NoiseSampler input;
     protected double fractalBounding = 1 / 1.75;
     protected int octaves = 3;
@@ -52,19 +52,4 @@ public abstract class FractalNoiseFunction extends DerivativeNoiseFunction {
     public void setWeightedStrength(double weightedStrength) {
         this.weightedStrength = weightedStrength;
     }
-
-    @Override
-    public boolean isDifferentiable() {
-        return false;
-    }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long seed, double x, double y) {
-        throw new UnsupportedOperationException("Implementation failed to check or set isDifferentiable correctly");
-    }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long seed, double x, double y, double z) {
-        throw new UnsupportedOperationException("Implementation failed to check or set isDifferentiable correctly");
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2SSampler.java

@@ -276,424 +276,4 @@ public class OpenSimplex2SSampler extends SimplexStyleSampler {
 
         return value * 9.046026385208288;
     }
-
-    @Override
-    public boolean isDifferentiable() {
-        return true;
-    }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long sl, double x, double y) {
-        int seed = (int) sl;
-        // 2D OpenSimplex2S case is a modified 2D simplex noise.
-
-        final double SQRT3 = 1.7320508075688772935274463415059;
-        final double G2 = (3 - SQRT3) / 6;
-
-        final double F2 = 0.5f * (SQRT3 - 1);
-        double s = (x + y) * F2;
-        x += s;
-        y += s;
-
-
-        int i = (int) Math.floor(x);
-        int j = (int) Math.floor(y);
-        double xi = x - i;
-        double yi = y - j;
-
-        i *= PRIME_X;
-        j *= PRIME_Y;
-        int i1 = i + PRIME_X;
-        int j1 = j + PRIME_Y;
-
-        double t = (xi + yi) * G2;
-        double x0 = xi - t;
-        double y0 = yi - t;
-
-        double[] out = { 0.0f, 0.0f, 0.0f };
-
-        double a0 = (2.0 / 3.0) - x0 * x0 - y0 * y0;
-        double aa0 = a0 * a0, aaa0 = aa0 * a0, aaaa0 = aa0 * aa0;
-        int gi0 = gradCoordIndex(seed, i, j);
-        double gx0 = GRADIENTS_2_D[gi0], gy0 = GRADIENTS_2_D[gi0 | 1];
-        double rampValue0 = gx0 * x0 + gy0 * y0;
-        out[0] = aaaa0 * rampValue0;
-        out[1] = gx0 * aaaa0 - 8 * rampValue0 * aaa0 * x0;
-        out[2] = gy0 * aaaa0 - 8 * rampValue0 * aaa0 * y0;
-
-
-        double a1 = 2 * (1 - 2 * G2) * (1 / G2 - 2) * t + ((-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a0);
-        double x1 = x0 - (1 - 2 * G2);
-        double y1 = y0 - (1 - 2 * G2);
-        double aa1 = a1 * a1, aaa1 = aa1 * a1, aaaa1 = aa1 * aa1;
-        int gi1 = gradCoordIndex(seed, i1, j1);
-        double gx1 = GRADIENTS_2_D[gi1], gy1 = GRADIENTS_2_D[gi1 | 1];
-        double rampValue1 = gx1 * x1 + gy1 * y1;
-        out[0] += aaaa1 * rampValue1;
-        out[1] += gx1 * aaaa1 - 8 * rampValue1 * aaa1 * x1;
-        out[2] += gy1 * aaaa1 - 8 * rampValue1 * aaa1 * y1;
-
-        // Nested conditionals were faster than compact bit logic/arithmetic.
-        double xmyi = xi - yi;
-        if(t > G2) {
-            if(xi + xmyi > 1) {
-                double x2 = x0 + (3 * G2 - 2);
-                double y2 = y0 + (3 * G2 - 1);
-                double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2;
-                if(a2 > 0) {
-                    double aa2 = a2 * a2, aaa2 = aa2 * a2, aaaa2 = aa2 * aa2;
-                    int gi2 = gradCoordIndex(seed, i + (PRIME_X << 1), j + PRIME_Y);
-                    double gx2 = GRADIENTS_2_D[gi2 | 0], gy2 = GRADIENTS_2_D[gi2 | 1];
-                    double rampValue2 = gx2 * x2 + gy2 * y2;
-                    out[0] += aaaa2 * rampValue2;
-                    out[1] += gx2 * aaaa2 - 8 * rampValue2 * aaa2 * x2;
-                    out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;
-                }
-            } else {
-                double x2 = x0 + G2;
-                double y2 = y0 + (G2 - 1);
-                double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2;
-                if(a2 > 0) {
-                    double aa2 = a2 * a2, aaa2 = aa2 * a2, aaaa2 = aa2 * aa2;
-                    int gi2 = gradCoordIndex(seed, i, j + PRIME_Y);
-                    double gx2 = GRADIENTS_2_D[gi2], gy2 = GRADIENTS_2_D[gi2 | 1];
-                    double rampValue2 = gx2 * x2 + gy2 * y2;
-                    out[0] += aaaa2 * rampValue2;
-                    out[1] += gx2 * aaaa2 - 8 * rampValue2 * aaa2 * x2;
-                    out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;
-                }
-            }
-
-            if(yi - xmyi > 1) {
-                double x3 = x0 + (3 * G2 - 1);
-                double y3 = y0 + (3 * G2 - 2);
-                double a3 = (2.0 / 3.0) - x3 * x3 - y3 * y3;
-                if(a3 > 0) {
-                    double aa3 = a3 * a3, aaa3 = aa3 * a3, aaaa3 = aa3 * aa3;
-                    int gi3 = gradCoordIndex(seed, i + PRIME_X, j + (PRIME_Y << 1));
-                    double gx3 = GRADIENTS_2_D[gi3], gy3 = GRADIENTS_2_D[gi3 | 1];
-                    double rampValue3 = gx3 * x3 + gy3 * y3;
-                    out[0] += aaaa3 * rampValue3;
-                    out[1] += gx3 * aaaa3 - 8 * rampValue3 * aaa3 * x3;
-                    out[2] += gy3 * aaaa3 - 8 * rampValue3 * aaa3 * y3;
-                }
-            } else {
-                double x3 = x0 + (G2 - 1);
-                double y3 = y0 + G2;
-                double a3 = (2.0 / 3.0) - x3 * x3 - y3 * y3;
-                if(a3 > 0) {
-                    double aa3 = a3 * a3, aaa3 = aa3 * a3, aaaa3 = aa3 * aa3;
-                    int gi3 = gradCoordIndex(seed, i + PRIME_X, j);
-                    double gx3 = GRADIENTS_2_D[gi3], gy3 = GRADIENTS_2_D[gi3 | 1];
-                    double rampValue3 = gx3 * x3 + gy3 * y3;
-                    out[0] += aaaa3 * rampValue3;
-                    out[1] += gx3 * aaaa3 - 8 * rampValue3 * aaa3 * x3;
-                    out[2] += gy3 * aaaa3 - 8 * rampValue3 * aaa3 * y3;
-                }
-            }
-        } else {
-            if(xi + xmyi < 0) {
-                double x2 = x0 + (1 - G2);
-                double y2 = y0 - G2;
-                double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2;
-                if(a2 > 0) {
-                    double aa2 = a2 * a2, aaa2 = aa2 * a2, aaaa2 = aa2 * aa2;
-                    int gi2 = gradCoordIndex(seed, i - PRIME_X, j);
-                    double gx2 = GRADIENTS_2_D[gi2], gy2 = GRADIENTS_2_D[gi2 | 1];
-                    double rampValue2 = gx2 * x2 + gy2 * y2;
-                    out[0] += aaaa2 * rampValue2;
-                    out[1] += gx2 * aaaa2 - 8 * rampValue2 * aaa2 * x2;
-                    out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;
-                }
-            } else {
-                double x2 = x0 + (G2 - 1);
-                double y2 = y0 + G2;
-                double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2;
-                if(a2 > 0) {
-                    double aa2 = a2 * a2, aaa2 = aa2 * a2, aaaa2 = aa2 * aa2;
-                    int gi2 = gradCoordIndex(seed, i + PRIME_X, j);
-                    double gx2 = GRADIENTS_2_D[gi2], gy2 = GRADIENTS_2_D[gi2 | 1];
-                    double rampValue2 = gx2 * x2 + gy2 * y2;
-                    out[0] += aaaa2 * rampValue2;
-                    out[1] += gx2 * aaaa2 - 8 * rampValue2 * aaa2 * x2;
-                    out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;
-                }
-            }
-
-            if(yi < xmyi) {
-                double x2 = x0 - G2;
-                double y2 = y0 - (G2 - 1);
-                double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2;
-                if(a2 > 0) {
-                    double aa2 = a2 * a2, aaa2 = aa2 * a2, aaaa2 = aa2 * aa2;
-                    int gi2 = gradCoordIndex(seed, i, j - PRIME_Y);
-                    double gx2 = GRADIENTS_2_D[gi2], gy2 = GRADIENTS_2_D[gi2 | 1];
-                    double rampValue2 = gx2 * x2 + gy2 * y2;
-                    out[0] += aaaa2 * rampValue2;
-                    out[1] += gx2 * aaaa2 - 8 * rampValue2 * aaa2 * x2;
-                    out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;
-                }
-            } else {
-                double x2 = x0 + G2;
-                double y2 = y0 + (G2 - 1);
-                double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2;
-                if(a2 > 0) {
-                    double aa2 = a2 * a2, aaa2 = aa2 * a2, aaaa2 = aa2 * aa2;
-                    int gi2 = gradCoordIndex(seed, i, j + PRIME_Y);
-                    double gx2 = GRADIENTS_2_D[gi2], gy2 = GRADIENTS_2_D[gi2 | 1];
-                    double rampValue2 = gx2 * x2 + gy2 * y2;
-                    out[0] += aaaa2 * rampValue2;
-                    out[1] += gx2 * aaaa2 - 8 * rampValue2 * aaa2 * x2;
-                    out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;
-                }
-            }
-        }
-        out[0] *= 18.24196194486065;
-        out[1] *= 18.24196194486065;
-        out[2] *= 18.24196194486065;
-        return out;
-    }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long sl, double x, double y, double z) {
-        int seed = (int) sl;
-        // 3D OpenSimplex2S case uses two offset rotated cube grids.
-        final double R3 = (2.0 / 3.0);
-        double r = (x + y + z) * R3; // Rotation, not skew
-        x = r - x;
-        y = r - y;
-        z = r - z;
-
-
-        int i = (int) Math.floor(x);
-        int j = (int) Math.floor(y);
-        int k = (int) Math.floor(z);
-        double xi = x - i;
-        double yi = y - j;
-        double zi = z - k;
-
-        i *= PRIME_X;
-        j *= PRIME_Y;
-        k *= PRIME_Z;
-        int seed2 = seed + 1293373;
-
-        int xNMask = (int) (-0.5 - xi);
-        int yNMask = (int) (-0.5 - yi);
-        int zNMask = (int) (-0.5 - zi);
-
-        double[] out = { 0.0f, 0.0f, 0.0f, 0.0f };
-
-        double x0 = xi + xNMask;
-        double y0 = yi + yNMask;
-        double z0 = zi + zNMask;
-        double a0 = 0.75 - x0 * x0 - y0 * y0 - z0 * z0;
-        double aa0 = a0 * a0, aaa0 = aa0 * a0, aaaa0 = aa0 * aa0;
-        int gi0 = gradCoordIndex(seed, i + (xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (zNMask & PRIME_Z));
-        double gx0 = GRADIENTS_3D[gi0], gy0 = GRADIENTS_3D[gi0 | 1], gz0 = GRADIENTS_3D[gi0 | 2];
-        double rampValue0 = gx0 * x0 + gy0 * y0 + gz0 * z0;
-        out[0] = aaaa0 * rampValue0;
-        out[1] = gx0 * aaaa0 - 8 * rampValue0 * aaa0 * x0;
-        out[2] = gy0 * aaaa0 - 8 * rampValue0 * aaa0 * y0;
-        out[3] = gz0 * aaaa0 - 8 * rampValue0 * aaa0 * z0;
-
-        double x1 = xi - 0.5;
-        double y1 = yi - 0.5;
-        double z1 = zi - 0.5;
-        double a1 = 0.75 - x1 * x1 - y1 * y1 - z1 * z1;
-        double aa1 = a1 * a1, aaa1 = aa1 * a1, aaaa1 = aa1 * aa1;
-        int gi1 = gradCoordIndex(seed2, i + PRIME_X, j + PRIME_Y, k + PRIME_Z);
-        double gx1 = GRADIENTS_3D[gi1], gy1 = GRADIENTS_3D[gi1 | 1], gz1 = GRADIENTS_3D[gi1 | 2];
-        double rampValue1 = gx1 * x1 + gy1 * y1 + gz1 * z1;
-        out[0] += aaaa1 * rampValue1;
-        out[1] += gx1 * aaaa1 - 8 * rampValue1 * aaa1 * x1;
-        out[2] += gy1 * aaaa1 - 8 * rampValue1 * aaa1 * y1;
-        out[3] += gz1 * aaaa1 - 8 * rampValue1 * aaa1 * z1;
-
-        double xAFlipMask0 = ((xNMask | 1) << 1) * x1;
-        double yAFlipMask0 = ((yNMask | 1) << 1) * y1;
-        double zAFlipMask0 = ((zNMask | 1) << 1) * z1;
-        double xAFlipMask1 = (-2 - (xNMask << 2)) * x1 - 1.0;
-        double yAFlipMask1 = (-2 - (yNMask << 2)) * y1 - 1.0;
-        double zAFlipMask1 = (-2 - (zNMask << 2)) * z1 - 1.0;
-
-        boolean skip5 = false;
-        double a2 = xAFlipMask0 + a0;
-        if(a2 > 0) {
-            double x2 = x0 - (xNMask | 1);
-            double aa2 = a2 * a2, aaa2 = aa2 * a2, aaaa2 = aa2 * aa2;
-            int gi2 = gradCoordIndex(seed, i + (~xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (zNMask & PRIME_Z));
-            double gx2 = GRADIENTS_3D[gi2], gy2 = GRADIENTS_3D[gi2 | 1], gz2 = GRADIENTS_3D[gi2 | 2];
-            double rampValue2 = gx2 * x2 + gy2 * y0 + gz2 * z0;
-            out[0] += aaaa2 * rampValue2;
-            out[1] += gx2 * aaaa2 - 8 * rampValue2 * aaa2 * x2;
-            out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y0;
-            out[3] += gz2 * aaaa2 - 8 * rampValue2 * aaa2 * z0;
-        } else {
-            double a3 = yAFlipMask0 + zAFlipMask0 + a0;
-            if(a3 > 0) {
-                double y3 = y0 - (yNMask | 1);
-                double z3 = z0 - (zNMask | 1);
-                double aa3 = a3 * a3, aaa3 = aa3 * a3, aaaa3 = aa3 * aa3;
-                int gi3 = gradCoordIndex(seed, i + (xNMask & PRIME_X), j + (~yNMask & PRIME_Y), k + (~zNMask & PRIME_Z));
-                double gx3 = GRADIENTS_3D[gi3], gy3 = GRADIENTS_3D[gi3 | 1], gz3 = GRADIENTS_3D[gi3 | 2];
-                double rampValue3 = gx3 * x0 + gy3 * y3 + gz3 * z3;
-                out[0] += aaaa3 * rampValue3;
-                out[1] += gx3 * aaaa3 - 8 * rampValue3 * aaa3 * x0;
-                out[2] += gy3 * aaaa3 - 8 * rampValue3 * aaa3 * y3;
-                out[3] += gz3 * aaaa3 - 8 * rampValue3 * aaa3 * z3;
-            }
-
-            double a4 = xAFlipMask1 + a1;
-            if(a4 > 0) {
-                double x4 = (xNMask | 1) + x1;
-                double aa4 = a4 * a4, aaa4 = aa4 * a4, aaaa4 = aa4 * aa4;
-                int gi4 = gradCoordIndex(seed2, i + (xNMask & (PRIME_X << 1)), j + PRIME_Y, k + PRIME_Z);
-                double gx4 = GRADIENTS_3D[gi4], gy4 = GRADIENTS_3D[gi4 | 1], gz4 = GRADIENTS_3D[gi4 | 2];
-                double rampValue4 = gx4 * x4 + gy4 * y1 + gz4 * z1;
-                out[0] += aaaa4 * rampValue4;
-                out[1] += gx4 * aaaa4 - 8 * rampValue4 * aaa4 * x4;
-                out[2] += gy4 * aaaa4 - 8 * rampValue4 * aaa4 * y1;
-                out[3] += gz4 * aaaa4 - 8 * rampValue4 * aaa4 * z1;
-                skip5 = true;
-            }
-        }
-
-        boolean skip9 = false;
-        double a6 = yAFlipMask0 + a0;
-        if(a6 > 0) {
-            double y6 = y0 - (yNMask | 1);
-            double aa6 = a6 * a6, aaa6 = aa6 * a6, aaaa6 = aa6 * aa6;
-            int gi6 = gradCoordIndex(seed, i + (xNMask & PRIME_X), j + (~yNMask & PRIME_Y), k + (zNMask & PRIME_Z));
-            double gx6 = GRADIENTS_3D[gi6], gy6 = GRADIENTS_3D[gi6 | 1], gz6 = GRADIENTS_3D[gi6 | 2];
-            double rampValue6 = gx6 * x0 + gy6 * y6 + gz6 * z0;
-            out[0] += aaaa6 * rampValue6;
-            out[1] += gx6 * aaaa6 - 8 * rampValue6 * aaa6 * x0;
-            out[2] += gy6 * aaaa6 - 8 * rampValue6 * aaa6 * y6;
-            out[3] += gz6 * aaaa6 - 8 * rampValue6 * aaa6 * z0;
-        } else {
-            double a7 = xAFlipMask0 + zAFlipMask0 + a0;
-            if(a7 > 0) {
-                double x7 = x0 - (xNMask | 1);
-                double z7 = z0 - (zNMask | 1);
-                double aa7 = a7 * a7, aaa7 = aa7 * a7, aaaa7 = aa7 * aa7;
-                int gi7 = gradCoordIndex(seed, i + (~xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (~zNMask & PRIME_Z));
-                double gx7 = GRADIENTS_3D[gi7], gy7 = GRADIENTS_3D[gi7 | 1], gz7 = GRADIENTS_3D[gi7 | 2];
-                double rampValue7 = gx7 * x7 + gy7 * y0 + gz7 * z7;
-                out[0] += aaaa7 * rampValue7;
-                out[1] += gx7 * aaaa7 - 8 * rampValue7 * aaa7 * x7;
-                out[2] += gy7 * aaaa7 - 8 * rampValue7 * aaa7 * y0;
-                out[3] += gz7 * aaaa7 - 8 * rampValue7 * aaa7 * z7;
-            }
-
-            double a8 = yAFlipMask1 + a1;
-            if(a8 > 0) {
-                double y8 = (yNMask | 1) + y1;
-                double aa8 = a8 * a8, aaa8 = aa8 * a8, aaaa8 = aa8 * aa8;
-                int gi8 = gradCoordIndex(seed2, i + PRIME_X, j + (yNMask & (PRIME_Y << 1)), k + PRIME_Z);
-                double gx8 = GRADIENTS_3D[gi8], gy8 = GRADIENTS_3D[gi8 | 1], gz8 = GRADIENTS_3D[gi8 | 2];
-                double rampValue8 = gx8 * x1 + gy8 * y8 + gz8 * z1;
-                out[0] += aaaa8 * rampValue8;
-                out[1] += gx8 * aaaa8 - 8 * rampValue8 * aaa8 * x1;
-                out[2] += gy8 * aaaa8 - 8 * rampValue8 * aaa8 * y8;
-                out[3] += gz8 * aaaa8 - 8 * rampValue8 * aaa8 * z1;
-                skip9 = true;
-            }
-        }
-
-        boolean skipD = false;
-        double aA = zAFlipMask0 + a0;
-        if(aA > 0) {
-            double zA = z0 - (zNMask | 1);
-            double aaA = aA * aA, aaaA = aaA * aA, aaaaA = aaA * aaA;
-            int giA = gradCoordIndex(seed, i + (xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (~zNMask & PRIME_Z));
-            double gxA = GRADIENTS_3D[giA], gyA = GRADIENTS_3D[giA | 1], gzA = GRADIENTS_3D[giA | 2];
-            double rampValueA = gxA * x0 + gyA * y0 + gzA * zA;
-            out[0] += aaaaA * rampValueA;
-            out[1] += gxA * aaaaA - 8 * rampValueA * aaaA * x0;
-            out[2] += gyA * aaaaA - 8 * rampValueA * aaaA * y0;
-            out[3] += gzA * aaaaA - 8 * rampValueA * aaaA * zA;
-        } else {
-            double aB = xAFlipMask0 + yAFlipMask0 + a0;
-            if(aB > 0) {
-                double xB = x0 - (xNMask | 1);
-                double yB = y0 - (yNMask | 1);
-                double aaB = aB * aB, aaaB = aaB * aB, aaaaB = aaB * aaB;
-                int giB = gradCoordIndex(seed, i + (~xNMask & PRIME_X), j + (~yNMask & PRIME_Y), k + (zNMask & PRIME_Z));
-                double gxB = GRADIENTS_3D[giB], gyB = GRADIENTS_3D[giB | 1], gzB = GRADIENTS_3D[giB | 2];
-                double rampValueB = gxB * xB + gyB * yB + gzB * z0;
-                out[0] += aaaaB * rampValueB;
-                out[1] += gxB * aaaaB - 8 * rampValueB * aaaB * xB;
-                out[2] += gyB * aaaaB - 8 * rampValueB * aaaB * yB;
-                out[3] += gzB * aaaaB - 8 * rampValueB * aaaB * z0;
-            }
-
-            double aC = zAFlipMask1 + a1;
-            if(aC > 0) {
-                double zC = (zNMask | 1) + z1;
-                double aaC = aC * aC, aaaC = aaC * aC, aaaaC = aaC * aaC;
-                int giC = gradCoordIndex(seed2, i + PRIME_X, j + PRIME_Y, k + (zNMask & (PRIME_Z << 1)));
-                double gxC = GRADIENTS_3D[giC], gyC = GRADIENTS_3D[giC | 1], gzC = GRADIENTS_3D[giC | 2];
-                double rampValueC = gxC * x1 + gyC * y1 + gzC * zC;
-                out[0] += aaaaC * rampValueC;
-                out[1] += gxC * aaaaC - 8 * rampValueC * aaaC * x1;
-                out[2] += gyC * aaaaC - 8 * rampValueC * aaaC * y1;
-                out[3] += gzC * aaaaC - 8 * rampValueC * aaaC * zC;
-                skipD = true;
-            }
-        }
-
-        if(!skip5) {
-            double a5 = yAFlipMask1 + zAFlipMask1 + a1;
-            if(a5 > 0) {
-                double y5 = (yNMask | 1) + y1;
-                double z5 = (zNMask | 1) + z1;
-                double aa5 = a5 * a5, aaa5 = aa5 * a5, aaaa5 = aa5 * aa5;
-                int gi5 = gradCoordIndex(seed2, i + PRIME_X, j + (yNMask & (PRIME_Y << 1)), k + (zNMask & (PRIME_Z << 1)));
-                double gx5 = GRADIENTS_3D[gi5], gy5 = GRADIENTS_3D[gi5 | 1], gz5 = GRADIENTS_3D[gi5 | 2];
-                double rampValue5 = gx5 * x1 + gy5 * y5 + gz5 * z5;
-                out[0] += aaaa5 * rampValue5;
-                out[1] += gx5 * aaaa5 - 8 * rampValue5 * aaa5 * x1;
-                out[2] += gy5 * aaaa5 - 8 * rampValue5 * aaa5 * y5;
-                out[3] += gz5 * aaaa5 - 8 * rampValue5 * aaa5 * z5;
-            }
-        }
-
-        if(!skip9) {
-            double a9 = xAFlipMask1 + zAFlipMask1 + a1;
-            if(a9 > 0) {
-                double x9 = (xNMask | 1) + x1;
-                double z9 = (zNMask | 1) + z1;
-                double aa9 = a9 * a9, aaa9 = aa9 * a9, aaaa9 = aa9 * aa9;
-                int gi9 = gradCoordIndex(seed2, i + (xNMask & (PRIME_X << 1)), j + PRIME_Y, k + (zNMask & (PRIME_Z << 1)));
-                double gx9 = GRADIENTS_3D[gi9], gy9 = GRADIENTS_3D[gi9 | 1], gz9 = GRADIENTS_3D[gi9 | 2];
-                double rampValue9 = gx9 * x9 + gy9 * y1 + gz9 * z9;
-                out[0] += aaaa9 * rampValue9;
-                out[1] += gx9 * aaaa9 - 8 * rampValue9 * aaa9 * x9;
-                out[2] += gy9 * aaaa9 - 8 * rampValue9 * aaa9 * y1;
-                out[3] += gz9 * aaaa9 - 8 * rampValue9 * aaa9 * z9;
-            }
-        }
-
-        if(!skipD) {
-            double aD = xAFlipMask1 + yAFlipMask1 + a1;
-            if(aD > 0) {
-                double xD = (xNMask | 1) + x1;
-                double yD = (yNMask | 1) + y1;
-                double aaD = aD * aD, aaaD = aaD * aD, aaaaD = aaD * aaD;
-                int giD = gradCoordIndex(seed2, i + (xNMask & (PRIME_X << 1)), j + (yNMask & (PRIME_Y << 1)), k + PRIME_Z);
-                double gxD = GRADIENTS_3D[giD], gyD = GRADIENTS_3D[giD | 1], gzD = GRADIENTS_3D[giD | 2];
-                double rampValueD = gxD * xD + gyD * yD + gzD * z1;
-                out[0] += aaaaD * rampValueD;
-                out[1] += gxD * aaaaD - 8 * rampValueD * aaaD * xD;
-                out[2] += gyD * aaaaD - 8 * rampValueD * aaaD * yD;
-                out[3] += gzD * aaaaD - 8 * rampValueD * aaaD * z1;
-            }
-        }
-
-        out[0] *= 9.046026385208288;
-        out[1] *= 9.046026385208288;
-        out[2] *= 9.046026385208288;
-        out[3] *= 9.046026385208288;
-        return out;
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java

@@ -37,37 +37,41 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
         i *= PRIME_X;
         j *= PRIME_Y;
 
-        double value = 0;
+        double n0, n1, n2;
 
         double a = 0.5 - x0 * x0 - y0 * y0;
-        if(a > 0) {
-            value = (a * a) * (a * a) * gradCoord(seed, i, j, x0, y0);
+        if(a <= 0) n0 = 0;
+        else {
+            n0 = (a * a) * (a * a) * gradCoord(seed, i, j, x0, y0);
         }
 
         double c = 2 * (1 - 2 * G2) * (1 / G2 - 2) * t + ((-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a);
-        if(c > 0) {
+        if(c <= 0) n2 = 0;
+        else {
             double x2 = x0 + (2 * G2 - 1);
             double y2 = y0 + (2 * G2 - 1);
-            value += (c * c) * (c * c) * gradCoord(seed, i + PRIME_X, j + PRIME_Y, x2, y2);
+            n2 = (c * c) * (c * c) * gradCoord(seed, i + PRIME_X, j + PRIME_Y, x2, y2);
         }
 
         if(y0 > x0) {
             double x1 = x0 + G2;
             double y1 = y0 + (G2 - 1);
             double b = 0.5 - x1 * x1 - y1 * y1;
-            if(b > 0) {
-                value += (b * b) * (b * b) * gradCoord(seed, i, j + PRIME_Y, x1, y1);
+            if(b <= 0) n1 = 0;
+            else {
+                n1 = (b * b) * (b * b) * gradCoord(seed, i, j + PRIME_Y, x1, y1);
             }
         } else {
             double x1 = x0 + (G2 - 1);
             double y1 = y0 + G2;
             double b = 0.5 - x1 * x1 - y1 * y1;
-            if(b > 0) {
-                value += (b * b) * (b * b) * gradCoord(seed, i + PRIME_X, j, x1, y1);
+            if(b <= 0) n1 = 0;
+            else {
+                n1 = (b * b) * (b * b) * gradCoord(seed, i + PRIME_X, j, x1, y1);
             }
         }
 
-        return value * 99.83685446303647f;
+        return (n0 + n1 + n2) * 99.83685446303647f;
     }
 
     @Override
@@ -153,208 +157,4 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
 
         return value * 32.69428253173828125;
     }
-
-    @Override
-    public boolean isDifferentiable() {
-        return true;
-    }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long sl, double x, double y) {
-        int seed = (int) sl;
-        // 2D OpenSimplex2 case uses the same algorithm as ordinary Simplex.
-        final double G2 = (3 - SQRT3) / 6;
-
-        final double F2 = 0.5f * (SQRT3 - 1);
-        double s = (x + y) * F2;
-        x += s;
-        y += s;
-
-
-        int i = (int) Math.floor(x);
-        int j = (int) Math.floor(y);
-        double xi = x - i;
-        double yi = y - j;
-
-        double t = (xi + yi) * G2;
-        double x0 = xi - t;
-        double y0 = yi - t;
-
-        i *= PRIME_X;
-        j *= PRIME_Y;
-
-        double[] out = { 0.0f, 0.0f, 0.0f };
-
-        double a = 0.5 - x0 * x0 - y0 * y0;
-        if(a > 0) {
-            double aa = a * a, aaa = aa * a, aaaa = aa * aa;
-            int gi = gradCoordIndex(seed, i, j);
-            double gx = GRADIENTS_2_D[gi], gy = GRADIENTS_2_D[gi | 1];
-            double rampValue = gx * x0 + gy * y0;
-            out[0] += aaaa * rampValue;
-            out[1] += gx * aaaa - 8 * rampValue * aaa * x0;
-            out[2] += gy * aaaa - 8 * rampValue * aaa * y0;
-        }
-
-        double c = 2 * (1 - 2 * G2) * (1 / G2 - 2) * t + ((-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a);
-        if(c > 0) {
-            double x2 = x0 + (2 * G2 - 1);
-            double y2 = y0 + (2 * G2 - 1);
-            double cc = c * c, ccc = cc * c, cccc = cc * cc;
-            int gi = gradCoordIndex(seed, i + PRIME_X, j + PRIME_Y);
-            double gx = GRADIENTS_2_D[gi], gy = GRADIENTS_2_D[gi | 1];
-            double rampValue = gx * x2 + gy * y2;
-            out[0] += cccc * rampValue;
-            out[1] += gx * cccc - 8 * rampValue * ccc * x2;
-            out[2] += gy * cccc - 8 * rampValue * ccc * y2;
-        }
-
-        if(y0 > x0) {
-            double x1 = x0 + G2;
-            double y1 = y0 + (G2 - 1);
-            double b = 0.5 - x1 * x1 - y1 * y1;
-            if(b > 0) {
-                double bb = b * b, bbb = bb * b, bbbb = bb * bb;
-                int gi = gradCoordIndex(seed, i, j + PRIME_Y);
-                double gx = GRADIENTS_2_D[gi], gy = GRADIENTS_2_D[gi | 1];
-                double rampValue = gx * x1 + gy * y1;
-                out[0] += bbbb * rampValue;
-                out[1] += gx * bbbb - 8 * rampValue * bbb * x1;
-                out[2] += gy * bbbb - 8 * rampValue * bbb * y1;
-            }
-        } else {
-            double x1 = x0 + (G2 - 1);
-            double y1 = y0 + G2;
-            double b = 0.5 - x1 * x1 - y1 * y1;
-            if(b > 0) {
-                double bb = b * b, bbb = bb * b, bbbb = bb * bb;
-                int gi = gradCoordIndex(seed, i + PRIME_X, j);
-                double gx = GRADIENTS_2_D[gi], gy = GRADIENTS_2_D[gi | 1];
-                double rampValue = gx * x1 + gy * y1;
-                out[0] += bbbb * rampValue;
-                out[1] += gx * bbbb - 8 * rampValue * bbb * x1;
-                out[2] += gy * bbbb - 8 * rampValue * bbb * y1;
-            }
-        }
-
-        out[0] *= 99.83685446303647f;
-        out[1] *= 99.83685446303647f;
-        out[2] *= 99.83685446303647f;
-        return out;
-    }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long sl, double x, double y, double z) {
-        int seed = (int) sl;
-        // 3D OpenSimplex2Sampler case uses two offset rotated cube grids.
-        final double R3 = (2.0 / 3.0);
-        double r = (x + y + z) * R3; // Rotation, not skew
-        x = r - x;
-        y = r - y;
-        z = r - z;
-
-
-        int i = (int) Math.round(x);
-        int j = (int) Math.round(y);
-        int k = (int) Math.round(z);
-        double x0 = x - i;
-        double y0 = y - j;
-        double z0 = z - k;
-
-        int xNSign = (int) (-1.0 - x0) | 1;
-        int yNSign = (int) (-1.0 - y0) | 1;
-        int zNSign = (int) (-1.0 - z0) | 1;
-
-        double ax0 = xNSign * -x0;
-        double ay0 = yNSign * -y0;
-        double az0 = zNSign * -z0;
-
-        i *= PRIME_X;
-        j *= PRIME_Y;
-        k *= PRIME_Z;
-
-        double[] out = { 0.0f, 0.0f, 0.0f, 0.0f };
-        double a = (0.6f - x0 * x0) - (y0 * y0 + z0 * z0);
-
-        for(int l = 0; ; l++) {
-            if(a > 0) {
-                double aa = a * a, aaa = aa * a, aaaa = aa * aa;
-                int gi = gradCoordIndex(seed, i, j, k);
-                double gx = GRADIENTS_3D[gi], gy = GRADIENTS_3D[gi | 1], gz = GRADIENTS_3D[gi | 2];
-                double rampValue = gx * x0 + gy * y0 + gz * z0;
-                out[0] += aaaa * rampValue;
-                out[1] += gx * aaaa - 8 * rampValue * aaa * x0;
-                out[1] += gy * aaaa - 8 * rampValue * aaa * y0;
-                out[2] += gz * aaaa - 8 * rampValue * aaa * z0;
-            }
-
-            if(ax0 >= ay0 && ax0 >= az0) {
-                double b = a + ax0 + ax0;
-                if(b > 1) {
-                    b -= 1;
-                    double bb = b * b, bbb = bb * b, bbbb = bb * bb;
-                    int gi = gradCoordIndex(seed, i - xNSign * PRIME_X, j, k);
-                    double gx = GRADIENTS_3D[gi], gy = GRADIENTS_3D[gi | 1], gz = GRADIENTS_3D[gi | 2];
-                    double rampValue = gx * (x0 + xNSign) + gy * y0 + gz * z0;
-                    out[0] += bbbb * rampValue;
-                    out[1] += gx * bbbb - 8 * rampValue * bbb * (x0 + xNSign);
-                    out[1] += gy * bbbb - 8 * rampValue * bbb * y0;
-                    out[2] += gz * bbbb - 8 * rampValue * bbb * z0;
-                }
-            } else if(ay0 > ax0 && ay0 >= az0) {
-                double b = a + ay0 + ay0;
-                if(b > 1) {
-                    b -= 1;
-                    double bb = b * b, bbb = bb * b, bbbb = bb * bb;
-                    int gi = gradCoordIndex(seed, i, j - yNSign * PRIME_Y, k);
-                    double gx = GRADIENTS_3D[gi], gy = GRADIENTS_3D[gi | 1], gz = GRADIENTS_3D[gi | 2];
-                    double rampValue = gx * x0 + gy * (y0 + yNSign) + gz * z0;
-                    out[0] += bbbb * rampValue;
-                    out[1] += gx * bbbb - 8 * rampValue * bbb * x0;
-                    out[1] += gy * bbbb - 8 * rampValue * bbb * (y0 + yNSign);
-                    out[2] += gz * bbbb - 8 * rampValue * bbb * z0;
-                }
-            } else {
-                double b = a + az0 + az0;
-                if(b > 1) {
-                    b -= 1;
-                    double bb = b * b, bbb = bb * b, bbbb = bb * bb;
-                    int gi = gradCoordIndex(seed, i, j, k - zNSign * PRIME_Z);
-                    double gx = GRADIENTS_3D[gi], gy = GRADIENTS_3D[gi | 1], gz = GRADIENTS_3D[gi | 2];
-                    double rampValue = gx * x0 + gy * y0 + gz * (z0 + zNSign);
-                    out[0] += bbbb * rampValue;
-                    out[1] += gx * bbbb - 8 * rampValue * bbb * x0;
-                    out[1] += gy * bbbb - 8 * rampValue * bbb * y0;
-                    out[2] += gz * bbbb - 8 * rampValue * bbb * (z0 + zNSign);
-                }
-            }
-
-            if(l == 1) break;
-
-            ax0 = 0.5 - ax0;
-            ay0 = 0.5 - ay0;
-            az0 = 0.5 - az0;
-
-            x0 = xNSign * ax0;
-            y0 = yNSign * ay0;
-            z0 = zNSign * az0;
-
-            a += (0.75 - ax0) - (ay0 + az0);
-
-            i += (xNSign >> 1) & PRIME_X;
-            j += (yNSign >> 1) & PRIME_Y;
-            k += (zNSign >> 1) & PRIME_Z;
-
-            xNSign = -xNSign;
-            yNSign = -yNSign;
-            zNSign = -zNSign;
-
-            seed = ~seed;
-        }
-        out[0] *= 32.69428253173828125;
-        out[1] *= 32.69428253173828125;
-        out[2] *= 32.69428253173828125;
-        out[3] *= 32.69428253173828125;
-        return out;
-    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexStyleSampler.java

@@ -7,13 +7,13 @@
 
 package com.dfsek.terra.addons.noise.samplers.noise.simplex;
 
-import com.dfsek.terra.addons.noise.samplers.noise.DerivativeNoiseFunction;
+import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
 
 
 /**
  * Abstract NoiseSampler implementation for simplex-style noise functions.
  */
-public abstract class SimplexStyleSampler extends DerivativeNoiseFunction {
+public abstract class SimplexStyleSampler extends NoiseFunction {
     protected static final double[] GRADIENTS_2_D = {
         0.130526192220052d, 0.99144486137381d, 0.38268343236509d, 0.923879532511287d, 0.608761429008721d, 0.793353340291235d,
         0.793353340291235d, 0.608761429008721d, 0.923879532511287d, 0.38268343236509d, 0.99144486137381d, 0.130526192220051d,
@@ -79,53 +79,26 @@ public abstract class SimplexStyleSampler extends DerivativeNoiseFunction {
         1, 1, 0, 0, 0, -1, 1, 0, -1, 1, 0, 0, 0, -1, -1, 0
     };
 
-    protected static int gradCoordIndex(int seed, int xPrimed, int yPrimed) {
+    protected static double gradCoord(int seed, int xPrimed, int yPrimed, double xd, double yd) {
         int hash = hash(seed, xPrimed, yPrimed);
         hash ^= hash >> 15;
         hash &= 127 << 1;
 
-        return hash;
-    }
-
-    protected static double gradCoord(int seed, int xPrimed, int yPrimed, double xd, double yd) {
-        int index = gradCoordIndex(seed, xPrimed, yPrimed);
-
-        double xg = GRADIENTS_2_D[index];
-        double yg = GRADIENTS_2_D[index | 1];
+        double xg = GRADIENTS_2_D[hash];
+        double yg = GRADIENTS_2_D[hash | 1];
 
         return xd * xg + yd * yg;
     }
 
-    protected static int gradCoordIndex(int seed, int xPrimed, int yPrimed, int zPrimed) {
+    protected static double gradCoord(int seed, int xPrimed, int yPrimed, int zPrimed, double xd, double yd, double zd) {
         int hash = hash(seed, xPrimed, yPrimed, zPrimed);
         hash ^= hash >> 15;
         hash &= 63 << 2;
 
-        return hash;
-    }
-
-    protected static double gradCoord(int seed, int xPrimed, int yPrimed, int zPrimed, double xd, double yd, double zd) {
-        int index = gradCoordIndex(seed, xPrimed, yPrimed, zPrimed);
-
-        double xg = GRADIENTS_3D[index];
-        double yg = GRADIENTS_3D[index | 1];
-        double zg = GRADIENTS_3D[index | 2];
+        double xg = GRADIENTS_3D[hash];
+        double yg = GRADIENTS_3D[hash | 1];
+        double zg = GRADIENTS_3D[hash | 2];
 
         return xd * xg + yd * yg + zd * zg;
     }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long seed, double x, double y) {
-        throw new UnsupportedOperationException("Implementation failed to check or set isDifferentiable correctly");
-    }
-
-    @Override
-    public double[] getNoiseDerivativeRaw(long seed, double x, double y, double z) {
-        throw new UnsupportedOperationException("Implementation failed to check or set isDifferentiable correctly");
-    }
-
-    @Override
-    public boolean isDifferentiable() {
-        return false;
-    }
 }

common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java

@@ -11,6 +11,13 @@ import com.dfsek.tectonic.api.config.template.dynamic.DynamicTemplate;
 import com.dfsek.tectonic.api.config.template.dynamic.DynamicValue;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.generation.feature.config.BiomeFeatures;
 import com.dfsek.terra.addons.generation.feature.config.FeatureStageTemplate;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
@@ -28,9 +35,6 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 
-import java.util.*;
-import java.util.function.Supplier;
-
 
 public class FeatureGenerationAddon implements AddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<GenerationStage>>> STAGE_TYPE_KEY = new TypeKey<>() {

common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java

@@ -7,6 +7,9 @@
 
 package com.dfsek.terra.addons.generation.feature;
 
+import java.util.Collections;
+import java.util.Random;
+
 import com.dfsek.terra.addons.generation.feature.config.BiomeFeatures;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.noise.NoiseSampler;
@@ -19,9 +22,6 @@ import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 import com.dfsek.terra.api.world.chunk.generation.util.Column;
 
-import java.util.Collections;
-import java.util.Random;
-
 
 public class FeatureGenerationStage implements GenerationStage, StringIdentifiable {
     private final Platform platform;

common/addons/structure-mutator/src/main/java/com/dfsek/terra/addons/structure/mutator/MutatedStructure.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.structure.mutator;
 
+import java.util.Random;
+
 import com.dfsek.terra.api.registry.key.Keyed;
 import com.dfsek.terra.api.registry.key.RegistryKey;
 import com.dfsek.terra.api.structure.Structure;
@@ -9,8 +11,6 @@ import com.dfsek.terra.api.world.WritableWorld;
 import com.dfsek.terra.api.world.util.ReadInterceptor;
 import com.dfsek.terra.api.world.util.WriteInterceptor;
 
-import java.util.Random;
-
 
 public class MutatedStructure implements Structure, Keyed<MutatedStructure> {
     private final RegistryKey key;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java

@@ -7,15 +7,15 @@
 
 package com.dfsek.terra.addons.terrascript.parser;
 
+import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
+import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.tokenizer.Token;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.tokenizer.Token;
-
 
 public class ParserUtil {
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java

@@ -7,13 +7,13 @@
 
 package com.dfsek.terra.addons.terrascript.script.builders;
 
+import java.util.List;
+
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.script.functions.CheckBlockFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
-import java.util.List;
-
 
 public class CheckBlockFunctionBuilder implements FunctionBuilder<CheckBlockFunction> {
     @SuppressWarnings("unchecked")

common/api/src/main/java/com/dfsek/terra/api/Platform.java

@@ -81,7 +81,4 @@ public interface Platform extends LoaderRegistrar {
     @NotNull
     @Contract(pure = true)
     Profiler getProfiler();
-
-    @Contract(pure = true)
-    int getGenerationThreads();
 }

common/api/src/main/java/com/dfsek/terra/api/event/events/platform/CommandRegistrationEvent.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.api.event.events.platform;
 
+import org.incendo.cloud.CommandManager;
+
 import com.dfsek.terra.api.command.CommandSender;
 import com.dfsek.terra.api.event.events.Event;
 
-import org.incendo.cloud.CommandManager;
-
 
 public class CommandRegistrationEvent implements Event {
     private final CommandManager<CommandSender> commandManager;

common/api/src/main/java/com/dfsek/terra/api/noise/DerivativeNoiseSampler.java

@@ -1,42 +0,0 @@
-package com.dfsek.terra.api.noise;
-
-/**
- * A NoiseSampler which additionally may provide a 1st directional derivative
- */
-public interface DerivativeNoiseSampler extends NoiseSampler {
-
-    static boolean isDifferentiable(NoiseSampler sampler) {
-        return sampler instanceof DerivativeNoiseSampler dSampler && dSampler.isDifferentiable();
-    }
-
-    /**
-     * Samplers may or may not be able to provide a derivative depending on what
-     * inputs they take, this method signals whether this is the case.
-     *
-     * @return If the noise sampler provides a derivative or not
-     */
-    boolean isDifferentiable();
-
-    /**
-     * Derivative return version of standard 2D noise evaluation
-     *
-     * @param seed
-     * @param x
-     * @param y
-     *
-     * @return 3 element array, in index order: noise value, partial x derivative, partial y derivative
-     */
-    double[] noised(long seed, double x, double y);
-
-    /**
-     * Derivative return version of standard 3D noise evaluation
-     *
-     * @param seed
-     * @param x
-     * @param y
-     * @param z
-     *
-     * @return 4 element array, in index order: noise value, partial x derivative, partial y derivative, partial z derivative
-     */
-    double[] noised(long seed, double x, double y, double z);
-}

common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.api.world.biome.generation;
 
-import com.dfsek.terra.api.Platform;
-
 import org.jetbrains.annotations.Contract;
 
 import java.util.Optional;
@@ -93,11 +91,11 @@ public interface BiomeProvider {
         return StreamSupport.stream(getBiomes().spliterator(), false);
     }
 
-    default CachingBiomeProvider caching(Platform platform) {
+    default CachingBiomeProvider caching() {
         if(this instanceof CachingBiomeProvider cachingBiomeProvider) {
             return cachingBiomeProvider;
         }
-        return new CachingBiomeProvider(this, platform.getGenerationThreads());
+        return new CachingBiomeProvider(this);
     }
 
 

common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java

@@ -21,20 +21,19 @@ public class CachingBiomeProvider implements BiomeProvider, Handle {
     private final LoadingCache<SeededVector3, Biome> cache;
     private final LoadingCache<SeededVector2, Optional<Biome>> baseCache;
 
-    protected CachingBiomeProvider(BiomeProvider delegate, int generationThreads) {
+    protected CachingBiomeProvider(BiomeProvider delegate) {
         this.delegate = delegate;
         this.res = delegate.resolution();
-        int size = generationThreads * 98304;
         this.cache = Caffeine
             .newBuilder()
             .scheduler(Scheduler.disabledScheduler())
-            .initialCapacity(size)
-            .maximumSize(size) // 1 full chunk (high res)
+            .initialCapacity(98304)
+            .maximumSize(98304) // 1 full chunk (high res)
             .build(vec -> delegate.getBiome(vec.x * res, vec.y * res, vec.z * res, vec.seed));
 
         this.baseCache = Caffeine
             .newBuilder()
-            .maximumSize(256L * generationThreads) // 1 full chunk (high res)
+            .maximumSize(256) // 1 full chunk (high res)
             .build(vec -> delegate.getBaseBiome(vec.x * res, vec.z * res, vec.seed));
 
     }
@@ -78,7 +77,7 @@ public class CachingBiomeProvider implements BiomeProvider, Handle {
             int code = x;
             code = 31 * code + y;
             code = 31 * code + z;
-            return 31 * code + (Long.hashCode(seed));
+            return 31 * code + ((int) (seed ^ (seed >>> 32)));
         }
     }
 
@@ -96,7 +95,7 @@ public class CachingBiomeProvider implements BiomeProvider, Handle {
         public int hashCode() {
             int code = x;
             code = 31 * code + z;
-            return 31 * code + (Long.hashCode(seed));
+            return 31 * code + ((int) (seed ^ (seed >>> 32)));
         }
     }
 }

common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java

@@ -310,24 +310,6 @@ public abstract class AbstractPlatform implements Platform {
         }
     }
 
-    public static int getGenerationThreadsWithReflection(String className, String fieldName, String project) {
-        try {
-            Class aClass = Class.forName(className);
-            int threads = aClass.getField(fieldName).getInt(null);
-            logger.info("{} found, setting {} generation threads.", project, threads);
-            return threads;
-        } catch(ClassNotFoundException e) {
-            logger.info("{} not found.", project);
-        } catch(NoSuchFieldException e) {
-            logger.warn("{} found, but {} field not found this probably means {0} has changed its code and " +
-                        "Terra has not updated to reflect that.", project, fieldName);
-        } catch(IllegalAccessException e) {
-            logger.error("Failed to access {} field in {}, assuming 1 generation thread.", fieldName, project, e);
-        }
-        return 0;
-
-    }
-
     @Override
     public void register(TypeRegistry registry) {
         loaders.register(registry);
@@ -357,9 +339,4 @@ public abstract class AbstractPlatform implements Platform {
     public @NotNull Profiler getProfiler() {
         return profiler;
     }
-
-    @Override
-    public int getGenerationThreads() {
-        return 1;
-    }
 }

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

@@ -232,7 +232,7 @@ public class ConfigPackImpl implements ConfigPack {
         ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate();
         selfLoader.load(packPostTemplate, packManifest);
         seededBiomeProvider =
-            template.getBiomeCache() ? packPostTemplate.getProviderBuilder().caching(platform) : packPostTemplate.getProviderBuilder();
+            template.getBiomeCache() ? packPostTemplate.getProviderBuilder().caching() : packPostTemplate.getProviderBuilder();
         checkDeadEntries();
     }
 

common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaNumberPreprocessor.java

@@ -24,15 +24,14 @@ import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.preprocessor.Result;
-
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.AnnotatedType;
 import java.util.Map;
 
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+
 
 public class MetaNumberPreprocessor extends MetaPreprocessor<Meta> {
     public static final TypeKey<String> META_STRING_KEY = new TypeKey<@Meta String>() {

common/implementation/base/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java

@@ -17,17 +17,6 @@
 
 package com.dfsek.terra.event;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.event.events.Event;
 import com.dfsek.terra.api.event.events.FailThroughEvent;
@@ -36,6 +25,12 @@ import com.dfsek.terra.api.event.functional.EventContext;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Type;
+import java.util.*;
+
 
 public class FunctionalEventHandlerImpl implements FunctionalEventHandler {
     private static final Logger logger = LoggerFactory.getLogger(FunctionalEventHandlerImpl.class);

platforms/bukkit/common/build.gradle.kts

@@ -11,5 +11,5 @@ dependencies {
 
     shadedApi("com.google.guava", "guava", Versions.Libraries.Internal.guava)
 
-    shadedApi("org.incendo", "cloud-paper", Versions.Libraries.cloudPaper)
+    shadedApi("org.incendo", "cloud-paper", Versions.Bukkit.cloud)
 }

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java

@@ -17,14 +17,14 @@
 
 package com.dfsek.terra.bukkit;
 
-import io.papermc.lib.PaperLib;
-import org.bukkit.Location;
-
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 
+import io.papermc.lib.PaperLib;
+import org.bukkit.Location;
+
 
 public class BukkitEntity implements Entity {
     private final org.bukkit.entity.Entity entity;

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java

@@ -51,13 +51,7 @@ public class PlatformImpl extends AbstractPlatform {
 
     private final TerraBukkitPlugin plugin;
 
-    private int generationThreads;
-
     public PlatformImpl(TerraBukkitPlugin plugin) {
-        generationThreads = getGenerationThreadsWithReflection("ca.spottedleaf.moonrise.common.util.MoonriseCommon", "WORKER_THREADS", "Moonrise");
-        if (generationThreads == 0) {
-            generationThreads = 1;
-        }
         this.plugin = plugin;
         load();
     }
@@ -114,11 +108,6 @@ public class PlatformImpl extends AbstractPlatform {
         return itemHandle;
     }
 
-    @Override
-    public int getGenerationThreads() {
-        return generationThreads;
-    }
-
     @Override
     public void register(TypeRegistry registry) {
         super.register(registry);

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java

@@ -23,11 +23,13 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Locale;
+
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.handle.WorldHandle;
-import com.dfsek.terra.bukkit.util.BukkitUtils;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
+import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
 
 
 public class BukkitWorldHandle implements WorldHandle {
@@ -59,6 +61,22 @@ public class BukkitWorldHandle implements WorldHandle {
 
     @Override
     public @NotNull EntityType getEntity(@NotNull String id) {
-        return BukkitUtils.getEntityType(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);
+
+        return new BukkitEntityType(switch(entityID) {
+            case "END_CRYSTAL" -> org.bukkit.entity.EntityType.END_CRYSTAL;
+            case "ENDER_CRYSTAL" -> throw new IllegalArgumentException(
+                "Invalid entity identifier " + id); // make sure this issue can't happen the other way around.
+            default -> org.bukkit.entity.EntityType.valueOf(entityID);
+        });
     }
 }

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/BukkitUtils.java

@@ -2,40 +2,11 @@ package com.dfsek.terra.bukkit.util;
 
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Locale;
-
-import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
 
 
 public class BukkitUtils {
-    private static final Logger logger = LoggerFactory.getLogger(BukkitUtils.class);
-
     public static boolean isLiquid(BlockData blockState) {
         Material material = blockState.getMaterial();
         return material == Material.WATER || material == Material.LAVA;
     }
-
-    public static EntityType getEntityType(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);
-
-        return new BukkitEntityType(switch(entityID) {
-            case "END_CRYSTAL" -> org.bukkit.entity.EntityType.END_CRYSTAL;
-            case "ENDER_CRYSTAL" -> throw new IllegalArgumentException(
-                "Invalid entity identifier " + id); // make sure this issue can't happen the other way around.
-            default -> org.bukkit.entity.EntityType.valueOf(entityID);
-        });
-    }
 }

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java

@@ -20,6 +20,7 @@ package com.dfsek.terra.bukkit.world;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.TreeType;
 import org.bukkit.entity.Player;
 import org.bukkit.generator.WorldInfo;
 import org.bukkit.util.Vector;
@@ -45,12 +46,27 @@ import com.dfsek.terra.bukkit.world.block.BukkitBlockTypeAndItem;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
 import com.dfsek.terra.bukkit.world.inventory.BukkitItemStack;
 import com.dfsek.terra.bukkit.world.inventory.meta.BukkitEnchantment;
+import com.dfsek.terra.transform.MapTransform;
+import com.dfsek.terra.transform.TransformerImpl;
 
 
 /**
  * Utility class to adapt Bukkit enums to Terra enums.
  */
 public final class BukkitAdapter {
+    public static TransformerImpl<TreeType, String> TREE_TRANSFORMER = new TransformerImpl.Builder<TreeType, String>()
+        .addTransform(new MapTransform<TreeType, String>()
+            .add(TreeType.COCOA_TREE, "JUNGLE_COCOA")
+            .add(TreeType.BIG_TREE, "LARGE_OAK")
+            .add(TreeType.TALL_REDWOOD, "LARGE_SPRUCE")
+            .add(TreeType.REDWOOD, "SPRUCE")
+            .add(TreeType.TREE, "OAK")
+            .add(TreeType.MEGA_REDWOOD, "MEGA_SPRUCE")
+            .add(TreeType.SWAMP, "SWAMP_OAK"))
+        .addTransform(TreeType::toString)
+        .build();
+
+
     public static BlockState adapt(org.bukkit.block.data.BlockData data) {
         return BukkitBlockState.newInstance(data);
     }

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorldProperties.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.world;
 
-import com.dfsek.terra.api.world.info.WorldProperties;
-
 import org.bukkit.generator.WorldInfo;
 
+import com.dfsek.terra.api.world.info.WorldProperties;
+
 
 public class BukkitWorldProperties implements WorldProperties {
     private final WorldInfo delegate;

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitMobSpawner.java

@@ -23,7 +23,6 @@ import org.jetbrains.annotations.NotNull;
 import com.dfsek.terra.api.block.entity.MobSpawner;
 import com.dfsek.terra.api.block.entity.SerialState;
 import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.bukkit.util.BukkitUtils;
 import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
 
 
@@ -116,7 +115,7 @@ public class BukkitMobSpawner extends BukkitBlockEntity implements MobSpawner {
     public void applyState(String state) {
         SerialState.parse(state).forEach((k, v) -> {
             switch(k) {
-                case "type" -> setSpawnedType(BukkitUtils.getEntityType(v));
+                case "type" -> setSpawnedType(new BukkitEntityType(org.bukkit.entity.EntityType.valueOf(v.toUpperCase())));
                 case "delay" -> setDelay(Integer.parseInt(v));
                 case "min_delay" -> setMinSpawnDelay(Integer.parseInt(v));
                 case "max_delay" -> setMaxSpawnDelay(Integer.parseInt(v));

platforms/bukkit/common/src/main/resources/plugin.yml

@@ -2,8 +2,8 @@ name: "Terra"
 main: "com.dfsek.terra.bukkit.TerraBukkitPlugin"
 version: "@VERSION@"
 load: "STARTUP"
-authors: [ "dfsek", "duplexsystem", "Astrash", "solonovamax", "Sancires", "Aureus", "RogueShade" ]
+author: dfsek
 website: "@WIKI@"
-api-version: "1.21.1"
+api-version: "1.20"
 description: "@DESCRIPTION@"
 folia-supported: true

platforms/cli/build.gradle.kts

@@ -10,9 +10,6 @@ dependencies {
     shadedApi("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO)
     shadedApi("com.github.Querz", "NBT", Versions.CLI.nbt)
 
-    shadedImplementation("info.picocli", "picocli", Versions.CLI.picocli)
-    annotationProcessor("info.picocli", "picocli-codegen", Versions.CLI.picocli)
-
     shadedImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava)
 
     shadedImplementation("ch.qos.logback", "logback-classic", Versions.CLI.logback)
@@ -29,12 +26,6 @@ tasks.withType<Jar> {
     }
 }
 
-tasks.withType<JavaCompile> {
-    doFirst {
-        options.compilerArgs.add("-Aproject=${project.group}/${project.name}")
-    }
-}
-
 application {
     mainClass.set(javaMainClass)
 }

platforms/cli/src/main/java/com/dfsek/terra/cli/CLIPlatform.java

@@ -22,8 +22,6 @@ public class CLIPlatform extends AbstractPlatform {
     private final CLIWorldHandle worldHandle = new CLIWorldHandle();
     private final CLIItemHandle itemHandle = new CLIItemHandle();
 
-    private final int generationThreads = Runtime.getRuntime().availableProcessors() - 1;
-
     public CLIPlatform() {
         LOGGER.info("Root directory: {}", getDataFolder().getAbsoluteFile());
         load();
@@ -60,9 +58,4 @@ public class CLIPlatform extends AbstractPlatform {
         super.register(registry);
         registry.registerLoader(PlatformBiome.class, (TypeLoader<PlatformBiome>) (annotatedType, o, configLoader, depthTracker) -> () -> o);
     }
-
-    @Override
-    public int getGenerationThreads() {
-        return generationThreads;
-    }
 }

platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java

@@ -5,74 +5,41 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.concurrent.Callable;
 
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
 import com.dfsek.terra.api.util.vector.Vector2Int;
 import com.dfsek.terra.cli.world.CLIWorld;
 
-import picocli.CommandLine;
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
 
+public final class TerraCLI {
+    private static final Logger LOGGER = LoggerFactory.getLogger(TerraCLI.class);
 
-//TODO auto pull in version
-@Command(name = "TerraCLI", mixinStandardHelpOptions = true, version = "6.6.0",
-         description = "Generates a Terra World and saves it in minecraft region format.")
-public final class TerraCLI implements Callable<Integer> {
-    @Option(names = { "-s", "--size"}, description = "Number of regions to generate.")
-    private int size = 2;
-
-    @Option(names = { "-p", "--pack"}, description = "Config pack to use.")
-    private String pack = "OVERWORLD";
-
-    @Option(names = { "--seed"}, description = "Seed for world generation.")
-    private long seed = 0;
-
-    @Option(names = { "--max-height"}, description = "Maximum height of the world.")
-    private int maxHeight = 384;
-
-    @Option(names = { "--min-height"}, description = "Minimum height of the world.")
-    private int minHeight = -64;
-
-    @Option(names = { "--no-save"}, description = "Don't save the world to disk.")
-    private boolean noSave = false;
-
-    @Override
-    public Integer call() {
-        Logger LOGGER = LoggerFactory.getLogger(TerraCLI.class);
+    public static void main(String... args) {
         LOGGER.info("Starting Terra CLI...");
 
         CLIPlatform platform = new CLIPlatform();
         platform.getEventManager().callEvent(new PlatformInitializationEvent());
 
-        ConfigPack generate = platform.getConfigRegistry().getByID(pack).orElseThrow();
+        ConfigPack generate = platform.getConfigRegistry().getByID("OVERWORLD").orElseThrow(); // TODO: make this a cli argument
 
-        CLIWorld world = new CLIWorld(size, seed, maxHeight, minHeight, generate, noSave);
+        CLIWorld world = new CLIWorld(2, 2, 384, -64, generate);
 
         world.generate();
 
-        if(!noSave) {
-            world.serialize().parallel().forEach(mcaFile -> {
-                Vector2Int pos = mcaFile.getLeft();
-                String name = MCAUtil.createNameFromRegionLocation(pos.getX(), pos.getZ());
-                LOGGER.info("Writing region ({}, {}) to {}", pos.getX(), pos.getZ(), name);
+        world.serialize().parallel().forEach(mcaFile -> {
+            Vector2Int pos = mcaFile.getLeft();
+            String name = MCAUtil.createNameFromRegionLocation(pos.getX(), pos.getZ());
+            LOGGER.info("Writing region ({}, {}) to {}", pos.getX(), pos.getZ(), name);
 
-                try {
-                    MCAUtil.write(mcaFile.getRight(), name);
-                } catch(IOException e) {
-                    e.printStackTrace();
-                }
-                LOGGER.info("Wrote region to file.");
-            });
-        }
+            try {
+                MCAUtil.write(mcaFile.getRight(), name);
+            } catch(IOException e) {
+                e.printStackTrace();
+            }
+            LOGGER.info("Wrote region to file.");
+        });
         LOGGER.info("Done.");
-        return 0;
-    }
-
-    public static void main(String... args) {
-        int exitCode = new CommandLine(new TerraCLI()).execute(args);
-        System.exit(exitCode);
+        System.exit(0);
     }
 }

platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java

@@ -43,7 +43,6 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
     private final ChunkGenerator chunkGenerator;
     private final BiomeProvider biomeProvider;
     private final ConfigPack pack;
-    private final boolean noSave;
     private final AtomicInteger amount = new AtomicInteger(0);
 
     private final ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() - 1);
@@ -52,7 +51,7 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
                     long seed,
                     int maxHeight,
                     int minHeight,
-                    ConfigPack pack, boolean noSave) {
+                    ConfigPack pack) {
         this.size = size;
         this.maxHeight = maxHeight;
         this.minHeight = minHeight;
@@ -60,7 +59,6 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
         this.chunkGenerator = pack.getGeneratorProvider().newInstance(pack);
         this.biomeProvider = pack.getBiomeProvider();
         this.pack = pack;
-        this.noSave = noSave;
 
 
         size += 1;
@@ -75,7 +73,6 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
     }
 
     public void generate() {
-        ArrayList<Double> CPSHistory = new ArrayList<>();
         int sizeChunks = size * 32;
         List<Future<?>> futures = new ArrayList<>();
         final AtomicLong start = new AtomicLong(System.nanoTime());
@@ -86,13 +83,7 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
                 futures.add(executor.submit(() -> {
                     try {
                         int num = amount.getAndIncrement();
-                        CLIChunk chunk;
-                        if (!noSave) {
-                            chunk = getChunkAt(finalX, finalZ);
-                        } else {
-                            chunk = new CLIChunk(Math.floorMod(finalX, 32), Math.floorMod(finalZ, 32), this);
-                        }
-
+                        CLIChunk chunk = getChunkAt(finalX, finalZ);
                         BiomeProvider cachingBiomeProvider = pack.getBiomeProvider();
                         chunkGenerator.generateChunkData(chunk, this, cachingBiomeProvider, finalX, finalZ);
                         CLIProtoWorld protoWorld = new CLIProtoWorld(this, cachingBiomeProvider, finalX, finalZ);
@@ -100,7 +91,6 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
                         if(num % 240 == 239) {
                             long time = System.nanoTime();
                             double cps = num / ((double) (time - start.get()) / 1000000000);
-                            CPSHistory.add(cps);
                             LOGGER.info("Generating chunk at ({}, {}), generated {} chunks at {}cps", finalX, finalZ, num, cps);
                             amount.set(0);
                             start.set(System.nanoTime());
@@ -119,8 +109,6 @@ public class CLIWorld implements ServerWorld, NBTSerializable<Stream<Pair<Vector
                 e.printStackTrace();
             }
         }
-
-        LOGGER.info("Average CPS: {}", CPSHistory.stream().mapToDouble(d -> d).average().orElse(0));
     }
 
     @Override

platforms/fabric/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 architectury {
     platformSetupLoomIde()
-    loader("fabric")
+    fabric()
 }
 
 dependencies {
@@ -21,13 +21,13 @@ dependencies {
     shaded(project(path = ":platforms:mixin-lifecycle", configuration = "transformProductionFabric")) { isTransitive = false }
 
 
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
+    minecraft("com.mojang", "minecraft", Versions.Mod.minecraft)
     mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
 
-    modImplementation("net.fabricmc:fabric-loader:${Versions.Mod.fabricLoader}")
+    modImplementation("net.fabricmc", "fabric-loader", Versions.Mod.fabricLoader)
 
-    modImplementation("org.incendo", "cloud-fabric", Versions.Libraries.cloudFabric)
-    include("org.incendo", "cloud-fabric", Versions.Libraries.cloudFabric)
+    modImplementation("org.incendo", "cloud-fabric", Versions.Fabric.cloud)
+    include("org.incendo", "cloud-fabric", Versions.Fabric.cloud)
 
     modRuntimeOnly("net.fabricmc.fabric-api", "fabric-api", Versions.Fabric.fabricAPI)
 }

platforms/fabric/src/main/resources/fabric.mod.json

@@ -5,13 +5,7 @@
     "name": "Terra",
     "description": "@DESCRIPTION@",
     "authors": [
-        "dfsek",
-        "duplexsystem",
-        "Astrash",
-        "solonovamax",
-        "Sancires",
-        "Aureus",
-        "RogueShade"
+        "dfsek"
     ],
     "contact": {
         "homepage": "@WIKI@",
@@ -34,7 +28,8 @@
     "depends": {
         "fabricloader": ">=0.16.5",
         "java": ">=21",
-        "minecraft": ">=1.21.1",
+        "minecraft": ">=1.20.6",
+        "cloud": "*",
         "fabric": "*"
     }
 }

platforms/forge/build.gradle.kts.disabled

@@ -1,80 +0,0 @@
-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 {
-    platformSetupLoomIde()
-    loader("forge")
-}
-
-dependencies {
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-
-    shadedApi(project(":common:implementation:base"))
-    "forgeRuntimeLibrary"(project(":common:implementation:base"))
-
-    implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
-    "developmentForge"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
-    shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionForge")) { isTransitive = false }
-
-    forge(group = "net.minecraftforge", name = "forge", version = Versions.Forge.forge)
-
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
-
-    //forge is not ok.
-    compileOnly("org.burningwave:core:${Versions.Forge.burningwave}")
-    "forgeRuntimeLibrary"("org.burningwave:core:${Versions.Forge.burningwave}")
-}
-
-loom {
-    accessWidenerPath.set(project(":platforms:mixin-common").file("src/main/resources/terra.accesswidener"))
-
-    mixin {
-        defaultRefmapName.set("terra.forge.refmap.json")
-    }
-
-//    launches {
-//        named("client") {
-//            property("fabric.log.level", "info")
-//            property("mixin.env.disableRefMap", "true")
-//        }
-//        named("server") {
-//            property("fabric.log.level", "info")
-//            property("mixin.env.disableRefMap", "true")
-//        }
-//    }
-
-    forge {
-        convertAccessWideners.set(true)
-        mixinConfig("terra.common.mixins.json")
-        mixinConfig("terra.forge.mixins.json")
-        extraAccessWideners.add(loom.accessWidenerPath.get().asFile.name)
-    }
-}
-
-
-addonDir(project.file("./run/config/Terra/addons"), tasks.named("configureLaunch").get())
-
-tasks {
-    jar {
-        manifest {
-            attributes(
-                mapOf(
-                    "Implementation-Title" to rootProject.name,
-                    "Implementation-Version" to project.version,
-                )
-            )
-        }
-    }
-
-    remapJar {
-        inputFile.set(shadowJar.get().archiveFile)
-        archiveFileName.set("${rootProject.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}-forge-${project.version}.jar")
-    }
-}

platforms/forge/gradle.properties

@@ -1 +0,0 @@
-loom.platform=forge

platforms/mixin-common/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
 }
 
 architectury {
-    common("fabric")
+    common("fabric", "neoforge")
     minecraft = Versions.Mod.minecraft
 }
 

platforms/mixin-lifecycle/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
     minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
     mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
 
-    modImplementation("org.incendo", "cloud-fabric", Versions.Libraries.cloudFabric) {
+    modImplementation("org.incendo", "cloud-fabric", Versions.Fabric.cloud) {
         exclude("net.fabricmc")
         exclude("net.fabricmc.fabric-api")
     }

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java

@@ -1,8 +1,5 @@
 package com.dfsek.terra.lifecycle;
 
-import com.dfsek.terra.api.command.CommandSender;
-import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
-
 import net.minecraft.server.command.ServerCommandSource;
 import org.incendo.cloud.SenderMapper;
 import org.incendo.cloud.execution.ExecutionCoordinator;
@@ -10,6 +7,9 @@ import org.incendo.cloud.fabric.FabricServerCommandManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.dfsek.terra.api.command.CommandSender;
+import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
+
 
 public final class LifecycleEntryPoint {
     private static final Logger logger = LoggerFactory.getLogger(LifecycleEntryPoint.class);

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java

@@ -3,9 +3,6 @@ package com.dfsek.terra.lifecycle;
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.parser.tokenizer.ParseException;
 import ca.solostudios.strata.version.Version;
-
-import com.dfsek.terra.api.util.reflection.ReflectionUtil;
-
 import net.minecraft.MinecraftVersion;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.registry.Registry;
@@ -40,15 +37,8 @@ public abstract class LifecyclePlatform extends ModPlatform {
     private static final AtomicReference<Registry<MultiNoiseBiomeSourceParameterList>> NOISE = new AtomicReference<>();
     private static final AtomicReference<Registry<Enchantment>> ENCHANTMENT = new AtomicReference<>();
     private static MinecraftServer server;
-    private int generationThreads;
 
     public LifecyclePlatform() {
-        generationThreads = getGenerationThreadsWithReflection("com.ishland.c2me.base.common.GlobalExecutors", "GLOBAL_EXECUTOR_PARALLELISM", "C2ME");
-        if (generationThreads == 0) {
-            generationThreads = getGenerationThreadsWithReflection("ca.spottedleaf.moonrise.common.util.MoonriseCommon", "WORKER_THREADS", "Moonrise");
-        } if (generationThreads == 0) {
-            generationThreads = 1;
-        }
         CommonPlatform.initialize(this);
         load();
     }
@@ -65,8 +55,6 @@ public abstract class LifecyclePlatform extends ModPlatform {
         ENCHANTMENT.set(enchantmentRegistry);
     }
 
-
-
     @Override
     public MinecraftServer getServer() {
         return server;

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java

@@ -18,7 +18,6 @@ import com.dfsek.terra.lifecycle.LifecyclePlatform;
 
 import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
 
-
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin {
     @Inject(method = "<init>(Ljava/lang/Thread;Lnet/minecraft/world/level/storage/LevelStorage$Session;" +

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java

@@ -13,7 +13,6 @@ import com.dfsek.terra.mod.CommonPlatform;
 
 public final class LifecycleUtil {
     public static boolean initialized = false;
-
     private LifecycleUtil() {
 
     }

platforms/neoforge/build.gradle.kts

@@ -0,0 +1,69 @@
+import java.util.*
+
+plugins {
+    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
+    id("architectury-plugin") version Versions.Mod.architecturyPlugin
+}
+
+architectury {
+    platformSetupLoomIde()
+    neoForge()
+}
+
+dependencies {
+    shadedApi(project(":common:implementation:base"))
+    "forgeRuntimeLibrary"(project(":common:implementation:base"))
+
+    implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
+    "developmentNeoForge"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
+    shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionNeoForge")) { isTransitive = false }
+
+    minecraft("com.mojang", "minecraft", Versions.Mod.minecraft)
+    mappings(
+        loom.layered {
+                mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+                mappings("dev.architectury:yarn-mappings-patch-neoforge:${Versions.NeoForge.yarnPatch}")
+            }
+    )
+
+    neoForge("net.neoforged", "neoforge", Versions.NeoForge.neoForge)
+
+    modImplementation("org.incendo", "cloud-neoforge", Versions.NeoForge.cloud)
+    include("org.incendo", "cloud-neoforge", Versions.NeoForge.cloud)
+
+    //forge is not ok.
+    compileOnly("org.burningwave:core:${Versions.NeoForge.burningwave}")
+    "forgeRuntimeLibrary"("org.burningwave:core:${Versions.NeoForge.burningwave}")
+}
+
+loom {
+    accessWidenerPath.set(project(":platforms:mixin-common").file("src/main/resources/terra.accesswidener"))
+
+//    mixin {
+//        defaultRefmapName.set("terra.neoforge.refmap.json")
+//    }
+}
+
+
+addonDir(project.file("./run/config/Terra/addons"), tasks.named("configureLaunch").get())
+
+tasks {
+    jar {
+        manifest {
+            attributes(
+                mapOf(
+                    "Implementation-Title" to rootProject.name,
+                    "Implementation-Version" to project.version,
+                )
+            )
+        }
+    }
+
+    remapJar {
+        dependsOn("installAddons")
+
+        injectAccessWidener.set(true)
+        inputFile.set(shadowJar.get().archiveFile)
+        archiveFileName.set("${rootProject.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}-neoforge-${project.version}.jar")
+    }
+}

platforms/neoforge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/AwfulForgeHacks.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge;
+package com.dfsek.terra.neoforge;
 
 import net.minecraftforge.fml.loading.FMLLoader;
 import org.burningwave.core.classes.Classes;
@@ -67,7 +67,7 @@ public final class AwfulForgeHacks {
             try(JarFile jar = getTerraJar()) {
                 jar.stream()
                     .forEach(jarEntry -> {
-                        if(jarEntry.getName().startsWith("com/dfsek/terra/forge/mixin")
+                        if(jarEntry.getName().startsWith("com/dfsek/terra/neoforge/mixin")
                            || jarEntry.getName().startsWith("com/dfsek/terra/mod/mixin")) {
                             return;
                         }

platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/ForgeAddon.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge;
+package com.dfsek.terra.neoforge;
 
 import com.dfsek.terra.mod.MinecraftAddon;
 import com.dfsek.terra.mod.ModPlatform;

platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/ForgeEntryPoint.java

@@ -15,7 +15,7 @@
  * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.dfsek.terra.forge;
+package com.dfsek.terra.neoforge;
 
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;
@@ -34,9 +34,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
-import com.dfsek.terra.forge.AwfulForgeHacks.RegistrySanityCheck;
-import com.dfsek.terra.forge.AwfulForgeHacks.RegistryStep;
-import com.dfsek.terra.forge.util.BiomeUtil;
+import com.dfsek.terra.neoforge.AwfulForgeHacks.RegistrySanityCheck;
+import com.dfsek.terra.neoforge.AwfulForgeHacks.RegistryStep;
+import com.dfsek.terra.neoforge.util.BiomeUtil;
 import com.dfsek.terra.mod.data.Codecs;
 
 
@@ -76,7 +76,7 @@ public class ForgeEntryPoint {
 
 
         event.register(RegistryKeys.CHUNK_GENERATOR,
-            helper -> helper.register(new Identifier("terra:terra"), Codecs.MINECRAFT_CHUNK_GENERATOR_WRAPPER));
-        event.register(RegistryKeys.BIOME_SOURCE, helper -> helper.register(new Identifier("terra:terra"), Codecs.TERRA_BIOME_SOURCE));
+            helper -> helper.register(Identifier.of("terra:terra"), Codecs.MINECRAFT_CHUNK_GENERATOR_WRAPPER));
+        event.register(RegistryKeys.BIOME_SOURCE, helper -> helper.register(Identifier.of("terra:terra"), Codecs.TERRA_BIOME_SOURCE));
     }
 }

platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/ForgePlatform.java

@@ -15,12 +15,13 @@
  * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.dfsek.terra.forge;
+package com.dfsek.terra.neoforge;
 
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.parser.tokenizer.ParseException;
 import ca.solostudios.strata.version.Version;
 import net.minecraft.MinecraftVersion;
+import net.minecraft.enchantment.Enchantment;
 import net.minecraft.registry.Registry;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.biome.Biome;
@@ -68,7 +69,7 @@ public class ForgePlatform extends ModPlatform {
         MinecraftServer server = getServer();
 
         if(server != null) {
-            server.reloadResources(server.getDataPackManager().getNames()).exceptionally(throwable -> {
+            server.reloadResources(server.getDataPackManager().getEnabledIds()).exceptionally(throwable -> {
                 LOGGER.warn("Failed to execute reload", throwable);
                 return null;
             }).join();
@@ -147,4 +148,9 @@ public class ForgePlatform extends ModPlatform {
     public Registry<MultiNoiseBiomeSourceParameterList> multiNoiseBiomeSourceParameterListRegistry() {
         return null;
     }
+
+    @Override
+    public Registry<Enchantment> enchantmentRegistry() {
+        return null;
+    }
 }

platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/mixin/lifecycle/NoiseConfigMixin.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge.mixin.lifecycle;
+package com.dfsek.terra.neoforge.mixin.lifecycle;
 
 import net.minecraft.registry.RegistryEntryLookup;
 import net.minecraft.util.math.noise.DoublePerlinNoiseSampler.NoiseParameters;

platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/mixin/lifecycle/package-info.java

@@ -19,4 +19,4 @@
  * Mixins that inject behavior into the client/server lifecycle.
  */
 
-package com.dfsek.terra.forge.mixin.lifecycle;
+package com.dfsek.terra.neoforge.mixin.lifecycle;

platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/util/BiomeUtil.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge.util;
+package com.dfsek.terra.neoforge.util;
 
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
@@ -16,7 +16,7 @@ import java.util.Objects;
 
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.forge.ForgeEntryPoint;
+import com.dfsek.terra.neoforge.ForgeEntryPoint;
 import com.dfsek.terra.mod.config.PreLoadCompatibilityOptions;
 import com.dfsek.terra.mod.config.ProtoPlatformBiome;
 import com.dfsek.terra.mod.config.VanillaBiomeProperties;
@@ -66,7 +66,7 @@ public final class BiomeUtil {
                     .value(),
                 vanillaBiomeProperties);
 
-            Identifier identifier = new Identifier("terra", MinecraftUtil.createBiomeID(pack, id));
+            Identifier identifier = Identifier.of("terra", MinecraftUtil.createBiomeID(pack, id));
 
             if(ForgeRegistries.BIOMES.containsKey(identifier)) {
                 ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(ForgeRegistries.BIOMES.getHolder(identifier)

platforms/neoforge/src/main/resources/terra.forge.mixins.json

@@ -1,7 +1,7 @@
 {
     "required": true,
     "minVersion": "0.8",
-    "package": "com.dfsek.terra.forge.mixin",
+    "package": "com.dfsek.terra.neoforge.mixin",
     "compatibilityLevel": "JAVA_21",
     "mixins": [
         "lifecycle.NoiseConfigMixin"

platforms/quilt/build.gradle.kts.disabled

@@ -1,65 +0,0 @@
-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 {
-    platformSetupLoomIde()
-    loader("quilt")
-}
-
-dependencies {
-    shadedApi(project(":common:implementation:base"))
-    
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-    
-    
-    implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
-    "developmentQuilt"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
-    shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionQuilt")) { isTransitive = false }
-    
-    implementation(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
-    "developmentQuilt"(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
-    shaded(project(path = ":platforms:mixin-lifecycle", configuration = "transformProductionQuilt")) { isTransitive = false }
-    
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
-    
-    modImplementation("org.quiltmc:quilt-loader:${Versions.Quilt.quiltLoader}")
-    
-    modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${Versions.Quilt.fabricApi}")
-    
-    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
-        exclude("net.fabricmc")
-        exclude("net.fabricmc.fabric-api")
-    }
-    include("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
-        exclude("net.fabricmc")
-        exclude("net.fabricmc.fabric-api")
-    }
-}
-
-loom {
-    accessWidenerPath.set(project(":platforms:mixin-common").file("src/main/resources/terra.accesswidener"))
-    
-    mixin {
-        defaultRefmapName.set("terra.quilt.refmap.json")
-    }
-}
-
-
-addonDir(project.file("./run/config/Terra/addons"), tasks.named("configureLaunch").get())
-
-tasks {
-    compileJava {
-        options.release.set(17)
-    }
-    
-    remapJar {
-        injectAccessWidener.set(true)
-        inputFile.set(shadowJar.get().archiveFile)
-        archiveFileName.set("${rootProject.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() })}-quilt-${project.version}.jar")
-    }
-}

platforms/quilt/gradle.properties

@@ -1 +0,0 @@
-loom.platform=quilt

platforms/quilt/src/main/java/com/dfsek/terra/quilt/AwfulQuiltHacks.java

@@ -1,44 +0,0 @@
-package com.dfsek.terra.quilt;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-
-/**
- * So you want to Mixin into Authlib/Brigadier/DataFixerUpper, on Fabric you'll need this guy.
- *
- * <p>YOU SHOULD ONLY USE THIS CLASS DURING "preLaunch" and ONLY TARGET A CLASS WHICH IS NOT ANY CLASS YOU MIXIN TO.
- * <p>
- * This will likely not work on Gson because FabricLoader has some special logic related to Gson.
- */
-public final class AwfulQuiltHacks {
-    private static final ClassLoader KNOT_CLASSLOADER = Thread.currentThread().getContextClassLoader();
-    private static final Method ADD_URL_METHOD;
-    static {
-        Method tempAddUrlMethod = null;
-        try {
-            tempAddUrlMethod = KNOT_CLASSLOADER.getClass().getMethod("addURL", URL.class);
-            tempAddUrlMethod.setAccessible(true);
-        } catch(ReflectiveOperationException e) {
-            throw new RuntimeException("Failed to load Classloader fields", e);
-        }
-
-        ADD_URL_METHOD = tempAddUrlMethod;
-    }
-
-    private AwfulQuiltHacks() { }
-
-    /**
-     * Hackily load the package which a mixin may exist within.
-     * <p>
-     * YOU SHOULD NOT TARGET A CLASS WHICH YOU MIXIN TO.
-     *
-     * @param pathOfAClass The path of any class within the package.
-     */
-    public static void hackilyLoadForMixin(String pathOfAClass)
-    throws ClassNotFoundException, InvocationTargetException, IllegalAccessException {
-        URL url = Class.forName(pathOfAClass).getProtectionDomain().getCodeSource().getLocation();
-        ADD_URL_METHOD.invoke(KNOT_CLASSLOADER, url);
-    }
-}

platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltAddon.java

@@ -1,17 +0,0 @@
-package com.dfsek.terra.quilt;
-
-import com.dfsek.terra.mod.MinecraftAddon;
-import com.dfsek.terra.mod.ModPlatform;
-
-
-public class QuiltAddon extends MinecraftAddon {
-
-    public QuiltAddon(ModPlatform modPlatform) {
-        super(modPlatform);
-    }
-
-    @Override
-    public String getID() {
-        return "terra-quilt";
-    }
-}

platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java

@@ -1,33 +0,0 @@
-/*
- * This file is part of Terra.
- *
- * Terra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Terra is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.dfsek.terra.quilt;
-
-import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;
-
-import com.dfsek.terra.lifecycle.LifecycleEntryPoint;
-
-
-public class QuiltEntryPoint extends LifecycleEntryPoint implements ModInitializer {
-    private static final QuiltPlatform TERRA_PLUGIN = new QuiltPlatform();
-
-    @Override
-    public void onInitialize(ModContainer container) {
-        initialize("Quilt", TERRA_PLUGIN);
-    }
-}

platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java

@@ -1,56 +0,0 @@
-/*
- * This file is part of Terra.
- *
- * Terra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Terra is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Terra.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.dfsek.terra.quilt;
-
-import org.jetbrains.annotations.NotNull;
-import org.quiltmc.loader.api.QuiltLoader;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.lifecycle.LifecyclePlatform;
-
-
-public class QuiltPlatform extends LifecyclePlatform {
-
-    @Override
-    protected Collection<BaseAddon> getPlatformMods() {
-        return QuiltLoader.getAllMods()
-            .stream()
-            .flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw(), "quilt"))
-            .collect(
-                Collectors.toList());
-    }
-
-    @Override
-    public @NotNull String platformName() {
-        return "Quilt";
-    }
-
-    @Override
-    public @NotNull File getDataFolder() {
-        return new File(QuiltLoader.getConfigDir().toFile(), "Terra");
-    }
-
-    @Override
-    public BaseAddon getPlatformAddon() {
-        return new QuiltAddon(this);
-    }
-}

platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPreLaunchEntryPoint.java

@@ -1,22 +0,0 @@
-package com.dfsek.terra.quilt;
-
-import cloud.commandframework.brigadier.BrigadierMappingBuilder;
-import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.loader.api.QuiltLoader;
-import org.quiltmc.loader.api.entrypoint.PreLaunchEntrypoint;
-
-import java.lang.reflect.InvocationTargetException;
-
-
-public class QuiltPreLaunchEntryPoint implements PreLaunchEntrypoint {
-    @Override
-    public void onPreLaunch(ModContainer mod) {
-        if(QuiltLoader.isDevelopmentEnvironment()) {
-            try {
-                AwfulQuiltHacks.hackilyLoadForMixin(BrigadierMappingBuilder.class.getName());
-            } catch(ClassNotFoundException | InvocationTargetException | IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-}

platforms/quilt/src/main/resources/assets/terra/lang/en_us.json

@@ -1,4 +0,0 @@
-{
-    "generator.terra": "Terra"
-}
-

platforms/quilt/src/main/resources/quilt.mod.json

@@ -1,55 +0,0 @@
-{
-    "schema_version": 1,
-    "quilt_loader": {
-        "group": "com.dfsek",
-        "id": "terra",
-        "version": "@VERSION@",
-        "metadata": {
-            "name": "Terra",
-            "description": "@DESCRIPTION@",
-            "authors": [
-                "dfsek"
-            ],
-            "contact": {
-                "homepage": "@WIKI@",
-                "sources": "@SOURCE@",
-                "issues": "@ISSUES@"
-            },
-            "license": "@LICENSE@",
-            "icon": "assets/terra/icon.png"
-        },
-        "environment": "*",
-        "intermediate_mappings": "net.fabricmc:intermediary",
-        "entrypoints": {
-            "init": [
-                "com.dfsek.terra.quilt.QuiltEntryPoint"
-            ],
-            "pre_launch": [
-                "com.dfsek.terra.quilt.QuiltPreLaunchEntryPoint"
-            ]
-        },
-        "depends": [
-            {
-                "id": "quilt_loader",
-                "version": ">=0.17.0"
-            },
-            {
-                "id": "java",
-                "version": ">=17"
-            },
-            {
-                "id": "minecraft",
-                "version": "1.20.x"
-            },
-            {
-                "id": "quilted_fabric_api",
-                "versions": ">=2.0.0-"
-            }
-        ]
-    },
-    "mixin": [
-        "terra.quilt.mixins.json",
-        "terra.lifecycle.mixins.json",
-        "terra.common.mixins.json"
-    ]
-}

platforms/quilt/src/main/resources/terra.quilt.mixins.json

@@ -1,15 +0,0 @@
-{
-    "required": true,
-    "minVersion": "0.8",
-    "package": "com.dfsek.terra.quilt.mixin",
-    "compatibilityLevel": "JAVA_21",
-    "mixins": [
-    ],
-    "client": [
-    ],
-    "server": [
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    }
-}