Merge remote-tracking branch 'origin/ver/7.0.0' into dev/pure

# Conflicts:
#	common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java
#	common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java
#	common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java

platforms/bukkit/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("xyz.jpenilla.run-paper") version "1.0.6"
+    alias(libs.plugins.bukkit.run.paper)
 }
 
 repositories {
@@ -9,15 +9,12 @@ repositories {
 dependencies {
     shaded(project(":platforms:bukkit:common"))
     shaded(project(":platforms:bukkit:nms:v1_19_R1", configuration = "reobf"))
-    shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
+    shaded(libs.bukkit.reflection.remapper)
 }
 
 tasks {
     shadowJar {
-        relocate("org.bstats.bukkit", "com.dfsek.terra.lib.bstats")
         relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
-        relocate("com.google.common", "com.dfsek.terra.lib.google.common")
-        relocate("org.apache.logging.slf4j", "com.dfsek.terra.lib.slf4j-over-log4j")
         exclude("org/slf4j/**")
         exclude("org/checkerframework/**")
         exclude("org/jetbrains/annotations/**")
@@ -28,7 +25,7 @@ tasks {
     }
     
     runServer {
-        minecraftVersion("1.19")
+        minecraftVersion(libs.versions.bukkit.minecraft.get())
         dependsOn(shadowJar)
         pluginJars(shadowJar.get().archiveFile)
     }

platforms/bukkit/common/build.gradle.kts

@@ -5,14 +5,9 @@ repositories {
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    api("org.slf4j:slf4j-api:1.8.0-beta4") {
-        because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
-    }
+    compileOnly(libs.bukkit.paper.api)
     
-    compileOnly("io.papermc.paper:paper-api:${Versions.Bukkit.paper}")
+    shadedApi(libs.bukkit.paper.lib)
     
-    shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
-    shadedApi("com.google.guava:guava:30.0-jre")
-    
-    shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
+    shadedApi(libs.bukkit.cloud.paper)
 }

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

@@ -28,7 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 import java.util.stream.Collectors;
 
 import com.dfsek.terra.api.block.state.BlockState;
@@ -62,7 +62,7 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
     }
     
     @Override
-    public void generateNoise(@NotNull WorldInfo worldInfo, @NotNull Random random, int x, int z, @NotNull ChunkData chunkData) {
+    public void generateNoise(@NotNull WorldInfo worldInfo, @NotNull RandomGenerator random, int x, int z, @NotNull ChunkData chunkData) {
         BukkitWorldProperties properties = new BukkitWorldProperties(worldInfo);
         delegate.generateChunkData(new BukkitProtoChunk(chunkData), properties, pack.getBiomeProvider(), x, z);
     }
@@ -73,7 +73,7 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
                    .stream()
                    .map(generationStage -> new BlockPopulator() {
                        @Override
-                       public void populate(@NotNull WorldInfo worldInfo, @NotNull Random random, int x, int z,
+                       public void populate(@NotNull WorldInfo worldInfo, @NotNull RandomGenerator random, int x, int z,
                                             @NotNull LimitedRegion limitedRegion) {
                            generationStage.populate(new BukkitProtoWorld(limitedRegion, air, pack.getBiomeProvider()));
                        }

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

@@ -1,4 +1,6 @@
-apply(plugin = "io.papermc.paperweight.userdev")
+plugins {
+    alias(libs.plugins.bukkit.paperweight)
+}
 
 repositories {
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")

platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/config/FertilizableConfig.java

@@ -3,6 +3,9 @@ package com.dfsek.terra.bukkit.nms.v1_19_R1.config;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import com.dfsek.terra.api.structure.Structure;
+
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.Map;
@@ -14,7 +17,7 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class FertilizableConfig implements ObjectTemplate<FertilizableConfig> {
     @Value("strucutres")
     @Default
-    private ProbabilityCollection<ConfiguredStructure> structures = null;
+    private ProbabilityCollection<Structure> structures = null;
     
     @Value("cooldowns")
     @Default
@@ -28,7 +31,7 @@ public class FertilizableConfig implements ObjectTemplate<FertilizableConfig> {
     @Default
     private Boolean villagerFertilizable = null;
     
-    public ProbabilityCollection<ConfiguredStructure> getStructures() {
+    public ProbabilityCollection<Structure> getStructures() {
         return structures;
     }
     

platforms/cli/build.gradle.kts

@@ -7,14 +7,10 @@ val javaMainClass = "com.dfsek.terra.cli.TerraCLI"
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    shadedApi("commons-io:commons-io:${Versions.CLI.commonsIO}")
-    shadedApi("com.github.Querz:NBT:${Versions.CLI.nbt}")
+    shadedApi(libs.libraries.internal.apache.io)
+    shadedApi(libs.cli.nbt)
     
-    shadedImplementation("com.google.guava:guava:${Versions.CLI.guava}")
-    
-    shadedImplementation("ch.qos.logback:logback-classic:${Versions.CLI.logback}")
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
+    shadedImplementation(libs.cli.logback)
 }
 
 tasks.withType<Jar> {

platforms/fabric/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 architectury {
@@ -12,9 +12,6 @@ architectury {
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-    
     implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     "developmentFabric"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionFabric")) { isTransitive = false }
@@ -22,28 +19,15 @@ dependencies {
     "developmentFabric"(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-lifecycle", configuration = "transformProductionFabric")) { isTransitive = false }
     
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    modImplementation(libs.mod.fabric.fabric.loader)
     
-    modImplementation("net.fabricmc:fabric-loader:${Versions.Fabric.fabricLoader}")
+    modImplementation(libs.mod.cloud.fabric)
+    include(libs.mod.cloud.fabric)
     
-    setOf(
-        "fabric-lifecycle-events-v1",
-        "fabric-resource-loader-v0",
-        "fabric-api-base",
-        "fabric-command-api-v2",
-        "fabric-networking-api-v1"
-         ).forEach { apiModule ->
-        val module = fabricApi.module(apiModule, Versions.Fabric.fabricAPI)
-        modImplementation(module)
-        include(module)
-    }
-    
-    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud)
-    include("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud)
-    
-    modLocalRuntime("com.github.astei:lazydfu:${Versions.Mod.lazyDfu}")
+    modLocalRuntime(libs.mod.lazy.dfu)
 }
 
 loom {

platforms/forge/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 architectury {
@@ -10,9 +10,6 @@ architectury {
 }
 
 dependencies {
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-    
     shadedApi(project(":common:implementation:base"))
     "forgeRuntimeLibrary"(project(":common:implementation:base"))
     
@@ -20,14 +17,14 @@ dependencies {
     "developmentForge"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionForge")) { isTransitive = false }
     
-    forge(group = "net.minecraftforge", name = "forge", version = Versions.Forge.forge)
+    forge(libs.mod.forge.forge)
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
     
     //forge is not ok.
-    compileOnly("org.burningwave:core:${Versions.Forge.burningwave}")
-    "forgeRuntimeLibrary"("org.burningwave:core:${Versions.Forge.burningwave}")
+    compileOnly(libs.mod.forge.burningwave)
+    "forgeRuntimeLibrary"(libs.mod.forge.burningwave)
 }
 
 loom {

platforms/mixin-common/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 loom {
@@ -15,16 +15,14 @@ loom {
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    compileOnly("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
+    modImplementation(libs.mod.fabric.fabric.loader)
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
 }
 
 architectury {
     common("fabric", "forge", "quilt")
-    minecraft = Versions.Mod.minecraft
+    minecraft = libs.versions.mod.minecraft.get()
 }
 

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/MinecraftAddon.java

@@ -19,6 +19,13 @@ package com.dfsek.terra.mod;
 
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.version.Version;
+
+import com.dfsek.terra.api.config.ConfigPack;
+
+import com.dfsek.terra.mod.config.VanillaWorldProperties;
+
+import com.dfsek.terra.mod.util.MinecraftUtil;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,6 +50,15 @@ public abstract class MinecraftAddon implements BaseAddon {
     
     @Override
     public void initialize() {
+        modPlatform.getEventManager()
+                .getHandler(FunctionalEventHandler.class)
+                .register(this, ConfigurationLoadEvent.class)
+                .then(event -> {
+                    if(event.is(ConfigPack.class)) {
+                        event.getLoadedObject(ConfigPack.class).getContext().put(event.load(new VanillaWorldProperties()));
+                    }
+                })
+                .global();
         modPlatform.getEventManager()
                    .getHandler(FunctionalEventHandler.class)
                    .register(this, ConfigPackPreLoadEvent.class)

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java

@@ -77,14 +77,11 @@ public abstract class ModPlatform extends AbstractPlatform {
                         throw new LoadException("Invalid identifier: " + o, depthTracker);
                     return identifier;
                 })
-                .registerLoader(Precipitation.class, (type, o, loader, depthTracker) -> Precipitation.valueOf(((String) o).toUpperCase(
-                        Locale.ROOT)))
+                .registerLoader(Precipitation.class, (type, o, loader, depthTracker) -> Precipitation.valueOf(((String) o).toUpperCase()))
                 .registerLoader(GrassColorModifier.class,
-                                (type, o, loader, depthTracker) -> GrassColorModifier.valueOf(((String) o).toUpperCase(
-                                        Locale.ROOT)))
-                .registerLoader(GrassColorModifier.class,
-                                (type, o, loader, depthTracker) -> TemperatureModifier.valueOf(((String) o).toUpperCase(
-                                        Locale.ROOT)))
+                                (type, o, loader, depthTracker) -> GrassColorModifier.valueOf(((String) o).toUpperCase()))
+                .registerLoader(TemperatureModifier.class,
+                                (type, o, loader, depthTracker) -> TemperatureModifier.valueOf(((String) o).toUpperCase()))
                 .registerLoader(SpawnGroup.class, (type, o, loader, depthTracker) -> SpawnGroup.valueOf((String) o))
                 .registerLoader(BiomeParticleConfig.class, BiomeParticleConfigTemplate::new)
                 .registerLoader(SoundEvent.class, SoundEventTemplate::new)

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/FertilizableConfig.java

@@ -7,14 +7,14 @@ import net.minecraft.util.Identifier;
 
 import java.util.Map;
 
-import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
+import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
 public class FertilizableConfig implements ObjectTemplate<FertilizableConfig> {
     @Value("strucutres")
     @Default
-    private ProbabilityCollection<ConfiguredStructure> structures = null;
+    private ProbabilityCollection<Structure> structures = null;
     
     @Value("cooldowns")
     @Default
@@ -22,13 +22,13 @@ public class FertilizableConfig implements ObjectTemplate<FertilizableConfig> {
     
     @Value("can-grow")
     @Default
-    private ConfiguredStructure canGrow = null;
+    private Structure canGrow = null;
     
-    @Value("villager-fertilizable")
+    @Value("villager-farmable")
     @Default
-    private Boolean villagerFertilizable = null;
+    private Boolean villagerFarmable = null;
     
-    public ProbabilityCollection<ConfiguredStructure> getStructures() {
+    public ProbabilityCollection<Structure> getStructures() {
         return structures;
     }
     
@@ -36,12 +36,12 @@ public class FertilizableConfig implements ObjectTemplate<FertilizableConfig> {
         return cooldowns;
     }
     
-    public ConfiguredStructure getCanGrow() {
+    public Structure getCanGrow() {
         return canGrow;
     }
     
-    public Boolean isVillagerFertilizable() {
-        return villagerFertilizable;
+    public Boolean isVillagerFarmable() {
+        return villagerFarmable;
     }
     
     @Override

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/MonsterSettingsTemplate.java

@@ -0,0 +1,38 @@
+package com.dfsek.terra.mod.config;
+
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import com.dfsek.terra.api.util.ConstantRange;
+import com.dfsek.terra.api.util.Range;
+
+import com.dfsek.terra.mod.implmentation.TerraIntProvider;
+
+import net.minecraft.world.dimension.DimensionType.MonsterSettings;
+
+
+public class MonsterSettingsTemplate implements ObjectTemplate<MonsterSettings> {
+    @Value("piglin-safe")
+    @Default
+    private Boolean piglinSafe = false;
+
+    @Value("has-raids")
+    @Default
+    private Boolean hasRaids = false;
+
+    @Value("monster-spawn-light")
+    @Default
+    private Range monsterSpawnLight = new ConstantRange(0, 1);
+
+    @Value("monster-spawn-block-light-limit")
+    @Default
+    private int monsterSpawnBlockLightLimit = 0;
+
+
+    @Override
+    public MonsterSettings get() {
+        return new MonsterSettings(piglinSafe, hasRaids, new TerraIntProvider(monsterSpawnLight), monsterSpawnBlockLightLimit);
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VanillaWorldProperties.java

@@ -0,0 +1,141 @@
+package com.dfsek.terra.mod.config;
+
+import com.dfsek.tectonic.api.config.template.ConfigTemplate;
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+
+import com.dfsek.terra.mod.implmentation.TerraIntProvider;
+
+import net.minecraft.client.gl.Uniform;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.intprovider.IntProvider;
+import net.minecraft.util.math.intprovider.IntProviderType;
+import net.minecraft.util.math.random.Random;
+import net.minecraft.world.dimension.DimensionType.MonsterSettings;
+
+import com.dfsek.terra.api.properties.Properties;
+import com.dfsek.terra.api.util.ConstantRange;
+import com.dfsek.terra.api.util.Range;
+
+
+public class VanillaWorldProperties implements ConfigTemplate, Properties {
+    @Value("minecraft.fixed-time")
+    @Default
+    private Long fixedTime = null;
+
+    @Value("minecraft.has-sky-light")
+    @Default
+    private Boolean hasSkyLight = false;
+
+    @Value("minecraft.has-ceiling")
+    @Default
+    private Boolean hasCeiling = false;
+
+    @Value("minecraft.ultra-warm")
+    @Default
+    private Boolean ultraWarm = false;
+
+    @Value("minecraft.natural")
+    @Default
+    private Boolean natural = false;
+
+    @Value("minecraft.coordinate-scale")
+    @Default
+    private Double coordinateScale = 1.0E-5d;
+
+    @Value("minecraft.bed-works")
+    @Default
+    private Boolean bedWorks = false;
+
+    @Value("minecraft.respawn-anchor-works")
+    @Default
+    private Boolean respawnAnchorWorks = false;
+
+    @Value("minecraft.height")
+    @Default
+    private Range height = new ConstantRange(0, 16);
+
+    @Value("minecraft.height.logical")
+    @Default
+    private Integer logicalHeight = 0;
+
+    @Value("minecraft.infiniburn")
+    @Default
+    private Identifier infiniburn = new Identifier("");
+
+    @Value("minecraft.effects")
+    @Default
+    private Identifier effects = new Identifier("");
+
+    @Value("minecraft.ambient-light")
+    @Default
+    private Float ambientLight = Float.MAX_VALUE;
+
+    @Value("minecraft.monster-settings")
+    @Default
+    private MonsterSettings monsterSettings = new MonsterSettings(false, false, new TerraIntProvider(new ConstantRange(0, 1)), 0);
+    
+    @Value("minecraft.sealevel")
+    @Default
+    private Integer sealevel = 0;
+
+    public Long getFixedTime() {
+        return fixedTime;
+    }
+
+    public Boolean getHasSkyLight() {
+        return hasSkyLight;
+    }
+
+    public Boolean getHasCeiling() {
+        return hasCeiling;
+    }
+
+    public Boolean getUltraWarm() {
+        return ultraWarm;
+    }
+
+    public Boolean getNatural() {
+        return natural;
+    }
+
+    public Double getCoordinateScale() {
+        return coordinateScale;
+    }
+
+    public Boolean getBedWorks() {
+        return bedWorks;
+    }
+
+    public Boolean getRespawnAnchorWorks() {
+        return respawnAnchorWorks;
+    }
+
+    public Range getHeight() {
+        return height;
+    }
+
+    public Integer getLogicalHeight() {
+        return logicalHeight;
+    }
+
+    public Identifier getInfiniburn() {
+        return infiniburn;
+    }
+
+    public Identifier getEffects() {
+        return effects;
+    }
+
+    public Float getAmbientLight() {
+        return ambientLight;
+    }
+
+    public MonsterSettings getMonsterSettings() {
+        return monsterSettings;
+    }
+    
+    public Integer getSealevel() {
+        return sealevel;
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/data/Codecs.java

@@ -1,5 +1,10 @@
 package com.dfsek.terra.mod.data;
 
+import com.dfsek.terra.api.util.ConstantRange;
+import com.dfsek.terra.api.util.Range;
+
+import com.dfsek.terra.mod.implmentation.TerraIntProvider;
+
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.util.dynamic.RegistryOps;
@@ -61,4 +66,9 @@ public final class Codecs {
                                                                  .forGetter(MinecraftChunkGeneratorWrapper::getSettings)
                                               ).apply(instance, instance.stable(MinecraftChunkGeneratorWrapper::new))
                    );
+    
+    public static final Codec<TerraIntProvider> TERRA_CONSTANT_RANGE_INT_PROVIDER_TYPE = RecordCodecBuilder.create(range -> range.group(
+            Codec.INT.fieldOf("min").stable().forGetter(TerraIntProvider::getMin),
+            Codec.INT.fieldOf("max").stable().forGetter(TerraIntProvider::getMax)).apply(range, range.stable((min, max) -> new TerraIntProvider(new ConstantRange(
+            min, max)))));
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/MinecraftChunkGeneratorWrapper.java

@@ -17,6 +17,9 @@
 
 package com.dfsek.terra.mod.generation;
 
+import com.dfsek.terra.mod.config.VanillaBiomeProperties;
+import com.dfsek.terra.mod.config.VanillaWorldProperties;
+
 import com.mojang.serialization.Codec;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -75,6 +78,8 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
     private ChunkGenerator delegate;
     private ConfigPack pack;
     
+    private VanillaWorldProperties vanillaWorldProperties;
+    
     public MinecraftChunkGeneratorWrapper(Registry<StructureSet> noiseRegistry, TerraBiomeSource biomeSource, ConfigPack configPack,
                                           RegistryEntry<ChunkGeneratorSettings> settingsSupplier) {
         super(noiseRegistry, Optional.empty(), biomeSource);
@@ -85,6 +90,11 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
         this.delegate = pack.getGeneratorProvider().newInstance(pack);
         logger.info("Loading world with config pack {}", pack.getID());
         this.biomeSource = biomeSource;
+        if (pack.getContext().has(VanillaBiomeProperties.class)) {
+            vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class);
+        } else {
+            vanillaWorldProperties = new VanillaWorldProperties();
+        }
     }
     
     public Registry<StructureSet> getNoiseRegistry() {
@@ -114,7 +124,7 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
     
     @Override
     public int getWorldHeight() {
-        return settings.value().generationShapeConfig().height();
+        return vanillaWorldProperties.getHeight().getMax();
     }
     
     
@@ -136,7 +146,7 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
     
     private void beard(StructureAccessor structureAccessor, Chunk chunk, WorldProperties world, BiomeProvider biomeProvider,
                        PreLoadCompatibilityOptions compatibilityOptions) {
-        StructureWeightSampler structureWeightSampler = StructureWeightSampler.method_42695(structureAccessor, chunk.getPos());
+        StructureWeightSampler structureWeightSampler = StructureWeightSampler.createStructureWeightSampler(structureAccessor, chunk.getPos());
         double threshold = compatibilityOptions.getBeardThreshold();
         double airThreshold = compatibilityOptions.getAirThreshold();
         int xi = chunk.getPos().x << 4;
@@ -173,12 +183,12 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
     
     @Override
     public int getSeaLevel() {
-        return settings.value().seaLevel();
+        return vanillaWorldProperties.getSealevel();
     }
     
     @Override
     public int getMinimumY() {
-        return settings.value().generationShapeConfig().minimumY();
+        return vanillaWorldProperties.getHeight().getMin();
     }
     
     
@@ -208,7 +218,7 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
     
     @Override
     public void getDebugHudText(List<String> text, NoiseConfig noiseConfig, BlockPos pos) {
-    
+        // no op
     }
     
     public ConfigPack getPack() {
@@ -219,6 +229,12 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
         this.pack = pack;
         this.delegate = pack.getGeneratorProvider().newInstance(pack);
         biomeSource.setPack(pack);
+    
+        if (pack.getContext().has(VanillaBiomeProperties.class)) {
+            vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class);
+        } else {
+            vanillaWorldProperties = new VanillaWorldProperties();
+        }
         
         logger.debug("Loading world with config pack {}", pack.getID());
     }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/implmentation/TerraIntProvider.java

@@ -0,0 +1,43 @@
+package com.dfsek.terra.mod.implmentation;
+
+import com.dfsek.terra.api.util.Range;
+
+import com.dfsek.terra.mod.util.MinecraftAdapter;
+
+import net.minecraft.util.math.intprovider.IntProvider;
+import net.minecraft.util.math.intprovider.IntProviderType;
+import net.minecraft.util.math.random.Random;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class TerraIntProvider extends IntProvider {
+    public static final Map<Class, IntProviderType> TERRA_RANGE_TYPE_TO_INT_PROVIDER_TYPE = new HashMap<>();
+    
+    public Range delegate;
+    
+    public TerraIntProvider(Range delegate) {
+        this.delegate = delegate;
+    }
+    
+    @Override
+    public int get(Random random) {
+        return delegate.get(MinecraftAdapter.adapt(random));
+    }
+    
+    @Override
+    public int getMin() {
+        return delegate.getMin();
+    }
+    
+    @Override
+    public int getMax() {
+        return delegate.getMax();
+    }
+    
+    @Override
+    public IntProviderType<?> getType() {
+        return TERRA_RANGE_TYPE_TO_INT_PROVIDER_TYPE.get(delegate.getClass());
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/access/BiomeAccessor.java

@@ -1,12 +0,0 @@
-package com.dfsek.terra.mod.mixin.access;
-
-import net.minecraft.world.biome.Biome;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-
-@Mixin(Biome.class)
-public interface BiomeAccessor {
-    @Accessor("weather")
-    Biome.Weather getWeather();
-}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/gameplay/BoneMealItemMixin.java

@@ -1,6 +1,8 @@
 package com.dfsek.terra.mod.mixin.gameplay;
 
 
+import com.dfsek.terra.mod.util.MinecraftAdapter;
+
 import net.minecraft.item.BoneMealItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.world.ServerWorld;
@@ -14,6 +16,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import com.dfsek.terra.mod.util.FertilizableUtil;
 
+import java.util.random.RandomGenerator;
+
 
 @Mixin(BoneMealItem.class)
 public class BoneMealItemMixin {
@@ -22,7 +26,7 @@ public class BoneMealItemMixin {
     @Inject(method = "useOnFertilizable", at = @At("HEAD"), cancellable = true)
     private static void injectUseOnFertilizable(ItemStack stack, World world, BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
         if(world instanceof ServerWorld) {
-            Boolean value = FertilizableUtil.grow((ServerWorld) world, pos, world.getBlockState(pos), cooldownId);
+            Boolean value = FertilizableUtil.grow((ServerWorld) world, MinecraftAdapter.adapt(world.getRandom()), pos, world.getBlockState(pos), cooldownId);
             stack.decrement(1);
             if(value != null) {
                 cir.setReturnValue(value);

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/gameplay/BoneMealTaskMixin.java

@@ -1,6 +1,10 @@
 package com.dfsek.terra.mod.mixin.gameplay;
 
 
+import com.dfsek.terra.api.world.World;
+
+import com.dfsek.terra.mod.util.WritableWorldSeedRedirecter;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.ai.brain.task.BoneMealTask;
@@ -14,14 +18,15 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Map;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
-import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
+import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.util.Rotation;
 import com.dfsek.terra.api.util.vector.Vector3Int;
 import com.dfsek.terra.api.world.WritableWorld;
 import com.dfsek.terra.mod.config.FertilizableConfig;
 import com.dfsek.terra.mod.util.BiomeUtil;
+import com.dfsek.terra.mod.util.MinecraftAdapter;
 
 
 @Mixin(BoneMealTask.class)
@@ -35,21 +40,20 @@ public class BoneMealTaskMixin {
             Block block = blockState.getBlock();
             FertilizableConfig config = map.get(Registry.BLOCK.getId(block));
             if(config != null) {
-                Boolean villagerFertilizable = config.isVillagerFertilizable();
-                if(villagerFertilizable != null) {
-                    if(villagerFertilizable) {
-                        ConfiguredStructure canGrow = config.getCanGrow();
+                Boolean villagerFarmable = config.isVillagerFarmable();
+                if(villagerFarmable != null) {
+                    if(villagerFarmable) {
+                        Structure canGrow = config.getCanGrow();
                         if(canGrow != null) {
-                            Random random = (Random) world.getRandom();
-                            cir.setReturnValue(canGrow.getStructure().get(random).generate(
-                                    Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), (WritableWorld) world, random, Rotation.NONE));
+                            RandomGenerator random = MinecraftAdapter.adapt(world.getRandom());
+                            cir.setReturnValue(canGrow.generate(
+                                    Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), new WritableWorldSeedRedirecter((WritableWorld) world, world.getSeed() + random.nextLong(Long.MAX_VALUE)), Rotation.NONE));
                             return;
                         }
                         cir.setReturnValue(true);
                         return;
                     }
                     cir.setReturnValue(false);
-                    return;
                 }
             }
         }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/gameplay/ServerWorldMixin.java

@@ -1,6 +1,8 @@
 package com.dfsek.terra.mod.mixin.gameplay;
 
 
+import com.dfsek.terra.mod.util.MinecraftAdapter;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
@@ -12,6 +14,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 import com.dfsek.terra.mod.util.FertilizableUtil;
 
+import java.util.random.RandomGenerator;
+
 
 @Mixin(ServerWorld.class)
 public class ServerWorldMixin {
@@ -22,7 +26,7 @@ public class ServerWorldMixin {
                        target = "Lnet/minecraft/block/BlockState;randomTick(Lnet/minecraft/server/world/ServerWorld;" +
                                 "Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/random/Random;)V"))
     public void injectTickChunk(BlockState instance, ServerWorld serverWorld, BlockPos blockPos, Random random) {
-        Boolean value = FertilizableUtil.grow(serverWorld, blockPos, instance, cooldownId);
+        Boolean value = FertilizableUtil.grow(serverWorld, MinecraftAdapter.adapt(random), blockPos, instance, cooldownId);
         if(value != null) {
             if(!value) {
                 instance.randomTick(serverWorld, blockPos, random);

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/lifecycle/DataPackContentsMixin.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.mod.mixin.lifecycle;
 
+import com.dfsek.terra.mod.util.MinecraftUtil;
+
 import net.minecraft.server.DataPackContents;
 import net.minecraft.util.registry.DynamicRegistryManager;
 import net.minecraft.util.registry.Registry;

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java

@@ -61,7 +61,13 @@ public class BiomeUtil {
      */
     protected static void registerBiome(Biome biome, ConfigPack pack,
                                         com.dfsek.terra.api.registry.key.RegistryKey id) {
-        VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
+        VanillaBiomeProperties vanillaBiomeProperties;
+        if (biome.getContext().has(VanillaBiomeProperties.class)) {
+            vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
+        } else {
+            vanillaBiomeProperties = new VanillaBiomeProperties();
+        }
+
         
         net.minecraft.world.biome.Biome minecraftBiome = MinecraftUtil.createBiome(vanillaBiomeProperties);
         

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java

@@ -0,0 +1,62 @@
+package com.dfsek.terra.mod.util;
+
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.mod.config.VanillaBiomeProperties;
+import com.dfsek.terra.mod.config.VanillaWorldProperties;
+
+import net.minecraft.tag.TagKey;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.world.dimension.DimensionOptions;
+import net.minecraft.world.dimension.DimensionType;
+
+import java.util.OptionalLong;
+
+
+public class DimensionUtil {
+    protected static RegistryKey<DimensionType> registerDimension(Identifier identifier,
+                                                                                DimensionType dimension) {
+        BuiltinRegistries.add(BuiltinRegistries.DIMENSION_TYPE,
+                              registerKey(identifier)
+                                           .getValue(),
+                              dimension);
+        return getDimensionKey(identifier);
+    }
+    
+    public static RegistryKey<DimensionOptions> registerKey(Identifier identifier) {
+        return RegistryKey.of(Registry.DIMENSION_KEY, identifier);
+    }
+    public static RegistryKey<DimensionType> getDimensionKey(Identifier identifier) {
+        return BuiltinRegistries.DIMENSION_TYPE.getKey(BuiltinRegistries.DIMENSION_TYPE.get(identifier)).orElseThrow();
+    }
+    
+    protected static RegistryKey<DimensionType> registerDimension(ConfigPack pack) {
+        VanillaWorldProperties vanillaWorldProperties;
+        if (pack.getContext().has(VanillaBiomeProperties.class)) {
+            vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class);
+        } else {
+            vanillaWorldProperties = new VanillaWorldProperties();
+        }
+    
+        DimensionType overworldDimensionType = new DimensionType(
+                vanillaWorldProperties.getFixedTime() == null ? OptionalLong.empty() : OptionalLong.of(vanillaWorldProperties.getFixedTime()),
+                vanillaWorldProperties.getHasSkyLight(),
+                vanillaWorldProperties.getHasCeiling(),
+                vanillaWorldProperties.getUltraWarm(),
+                vanillaWorldProperties.getNatural(),
+                vanillaWorldProperties.getCoordinateScale(),
+                vanillaWorldProperties.getBedWorks(),
+                vanillaWorldProperties.getRespawnAnchorWorks(),
+                vanillaWorldProperties.getHeight().getMin(),
+                vanillaWorldProperties.getHeight().getMax(),
+                vanillaWorldProperties.getLogicalHeight(),
+                TagKey.of(Registry.BLOCK_KEY, vanillaWorldProperties.getInfiniburn()),
+                vanillaWorldProperties.getEffects(),
+                vanillaWorldProperties.getAmbientLight(),
+                vanillaWorldProperties.getMonsterSettings());
+        
+        return registerDimension(new Identifier("terra", pack.getID().toLowerCase()), overworldDimensionType);
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/FertilizableUtil.java

@@ -8,9 +8,9 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.registry.Registry;
 
 import java.util.Map;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 
-import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
+import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.util.Rotation;
 import com.dfsek.terra.api.util.vector.Vector3Int;
 import com.dfsek.terra.api.world.WritableWorld;
@@ -18,23 +18,16 @@ import com.dfsek.terra.mod.config.FertilizableConfig;
 
 
 public class FertilizableUtil {
-    
-    private static final Random mojankRandom = new Random();
-    
-    public static Boolean grow(ServerWorld world, BlockPos pos, BlockState state, Identifier cooldownId) {
-        return grow(world, mojankRandom, pos, state, cooldownId);
-    }
-    
-    public static Boolean grow(ServerWorld world, Random random, BlockPos pos, BlockState state, Identifier cooldownId) {
+    public static Boolean grow(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state, Identifier cooldownId) {
         Map<Identifier, FertilizableConfig> map = BiomeUtil.TERRA_BIOME_FERTILIZABLE_MAP.get(world.getBiome(pos));
         if(map != null) {
             Block block = state.getBlock();
             FertilizableConfig config = map.get(Registry.BLOCK.getId(block));
             if(config != null) {
-                ConfiguredStructure canGrow = config.getCanGrow();
+                Structure canGrow = config.getCanGrow();
                 if(canGrow != null) {
-                    if(!canGrow.getStructure().get(random).generate(
-                            Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), (WritableWorld) world, random, Rotation.NONE)) {
+                    if(!canGrow.generate(
+                            Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), new WritableWorldSeedRedirecter((WritableWorld) world, world.getSeed() + random.nextLong(Long.MAX_VALUE)), Rotation.NONE)) {
                         return false;
                     }
                 }
@@ -44,8 +37,8 @@ public class FertilizableUtil {
                         return true;
                     }
                 }
-                config.getStructures().get(random).getStructure().get(random).generate(
-                        Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), (WritableWorld) world, random, Rotation.NONE);
+                config.getStructures().get(random).generate(
+                        Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), new WritableWorldSeedRedirecter((WritableWorld) world, world.getSeed() + random.nextLong(Long.MAX_VALUE)), Rotation.NONE);
                 return true;
             }
         }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftAdapter.java

@@ -18,11 +18,14 @@
 package com.dfsek.terra.mod.util;
 
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.random.Random;
 import net.minecraft.world.HeightLimitView;
 
 import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.info.WorldProperties;
 
+import java.util.random.RandomGenerator;
+
 
 public final class MinecraftAdapter {
     
@@ -53,4 +56,48 @@ public final class MinecraftAdapter {
             }
         };
     }
+    
+    public static RandomGenerator adapt(Random random) {
+        return new RandomGenerator() {
+            @Override
+            public boolean nextBoolean() {
+                return random.nextBoolean();
+            }
+    
+            @Override
+            public float nextFloat() {
+                return random.nextFloat();
+            }
+    
+            @Override
+            public double nextDouble() {
+                return random.nextDouble();
+            }
+    
+            @Override
+            public int nextInt() {
+                return random.nextInt();
+            }
+    
+            @Override
+            public int nextInt(int bound) {
+                return random.nextInt(bound);
+            }
+    
+            @Override
+            public long nextLong() {
+                return random.nextLong();
+            }
+    
+            @Override
+            public double nextGaussian() {
+                return random.nextGaussian();
+            }
+    
+            @Override
+            public int nextInt(int origin, int bound) {
+                return random.nextBetween(origin, bound);
+            }
+        };
+    }
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java

@@ -1,10 +1,17 @@
 package com.dfsek.terra.mod.util;
 
+import com.dfsek.terra.api.util.ConstantRange;
+import com.dfsek.terra.mod.data.Codecs;
+
+import com.dfsek.terra.mod.implmentation.TerraIntProvider;
+
 import net.minecraft.block.entity.LootableContainerBlockEntity;
 import net.minecraft.block.entity.MobSpawnerBlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.intprovider.ConstantIntProvider;
+import net.minecraft.util.math.intprovider.IntProviderType;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryEntry;
 import net.minecraft.util.registry.RegistryKey;
@@ -12,6 +19,7 @@ import net.minecraft.world.WorldAccess;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.Biome.Builder;
 import net.minecraft.world.biome.BiomeEffects;
+import net.minecraft.world.biome.BiomeEffects.GrassColorModifier;
 import net.minecraft.world.biome.GenerationSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,6 +61,13 @@ public final class MinecraftUtil {
         return null;
     }
     
+    public static void registerIntProviderTypes() {
+        IntProviderType<TerraIntProvider> CONSTANT = IntProviderType.register("terra:constant_range",
+                                                                              Codecs.TERRA_CONSTANT_RANGE_INT_PROVIDER_TYPE);
+        
+        TerraIntProvider.TERRA_RANGE_TYPE_TO_INT_PROVIDER_TYPE.put(ConstantRange.class, CONSTANT);
+    }
+    
     public static RegistryKey<Biome> registerKey(Identifier identifier) {
         return RegistryKey.of(Registry.BIOME_KEY, identifier);
     }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java

@@ -1,11 +1,16 @@
 package com.dfsek.terra.mod.util;
 
+import net.minecraft.client.gui.screen.CustomizeBuffetLevelScreen;
+import net.minecraft.client.gui.screen.CustomizeFlatLevelScreen;
+import net.minecraft.client.gui.screen.world.LevelScreenProvider;
 import net.minecraft.structure.StructureSet;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.noise.DoublePerlinNoiseSampler.NoiseParameters;
 import net.minecraft.util.registry.BuiltinRegistries;
+import net.minecraft.util.registry.DynamicRegistryManager;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryEntry;
+import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.MultiNoiseBiomeSource;
 import net.minecraft.world.biome.source.TheEndBiomeSource;
@@ -13,8 +18,11 @@ import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.dimension.DimensionTypes;
 import net.minecraft.world.gen.WorldPreset;
+import net.minecraft.world.gen.WorldPresets;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
+import net.minecraft.world.gen.chunk.FlatChunkGenerator;
+import net.minecraft.world.gen.chunk.FlatChunkGeneratorConfig;
 import net.minecraft.world.gen.chunk.NoiseChunkGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,6 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.mod.generation.MinecraftChunkGeneratorWrapper;
@@ -33,6 +42,9 @@ public class PresetUtil {
     private static final Logger LOGGER = LoggerFactory.getLogger(PresetUtil.class);
     private static final List<Identifier> PRESETS = new ArrayList<>();
     
+    public static RegistryKey<WorldPreset> getPresetKey(Identifier identifier) {
+        return RegistryKey.of(Registry.WORLD_PRESET_KEY, identifier);
+    }
     public static Pair<Identifier, WorldPreset> createDefault(ConfigPack pack) {
         Registry<DimensionType> dimensionTypeRegistry = BuiltinRegistries.DIMENSION_TYPE;
         Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry = BuiltinRegistries.CHUNK_GENERATOR_SETTINGS;
@@ -57,7 +69,7 @@ public class PresetUtil {
                                                                                             new TheEndBiomeSource(biomeRegistry),
                                                                                             endChunkGeneratorSettings));
         
-        RegistryEntry<DimensionType> overworldDimensionType = dimensionTypeRegistry.getOrCreateEntry(DimensionTypes.OVERWORLD);
+        RegistryEntry<DimensionType> overworldDimensionType = dimensionTypeRegistry.getOrCreateEntry(DimensionUtil.registerDimension(pack));
         
         RegistryEntry<ChunkGeneratorSettings> overworld = chunkGeneratorSettingsRegistry.getOrCreateEntry(ChunkGeneratorSettings.OVERWORLD);
         

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/WritableWorldSeedRedirecter.java

@@ -0,0 +1,168 @@
+package com.dfsek.terra.mod.util;
+
+import com.dfsek.terra.api.block.entity.BlockEntity;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.entity.Entity;
+import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.util.vector.Vector3;
+import com.dfsek.terra.api.util.vector.Vector3.Mutable;
+import com.dfsek.terra.api.util.vector.Vector3Int;
+import com.dfsek.terra.api.world.BufferedWorld;
+import com.dfsek.terra.api.world.BufferedWorld.Builder;
+import com.dfsek.terra.api.world.WritableWorld;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;
+
+
+public class WritableWorldSeedRedirecter implements WritableWorld {
+    private final WritableWorld delegate;
+    private final long seed;
+    
+    
+    public WritableWorldSeedRedirecter(WritableWorld delegate, long seed) {
+        this.delegate = delegate;
+        this.seed = seed;
+    }
+    
+    @Override
+    public Object getHandle() {
+            return delegate.getHandle();
+    }
+    
+    @Override
+    public BlockState getBlockState(int x, int y, int z) {
+        return delegate.getBlockState(x, y, z);
+    }
+    
+    @Override
+    public BlockState getBlockState(Vector3 position) {
+        return delegate.getBlockState(position);
+    }
+    
+    @Override
+    public BlockState getBlockState(Vector3Int position) {
+        return delegate.getBlockState(position);
+    }
+    
+    @Override
+    public BlockEntity getBlockEntity(int x, int y, int z) {
+        return delegate.getBlockEntity(x, y, z);
+    }
+    
+    @Override
+    public BlockEntity getBlockEntity(Vector3 position) {
+        return delegate.getBlockEntity(position);
+    }
+    
+    @Override
+    public BlockEntity getBlockEntity(Vector3Int position) {
+        return delegate.getBlockEntity(position);
+    }
+    
+    @Override
+    public ChunkGenerator getGenerator() {
+        return delegate.getGenerator();
+    }
+    
+    @Override
+    public BiomeProvider getBiomeProvider() {
+        return delegate.getBiomeProvider();
+    }
+    
+    @Override
+    public ConfigPack getPack() {
+        return delegate.getPack();
+    }
+    
+    @Override
+    public void setBlockState(Vector3 position, BlockState data, boolean physics) {
+        delegate.setBlockState(position, data, physics);
+    }
+    
+    @Override
+    public void setBlockState(Mutable position, BlockState data, boolean physics) {
+        delegate.setBlockState(position, data, physics);
+    }
+    
+    @Override
+    public void setBlockState(Vector3Int position, BlockState data, boolean physics) {
+        delegate.setBlockState(position, data, physics);
+    }
+    
+    @Override
+    public void setBlockState(Vector3Int.Mutable position, BlockState data, boolean physics) {
+        delegate.setBlockState(position, data, physics);
+    }
+    
+    @Override
+    public void setBlockState(Vector3 position, BlockState data) {
+        delegate.setBlockState(position, data);
+    }
+    
+    @Override
+    public void setBlockState(Mutable position, BlockState data) {
+        delegate.setBlockState(position, data);
+    }
+    
+    @Override
+    public void setBlockState(Vector3Int position, BlockState data) {
+        delegate.setBlockState(position, data);
+    }
+    
+    @Override
+    public void setBlockState(Vector3Int.Mutable position, BlockState data) {
+        delegate.setBlockState(position, data);
+    }
+    
+    @Override
+    public void setBlockState(int x, int y, int z, BlockState data) {
+        delegate.setBlockState(x, y, z, data);
+    }
+    
+    @Override
+    public void setBlockState(int x, int y, int z, BlockState data, boolean physics) {
+        delegate.setBlockState(x, y, z, data, physics);
+    }
+    
+    @Override
+    public Entity spawnEntity(Vector3 location, EntityType entityType) {
+        return delegate.spawnEntity(location, entityType);
+    }
+    
+    @Override
+    public Entity spawnEntity(double x, double y, double z, EntityType entityType) {
+        return delegate.spawnEntity(x, y, z, entityType);
+    }
+    
+    @Override
+    public BufferedWorld buffer(int offsetX, int offsetY, int offsetZ) {
+        return delegate.buffer(offsetX, offsetY, offsetZ);
+    }
+    
+    @Override
+    public Builder buffer() {
+        return delegate.buffer();
+    }
+    
+    @Override
+    public Column<WritableWorld> column(int x, int z) {
+        return delegate.column(x, z);
+    }
+    
+    @Override
+    public long getSeed() {
+        return seed;
+    }
+    
+    @Override
+    public int getMaxHeight() {
+        return delegate.getMaxHeight();
+    }
+    
+    @Override
+    public int getMinHeight() {
+        return delegate.getMinHeight();
+    }
+}

platforms/mixin-common/src/main/resources/terra.accesswidener

@@ -1,2 +1 @@
-accessWidener v1 named
-accessible class net/minecraft/world/biome/Biome$Weather
+accessWidener v1 named

platforms/mixin-lifecycle/build.gradle.kts

@@ -1,22 +1,22 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    compileOnly("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-    
     implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    shadedApi(project(":common:implementation:base"))
     
-    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
+    modImplementation(libs.mod.fabric.fabric.loader)
+    
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
+    
+    modImplementation(libs.mod.cloud.fabric) {
         exclude("net.fabricmc")
         exclude("net.fabricmc.fabric-api")
     }
@@ -42,5 +42,5 @@ tasks {
 
 architectury {
     common("fabric", "quilt")
-    minecraft = Versions.Mod.minecraft
+    minecraft = libs.versions.mod.minecraft.get()
 }

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

@@ -16,15 +16,19 @@ public class LifecycleEntryPoint {
     protected static void initialize(String modName, LifecyclePlatform platform) {
         logger.info("Initializing Terra {} mod...", modName);
         
-        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
-                CommandExecutionCoordinator.simpleCoordinator(),
-                serverCommandSource -> (CommandSender) serverCommandSource,
-                commandSender -> (ServerCommandSource) commandSender
-        );
-        
-        
-        manager.brigadierManager().setNativeNumberSuggestions(false);
-        
-        platform.getEventManager().callEvent(new CommandRegistrationEvent(manager));
+        try {
+            FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
+                    CommandExecutionCoordinator.simpleCoordinator(),
+                    serverCommandSource -> (CommandSender) serverCommandSource,
+                    commandSender -> (ServerCommandSource) commandSender
+            );
+    
+    
+            manager.brigadierManager().setNativeNumberSuggestions(false);
+    
+            platform.getEventManager().callEvent(new CommandRegistrationEvent(manager));
+        } catch (Exception e) {
+            logger.warn("Fabric API not found, Terra commands will not work.");
+        }
     }
 }

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

@@ -1,5 +1,7 @@
 package com.dfsek.terra.lifecycle.util;
 
+import com.dfsek.terra.mod.util.MinecraftUtil;
+
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
@@ -12,6 +14,7 @@ public final class RegistryUtil {
     }
     
     public static void register() {
+        MinecraftUtil.registerIntProviderTypes();
         Registry.register(Registry.CHUNK_GENERATOR, new Identifier("terra:terra"), Codecs.MINECRAFT_CHUNK_GENERATOR_WRAPPER);
         Registry.register(Registry.BIOME_SOURCE, new Identifier("terra:terra"), Codecs.TERRA_BIOME_SOURCE);
     }

platforms/quilt/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 architectury {
@@ -12,9 +12,6 @@ architectury {
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-    
     implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     "developmentQuilt"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionQuilt")) { isTransitive = false }
@@ -23,23 +20,22 @@ dependencies {
     "developmentQuilt"(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-lifecycle", configuration = "transformProductionQuilt")) { isTransitive = false }
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
     
-    modImplementation("org.quiltmc:quilt-loader:${Versions.Quilt.quiltLoader}")
+    modImplementation(libs.mod.quilt.quilt.loader)
+    modImplementation(libs.mod.quilt.fabric.api)
     
-    modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${Versions.Quilt.fabricApi}")
-    
-    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
+    modImplementation(libs.mod.cloud.fabric) {
         exclude("net.fabricmc")
         exclude("net.fabricmc.fabric-api")
     }
-    include("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
+    include(libs.mod.cloud.fabric) {
         exclude("net.fabricmc")
         exclude("net.fabricmc.fabric-api")
     }
     
-    modLocalRuntime("com.github.astei:lazydfu:${Versions.Mod.lazyDfu}") {
+    modLocalRuntime(libs.mod.lazy.dfu) {
         exclude("net.fabricmc")
         exclude("net.fabricmc.fabric-api")
     }