Merge remote-tracking branch 'origin/ver/6.5.0' into dev/metapacks

also it's not needed mc seems to have done this themselves

.github/workflows/gradle-build.yml

@@ -18,10 +18,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'temurin'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

build.gradle.kts

@@ -15,7 +15,6 @@ allprojects {
     tasks.withType<JavaCompile>().configureEach {
         options.isFork = true
         options.isIncremental = true
-        options.release.set(21)
     }
 
     tasks.withType<Test>().configureEach {
@@ -45,7 +44,7 @@ afterEvaluate {
     }
     project(":platforms:bukkit:common").configureDistribution()
     forSubProjects(":common:addons") {
-        apply(plugin = "com.gradleup.shadow")
+        apply(plugin = "com.github.johnrengelman.shadow")
 
         tasks.named("build") {
             finalizedBy(tasks.named("shadowJar"))

buildSrc/build.gradle.kts

@@ -9,18 +9,18 @@ repositories {
     maven("https://repo.codemc.org/repository/maven-public") {
         name = "CodeMC"
     }
-    maven("https://repo.papermc.io/repository/maven-public/") {
+    maven("https://papermc.io/repo/repository/maven-public/") {
         name = "PaperMC"
     }
 }
 
 dependencies {
     //TODO Allow pulling from Versions.kt
-    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.1")
-    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.7.2")
+    implementation("com.github.johnrengelman", "shadow", "8.1.1")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.11")
 
-    implementation("org.ow2.asm", "asm", "9.7")
-    implementation("org.ow2.asm", "asm-tree", "9.7")
+    implementation("org.ow2.asm", "asm", "9.6")
+    implementation("org.ow2.asm", "asm-tree", "9.6")
     implementation("com.dfsek.tectonic", "common", "4.2.1")
-    implementation("org.yaml", "snakeyaml", "2.3")
+    implementation("org.yaml", "snakeyaml", "2.2")
 }

buildSrc/src/main/kotlin/CompilationConfig.kt

@@ -22,8 +22,8 @@ fun Project.configureCompilation() {
     apply<TectonicDocPlugin>()
     
     configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     
     tasks.withType<JavaCompile> {

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -36,21 +36,18 @@ fun Project.configureDependencies() {
         maven("https://repo.codemc.org/repository/maven-public") {
             name = "CodeMC"
         }
-        maven("https://repo.papermc.io/repository/maven-public/") {
+        maven("https://papermc.io/repo/repository/maven-public/") {
             name = "PaperMC"
         }
+        maven("https://files.minecraftforge.net/maven/") {
+            name = "Forge"
+        }
         maven("https://maven.quiltmc.org/repository/release/") {
             name = "Quilt"
         }
         maven("https://jitpack.io") {
             name = "JitPack"
         }
-        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/DistributionConfig.kt

@@ -21,7 +21,7 @@ import kotlin.io.path.exists
 
 
 fun Project.configureDistribution() {
-    apply(plugin = "com.gradleup.shadow")
+    apply(plugin = "com.github.johnrengelman.shadow")
     
     val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
         group = "terra"

buildSrc/src/main/kotlin/Versions.kt

@@ -8,57 +8,59 @@ object Versions {
         const val paralithic = "0.7.1"
         const val strata = "1.3.2"
         
-        const val cloud = "2.0.0"
+        const val cloud = "1.8.4"
         
         const val caffeine = "3.1.8"
         
-        const val slf4j = "2.0.16"
-
+        const val slf4j = "2.0.9"
+        const val log4j_slf4j_impl = "2.20.0"
+        
         object Internal {
-            const val shadow = "8.3.1"
-            const val apacheText = "1.12.0"
-            const val apacheIO = "2.16.1"
-            const val guava = "33.3.0-jre"
-            const val asm = "9.7"
-            const val snakeYml = "2.3"
+            const val shadow = "8.1.1"
+            const val apacheText = "1.11.0"
+            const val apacheIO = "2.15.1"
+            const val guava = "32.1.3-jre"
+            const val asm = "9.6"
+            const val snakeYml = "2.2"
             const val jetBrainsAnnotations = "24.1.0"
-            const val junit = "5.11.0"
+            const val junit = "5.10.1"
         }
     }
     
-    object Mod {
-        const val mixin = "0.15.3+mixin.0.8.7"
-        
-        const val minecraft = "1.21.1"
-        const val yarn = "$minecraft+build.3"
-        const val fabricLoader = "0.16.5"
-        
-        const val architecuryLoom = "1.7.413"
-        const val architecturyPlugin = "3.4.159"
-    }
-    
     object Fabric {
-        const val cloud = "2.0.0-beta.9"
-        const val fabricAPI = "0.104.0+${Mod.minecraft}"
+        const val fabricAPI = "0.91.2+${Mod.minecraft}"
     }
+//
+//    object Quilt {
+//        const val quiltLoader = "0.20.2"
+//        const val fabricApi = "7.3.1+0.89.3-1.20.1"
+//    }
     
-    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 Mod {
+        const val mixin = "0.12.5+mixin.0.8.5"
+        
+        const val minecraft = "1.20.4"
+        const val yarn = "$minecraft+build.1"
+        const val fabricLoader = "0.15.1"
+        
+        const val architecuryLoom = "1.4.369"
+        const val architecturyPlugin = "3.4.151"
     }
+//
+//    object Forge {
+//        const val forge = "${Mod.minecraft}-48.0.13"
+//        const val burningwave = "12.63.0"
+//    }
     
     object Bukkit {
-        const val minecraft = "1.21.1"
-        const val paperBuild = "$minecraft-R0.1-20240917.151311-80"
+        const val minecraft = "1.20.4"
+        const val paperBuild = "$minecraft-R0.1-20231209.173338-2"
         const val paper = paperBuild
         const val paperLib = "1.0.8"
-        const val reflectionRemapper = "0.1.1"
+        const val reflectionRemapper = "0.1.0"
         const val paperDevBundle = paperBuild
-        const val runPaper = "2.3.1"
-        const val cloud = "2.0.0-beta.10"
-        const val paperWeight = "1.7.2"
+        const val runPaper = "2.2.2"
+        const val paperWeight = "1.5.11"
     }
     
     //
@@ -70,6 +72,6 @@ object Versions {
 //
     object CLI {
         const val nbt = "6.1"
-        const val logback = "1.5.8"
+        const val logback = "1.4.14"
     }
 }

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
 
-import java.util.Set;
-
 import com.dfsek.terra.api.world.biome.Biome;
 
+import java.util.Set;
+
 
 public final class DelegatedPipelineBiome implements PipelineBiome {
     private final Biome biome;

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

@@ -29,7 +29,7 @@ public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
     @Default
     @Description("""
                  The resolution at which to sample biomes.
-                 
+                                  
                  Larger values are quadratically faster, but produce lower quality results.
                  For example, a value of 3 would sample every 3 blocks.""")
     protected @Meta int resolution = 1;

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceListStage.java

@@ -7,17 +7,17 @@
 
 package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Stream;
-
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+
 
 public class ReplaceListStage implements Stage {
     private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;

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/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java

@@ -28,7 +28,7 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate {
     @Description("""
                  The initial size of biome chunks. This value must be at least 2.
                  <b>This is not the final size of biome chunks. Final chunks will be much larger</b>.
-                 
+                                  
                  It is recommended to keep biome chunks' final size in the range of [50, 300]
                  to prevent performance issues. To calculate the size of biome chunks, simply
                  take initial-size and for each expand stage, multiply the running value by 2

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java

@@ -22,7 +22,7 @@ public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvi
     @Default
     @Description("""
                  The resolution at which to sample biomes.
-                 
+                                  
                  Larger values are quadratically faster, but produce lower quality results.
                  For example, a value of 3 would sample every 3 blocks.""")
     protected @Meta int resolution = 1;

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java

@@ -58,8 +58,7 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
                         pack -> new NoiseChunkGenerator3D(pack, platform, config.getElevationBlend(),
                             config.getHorizontalRes(),
                             config.getVerticalRes(), noisePropertiesPropertyKey,
-                            paletteInfoPropertyKey, config.getSlantCalculationMethod(),
-                            config.isSlantPalettesEnabled()));
+                            paletteInfoPropertyKey, config.getSlantCalculationMethod()));
                 event.getPack()
                     .applyLoader(SlantHolder.Layer.class, SlantLayerTemplate::new);
             })

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/NoiseChunkGeneratorPackConfigTemplate.java

@@ -26,10 +26,6 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate, Pr
     @Default
     private @Meta SlantCalculationMethod slantCalculationMethod = SlantCalculationMethod.Derivative;
 
-    @Value("slant.disable-palettes")
-    @Default
-    private @Meta boolean disableSlantPalettes = false;
-
     public int getElevationBlend() {
         return elevationBlend;
     }
@@ -45,8 +41,4 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate, Pr
     public SlantCalculationMethod getSlantCalculationMethod() {
         return slantCalculationMethod;
     }
-
-    public boolean isSlantPalettesEnabled() {
-        return !disableSlantPalettes;
-    }
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java

@@ -8,15 +8,17 @@
 package com.dfsek.terra.addons.chunkgenerator.generation;
 
 
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
+
+import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
+
 import org.jetbrains.annotations.NotNull;
 
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
-import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.LazilyEvaluatedInterpolator;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider;
 import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
-import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
@@ -45,13 +47,10 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
 
     private final SlantCalculationMethod slantCalculationMethod;
 
-    private final boolean useSlantPalettes;
-
     public NoiseChunkGenerator3D(ConfigPack pack, Platform platform, int elevationBlend, int carverHorizontalResolution,
                                  int carverVerticalResolution,
                                  PropertyKey<BiomeNoiseProperties> noisePropertiesKey,
-                                 PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey,
-                                 SlantCalculationMethod slantCalculationMethod, boolean useSlantPalettes) {
+                                 PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey, SlantCalculationMethod slantCalculationMethod) {
         this.platform = platform;
         this.air = platform.getWorldHandle().air();
         this.carverHorizontalResolution = carverHorizontalResolution;
@@ -59,7 +58,6 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
         this.paletteInfoPropertyKey = paletteInfoPropertyKey;
         this.noisePropertiesKey = noisePropertiesKey;
         this.slantCalculationMethod = slantCalculationMethod;
-        this.useSlantPalettes = useSlantPalettes;
         int maxBlend = pack
             .getBiomeProvider()
             .stream()
@@ -73,7 +71,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
 
     private Palette paletteAt(int x, int y, int z, Sampler3D sampler, BiomePaletteInfo paletteInfo, int depth) {
         SlantHolder slantHolder = paletteInfo.slantHolder();
-        if(useSlantPalettes && slantHolder.isAboveDepth(depth)) {
+        if(slantHolder.isAboveDepth(depth)) {
             double slant = slantCalculationMethod.slant(sampler, x, y, z);
             if(slantHolder.isInSlantThreshold(slant)) {
                 return slantHolder.getPalette(slant).getPalette(y);

common/addons/command-addons/src/main/java/com/dfsek/terra/addons/commands/addons/AddonsCommandAddon.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.commands.addons;
 
-import org.incendo.cloud.CommandManager;
-import org.incendo.cloud.description.Description;
+import cloud.commandframework.ArgumentDescription;
+import cloud.commandframework.CommandManager;
 
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
@@ -30,7 +30,7 @@ public class AddonsCommandAddon implements AddonInitializer {
                 CommandManager<CommandSender> manager = event.getCommandManager();
 
                 manager.command(
-                        manager.commandBuilder("addons", Description.of("List installed Terra addons"))
+                        manager.commandBuilder("addons", ArgumentDescription.of("List installed Terra addons"))
                             .permission("terra.addons")
                             .handler(context -> {
                                 StringBuilder addons = new StringBuilder("Installed addons:\n");
@@ -41,7 +41,7 @@ public class AddonsCommandAddon implements AddonInitializer {
                                         .append('@')
                                         .append(addon.getVersion().getFormatted())
                                         .append('\n'));
-                                context.sender().sendMessage(addons.toString());
+                                context.getSender().sendMessage(addons.toString());
                             })
                     )
                     .command(
@@ -61,7 +61,7 @@ public class AddonsCommandAddon implements AddonInitializer {
                                     .append('@')
                                     .append(versions.getFormatted())
                                     .append('\n'));
-                                context.sender().sendMessage(addonInfo.toString());
+                                context.getSender().sendMessage(addonInfo.toString());
                             })
                     );
             });

common/addons/command-packs/src/main/java/com/dfsek/terra/addons/commands/packs/PacksCommandAddon.java

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

common/addons/command-profiler/src/main/java/com/dfsek/terra/addons/commands/profiler/ProfilerCommandAddon.java

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

common/addons/command-structures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.addons.commands.structure;
 
-import org.incendo.cloud.CommandManager;
-import org.incendo.cloud.component.DefaultValue;
-import org.incendo.cloud.context.CommandContext;
-import org.incendo.cloud.description.Description;
-import org.incendo.cloud.parser.standard.EnumParser;
-import org.incendo.cloud.parser.standard.LongParser;
+import cloud.commandframework.ArgumentDescription;
+import cloud.commandframework.CommandManager;
+import cloud.commandframework.arguments.standard.EnumArgument;
+import cloud.commandframework.arguments.standard.LongArgument;
+import cloud.commandframework.context.CommandContext;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
@@ -32,7 +32,7 @@ public class StructureCommandAddon implements AddonInitializer {
     private BaseAddon addon;
 
     private static Registry<Structure> getStructureRegistry(CommandContext<CommandSender> sender) {
-        return sender.sender().getEntity().orElseThrow().world().getPack().getRegistry(Structure.class);
+        return sender.getSender().getEntity().orElseThrow().world().getPack().getRegistry(Structure.class);
     }
 
     @Override
@@ -44,20 +44,24 @@ public class StructureCommandAddon implements AddonInitializer {
                 CommandManager<CommandSender> manager = event.getCommandManager();
 
                 manager.command(
-                    manager.commandBuilder("structures", Description.of("Manage or generate structures"))
+                    manager.commandBuilder("structures", ArgumentDescription.of("Manage or generate structures"))
                         .literal("generate")
-                        .optional(RegistryArgument.builder("structure",
+                        .argument(RegistryArgument.builder("structure",
                             StructureCommandAddon::getStructureRegistry,
                             TypeKey.of(Structure.class)))
-                        .optional("seed", LongParser.longParser(), DefaultValue.constant(0L))
-                        .optional("rotation", EnumParser.enumParser(Rotation.class), DefaultValue.constant(Rotation.NONE))
+                        .argument(LongArgument.optional("seed", 0))
+                        .argument(EnumArgument.optional(Rotation.class, "rotation", Rotation.NONE))
                         .handler(context -> {
                             Structure structure = context.get("structure");
-                            Entity sender = context.sender().getEntity().orElseThrow();
+                            Entity sender = context.getSender().getEntity().orElseThrow();
                             structure.generate(
                                 sender.position().toInt(),
                                 sender.world(),
-                                ((Long) context.get("seed") == 0) ? new Random() : new Random(context.get("seed")),
+                                ((Long) context.get("seed") == 0)
+                                ? RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus")
+                                    .create()
+                                : RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus")
+                                    .create(context.get("seed")),
                                 context.get("rotation")
                             );
                         })

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

@@ -1,6 +1,7 @@
 package com.dfsek.terra.addons.feature.distributor.distributors;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.api.structure.feature.Distributor;
 import com.dfsek.terra.api.util.MathUtil;
@@ -24,7 +25,8 @@ public class PaddedGridDistributor implements Distributor {
         int cellX = Math.floorDiv(x, cellWidth);
         int cellZ = Math.floorDiv(z, cellWidth);
 
-        Random random = new Random((MathUtil.murmur64(MathUtil.squash(cellX, cellZ)) ^ seed) + salt);
+        RandomGenerator random = RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus").create(
+            (MathUtil.murmur64(MathUtil.squash(cellX, cellZ)) ^ seed) + salt);
 
         int pointX = random.nextInt(width) + cellX * cellWidth;
         int pointZ = random.nextInt(width) + cellZ * cellWidth;

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java

@@ -10,7 +10,8 @@ package com.dfsek.terra.addons.flora.flora.gen;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.state.properties.enums.Direction;
@@ -71,7 +72,7 @@ public class TerraFlora implements Structure {
     }
 
     @Override
-    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
+    public boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation) {
         boolean doRotation = testRotation.size() > 0;
         int size = layers.size();
         int c = ceiling ? -1 : 1;
@@ -86,7 +87,9 @@ public class TerraFlora implements Structure {
                 location.getZ(), world.getSeed());
             if(doRotation) {
                 Direction oneFace = new ArrayList<>(faces).get(
-                    new Random(location.getX() ^ location.getZ()).nextInt(faces.size())); // Get random face.
+                    RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus")
+                        .create(location.getX() ^ location.getZ())
+                        .nextInt(faces.size())); // Get RandomGenerator face.
             }
             world.setBlockState(location.mutable().add(0, i + c, 0).immutable(), data, physics);
         }

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/GaussianRandomLocator.java

@@ -7,7 +7,8 @@
 
 package com.dfsek.terra.addons.feature.locator.locators;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
@@ -40,7 +41,7 @@ public class GaussianRandomLocator implements Locator {
         seed = 31 * seed + column.getZ();
         seed += salt;
 
-        Random r = new Random(seed);
+        RandomGenerator r = RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus").create(seed);
 
         int size = points.get(r);
 

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java

@@ -7,7 +7,8 @@
 
 package com.dfsek.terra.addons.feature.locator.locators;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
@@ -36,7 +37,7 @@ public class RandomLocator implements Locator {
         seed = 31 * seed + column.getZ();
         seed += salt;
 
-        Random r = new Random(seed);
+        RandomGenerator r = RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus").create(seed);
 
         int size = points.get(r);
 

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

@@ -9,17 +9,44 @@ 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.*;
-import com.dfsek.terra.addons.noise.config.templates.noise.*;
+import com.dfsek.terra.addons.noise.config.templates.BinaryArithmeticTemplate;
+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.SimpleNoiseTemplate;
 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.*;
+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.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.math.CubicSpline;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.*;
+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.noise.CellularSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.DistanceSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.GaussianNoiseSampler;
@@ -40,10 +67,6 @@ 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<>() {

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

@@ -8,16 +8,15 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-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;
 
+import com.dfsek.terra.addons.noise.samplers.ImageSampler;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
+
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })
 public class ImageSamplerTemplate extends SamplerTemplate<ImageSampler> {

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

@@ -11,8 +11,6 @@ import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
 import com.dfsek.terra.addons.noise.paralithic.defined.UserDefinedFunction;
 import com.dfsek.terra.addons.noise.paralithic.noise.NoiseFunction2;
 import com.dfsek.terra.addons.noise.paralithic.noise.NoiseFunction3;
-import com.dfsek.terra.addons.noise.paralithic.noise.SaltedNoiseFunction2;
-import com.dfsek.terra.addons.noise.paralithic.noise.SaltedNoiseFunction3;
 
 
 public class FunctionUtil {
@@ -25,15 +23,10 @@ public class FunctionUtil {
         for(Map.Entry<String, FunctionTemplate> entry : functions.entrySet()) {
             functionMap.put(entry.getKey(), UserDefinedFunction.newInstance(entry.getValue()));
         }
-        samplers.forEach((id, sampler) -> {
-            if(sampler.getDimensions() == 2) {
-                functionMap.put(id, new NoiseFunction2(sampler.getSampler()));
-                functionMap.put(id + "Salted", new SaltedNoiseFunction2(sampler.getSampler()));
-            } else {
-                functionMap.put(id, new NoiseFunction3(sampler.getSampler()));
-                functionMap.put(id + "Salted", new SaltedNoiseFunction3(sampler.getSampler()));
-            }
-        });
+        samplers.forEach((id, sampler) -> functionMap.put(id,
+            sampler.getDimensions() == 2 ?
+            new NoiseFunction2(sampler.getSampler()) :
+            new NoiseFunction3(sampler.getSampler())));
         return functionMap;
     }
 }

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

@@ -1,37 +0,0 @@
-package com.dfsek.terra.addons.noise.paralithic.noise;
-
-import com.dfsek.paralithic.functions.dynamic.Context;
-import com.dfsek.paralithic.functions.dynamic.DynamicFunction;
-import com.dfsek.paralithic.node.Statefulness;
-import org.jetbrains.annotations.NotNull;
-
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public class SaltedNoiseFunction2 implements DynamicFunction {
-    private final NoiseSampler gen;
-
-    public SaltedNoiseFunction2(NoiseSampler gen) {
-        this.gen = gen;
-    }
-
-    @Override
-    public double eval(double... args) {
-        throw new UnsupportedOperationException("Cannot evaluate seeded function without seed context.");
-    }
-
-    @Override
-    public double eval(Context context, double... args) {
-        return gen.noise(((SeedContext) context).getSeed() + (long) args[2], args[0], args[1]);
-    }
-
-    @Override
-    public int getArgNumber() {
-        return 3;
-    }
-
-    @Override
-    public @NotNull Statefulness statefulness() {
-        return Statefulness.CONTEXTUAL;
-    }
-}

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

@@ -1,37 +0,0 @@
-package com.dfsek.terra.addons.noise.paralithic.noise;
-
-import com.dfsek.paralithic.functions.dynamic.Context;
-import com.dfsek.paralithic.functions.dynamic.DynamicFunction;
-import com.dfsek.paralithic.node.Statefulness;
-import org.jetbrains.annotations.NotNull;
-
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public class SaltedNoiseFunction3 implements DynamicFunction {
-    private final NoiseSampler gen;
-
-    public SaltedNoiseFunction3(NoiseSampler gen) {
-        this.gen = gen;
-    }
-
-    @Override
-    public double eval(double... args) {
-        throw new UnsupportedOperationException("Cannot evaluate seeded function without seed context.");
-    }
-
-    @Override
-    public double eval(Context context, double... args) {
-        return gen.noise(((SeedContext) context).getSeed() + (long) args[3], args[0], args[1], args[2]);
-    }
-
-    @Override
-    public int getArgNumber() {
-        return 4;
-    }
-
-    @Override
-    public @NotNull Statefulness statefulness() {
-        return Statefulness.CONTEXTUAL;
-    }
-}

common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java

@@ -9,7 +9,7 @@ package com.dfsek.terra.addons.ore.ores;
 
 import java.util.BitSet;
 import java.util.Map;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.block.state.BlockState;
@@ -44,7 +44,7 @@ public class VanillaOre implements Structure {
     }
 
     @Override
-    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
+    public boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation) {
         float randomRadian = random.nextFloat() * (float) Math.PI;
         double eighthSize = size / 8.0F;
 

common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.ore.ores;
 
 import java.util.Map;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.block.state.BlockState;
@@ -24,7 +24,7 @@ public class VanillaScatteredOre extends VanillaOre {
     }
 
     @Override
-    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
+    public boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation) {
         int i = random.nextInt((int) (size + 1));
         Vector3Int.Mutable mutable = Vector3Int.zero().mutable();
 
@@ -39,7 +39,7 @@ public class VanillaScatteredOre extends VanillaOre {
         return true;
     }
 
-    private void setPos(Vector3Int.Mutable mutable, Random random, Vector3Int location, int spread) {
+    private void setPos(Vector3Int.Mutable mutable, RandomGenerator random, Vector3Int location, int spread) {
         int x = this.getSpread(random, spread);
         int y = this.getSpread(random, spread);
         int z = this.getSpread(random, spread);
@@ -48,7 +48,7 @@ public class VanillaScatteredOre extends VanillaOre {
         mutable.setZ(location.getZ() + z);
     }
 
-    private int getSpread(Random random, int spread) {
+    private int getSpread(RandomGenerator random, int spread) {
         return Math.round((random.nextFloat() - random.nextFloat()) * (float) spread);
     }
 }

common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/utils/VanillaOreUtils.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.addons.ore.utils;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.util.collection.MaterialSet;
@@ -8,13 +8,14 @@ import com.dfsek.terra.api.world.WritableWorld;
 
 
 public class VanillaOreUtils {
-    private static boolean shouldExpose(Random random, double exposedChance) {
+    private static boolean shouldExpose(RandomGenerator random, double exposedChance) {
         if(exposedChance >= 1.0F) return true;
         if(exposedChance <= 0.0F) return false;
         return random.nextFloat() < exposedChance;
     }
 
-    public static boolean shouldPlace(MaterialSet replaceable, BlockType type, Double exposedChance, Random random, WritableWorld world,
+    public static boolean shouldPlace(MaterialSet replaceable, BlockType type, Double exposedChance, RandomGenerator random,
+                                      WritableWorld world,
                                       int x,
                                       int y, int z) {
         if(!replaceable.contains(type)) return false;

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java

@@ -12,7 +12,7 @@ import org.json.simple.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.addons.structure.structures.loot.functions.AmountFunction;
 import com.dfsek.terra.addons.structure.structures.loot.functions.DamageFunction;
@@ -85,11 +85,11 @@ public class Entry {
     /**
      * Fetches a single ItemStack from the Entry, applying all functions to it.
      *
-     * @param r The Random instance to apply functions with
+     * @param r The RandomGenerator instance to apply functions with
      *
      * @return ItemStack - The ItemStack with all functions applied.
      */
-    public ItemStack getItem(Random r) {
+    public ItemStack getItem(RandomGenerator r) {
         ItemStack item = this.item.newItemStack(1);
         for(LootFunction f : functions) {
             item = f.apply(item, r);

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/LootTableImpl.java

@@ -14,7 +14,7 @@ import org.json.simple.parser.ParseException;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.inventory.Inventory;
@@ -44,7 +44,7 @@ public class LootTableImpl implements com.dfsek.terra.api.structure.LootTable {
     }
 
     @Override
-    public void fillInventory(Inventory i, Random r) {
+    public void fillInventory(Inventory i, RandomGenerator r) {
         List<ItemStack> loot = getLoot(r);
         for(ItemStack stack : loot) {
             int attempts = 0;
@@ -70,7 +70,7 @@ public class LootTableImpl implements com.dfsek.terra.api.structure.LootTable {
     }
 
     @Override
-    public List<ItemStack> getLoot(Random r) {
+    public List<ItemStack> getLoot(RandomGenerator r) {
         List<ItemStack> itemList = new ArrayList<>();
         for(Pool pool : pools) {
             itemList.addAll(pool.getItems(r));

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Pool.java

@@ -12,7 +12,7 @@ import org.json.simple.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.inventory.ItemStack;
@@ -50,13 +50,13 @@ public class Pool {
     }
 
     /**
-     * Fetches a list of items from the pool using the provided Random instance.
+     * Fetches a list of items from the pool using the provided RandomGenerator instance.
      *
-     * @param r The Random instance to use.
+     * @param r The RandomGenerator instance to use.
      *
      * @return List<ItemStack> - The list of items fetched.
      */
-    public List<ItemStack> getItems(Random r) {
+    public List<ItemStack> getItems(RandomGenerator r) {
 
         int rolls = r.nextInt(max - min + 1) + min;
         List<ItemStack> items = new ArrayList<>();

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/AmountFunction.java

@@ -8,7 +8,7 @@
 package com.dfsek.terra.addons.structure.structures.loot.functions;
 
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.inventory.ItemStack;
 
@@ -35,12 +35,12 @@ public class AmountFunction implements LootFunction {
      * Applies the function to an ItemStack.
      *
      * @param original The ItemStack on which to apply the function.
-     * @param r        The Random instance to use.
+     * @param r        The RandomGenerator instance to use.
      *
      * @return - ItemStack - The mutated ItemStack.
      */
     @Override
-    public ItemStack apply(ItemStack original, Random r) {
+    public ItemStack apply(ItemStack original, RandomGenerator r) {
         original.setAmount(r.nextInt(max - min + 1) + min);
         return original;
     }

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/DamageFunction.java

@@ -7,7 +7,7 @@
 
 package com.dfsek.terra.addons.structure.structures.loot.functions;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.inventory.ItemStack;
 import com.dfsek.terra.api.inventory.item.Damageable;
@@ -36,12 +36,12 @@ public class DamageFunction implements LootFunction {
      * Applies the function to an ItemStack.
      *
      * @param original The ItemStack on which to apply the function.
-     * @param r        The Random instance to use.
+     * @param r        The RandomGenerator instance to use.
      *
      * @return - ItemStack - The mutated ItemStack.
      */
     @Override
-    public ItemStack apply(ItemStack original, Random r) {
+    public ItemStack apply(ItemStack original, RandomGenerator r) {
         if(original == null) return null;
         if(!original.isDamageable()) return original;
         ItemMeta meta = original.getItemMeta();

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java

@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.inventory.ItemStack;
@@ -41,12 +41,12 @@ public class EnchantFunction implements LootFunction {
      * Applies the function to an ItemStack.
      *
      * @param original The ItemStack on which to apply the function.
-     * @param r        The Random instance to use.
+     * @param r        The RandomGenerator instance to use.
      *
      * @return - ItemStack - The mutated ItemStack.
      */
     @Override
-    public ItemStack apply(ItemStack original, Random r) {
+    public ItemStack apply(ItemStack original, RandomGenerator r) {
         if(original.getItemMeta() == null) return original;
 
         double enchant = (r.nextDouble() * (max - min)) + min;

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/LootFunction.java

@@ -8,7 +8,7 @@
 package com.dfsek.terra.addons.structure.structures.loot.functions;
 
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.inventory.ItemStack;
 
@@ -21,9 +21,9 @@ public interface LootFunction {
      * Applies the function to an ItemStack.
      *
      * @param original The ItemStack on which to apply the function.
-     * @param r        The Random instance to use.
+     * @param r        The RandomGenerator instance to use.
      *
      * @return - ItemStack - The mutated ItemStack.
      */
-    ItemStack apply(ItemStack original, Random r);
+    ItemStack apply(ItemStack original, RandomGenerator r);
 }

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

@@ -8,11 +8,11 @@
 package com.dfsek.terra.addons.generation.feature;
 
 import java.util.Collections;
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.addons.generation.feature.config.BiomeFeatures;
 import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.properties.PropertyKey;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.Rotation;
@@ -32,20 +32,13 @@ public class FeatureGenerationStage implements GenerationStage, StringIdentifiab
 
     private final int resolution;
     private final PropertyKey<BiomeFeatures> biomeFeaturesKey;
-    private final NoiseSampler blendSampler;
-    private final boolean doBlending;
-    private final double blendAmplitude;
 
-    public FeatureGenerationStage(Platform platform, String id, int resolution, PropertyKey<BiomeFeatures> biomeFeaturesKey,
-                                  NoiseSampler blendSampler, double blendAmplitude) {
+    public FeatureGenerationStage(Platform platform, String id, int resolution, PropertyKey<BiomeFeatures> biomeFeaturesKey) {
         this.platform = platform;
         this.id = id;
         this.profile = "feature_stage:" + id;
         this.resolution = resolution;
         this.biomeFeaturesKey = biomeFeaturesKey;
-        this.blendSampler = blendSampler;
-        this.doBlending = blendAmplitude != 0d;
-        this.blendAmplitude = blendAmplitude;
     }
 
     @Override
@@ -60,10 +53,7 @@ public class FeatureGenerationStage implements GenerationStage, StringIdentifiab
                 int tx = cx + chunkX;
                 int tz = cz + chunkZ;
                 world.getBiomeProvider()
-                    .getColumn(
-                        tx + (doBlending ? (int) (blendSampler.noise(seed, tx, tz) * blendAmplitude) : 0),
-                        tz + (doBlending ? (int) (blendSampler.noise(seed + 1, tx, tz) * blendAmplitude) : 0),
-                        world)
+                    .getColumn(tx, tz, world)
                     .forRanges(resolution, (min, max, biome) -> {
                         for(int subChunkX = 0; subChunkX < resolution; subChunkX++) {
                             for(int subChunkZ = 0; subChunkZ < resolution; subChunkZ++) {
@@ -83,7 +73,9 @@ public class FeatureGenerationStage implements GenerationStage, StringIdentifiab
                                                 .forEach(y -> feature.getStructure(world, x, y, z)
                                                     .generate(Vector3Int.of(x, y, z),
                                                         world,
-                                                        new Random(coordinateSeed * 31 + y),
+                                                        RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of(
+                                                                "Xoroshiro128PlusPlus")
+                                                            .create(coordinateSeed * 31 + y),
                                                         Rotation.NONE)
                                                 );
                                         }

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

@@ -8,7 +8,6 @@ import com.dfsek.tectonic.api.exception.ValidationException;
 
 import com.dfsek.terra.addons.generation.feature.FeatureGenerationStage;
 import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.properties.PropertyKey;
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 
@@ -23,24 +22,6 @@ public class FeatureStageTemplate implements ObjectTemplate<GenerationStage>, Va
     @Default
     private int resolution = 4;
 
-    @Value("blend.sampler")
-    @Default
-    private NoiseSampler blendSampler = new NoiseSampler() {
-        @Override
-        public double noise(long seed, double x, double y) {
-            return 0;
-        }
-
-        @Override
-        public double noise(long seed, double x, double y, double z) {
-            return 0;
-        }
-    };
-
-    @Value("blend.amplitude")
-    @Default
-    private double blendAmplitude = 0d;
-
     public FeatureStageTemplate(Platform platform, PropertyKey<BiomeFeatures> biomeFeaturesKey) {
         this.platform = platform;
         this.biomeFeaturesKey = biomeFeaturesKey;
@@ -49,7 +30,7 @@ public class FeatureStageTemplate implements ObjectTemplate<GenerationStage>, Va
 
     @Override
     public FeatureGenerationStage get() {
-        return new FeatureGenerationStage(platform, id, resolution, biomeFeaturesKey, blendSampler, blendAmplitude);
+        return new FeatureGenerationStage(platform, id, resolution, biomeFeaturesKey);
     }
 
     @Override

common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java

@@ -11,12 +11,16 @@ import com.dfsek.tectonic.yaml.YamlConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.nio.file.Files;
+
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.event.events.config.ConfigurationDiscoveryEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.util.FileUtil;
 
 
 public class YamlAddon implements AddonInitializer {
@@ -33,10 +37,21 @@ public class YamlAddon implements AddonInitializer {
         platform.getEventManager()
             .getHandler(FunctionalEventHandler.class)
             .register(addon, ConfigurationDiscoveryEvent.class)
-            .then(event -> event.getLoader().open("", ".yml").thenEntries(entries -> entries.forEach(entry -> {
-                LOGGER.debug("Discovered config {}", entry.getKey());
-                event.register(entry.getKey(), new YamlConfiguration(entry.getValue(), entry.getKey()));
-            })).close())
+            .then(event -> {
+                try {
+                    FileUtil.filesWithExtension(event.getPack().getRootPath(), ".yml")
+                        .forEach((key, value) -> {
+                            LOGGER.debug("Discovered config {}", key);
+                            try {
+                                event.register(key, new YamlConfiguration(Files.newInputStream(value), key));
+                            } catch(IOException e) {
+                                throw new RuntimeException("Failed to load config " + key, e);
+                            }
+                        });
+                } catch(IOException e) {
+                    throw new RuntimeException("Error occurred while reading config pack files", e);
+                }
+            })
             .failThrough();
     }
 }

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java

@@ -60,8 +60,8 @@ public class ImageLibraryAddon implements AddonInitializer {
             .then(event -> {
                 ConfigPack pack = event.getPack();
                 CheckedRegistry<Supplier<ObjectTemplate<Image>>> imageRegistry = pack.getOrCreateRegistry(IMAGE_REGISTRY_KEY);
-                imageRegistry.register(addon.key("BITMAP"), () -> new ImageTemplate(pack.getLoader(), pack));
-                imageRegistry.register(addon.key("STITCHED_BITMAP"), () -> new StitchedImageTemplate(pack.getLoader(), pack));
+                imageRegistry.register(addon.key("BITMAP"), () -> new ImageTemplate(pack));
+                imageRegistry.register(addon.key("STITCHED_BITMAP"), () -> new StitchedImageTemplate(pack));
             })
             .then(event -> {
                 event.getPack()

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java

@@ -4,8 +4,10 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 
 import javax.imageio.ImageIO;
-import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
 
 import com.dfsek.terra.addons.image.config.ImageLibraryPackConfigTemplate;
@@ -13,7 +15,6 @@ import com.dfsek.terra.addons.image.image.BufferedImageWrapper;
 import com.dfsek.terra.addons.image.image.Image;
 import com.dfsek.terra.addons.image.image.SuppliedImage;
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.Loader;
 import com.dfsek.terra.api.properties.Properties;
 import com.dfsek.terra.api.util.generic.Lazy;
 
@@ -22,13 +23,13 @@ import com.dfsek.terra.api.util.generic.Lazy;
  * Cache prevents configs from loading the same image multiple times into memory
  */
 record ImageCache(LoadingCache<String, Image> cache) implements Properties {
-    public static Image load(String path, ConfigPack pack, Loader files) throws IOException {
+    public static Image load(String path, ConfigPack pack) throws IOException {
         ImageLibraryPackConfigTemplate config = pack.getContext().get(ImageLibraryPackConfigTemplate.class);
         ImageCache images;
         if(!pack.getContext().has(ImageCache.class)) {
             var cacheBuilder = Caffeine.newBuilder();
             if(config.unloadOnTimeout()) cacheBuilder.expireAfterAccess(config.getCacheTimeout(), TimeUnit.SECONDS);
-            images = new ImageCache(cacheBuilder.build(s -> loadImage(s, files)));
+            images = new ImageCache(cacheBuilder.build(s -> loadImage(s, pack.getRootPath())));
             pack.getContext().put(images);
         } else images = pack.getContext().get(ImageCache.class);
 
@@ -45,17 +46,8 @@ record ImageCache(LoadingCache<String, Image> cache) implements Properties {
         return images.cache.get(path);
     }
 
-    private static Image loadImage(String path, Loader files) throws IOException {
-        try {
-            return new BufferedImageWrapper(ImageIO.read(files.get(path)));
-        } catch(IllegalArgumentException e) {
-            throw new IllegalArgumentException("Unable to load image (image might be too large?)", e);
-        } catch(IOException e) {
-            if(e instanceof FileNotFoundException) {
-                // Rethrow using nicer message
-                throw new IOException("Unable to load image: No such file or directory: " + path, e);
-            }
-            throw new IOException("Unable to load image", e);
-        }
+    private static Image loadImage(String path, Path directory) throws IOException {
+        InputStream is = Files.newInputStream(directory.resolve(path));
+        return new BufferedImageWrapper(ImageIO.read(is));
     }
 }

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageTemplate.java

@@ -7,25 +7,22 @@ import java.io.IOException;
 
 import com.dfsek.terra.addons.image.image.Image;
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.Loader;
 
 
 public class ImageTemplate implements ObjectTemplate<Image> {
 
-    private final Loader files;
     private final ConfigPack pack;
     @Value("path")
     private String path;
 
-    public ImageTemplate(Loader files, ConfigPack pack) {
-        this.files = files;
+    public ImageTemplate(ConfigPack pack) {
         this.pack = pack;
     }
 
     @Override
     public Image get() {
         try {
-            return ImageCache.load(path, pack, files);
+            return ImageCache.load(path, pack);
         } catch(IOException e) {
             throw new RuntimeException(e);
         }

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/StitchedImageTemplate.java

@@ -11,12 +11,10 @@ import java.io.IOException;
 import com.dfsek.terra.addons.image.image.Image;
 import com.dfsek.terra.addons.image.image.StitchedImage;
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.Loader;
 
 
 public class StitchedImageTemplate implements ObjectTemplate<Image>, ValidatedConfigTemplate {
 
-    private final Loader files;
     private final ConfigPack pack;
     @Value("path-format")
     private String path;
@@ -28,8 +26,7 @@ public class StitchedImageTemplate implements ObjectTemplate<Image>, ValidatedCo
     @Default
     private boolean zeroIndexed = false;
 
-    public StitchedImageTemplate(Loader files, ConfigPack pack) {
-        this.files = files;
+    public StitchedImageTemplate(ConfigPack pack) {
         this.pack = pack;
     }
 
@@ -39,7 +36,7 @@ public class StitchedImageTemplate implements ObjectTemplate<Image>, ValidatedCo
         for(int i = 0; i < rows; i++) {
             for(int j = 0; j < cols; j++) {
                 try {
-                    grid[i][j] = ImageCache.load(getFormattedPath(i, j), pack, files);
+                    grid[i][j] = ImageCache.load(getFormattedPath(i, j), pack);
                 } catch(IOException e) {
                     throw new RuntimeException(e);
                 }

common/addons/structure-block-shortcut/src/main/java/com/dfsek/terra/addons/palette/shortcut/block/SingletonStructure.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.addons.palette.shortcut.block;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structure.Structure;
@@ -17,7 +17,7 @@ public class SingletonStructure implements Structure {
     }
 
     @Override
-    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
+    public boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation) {
         world.setBlockState(location, blockState);
         return true;
     }

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

@@ -1,7 +1,5 @@
 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;
@@ -11,6 +9,8 @@ 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.RandomGenerator;
+
 
 public class MutatedStructure implements Structure, Keyed<MutatedStructure> {
     private final RegistryKey key;
@@ -32,7 +32,7 @@ public class MutatedStructure implements Structure, Keyed<MutatedStructure> {
     }
 
     @Override
-    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
+    public boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation) {
         return base.generate(location,
             world
                 .buffer()

common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java

@@ -16,6 +16,7 @@ import net.querz.nbt.tag.Tag;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PushbackInputStream;
+import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.zip.GZIPInputStream;
@@ -29,7 +30,7 @@ import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.terra.api.util.StringUtil;
+import com.dfsek.terra.api.util.FileUtil;
 import com.dfsek.terra.api.util.vector.Vector3Int;
 
 
@@ -58,13 +59,21 @@ public class SpongeSchematicAddon implements AddonInitializer {
             .register(addon, ConfigPackPreLoadEvent.class)
             .then(event -> {
                 CheckedRegistry<Structure> structureRegistry = event.getPack().getOrCreateRegistry(Structure.class);
-                event.getPack()
-                    .getLoader()
-                    .open("", ".schem")
-                    .thenEntries(entries -> entries
+                try {
+                    FileUtil.filesWithExtension(event.getPack().getRootPath(), ".schem")
+                        .entrySet()
                         .stream()
-                        .map(entry -> convert(entry.getValue(), StringUtil.fileName(entry.getKey())))
-                        .forEach(structureRegistry::register)).close();
+                        .map(entry -> {
+                            try {
+                                return convert(Files.newInputStream(entry.getValue()), FileUtil.fileName(entry.getKey()));
+                            } catch(IOException e) {
+                                throw new RuntimeException("Failed to load config " + entry.getKey(), e);
+                            }
+                        })
+                        .forEach(structureRegistry::register);
+                } catch(IOException e) {
+                    throw new RuntimeException("Error occurred while reading config pack files", e);
+                }
             })
             .failThrough();
     }

common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java

@@ -7,7 +7,7 @@
 
 package com.dfsek.terra.addons.sponge;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.registry.key.Keyed;
@@ -36,7 +36,7 @@ public class SpongeStructure implements Structure, Keyed<SpongeStructure> {
     }
 
     @Override
-    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
+    public boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation) {
         int bX = location.getX();
         int bY = location.getY();
         int bZ = location.getZ();

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

@@ -7,6 +7,9 @@
 
 package com.dfsek.terra.addons.terrascript;
 
+import java.io.IOException;
+import java.nio.file.Files;
+
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
@@ -19,7 +22,7 @@ import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.structure.LootTable;
 import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.terra.api.util.StringUtil;
+import com.dfsek.terra.api.util.FileUtil;
 
 
 public class TerraScriptAddon implements AddonInitializer {
@@ -37,26 +40,28 @@ public class TerraScriptAddon implements AddonInitializer {
             .then(event -> {
                 CheckedRegistry<Structure> structureRegistry = event.getPack().getOrCreateRegistry(Structure.class);
                 CheckedRegistry<LootTable> lootRegistry = event.getPack().getOrCreateRegistry(LootTable.class);
-                event.getPack().getLoader().open("", ".tesf").thenEntries(
-                        entries ->
-                            entries.stream()
-                                .parallel()
-                                .map(entry -> {
-                                    try {
-                                        String id = StringUtil.fileName(entry.getKey());
-                                        return new StructureScript(entry.getValue(),
-                                            addon.key(id),
-                                            platform,
-                                            structureRegistry,
-                                            lootRegistry,
-                                            event.getPack().getOrCreateRegistry(FunctionBuilder.class));
-                                    } catch(ParseException e) {
-                                        throw new RuntimeException("Failed to load script \"" + entry.getKey() + "\"", e);
-                                    }
-                                })
-                                .toList()
-                                .forEach(structureRegistry::register))
-                    .close();
+                try {
+                    FileUtil.filesWithExtension(event.getPack().getRootPath(), ".tesf")
+                        .entrySet()
+                        .stream()
+                        .parallel()
+                        .map(entry -> {
+                            try {
+                                String id = FileUtil.fileName(entry.getKey());
+                                return new StructureScript(Files.newInputStream(entry.getValue()),
+                                    addon.key(id),
+                                    platform,
+                                    structureRegistry,
+                                    lootRegistry,
+                                    event.getPack().getOrCreateRegistry(FunctionBuilder.class));
+                            } catch(ParseException | IOException e) {
+                                throw new RuntimeException("Failed to load script \"" + entry.getKey() + "\"", e);
+                            }
+                        })
+                        .forEach(structureRegistry::register);
+                } catch(IOException e) {
+                    throw new RuntimeException("Error occurred while reading config pack files", e);
+                }
             })
             .priority(100)
             .failThrough();

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/StructureScript.java

@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.addons.terrascript.parser.Parser;
 import com.dfsek.terra.addons.terrascript.parser.lang.Executable;
@@ -131,14 +131,14 @@ public class StructureScript implements Structure, Keyed<StructureScript> {
 
     @Override
     @SuppressWarnings("try")
-    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
+    public boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation) {
         platform.getProfiler().push(profile);
         boolean result = applyBlock(new TerraImplementationArguments(location, rotation, random, world, 0));
         platform.getProfiler().pop(profile);
         return result;
     }
 
-    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation, int recursions) {
+    public boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation, int recursions) {
         platform.getProfiler().push(profile);
         boolean result = applyBlock(new TerraImplementationArguments(location, rotation, random, world, recursions));
         platform.getProfiler().pop(profile);

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

@@ -9,7 +9,7 @@ package com.dfsek.terra.addons.terrascript.script;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.util.Rotation;
@@ -20,14 +20,14 @@ import com.dfsek.terra.api.world.WritableWorld;
 
 public class TerraImplementationArguments implements ImplementationArguments {
     private final Rotation rotation;
-    private final Random random;
+    private final RandomGenerator random;
     private final WritableWorld world;
     private final Map<Vector3, String> marks = new HashMap<>();
     private final int recursions;
     private final Vector3Int origin;
     private boolean waterlog = false;
 
-    public TerraImplementationArguments(Vector3Int origin, Rotation rotation, Random random, WritableWorld world, int recursions) {
+    public TerraImplementationArguments(Vector3Int origin, Rotation rotation, RandomGenerator random, WritableWorld world, int recursions) {
         this.rotation = rotation;
         this.random = random;
         this.world = world;
@@ -39,7 +39,7 @@ public class TerraImplementationArguments implements ImplementationArguments {
         return recursions;
     }
 
-    public Random getRandom() {
+    public RandomGenerator getRandom() {
         return random;
     }
 

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

@@ -10,7 +10,8 @@ package com.dfsek.terra.addons.terrascript.script.functions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
@@ -84,7 +85,8 @@ public class LootFunction implements Function<Void> {
                         if(event.isCancelled()) return;
 
                         event.getTable().fillInventory(container.getInventory(),
-                            new Random(apply.hashCode()));
+                            RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of(
+                                "Xoroshiro128PlusPlus").create(apply.hashCode()));
                         data.update(false);
                     } catch(Exception e) {
                         LOGGER.error("Could not apply loot at {}", apply, e);

common/api/build.gradle.kts

@@ -2,7 +2,7 @@ dependencies {
     api("ca.solo-studios", "strata", Versions.Libraries.strata)
     compileOnlyApi("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
     testImplementation("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
-    api("org.incendo", "cloud-core", Versions.Libraries.cloud)
+    api("cloud.commandframework", "cloud-core", Versions.Libraries.cloud)
 
     api("com.dfsek.tectonic", "common", Versions.Libraries.tectonic)
 

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

@@ -14,6 +14,7 @@ import java.io.File;
 
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.config.MetaPack;
 import com.dfsek.terra.api.config.PluginConfig;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.handle.ItemHandle;
@@ -61,6 +62,10 @@ public interface Platform extends LoaderRegistrar {
     @Contract(pure = true)
     CheckedRegistry<ConfigPack> getConfigRegistry();
 
+    @NotNull
+    @Contract(pure = true)
+    CheckedRegistry<MetaPack> getMetaConfigRegistry();
+
     @NotNull
     @Contract(pure = true)
     Registry<BaseAddon> getAddons();

common/api/src/main/java/com/dfsek/terra/api/command/arguments/RegistryArgument.java

@@ -1,19 +1,18 @@
 package com.dfsek.terra.api.command.arguments;
 
+import cloud.commandframework.ArgumentDescription;
+import cloud.commandframework.arguments.CommandArgument;
+import cloud.commandframework.arguments.parser.ArgumentParseResult;
+import cloud.commandframework.arguments.parser.ArgumentParser;
+import cloud.commandframework.context.CommandContext;
 import io.leangen.geantyref.TypeToken;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.incendo.cloud.component.CommandComponent;
-import org.incendo.cloud.component.DefaultValue;
-import org.incendo.cloud.context.CommandContext;
-import org.incendo.cloud.context.CommandInput;
-import org.incendo.cloud.parser.ArgumentParseResult;
-import org.incendo.cloud.parser.ArgumentParser;
-import org.incendo.cloud.parser.ParserDescriptor;
-import org.incendo.cloud.suggestion.Suggestion;
-import org.incendo.cloud.suggestion.SuggestionProvider;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
+import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
+import java.util.Queue;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -23,22 +22,39 @@ import com.dfsek.terra.api.registry.key.RegistryKey;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
 
-public class RegistryArgument {
+public class RegistryArgument<T, R> extends CommandArgument<T, R> {
+    private RegistryArgument(
+        boolean required,
+        @NonNull String name,
+        Function<CommandContext<T>, Registry<R>> registryFunction,
+        TypeToken<R> typeToken,
+        @NonNull String defaultValue,
+        @Nullable BiFunction<CommandContext<T>, String, List<String>> suggestionsProvider,
+        @NonNull ArgumentDescription description
+    ) {
+        super(required,
+            name,
+            new RegistryArgumentParser<>(registryFunction),
+            defaultValue,
+            typeToken,
+            suggestionsProvider,
+            description);
+    }
 
     public static <T, R> Builder<T, R> builder(String name, Registry<R> registry) {
         return new Builder<>(name, registry);
     }
 
-    public static <T, R> CommandComponent<T> of(String name, Registry<R> registry) {
+    public static <T, R> CommandArgument<T, R> of(String name, Registry<R> registry) {
         return RegistryArgument.<T, R>builder(name, registry).build();
     }
 
-    public static <T, R> CommandComponent<T> optional(String name, Registry<R> registry) {
-        return RegistryArgument.<T, R>builder(name, registry).optional().build();
+    public static <T, R> CommandArgument<T, R> optional(String name, Registry<R> registry) {
+        return RegistryArgument.<T, R>builder(name, registry).asOptional().build();
     }
 
-    public static <T, R> CommandComponent<T> optional(String name, Registry<R> registry, DefaultValue<T, R> defaultKey) {
-        return RegistryArgument.<T, R>builder(name, registry).optional(defaultKey).build();
+    public static <T, R> CommandArgument<T, R> optional(String name, Registry<R> registry, String defaultKey) {
+        return RegistryArgument.<T, R>builder(name, registry).asOptionalWithDefault(defaultKey).build();
     }
 
     @SuppressWarnings("unchecked")
@@ -47,36 +63,49 @@ public class RegistryArgument {
         return new Builder<>(name, registryFunction, (TypeToken<R>) TypeToken.get(registryType.getType()));
     }
 
-    public static <T, R> CommandComponent<T> of(String name, Function<CommandContext<T>, Registry<R>> registryFunction,
-                                                TypeKey<R> registryType) {
+    public static <T, R> CommandArgument<T, R> of(String name, Function<CommandContext<T>, Registry<R>> registryFunction,
+                                                  TypeKey<R> registryType) {
         return RegistryArgument.<T, R>builder(name, registryFunction, registryType).build();
     }
 
-    public static <T, R> CommandComponent<T> optional(String name, Function<CommandContext<T>, Registry<R>> registryFunction,
-                                                      TypeKey<R> registryType) {
-        return RegistryArgument.builder(name, registryFunction, registryType).optional().build();
+    public static <T, R> CommandArgument<T, R> optional(String name, Function<CommandContext<T>, Registry<R>> registryFunction,
+                                                        TypeKey<R> registryType) {
+        return RegistryArgument.builder(name, registryFunction, registryType).asOptional().build();
     }
 
-    public static <T, R> CommandComponent<T> optional(String name, Function<CommandContext<T>, Registry<R>> registryFunction,
-                                                      TypeKey<R> registryType, DefaultValue<T, R> defaultKey) {
-        return RegistryArgument.builder(name, registryFunction, registryType).optional(defaultKey).build();
+    public static <T, R> CommandArgument<T, R> optional(String name, Function<CommandContext<T>, Registry<R>> registryFunction,
+                                                        TypeKey<R> registryType, String defaultKey) {
+        return RegistryArgument.builder(name, registryFunction, registryType).asOptionalWithDefault(defaultKey).build();
     }
 
-    public static final class Builder<T, R> extends CommandComponent.Builder<T, R> {
+    public static final class Builder<T, R> extends CommandArgument.Builder<T, R> {
+        private final Function<CommandContext<T>, Registry<R>> registryFunction;
+        private final TypeToken<R> typeToken;
 
         @SuppressWarnings("unchecked")
         private Builder(@NonNull String name, Registry<R> registry) {
-            super();
-            this.name(name);
-            this.parser(ParserDescriptor.of(
-                new RegistryArgumentParser<>(commandContext -> registry),
-                (TypeToken<R>) TypeToken.get(registry.getType().getType())));
+            super((TypeToken<R>) TypeToken.get(registry.getType().getType()), name);
+            this.registryFunction = commandContext -> registry;
+            this.typeToken = (TypeToken<R>) TypeToken.get(registry.getType().getType());
         }
 
         private Builder(@NonNull String name, Function<CommandContext<T>, Registry<R>> registryFunction, TypeToken<R> typeToken) {
-            super();
-            this.name(name);
-            this.parser(ParserDescriptor.of(new RegistryArgumentParser<>(registryFunction), typeToken));
+            super(typeToken, name);
+            this.typeToken = typeToken;
+            this.registryFunction = registryFunction;
+        }
+
+        @Override
+        public @NonNull RegistryArgument<T, R> build() {
+            return new RegistryArgument<>(
+                isRequired(),
+                getName(),
+                registryFunction,
+                typeToken,
+                getDefaultValue(),
+                getSuggestionsProvider(),
+                getDefaultDescription()
+            );
         }
     }
 
@@ -90,12 +119,12 @@ public class RegistryArgument {
 
         @Override
         public @NonNull ArgumentParseResult<@NonNull R> parse(@NonNull CommandContext<@NonNull T> commandContext,
-                                                              @NonNull CommandInput commandInput) {
-            String input = commandInput.readString();
-            String next = commandInput.peekString();
-            if(next.equals(":")) {
-                input += commandInput.readString();
-                input += commandInput.readString();
+                                                              @NonNull Queue<@NonNull String> inputQueue) {
+            String input = inputQueue.remove();
+            String next = inputQueue.peek();
+            if(next != null && next.equals(":")) {
+                input += inputQueue.remove();
+                input += inputQueue.remove();
             }
 
             Registry<R> registry = registryFunction.apply(commandContext);
@@ -117,17 +146,8 @@ public class RegistryArgument {
         }
 
         @Override
-        public @NonNull SuggestionProvider<T> suggestionProvider() {
-            return new SuggestionProvider<>() {
-                @Override
-                public @NonNull CompletableFuture<? extends @NonNull Iterable<? extends @NonNull Suggestion>> suggestionsFuture(
-                    @NonNull CommandContext<T> context, @NonNull CommandInput input) {
-
-                    // TODO: Verify whether this is correct
-                    return CompletableFuture.completedFuture(registryFunction.apply(context).keys().stream().map(
-                        registryKey -> Suggestion.suggestion(registryKey.toString())).sorted().collect(Collectors.toList()));
-                }
-            };
+        public @NonNull List<@NonNull String> suggestions(@NonNull CommandContext<T> commandContext, @NonNull String input) {
+            return registryFunction.apply(commandContext).keys().stream().map(RegistryKey::toString).sorted().collect(Collectors.toList());
         }
     }
 }

common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java

@@ -10,6 +10,7 @@ package com.dfsek.terra.api.config;
 import ca.solostudios.strata.version.Version;
 import ca.solostudios.strata.version.VersionRange;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 
@@ -43,7 +44,7 @@ public interface ConfigPack extends LoaderRegistrar,
 
     List<GenerationStage> getStages();
 
-    Loader getLoader();
+    Path getRootPath();
 
     String getAuthor();
 

common/api/src/main/java/com/dfsek/terra/api/config/Loader.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2020-2023 Polyhedral Development
- *
- * The Terra API is licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in the common/api directory.
- */
-
-package com.dfsek.terra.api.config;
-
-import com.dfsek.tectonic.api.exception.ConfigException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
-
-
-public interface Loader {
-
-    Loader thenNames(Consumer<List<String>> consumer) throws ConfigException;
-
-    Loader thenEntries(Consumer<Set<Map.Entry<String, InputStream>>> consumer) throws ConfigException;
-
-    /**
-     * Get a single file from this Loader.
-     *
-     * @param singleFile File to get
-     *
-     * @return InputStream from file.
-     */
-    InputStream get(String singleFile) throws IOException;
-
-    /**
-     * Open a subdirectory.
-     *
-     * @param directory Directory to open
-     * @param extension File extension
-     */
-    Loader open(String directory, String extension);
-
-    /**
-     * Close all InputStreams opened.
-     */
-    Loader close();
-}

common/api/src/main/java/com/dfsek/terra/api/config/MetaPack.java

@@ -0,0 +1,27 @@
+package com.dfsek.terra.api.config;
+
+import ca.solostudios.strata.version.Version;
+
+import java.util.Map;
+
+import com.dfsek.terra.api.properties.PropertyHolder;
+import com.dfsek.terra.api.registry.key.Keyed;
+import com.dfsek.terra.api.registry.meta.CheckedRegistryHolder;
+import com.dfsek.terra.api.registry.meta.RegistryProvider;
+import com.dfsek.terra.api.tectonic.ConfigLoadingDelegate;
+import com.dfsek.terra.api.tectonic.LoaderRegistrar;
+
+
+public interface MetaPack extends LoaderRegistrar,
+                                  ConfigLoadingDelegate,
+                                  CheckedRegistryHolder,
+                                  RegistryProvider,
+                                  Keyed<MetaPack>,
+                                  PropertyHolder {
+
+    Map<String, ConfigPack> packs();
+
+    String getAuthor();
+
+    Version getVersion();
+}

common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationDiscoveryEvent.java

@@ -12,7 +12,6 @@ import com.dfsek.tectonic.api.config.Configuration;
 import java.util.function.BiConsumer;
 
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.Loader;
 import com.dfsek.terra.api.event.events.FailThroughEvent;
 import com.dfsek.terra.api.event.events.PackEvent;
 
@@ -25,13 +24,11 @@ import com.dfsek.terra.api.event.events.PackEvent;
  */
 public class ConfigurationDiscoveryEvent implements PackEvent, FailThroughEvent {
     private final ConfigPack pack;
-    private final Loader loader;
 
     private final BiConsumer<String, Configuration> consumer;
 
-    public ConfigurationDiscoveryEvent(ConfigPack pack, Loader loader, BiConsumer<String, Configuration> consumer) {
+    public ConfigurationDiscoveryEvent(ConfigPack pack, BiConsumer<String, Configuration> consumer) {
         this.pack = pack;
-        this.loader = loader;
         this.consumer = consumer;
     }
 
@@ -43,8 +40,4 @@ public class ConfigurationDiscoveryEvent implements PackEvent, FailThroughEvent
     public ConfigPack getPack() {
         return pack;
     }
-
-    public Loader getLoader() {
-        return loader;
-    }
 }

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.event.events.platform;
 
-import org.incendo.cloud.CommandManager;
+import cloud.commandframework.CommandManager;
 
 import com.dfsek.terra.api.command.CommandSender;
 import com.dfsek.terra.api.event.events.Event;

common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java

@@ -10,7 +10,7 @@ package com.dfsek.terra.api.structure;
 import org.jetbrains.annotations.ApiStatus.Experimental;
 
 import java.util.List;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.inventory.Inventory;
 import com.dfsek.terra.api.inventory.ItemStack;
@@ -22,16 +22,16 @@ public interface LootTable {
      * Fills an Inventory with loot.
      *
      * @param i The Inventory to fill.
-     * @param r The The Random instance to use.
+     * @param r The The RandomGenerator instance to use.
      */
-    void fillInventory(Inventory i, Random r);
+    void fillInventory(Inventory i, RandomGenerator r);
 
     /**
-     * Fetches a list of ItemStacks from the loot table using the given Random instance.
+     * Fetches a list of ItemStacks from the loot table using the given RandomGenerator instance.
      *
-     * @param r The Random instance to use.
+     * @param r The RandomGenerator instance to use.
      *
      * @return List<ItemStack> - The list of loot fetched.
      */
-    List<ItemStack> getLoot(Random r);
+    List<ItemStack> getLoot(RandomGenerator r);
 }

common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java

@@ -7,7 +7,7 @@
 
 package com.dfsek.terra.api.structure;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.util.Rotation;
 import com.dfsek.terra.api.util.vector.Vector3Int;
@@ -15,5 +15,5 @@ import com.dfsek.terra.api.world.WritableWorld;
 
 
 public interface Structure {
-    boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation);
+    boolean generate(Vector3Int location, WritableWorld world, RandomGenerator random, Rotation rotation);
 }

common/api/src/main/java/com/dfsek/terra/api/util/ConstantRange.java

@@ -10,7 +10,7 @@ package com.dfsek.terra.api.util;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
 
 public class ConstantRange implements Range {
@@ -36,7 +36,7 @@ public class ConstantRange implements Range {
     }
 
     @Override
-    public int get(Random r) {
+    public int get(RandomGenerator r) {
         return r.nextInt(min, max);
     }
 

common/api/src/main/java/com/dfsek/terra/api/util/FileUtil.java

@@ -0,0 +1,38 @@
+package com.dfsek.terra.api.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static java.util.function.Function.identity;
+
+
+public class FileUtil {
+    public static Map<String, Path> filesWithExtension(Path start, String... extensions) throws IOException {
+        if(Files.notExists(start) || !Files.isDirectory(start)) return Collections.emptyMap();
+        try(Stream<Path> paths = Files.walk(start)) {
+            return paths
+                .filter(Files::isRegularFile)
+                .filter(p -> Arrays.stream(extensions).anyMatch(e -> p.getFileName().toString().endsWith(e)))
+                .collect(Collectors.toMap(p -> start.relativize(p).toString(), identity()));
+        }
+    }
+
+    public static String fileName(String path) {
+        if(path.contains(File.separator)) {
+            return path.substring(path.lastIndexOf(File.separatorChar) + 1, path.lastIndexOf('.'));
+        } else if(path.contains("/")) {
+            return path.substring(path.lastIndexOf("/") + 1, path.lastIndexOf('.'));
+        } else if(path.contains(".")) {
+            return path.substring(0, path.lastIndexOf('.'));
+        } else {
+            return path;
+        }
+    }
+}

common/api/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java

@@ -7,18 +7,20 @@
 
 package com.dfsek.terra.api.util;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.api.world.chunk.Chunk;
 
 
 public final class PopulationUtil {
-    public static Random getRandom(Chunk c) {
+    public static RandomGenerator getRandom(Chunk c) {
         return getRandom(c, 0);
     }
 
-    public static Random getRandom(Chunk c, long salt) {
-        return new Random(getCarverChunkSeed(c.getX(), c.getZ(), c.getWorld().getSeed() + salt));
+    public static RandomGenerator getRandom(Chunk c, long salt) {
+        return RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus").create(
+            getCarverChunkSeed(c.getX(), c.getZ(), c.getWorld().getSeed() + salt));
     }
 
     /**
@@ -31,7 +33,7 @@ public final class PopulationUtil {
      * @return long - The carver seed.
      */
     public static long getCarverChunkSeed(int chunkX, int chunkZ, long seed) {
-        Random r = new Random(seed);
+        RandomGenerator r = RandomGeneratorFactory.<RandomGenerator.SplittableGenerator>of("Xoroshiro128PlusPlus").create(seed);
         return chunkX * r.nextLong() ^ chunkZ * r.nextLong() ^ seed;
     }
 }

common/api/src/main/java/com/dfsek/terra/api/util/Range.java

@@ -10,8 +10,8 @@ package com.dfsek.terra.api.util;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;
-import java.util.Random;
 import java.util.function.Supplier;
+import java.util.random.RandomGenerator;
 
 
 public interface Range extends Iterable<Integer> {
@@ -19,7 +19,7 @@ public interface Range extends Iterable<Integer> {
 
     Range reflect(int pt);
 
-    int get(Random r);
+    int get(RandomGenerator r);
 
     Range intersects(Range other);
 

common/api/src/main/java/com/dfsek/terra/api/util/StringUtil.java

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2020-2023 Polyhedral Development
- *
- * The Terra API is licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in the common/api directory.
- */
-
-package com.dfsek.terra.api.util;
-
-import java.io.File;
-
-
-public class StringUtil {
-    public static String fileName(String path) {
-        if(path.contains(File.separator)) {
-            return path.substring(path.lastIndexOf(File.separatorChar) + 1, path.lastIndexOf('.'));
-        } else if(path.contains("/")) {
-            return path.substring(path.lastIndexOf("/") + 1, path.lastIndexOf('.'));
-        } else if(path.contains(".")) {
-            return path.substring(0, path.lastIndexOf('.'));
-        } else {
-            return path;
-        }
-    }
-}

common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java

@@ -15,9 +15,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Random;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.MathUtil;
@@ -43,7 +43,7 @@ public class ProbabilityCollection<E> implements Collection<E> {
     }
 
     @SuppressWarnings("unchecked")
-    public E get(Random r) {
+    public E get(RandomGenerator r) {
         if(array.length == 0) return null;
         return (E) array[r.nextInt(array.length)];
     }
@@ -197,7 +197,7 @@ public class ProbabilityCollection<E> implements Collection<E> {
         }
 
         @Override
-        public T get(Random r) {
+        public T get(RandomGenerator r) {
             return single;
         }
 

common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java

@@ -8,7 +8,6 @@
 package com.dfsek.terra.api.util.reflection;
 
 import org.jetbrains.annotations.NotNull;
-import sun.misc.Unsafe;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
@@ -27,18 +26,6 @@ import java.util.stream.Stream;
 
 
 public final class ReflectionUtil {
-    private static final Unsafe UNSAFE;
-
-    static {
-        try {
-            final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
-            unsafeField.setAccessible(true);
-            UNSAFE = (Unsafe) unsafeField.get(null);
-        } catch(NoSuchFieldException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     public static Field[] getFields(@NotNull Class<?> type) {
         Field[] result = type.getDeclaredFields();
         Class<?> parentClass = type.getSuperclass();
@@ -48,14 +35,6 @@ public final class ReflectionUtil {
         return result;
     }
 
-    public static void setFinalField(Object obj, String fieldName, Object value) throws NoSuchFieldException {
-        Field field = obj.getClass().getDeclaredField(fieldName);
-        field.setAccessible(true);
-        long fieldOffset = UNSAFE.objectFieldOffset(field);
-
-        UNSAFE.putObject(obj, fieldOffset, value);
-    }
-
     public static Method[] getMethods(@NotNull Class<?> type) {
         Method[] result = type.getDeclaredMethods();
         Class<?> parentClass = type.getSuperclass();

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

@@ -51,6 +51,7 @@ import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader;
 import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.config.MetaPack;
 import com.dfsek.terra.api.config.PluginConfig;
 import com.dfsek.terra.api.event.EventManager;
 import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
@@ -72,6 +73,8 @@ import com.dfsek.terra.registry.CheckedRegistryImpl;
 import com.dfsek.terra.registry.LockedRegistryImpl;
 import com.dfsek.terra.registry.OpenRegistryImpl;
 import com.dfsek.terra.registry.master.ConfigRegistry;
+import com.dfsek.terra.registry.master.ConfigRegistry.PackLoadFailuresException;
+import com.dfsek.terra.registry.master.MetaConfigRegistry;
 
 
 /**
@@ -85,9 +88,12 @@ public abstract class AbstractPlatform implements Platform {
     private static final MutableBoolean LOADED = new MutableBoolean(false);
     private final EventManager eventManager = new EventManagerImpl();
     private final ConfigRegistry configRegistry = new ConfigRegistry();
+    private final MetaConfigRegistry metaConfigRegistry = new MetaConfigRegistry();
 
     private final CheckedRegistry<ConfigPack> checkedConfigRegistry = new CheckedRegistryImpl<>(configRegistry);
 
+    private final CheckedRegistry<MetaPack> checkedMetaConfigRegistry = new CheckedRegistryImpl<>(metaConfigRegistry);
+
     private final Profiler profiler = new ProfilerImpl();
 
     private final GenericLoaders loaders = new GenericLoaders(this);
@@ -102,6 +108,10 @@ public abstract class AbstractPlatform implements Platform {
         return configRegistry;
     }
 
+    public MetaConfigRegistry getRawMetaConfigRegistry() {
+        return metaConfigRegistry;
+    }
+
     protected Iterable<BaseAddon> platformAddon() {
         return Collections.emptySet();
     }
@@ -147,11 +157,12 @@ public abstract class AbstractPlatform implements Platform {
 
         eventManager.getHandler(FunctionalEventHandler.class)
             .register(internalAddon, PlatformInitializationEvent.class)
-            .then(event -> {
-                logger.info("Loading config packs...");
-                configRegistry.loadAll(this);
-                logger.info("Loaded packs.");
-            })
+            .then(event -> loadConfigPacks())
+            .global();
+
+        eventManager.getHandler(FunctionalEventHandler.class)
+            .register(internalAddon, PlatformInitializationEvent.class)
+            .then(event -> loadMetaConfigPacks())
             .global();
 
 
@@ -159,6 +170,38 @@ public abstract class AbstractPlatform implements Platform {
         logger.info("Finished initialization.");
     }
 
+    protected boolean loadConfigPacks() {
+        logger.info("Loading config packs...");
+        ConfigRegistry configRegistry = getRawConfigRegistry();
+        configRegistry.clear();
+        try {
+            configRegistry.loadAll(this);
+        } catch(IOException e) {
+            logger.error("Failed to load config packs", e);
+            return false;
+        } catch(PackLoadFailuresException e) {
+            e.getExceptions().forEach(ex -> logger.error("Failed to load config pack", ex));
+            return false;
+        }
+        return true;
+    }
+
+    protected boolean loadMetaConfigPacks() {
+        logger.info("Loading meta config packs...");
+        MetaConfigRegistry metaConfigRegistry = getRawMetaConfigRegistry();
+        metaConfigRegistry.clear();
+        try {
+            metaConfigRegistry.loadAll(this, configRegistry);
+        } catch(IOException e) {
+            logger.error("Failed to load meta config packs", e);
+            return false;
+        } catch(PackLoadFailuresException e) {
+            e.getExceptions().forEach(ex -> logger.error("Failed to meta load config pack", ex));
+            return false;
+        }
+        return true;
+    }
+
     protected InternalAddon loadAddons() {
         List<BaseAddon> addonList = new ArrayList<>();
 
@@ -325,6 +368,12 @@ public abstract class AbstractPlatform implements Platform {
         return checkedConfigRegistry;
     }
 
+    @Override
+    public @NotNull CheckedRegistry<MetaPack> getMetaConfigRegistry() {
+        return checkedMetaConfigRegistry;
+    }
+
+
     @Override
     public @NotNull Registry<BaseAddon> getAddons() {
         return lockedAddonRegistry;

common/implementation/base/src/main/java/com/dfsek/terra/config/fileloaders/FolderLoader.java

@@ -1,66 +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.config.fileloaders;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.stream.Stream;
-
-
-/**
- * Load all {@code *.yml} files from a {@link java.nio.file.Path}.
- */
-public class FolderLoader extends LoaderImpl {
-    private static final Logger logger = LoggerFactory.getLogger(FolderLoader.class);
-
-    private final Path path;
-
-    public FolderLoader(Path path) {
-        this.path = path;
-    }
-
-    @Override
-    public InputStream get(String singleFile) throws IOException {
-        return new FileInputStream(new File(path.toFile(), singleFile));
-    }
-
-    protected void load(String directory, String extension) {
-        File newPath = new File(path.toFile(), directory);
-        newPath.mkdirs();
-        try(Stream<Path> paths = Files.walk(newPath.toPath())) {
-            paths.filter(Files::isRegularFile).filter(file -> file.toString().toLowerCase().endsWith(extension)).forEach(file -> {
-                try {
-                    String rel = newPath.toPath().relativize(file).toString();
-                    streams.put(rel, new FileInputStream(file.toFile()));
-                } catch(FileNotFoundException e) {
-                    logger.error("Could not find file to load", e);
-                }
-            });
-        } catch(IOException e) {
-            logger.error("Error while loading files", e);
-        }
-    }
-}

common/implementation/base/src/main/java/com/dfsek/terra/config/fileloaders/LoaderImpl.java

@@ -1,83 +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.config.fileloaders;
-
-import com.dfsek.tectonic.api.exception.ConfigException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
-
-import com.dfsek.terra.api.config.Loader;
-
-
-public abstract class LoaderImpl implements Loader {
-    private static final Logger logger = LoggerFactory.getLogger(LoaderImpl.class);
-
-    protected final Map<String, InputStream> streams = new HashMap<>();
-
-    @Override
-    public Loader thenNames(Consumer<List<String>> consumer) throws ConfigException {
-        consumer.accept(new ArrayList<>(streams.keySet()));
-        return this;
-    }
-
-    @Override
-    public Loader thenEntries(Consumer<Set<Map.Entry<String, InputStream>>> consumer) throws ConfigException {
-        consumer.accept(streams.entrySet());
-        return this;
-    }
-
-    /**
-     * Open a subdirectory.
-     *
-     * @param directory Directory to open
-     * @param extension File extension
-     */
-    @Override
-    public LoaderImpl open(String directory, String extension) {
-        if(!streams.isEmpty()) throw new IllegalStateException("Attempted to load new directory before closing existing InputStreams");
-        load(directory, extension);
-        return this;
-    }
-
-    /**
-     * Close all InputStreams opened.
-     */
-    @Override
-    public Loader close() {
-        streams.forEach((name, input) -> {
-            try {
-                input.close();
-            } catch(IOException e) {
-                logger.error("Error occurred while loading", e);
-            }
-        });
-        streams.clear();
-        return this;
-    }
-
-    protected abstract void load(String directory, String extension);
-}

common/implementation/base/src/main/java/com/dfsek/terra/config/fileloaders/ZIPLoader.java

@@ -1,63 +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.config.fileloaders;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-
-public class ZIPLoader extends LoaderImpl {
-    private static final Logger logger = LoggerFactory.getLogger(ZIPLoader.class);
-
-    private final ZipFile file;
-
-    public ZIPLoader(ZipFile file) {
-        this.file = file;
-    }
-
-    @Override
-    public InputStream get(String singleFile) throws IOException {
-        Enumeration<? extends ZipEntry> entries = file.entries();
-        while(entries.hasMoreElements()) {
-            ZipEntry entry = entries.nextElement();
-            if(!entry.isDirectory() && entry.getName().equals(singleFile)) return file.getInputStream(entry);
-        }
-        throw new IllegalArgumentException("No such file: " + singleFile);
-    }
-
-    protected void load(String directory, String extension) {
-        Enumeration<? extends ZipEntry> entries = file.entries();
-        while(entries.hasMoreElements()) {
-            ZipEntry entry = entries.nextElement();
-            if(!entry.isDirectory() && entry.getName().startsWith(directory) && entry.getName().endsWith(extension)) {
-                try {
-                    String rel = entry.getName().substring(directory.length());
-                    streams.put(rel, file.getInputStream(entry));
-                } catch(IOException e) {
-                    logger.error("Error while loading file from zip", e);
-                }
-            }
-        }
-    }
-}

common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/config/BufferedImageLoader.java

@@ -27,10 +27,10 @@ import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.lang.reflect.AnnotatedType;
+import java.nio.file.Files;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.Loader;
 import com.dfsek.terra.api.properties.Properties;
 
 
@@ -39,12 +39,10 @@ import com.dfsek.terra.api.properties.Properties;
  */
 @Deprecated
 public class BufferedImageLoader implements TypeLoader<BufferedImage> {
-    private final Loader files;
 
     private final ConfigPack pack;
 
-    public BufferedImageLoader(Loader files, ConfigPack pack) {
-        this.files = files;
+    public BufferedImageLoader(ConfigPack pack) {
         this.pack = pack;
         if(!pack.getContext().has(ImageCache.class))
             pack.getContext().put(new ImageCache(new ConcurrentHashMap<>()));
@@ -55,7 +53,7 @@ public class BufferedImageLoader implements TypeLoader<BufferedImage> {
     throws LoadException {
         return pack.getContext().get(ImageCache.class).map.computeIfAbsent((String) c, s -> {
             try {
-                return ImageIO.read(files.get(s));
+                return ImageIO.read(Files.newInputStream(pack.getRootPath().resolve(s)));
             } catch(IOException e) {
                 throw new LoadException("Unable to load image", e, depthTracker);
             }

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

@@ -33,15 +33,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -51,15 +51,12 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.config.ConfigFactory;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.ConfigType;
-import com.dfsek.terra.api.config.Loader;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.event.events.config.ConfigurationDiscoveryEvent;
 import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
@@ -72,15 +69,12 @@ import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.registry.key.RegistryKey;
 import com.dfsek.terra.api.tectonic.ShortcutLoader;
-import com.dfsek.terra.api.util.generic.Construct;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.api.util.reflection.ReflectionUtil;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider;
-import com.dfsek.terra.config.fileloaders.FolderLoader;
-import com.dfsek.terra.config.fileloaders.ZIPLoader;
 import com.dfsek.terra.config.loaders.GenericTemplateSupplierLoader;
 import com.dfsek.terra.config.loaders.config.BufferedImageLoader;
 import com.dfsek.terra.config.preprocessor.MetaListLikePreprocessor;
@@ -107,7 +101,7 @@ public class ConfigPackImpl implements ConfigPack {
     private final AbstractConfigLoader abstractConfigLoader = new AbstractConfigLoader();
     private final ConfigLoader selfLoader = new ConfigLoader();
     private final Platform platform;
-    private final Loader loader;
+    private final Path rootPath;
 
     private final Map<BaseAddon, VersionRange> addons;
 
@@ -121,40 +115,29 @@ public class ConfigPackImpl implements ConfigPack {
 
     private final RegistryKey key;
 
-    public ConfigPackImpl(File folder, Platform platform) {
-        this(new FolderLoader(folder.toPath()), Construct.construct(() -> {
-            try {
-                return new YamlConfiguration(new FileInputStream(new File(folder, "pack.yml")), "pack.yml");
-            } catch(FileNotFoundException e) {
-                throw new UncheckedIOException("No pack.yml file found in " + folder.getAbsolutePath(), e);
-            }
-        }), platform);
-    }
-
-    public ConfigPackImpl(ZipFile file, Platform platform) {
-        this(new ZIPLoader(file), Construct.construct(() -> {
-            ZipEntry pack = null;
-            Enumeration<? extends ZipEntry> entries = file.entries();
-            while(entries.hasMoreElements()) {
-                ZipEntry entry = entries.nextElement();
-                if(entry.getName().equals("pack.yml")) pack = entry;
-            }
-
-            if(pack == null) throw new IllegalArgumentException("No pack.yml file found in " + file.getName());
-
-            try {
-                return new YamlConfiguration(file.getInputStream(pack), "pack.yml");
-            } catch(IOException e) {
-                throw new UncheckedIOException("Unable to load pack.yml from ZIP file", e);
-            }
-        }), platform);
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private ConfigPackImpl(Loader loader, Configuration packManifest, Platform platform) {
+    @SuppressWarnings({ "rawtypes" })
+    public ConfigPackImpl(Path path, Platform platform) throws IOException {
         long start = System.nanoTime();
 
-        this.loader = loader;
+        if(Files.notExists(path)) throw new FileNotFoundException("Could not load config pack, " + path + " does not exist");
+
+        if(Files.isDirectory(path)) {
+            this.rootPath = path;
+        } else if(Files.isRegularFile(path)) {
+            if(!path.getFileName().toString().endsWith(".zip")) {
+                throw new IOException("Could not load config pack, file " + path + " is not a zip");
+            }
+            FileSystem zipfs = FileSystems.newFileSystem(path);
+            this.rootPath = zipfs.getPath("/");
+        } else {
+            throw new IOException("Could not load config pack from " + path);
+        }
+
+        Path packManifestPath = rootPath.resolve("pack.yml");
+        if(Files.notExists(packManifestPath)) throw new IOException("No pack.yml found in " + path);
+        Configuration packManifest = new YamlConfiguration(Files.newInputStream(packManifestPath),
+            packManifestPath.getFileName().toString());
+
         this.platform = platform;
         this.configTypeRegistry = createConfigRegistry();
 
@@ -238,7 +221,7 @@ public class ConfigPackImpl implements ConfigPack {
 
     private Map<String, Configuration> discoverConfigurations() {
         Map<String, Configuration> configurations = new HashMap<>();
-        platform.getEventManager().callEvent(new ConfigurationDiscoveryEvent(this, loader,
+        platform.getEventManager().callEvent(new ConfigurationDiscoveryEvent(this,
             (s, c) -> configurations.put(s.replace("\\", "/"),
                 c))); // Create all the configs.
         return configurations;
@@ -283,7 +266,7 @@ public class ConfigPackImpl implements ConfigPack {
     @Override
     public void register(TypeRegistry registry) {
         registry.registerLoader(ConfigType.class, configTypeRegistry)
-            .registerLoader(BufferedImage.class, new BufferedImageLoader(loader, this));
+            .registerLoader(BufferedImage.class, new BufferedImageLoader(this));
         registryMap.forEach(registry::registerLoader);
         shortcuts.forEach(registry::registerLoader); // overwrite with delegated shortcuts if present
     }
@@ -309,7 +292,6 @@ public class ConfigPackImpl implements ConfigPack {
         return seededBiomeProvider;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public <T> CheckedRegistry<T> getOrCreateRegistry(TypeKey<T> typeKey) {
         return (CheckedRegistry<T>) registryMap.computeIfAbsent(typeKey.getType(), c -> {
@@ -348,8 +330,8 @@ public class ConfigPackImpl implements ConfigPack {
     }
 
     @Override
-    public Loader getLoader() {
-        return loader;
+    public Path getRootPath() {
+        return rootPath;
     }
 
     @Override
@@ -362,7 +344,7 @@ public class ConfigPackImpl implements ConfigPack {
         return template.getVersion();
     }
 
-    @SuppressWarnings("unchecked,rawtypes")
+    @SuppressWarnings("rawtypes")
     @Override
     public <T> ConfigPack registerShortcut(TypeKey<T> clazz, String shortcut, ShortcutLoader<T> loader) {
         ShortcutHolder<?> holder = shortcuts
@@ -406,12 +388,10 @@ public class ConfigPackImpl implements ConfigPack {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public <T> CheckedRegistry<T> getRegistry(Type type) {
         return (CheckedRegistry<T>) registryMap.get(type);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public <T> CheckedRegistry<T> getCheckedRegistry(Type type) throws IllegalStateException {
         return (CheckedRegistry<T>) registryMap.get(type);

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

@@ -0,0 +1,215 @@
+package com.dfsek.terra.config.pack;
+
+import ca.solostudios.strata.version.Version;
+import com.dfsek.tectonic.api.TypeRegistry;
+import com.dfsek.tectonic.api.config.Configuration;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import com.dfsek.tectonic.api.loader.AbstractConfigLoader;
+import com.dfsek.tectonic.api.loader.ConfigLoader;
+import com.dfsek.tectonic.api.loader.type.TypeLoader;
+import com.dfsek.tectonic.yaml.YamlConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.regex.Pattern;
+
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.config.MetaPack;
+import com.dfsek.terra.api.properties.Context;
+import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.api.registry.OpenRegistry;
+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.registry.key.RegistryKey;
+import com.dfsek.terra.api.util.reflection.ReflectionUtil;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+import com.dfsek.terra.config.loaders.GenericTemplateSupplierLoader;
+import com.dfsek.terra.registry.CheckedRegistryImpl;
+import com.dfsek.terra.registry.OpenRegistryImpl;
+import com.dfsek.terra.registry.master.ConfigRegistry;
+
+
+public class MetaPackImpl implements MetaPack {
+
+    private static final Pattern PATTERN = Pattern.compile(", ");
+    private static final Logger logger = LoggerFactory.getLogger(MetaPackImpl.class);
+    private final MetaPackTemplate template = new MetaPackTemplate();
+    private final Platform platform;
+    private final Path rootPath;
+    private final Map<String, ConfigPack> packs = new HashMap<>();
+    private final ConfigLoader selfLoader = new ConfigLoader();
+    private final Context context = new Context();
+    private final RegistryKey key;
+    private final Map<Type, CheckedRegistryImpl<?>> registryMap = new HashMap<>();
+    private final AbstractConfigLoader abstractConfigLoader = new AbstractConfigLoader();
+    private final String author;
+
+    public MetaPackImpl(Path path, Platform platform, ConfigRegistry configRegistry) throws IOException {
+        long start = System.nanoTime();
+
+        if(Files.notExists(path)) throw new FileNotFoundException("Could not load metapack, " + path + " does not exist");
+
+        if(Files.isDirectory(path)) {
+            this.rootPath = path;
+        } else if(Files.isRegularFile(path)) {
+            if(!path.getFileName().toString().endsWith(".zip")) {
+                throw new IOException("Could not load metapack, file " + path + " is not a zip");
+            }
+            FileSystem zipfs = FileSystems.newFileSystem(path);
+            this.rootPath = zipfs.getPath("/");
+        } else {
+            throw new IOException("Could not load metapack from " + path);
+        }
+
+        Path packManifestPath = rootPath.resolve("metapack.yml");
+        if(Files.notExists(packManifestPath)) throw new IOException("No metapack.yml found in " + path);
+        Configuration packManifest = new YamlConfiguration(Files.newInputStream(packManifestPath),
+            packManifestPath.getFileName().toString());
+
+        this.platform = platform;
+
+        register(selfLoader);
+        platform.register(selfLoader);
+
+        register(abstractConfigLoader);
+        platform.register(abstractConfigLoader);
+
+        selfLoader.load(template, packManifest);
+
+        String namespace;
+        String id;
+        if(template.getID().contains(":")) {
+            namespace = template.getID().substring(0, template.getID().indexOf(":"));
+            id = template.getID().substring(template.getID().indexOf(":") + 1);
+        } else {
+            id = template.getID();
+            namespace = template.getID();
+        }
+
+        this.key = RegistryKey.of(namespace, id);
+
+        logger.info("Loading metapack \"{}:{}\"", id, namespace);
+
+        template.getPacks().forEach((k, v) -> {
+            RegistryKey registryKey = RegistryKey.parse(v);
+            if(configRegistry.contains(registryKey)) {
+                packs.put(k, configRegistry.get(registryKey).get());
+                logger.info("Linked config pack \"{}\" to metapack \"{}:{}\".", v, namespace, id);
+            } else {
+                logger.warn("Failed to link config pack \"{}\" to metapack \"{}:{}\".", v, namespace, id);
+            }
+        });
+
+        HashSet<String> authors = new HashSet<>();
+        packs.forEach((k, v) -> {
+            authors.addAll(Arrays.asList(PATTERN.split(v.getAuthor())));
+        });
+        authors.addAll(Arrays.asList(PATTERN.split(template.getAuthor())));
+
+        this.author = String.join(", ", authors);
+
+        logger.info("Loaded metapack \"{}:{}\" v{} by {} in {}ms.",
+            namespace, id, getVersion().getFormatted(), author, (System.nanoTime() - start) / 1000000.0D);
+    }
+
+
+    @Override
+    public String getAuthor() {
+        return author;
+    }
+
+    @Override
+    public Version getVersion() {
+        return template.getVersion();
+    }
+
+    @Override
+    public Map<String, ConfigPack> packs() {
+        return packs;
+    }
+
+    @Override
+    public Context getContext() {
+        return context;
+    }
+
+    @Override
+    public RegistryKey getRegistryKey() {
+        return key;
+    }
+
+    @Override
+    public <T> CheckedRegistry<T> getRegistry(Type type) {
+        return (CheckedRegistry<T>) registryMap.get(type);
+    }
+
+    @Override
+    public <T> CheckedRegistry<T> getCheckedRegistry(Type type) throws IllegalStateException {
+        return (CheckedRegistry<T>) registryMap.get(type);
+    }
+
+    @Override
+    public <T> CheckedRegistry<T> getOrCreateRegistry(TypeKey<T> typeKey) {
+        return (CheckedRegistry<T>) registryMap.computeIfAbsent(typeKey.getType(), c -> {
+            OpenRegistry<T> registry = new OpenRegistryImpl<>(typeKey);
+            selfLoader.registerLoader(c, registry);
+            abstractConfigLoader.registerLoader(c, registry);
+            logger.debug("Registered loader for registry of class {}", ReflectionUtil.typeToString(c));
+
+            if(typeKey.getType() instanceof ParameterizedType param) {
+                Type base = param.getRawType();
+                if(base instanceof Class  // should always be true but we'll check anyways
+                   && Supplier.class.isAssignableFrom((Class<?>) base)) { // If it's a supplier
+                    Type supplied = param.getActualTypeArguments()[0]; // Grab the supplied type
+                    if(supplied instanceof ParameterizedType suppliedParam) {
+                        Type suppliedBase = suppliedParam.getRawType();
+                        if(suppliedBase instanceof Class // should always be true but we'll check anyways
+                           && ObjectTemplate.class.isAssignableFrom((Class<?>) suppliedBase)) {
+                            Type templateType = suppliedParam.getActualTypeArguments()[0];
+                            GenericTemplateSupplierLoader<?> loader = new GenericTemplateSupplierLoader<>(
+                                (Registry<Supplier<ObjectTemplate<Supplier<ObjectTemplate<?>>>>>) registry);
+                            selfLoader.registerLoader(templateType, loader);
+                            abstractConfigLoader.registerLoader(templateType, loader);
+                            logger.debug("Registered template loader for registry of class {}", ReflectionUtil.typeToString(templateType));
+                        }
+                    }
+                }
+            }
+
+            return new CheckedRegistryImpl<>(registry);
+        });
+    }
+
+    @Override
+    public <T> MetaPackImpl applyLoader(Type type, TypeLoader<T> loader) {
+        abstractConfigLoader.registerLoader(type, loader);
+        selfLoader.registerLoader(type, loader);
+        return this;
+    }
+
+    @Override
+    public <T> MetaPackImpl applyLoader(Type type, Supplier<ObjectTemplate<T>> loader) {
+        abstractConfigLoader.registerLoader(type, loader);
+        selfLoader.registerLoader(type, loader);
+        return this;
+    }
+
+    @Override
+    public void register(TypeRegistry registry) {
+        registryMap.forEach(registry::registerLoader);
+    }
+
+}

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

@@ -0,0 +1,41 @@
+package com.dfsek.terra.config.pack;
+
+import ca.solostudios.strata.version.Version;
+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.Map;
+
+
+@SuppressWarnings({ "unused", "FieldMayBeFinal" })
+public class MetaPackTemplate implements ConfigTemplate {
+    @Value("id")
+    private String id;
+
+    @Value("author")
+    @Default
+    private String author = "Anon Y. Mous";
+
+    @Value("version")
+    private Version version;
+
+    @Value("packs")
+    private Map<String, String> packs;
+
+    public String getID() {
+        return id;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public Version getVersion() {
+        return version;
+    }
+
+    public Map<String, String> getPacks() {
+        return packs;
+    }
+}

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

@@ -17,6 +17,17 @@
 
 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;
@@ -25,12 +36,6 @@ 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);

common/implementation/base/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java

@@ -17,14 +17,13 @@
 
 package com.dfsek.terra.registry.master;
 
-import com.dfsek.tectonic.api.exception.ConfigException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
 import java.io.IOException;
-import java.util.Objects;
-import java.util.zip.ZipFile;
+import java.io.Serial;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
 
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.config.ConfigPack;
@@ -37,44 +36,42 @@ import com.dfsek.terra.registry.OpenRegistryImpl;
  * Class to hold config packs
  */
 public class ConfigRegistry extends OpenRegistryImpl<ConfigPack> {
-    private static final Logger logger = LoggerFactory.getLogger(ConfigRegistry.class);
 
     public ConfigRegistry() {
         super(TypeKey.of(ConfigPack.class));
     }
 
-    public void load(File folder, Platform platform) throws ConfigException {
-        ConfigPack pack = new ConfigPackImpl(folder, platform);
-        registerChecked(pack.getRegistryKey(), pack);
+    public void loadAll(Platform platform) throws IOException, PackLoadFailuresException {
+        Path packsDirectory = platform.getDataFolder().toPath().resolve("packs");
+        Files.createDirectories(packsDirectory);
+        List<IOException> failedLoads = new ArrayList<>();
+        try(Stream<Path> packs = Files.list(packsDirectory)) {
+            packs.forEach(path -> {
+                try {
+                    ConfigPack pack = new ConfigPackImpl(path, platform);
+                    registerChecked(pack.getRegistryKey(), pack);
+                } catch(IOException e) {
+                    failedLoads.add(e);
+                }
+            });
+        }
+        if(!failedLoads.isEmpty()) {
+            throw new PackLoadFailuresException(failedLoads);
+        }
     }
 
-    public boolean loadAll(Platform platform) {
-        boolean valid = true;
-        File packsFolder = new File(platform.getDataFolder(), "packs");
-        packsFolder.mkdirs();
-        for(File dir : Objects.requireNonNull(packsFolder.listFiles(File::isDirectory))) {
-            try {
-                load(dir, platform);
-            } catch(ConfigException e) {
-                logger.error("Error loading config pack {}", dir.getName(), e);
-                valid = false;
-            }
-        }
-        for(File zip : Objects.requireNonNull(
-            packsFolder.listFiles(file -> file.getName().endsWith(".zip") || file.getName().endsWith(".terra")))) {
-            try {
-                logger.info("Loading ZIP archive: {}", zip.getName());
-                load(new ZipFile(zip), platform);
-            } catch(IOException | ConfigException e) {
-                logger.error("Error loading config pack {}", zip.getName(), e);
-                valid = false;
-            }
-        }
-        return valid;
-    }
+    public static class PackLoadFailuresException extends Exception {
+        @Serial
+        private static final long serialVersionUID = 538998844645186306L;
 
-    public void load(ZipFile file, Platform platform) throws ConfigException {
-        ConfigPackImpl pack = new ConfigPackImpl(file, platform);
-        registerChecked(pack.getRegistryKey(), pack);
+        private final List<Throwable> exceptions;
+
+        public PackLoadFailuresException(List<? extends Throwable> exceptions) {
+            this.exceptions = (List<Throwable>) exceptions;
+        }
+
+        public List<Throwable> getExceptions() {
+            return exceptions;
+        }
     }
 }

common/implementation/base/src/main/java/com/dfsek/terra/registry/master/MetaConfigRegistry.java

@@ -0,0 +1,62 @@
+/*
+ * 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.registry.master;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.config.MetaPack;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+import com.dfsek.terra.config.pack.MetaPackImpl;
+import com.dfsek.terra.registry.OpenRegistryImpl;
+import com.dfsek.terra.registry.master.ConfigRegistry.PackLoadFailuresException;
+
+
+/**
+ * Class to hold config packs
+ */
+public class MetaConfigRegistry extends OpenRegistryImpl<MetaPack> {
+
+    public MetaConfigRegistry() {
+        super(TypeKey.of(MetaPack.class));
+    }
+
+    public void loadAll(Platform platform, ConfigRegistry configRegistry) throws IOException, PackLoadFailuresException {
+        Path packsDirectory = platform.getDataFolder().toPath().resolve("metapacks");
+        Files.createDirectories(packsDirectory);
+        List<IOException> failedLoads = new ArrayList<>();
+        try(Stream<Path> packs = Files.list(packsDirectory)) {
+            packs.forEach(path -> {
+                try {
+                    MetaPack pack = new MetaPackImpl(path, platform, configRegistry);
+                    registerChecked(pack.getRegistryKey(), pack);
+                } catch(IOException e) {
+                    failedLoads.add(e);
+                }
+            });
+        }
+        if(!failedLoads.isEmpty()) {
+            throw new PackLoadFailuresException(failedLoads);
+        }
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=1541fa36599e12857140465f3c91a97409b4512501c26f9631fb113e392c5bd1
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 

platforms/bukkit/build.gradle.kts

@@ -2,9 +2,15 @@ plugins {
     id("xyz.jpenilla.run-paper") version Versions.Bukkit.runPaper
 }
 
+repositories {
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
+        name = "Sonatype"
+    }
+}
+
 dependencies {
     shaded(project(":platforms:bukkit:common"))
-    shaded(project(":platforms:bukkit:nms:v1_21", configuration = "reobf"))
+    shaded(project(":platforms:bukkit:nms:v1_20_R3", configuration = "reobf"))
     shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 

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.Bukkit.cloud)
+    shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.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

@@ -63,8 +63,7 @@ public class PlatformImpl extends AbstractPlatform {
     @Override
     public boolean reload() {
         getTerraConfig().load(this);
-        getRawConfigRegistry().clear();
-        boolean succeed = getRawConfigRegistry().loadAll(this);
+        boolean succeed = loadConfigPacks();
 
         Bukkit.getWorlds().forEach(world -> {
             if(world.getGenerator() instanceof BukkitChunkGeneratorWrapper wrapper) {

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

@@ -17,16 +17,15 @@
 
 package com.dfsek.terra.bukkit;
 
+import cloud.commandframework.brigadier.CloudBrigadierManager;
+import cloud.commandframework.bukkit.CloudBukkitCapabilities;
+import cloud.commandframework.execution.CommandExecutionCoordinator;
+import cloud.commandframework.paper.PaperCommandManager;
 import io.papermc.paper.threadedregions.scheduler.AsyncScheduler;
 import io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler;
 import org.bukkit.Bukkit;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.incendo.cloud.SenderMapper;
-import org.incendo.cloud.brigadier.CloudBrigadierManager;
-import org.incendo.cloud.bukkit.CloudBukkitCapabilities;
-import org.incendo.cloud.execution.ExecutionCoordinator;
-import org.incendo.cloud.paper.LegacyPaperCommandManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -72,14 +71,14 @@ public class TerraBukkitPlugin extends JavaPlugin {
         }
 
         try {
-            LegacyPaperCommandManager<CommandSender> commandManager = getCommandSenderPaperCommandManager();
+            PaperCommandManager<CommandSender> commandManager = getCommandSenderPaperCommandManager();
 
             platform.getEventManager().callEvent(new CommandRegistrationEvent(commandManager));
 
         } catch(Exception e) { // This should never happen.
             logger.error("""
                          TERRA HAS BEEN DISABLED
-                         
+                                                  
                          Errors occurred while registering commands.
                          Please report this to Terra.
                          """.strip(), e);
@@ -92,26 +91,22 @@ public class TerraBukkitPlugin extends JavaPlugin {
     }
 
     @NotNull
-    private LegacyPaperCommandManager<CommandSender> getCommandSenderPaperCommandManager() throws Exception {
-        // TODO: Update to PaperCommandManager
-        LegacyPaperCommandManager<CommandSender> commandManager = new LegacyPaperCommandManager<>(
-            this,
-            ExecutionCoordinator.simpleCoordinator(),
-            SenderMapper.create(
-                BukkitAdapter::adapt,
-                BukkitAdapter::adapt
-            ));
-
+    private PaperCommandManager<CommandSender> getCommandSenderPaperCommandManager() throws Exception {
+        PaperCommandManager<CommandSender> commandManager = new PaperCommandManager<>(this,
+            CommandExecutionCoordinator.simpleCoordinator(),
+            BukkitAdapter::adapt,
+            BukkitAdapter::adapt);
         if(commandManager.hasCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER)) {
             commandManager.registerBrigadier();
             final CloudBrigadierManager<?, ?> brigManager = commandManager.brigadierManager();
             if(brigManager != null) {
                 brigManager.setNativeNumberSuggestions(false);
             }
-        } else if(commandManager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
-            commandManager.registerAsynchronousCompletions();
         }
 
+        if(commandManager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
+            commandManager.registerAsynchronousCompletions();
+        }
         return commandManager;
     }
 
@@ -181,7 +176,7 @@ public class TerraBukkitPlugin extends JavaPlugin {
                 logger.warn("""
                             You are using Mohist, so we will not give you any support for issues that may arise.
                             Since you enabled the "IKnowMohistCausesLotsOfIssuesButIWillUseItAnyways" flag, we won't disable Terra. But be warned.
-                            
+                                                        
                             > I felt a great disturbance in the JVM, as if millions of plugins suddenly cried out in stack traces and were suddenly silenced.
                             > I fear something terrible has happened.
                             > - Astrash
@@ -194,7 +189,6 @@ public class TerraBukkitPlugin extends JavaPlugin {
     @Override
     public @Nullable
     ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id) {
-        if(id == null || id.trim().equals("")) { return null; }
         return new BukkitChunkGeneratorWrapper(generatorMap.computeIfAbsent(worldName, name -> {
             ConfigPack pack = platform.getConfigRegistry().getByID(id).orElseThrow(
                 () -> new IllegalArgumentException("No such config pack \"" + id + "\""));

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java

@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Random;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;

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

@@ -63,7 +63,6 @@ public class BukkitWorldHandle implements WorldHandle {
     public @NotNull EntityType getEntity(@NotNull String id) {
         if(!id.contains(":")) { //TODO: remove in 7.0
             String newid = "minecraft:" + id.toLowerCase();
-            ;
             logger.warn(
                 "Translating " + id + " to " + newid + ". In 1.20.3 entity parsing was reworked" +
                 ". You are advised to perform this rename in your config backs as this translation will be removed in the next major " +
@@ -73,7 +72,7 @@ public class BukkitWorldHandle implements WorldHandle {
         String entityID = id.toUpperCase(Locale.ROOT).substring(10);
 
         return new BukkitEntityType(switch(entityID) {
-            case "END_CRYSTAL" -> org.bukkit.entity.EntityType.END_CRYSTAL;
+            case "END_CRYSTAL" -> org.bukkit.entity.EntityType.ENDER_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/nms/Initializer.java

@@ -1,25 +1,20 @@
 package com.dfsek.terra.bukkit.nms;
 
+import org.bukkit.Bukkit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.dfsek.terra.bukkit.PlatformImpl;
-import com.dfsek.terra.bukkit.util.VersionUtil;
 
 
 public interface Initializer {
-    String NMS = VersionUtil.getMinecraftVersionInfo().toString().replace(".", "_");
+    String NMS = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
     String TERRA_PACKAGE = Initializer.class.getPackageName();
 
     static boolean init(PlatformImpl platform) {
         Logger logger = LoggerFactory.getLogger(Initializer.class);
         try {
-            String packageVersion = NMS;
-            if(NMS.equals("v1_21_1")) {
-                packageVersion = "v1_21";
-            }
-
-            Class<?> initializerClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSInitializer");
+            Class<?> initializerClass = Class.forName(TERRA_PACKAGE + "." + NMS + ".NMSInitializer");
             try {
                 Initializer initializer = (Initializer) initializerClass.getConstructor().newInstance();
                 initializer.initialize(platform);

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

@@ -77,13 +77,13 @@ public final class VersionUtil {
     public static final class MinecraftVersionInfo {
         private static final Logger logger = LoggerFactory.getLogger(MinecraftVersionInfo.class);
 
-        private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)(?:\\.(\\d+))?");
+        private static final Pattern VERSION_PATTERN = Pattern.compile("v?(\\d+)_(\\d+)_R(\\d+)");
         private final int major;
         private final int minor;
         private final int patch;
 
         private MinecraftVersionInfo() {
-            this(Bukkit.getServer().getBukkitVersion().split("-")[0]);
+            this(Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]);
         }
 
         private MinecraftVersionInfo(int major, int minor, int patch) {
@@ -97,7 +97,7 @@ public final class VersionUtil {
             if(versionMatcher.find()) {
                 major = Integer.parseInt(versionMatcher.group(1));
                 minor = Integer.parseInt(versionMatcher.group(2));
-                patch = versionMatcher.group(3) != null ? Integer.parseInt(versionMatcher.group(3)) : -1;
+                patch = Integer.parseInt(versionMatcher.group(3));
             } else {
                 logger.warn("Error while parsing minecraft version info. Continuing launch, but setting all versions to -1.");
 
@@ -112,11 +112,7 @@ public final class VersionUtil {
             if(major == -1 && minor == -1 && patch == -1)
                 return "Unknown";
 
-            if(patch >= 0) {
-                return String.format("v%d.%d.%d", major, minor, patch);
-            } else {
-                return String.format("v%d.%d", major, minor);
-            }
+            return String.format("v%d.%d.%d", major, minor, patch);
         }
 
         public int getMajor() {

platforms/bukkit/nms/v1_20_R3/build.gradle.kts

@@ -1,5 +1,9 @@
 apply(plugin = "io.papermc.paperweight.userdev")
 
+repositories {
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+}
+
 dependencies {
     api(project(":platforms:bukkit:common"))
     paperDevBundle(Versions.Bukkit.paperDevBundle)

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/AwfulBukkitHacks.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.bukkit.nms.v1_21;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import com.google.common.collect.ImmutableMap;
+import com.mojang.serialization.Lifecycle;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Holder.Reference;
 import net.minecraft.core.MappedRegistry;
-import net.minecraft.core.RegistrationInfo;
 import net.minecraft.core.WritableRegistry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
@@ -41,16 +41,15 @@ public class AwfulBukkitHacks {
                 try {
                     BukkitPlatformBiome platformBiome = (BukkitPlatformBiome) biome.getPlatformBiome();
                     NamespacedKey vanillaBukkitKey = platformBiome.getHandle().getKey();
-                    ResourceLocation vanillaMinecraftKey = ResourceLocation.fromNamespaceAndPath(vanillaBukkitKey.getNamespace(),
-                        vanillaBukkitKey.getKey());
+                    ResourceLocation vanillaMinecraftKey = new ResourceLocation(vanillaBukkitKey.getNamespace(), vanillaBukkitKey.getKey());
                     Biome platform = NMSBiomeInjector.createBiome(biome, Objects.requireNonNull(biomeRegistry.get(vanillaMinecraftKey)));
 
                     ResourceKey<Biome> delegateKey = ResourceKey.create(
                         Registries.BIOME,
-                        ResourceLocation.fromNamespaceAndPath("terra", NMSBiomeInjector.createBiomeID(pack, key))
+                        new ResourceLocation("terra", NMSBiomeInjector.createBiomeID(pack, key))
                     );
 
-                    Reference<Biome> holder = biomeRegistry.register(delegateKey, platform, RegistrationInfo.BUILT_IN);
+                    Reference<Biome> holder = biomeRegistry.register(delegateKey, platform, Lifecycle.stable());
                     Reflection.REFERENCE.invokeBindValue(holder, platform); // IMPORTANT: bind holder.
 
                     platformBiome.getContext().put(new NMSBiomeInfo(delegateKey));

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeInfo.java

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

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeInjector.java

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