Reformat

2026-06-20 15:51:11 +00:00 · 2023-12-12 19:07:57 -07:00
parent e83b70b5ae
commit 4c71355535
45 changed files with 253 additions and 300 deletions
@@ -19,13 +19,6 @@ 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;

@@ -38,6 +31,7 @@ import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.mod.config.PostLoadCompatibilityOptions;
 import com.dfsek.terra.mod.config.PreLoadCompatibilityOptions;
 import com.dfsek.terra.mod.config.VanillaBiomeProperties;
+import com.dfsek.terra.mod.config.VanillaWorldProperties;


 public abstract class MinecraftAddon implements BaseAddon {
@@ -52,17 +46,17 @@ public abstract class MinecraftAddon implements BaseAddon {
    @Override
    public void initialize() {
        modPlatform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(this, ConfigPackPostLoadEvent.class)
-                .then(event -> event.getPack().getContext().put(event.loadTemplate(new VanillaWorldProperties())))
-                .priority(100)
-                .global();
+            .getHandler(FunctionalEventHandler.class)
+            .register(this, ConfigPackPostLoadEvent.class)
+            .then(event -> event.getPack().getContext().put(event.loadTemplate(new VanillaWorldProperties())))
+            .priority(100)
+            .global();
        modPlatform.getEventManager()
-                   .getHandler(FunctionalEventHandler.class)
-                   .register(this, ConfigPackPreLoadEvent.class)
-                   .then(event -> event.getPack().getContext().put(event.loadTemplate(new PreLoadCompatibilityOptions())))
-                   .global();
-        
+            .getHandler(FunctionalEventHandler.class)
+            .register(this, ConfigPackPreLoadEvent.class)
+            .then(event -> event.getPack().getContext().put(event.loadTemplate(new PreLoadCompatibilityOptions())))
+            .global();
+
        modPlatform.getEventManager()
            .getHandler(FunctionalEventHandler.class)
            .register(this, ConfigPackPostLoadEvent.class)
@@ -6,7 +6,6 @@ import com.dfsek.tectonic.api.exception.LoadException;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.sound.BiomeAdditionsSound;
 import net.minecraft.sound.BiomeMoodSound;
@@ -22,7 +21,6 @@ import net.minecraft.world.biome.BiomeParticleConfig;
 import net.minecraft.world.biome.SpawnSettings;
 import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
 import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterList;
-import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.WorldPreset;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
@@ -70,7 +68,7 @@ public abstract class ModPlatform extends AbstractPlatform {
        });
        getRawConfigRegistry()
            .forEach(pack -> {
-                if (!configPacksInMetaPack.contains(pack.getID())) {
+                if(!configPacksInMetaPack.contains(pack.getID())) {
                    PresetUtil.createDefault(pack, this).apply(registerFunction);
                }
            });
@@ -2,15 +2,10 @@ 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.Range;

-import com.dfsek.terra.mod.implmentation.TerraIntProvider;
-
-import net.minecraft.world.dimension.DimensionType.MonsterSettings;
-

 public class MonsterSettingsConfig implements ObjectTemplate<MonsterSettingsConfig> {
    @Value("piglin-safe")
@@ -46,7 +41,6 @@ public class MonsterSettingsConfig implements ObjectTemplate<MonsterSettingsConf
    }


-
    @Override
    public MonsterSettingsConfig get() {
        return this;
@@ -3,15 +3,7 @@ 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;
@@ -134,7 +126,7 @@ public class VanillaWorldProperties implements ConfigTemplate, Properties {

    public ConstantRange getHeight() {
        //TODO THIS IS BAD
-        if (height != null) {
+        if(height != null) {
            return new ConstantRange(height.getMin(), height.getMax());
        } else {
            return null;
@@ -1,20 +1,16 @@
 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.generation.GenerationSettings;
-import com.dfsek.terra.mod.implmentation.TerraIntProvider;
-
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;

 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.registry.key.RegistryKey;
+import com.dfsek.terra.api.util.ConstantRange;
 import com.dfsek.terra.mod.CommonPlatform;
+import com.dfsek.terra.mod.generation.GenerationSettings;
 import com.dfsek.terra.mod.generation.MinecraftChunkGeneratorWrapper;
 import com.dfsek.terra.mod.generation.TerraBiomeSource;
+import com.dfsek.terra.mod.implmentation.TerraIntProvider;


 public final class Codecs {
@@ -75,6 +71,7 @@ public final class Codecs {

    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(
+            Codec.INT.fieldOf("max").stable().forGetter(TerraIntProvider::getMax))
+        .apply(range, range.stable((min, max) -> new TerraIntProvider(new ConstantRange(
            min, max)))));
 }
@@ -1,7 +1,6 @@
 package com.dfsek.terra.mod.generation;

 import com.dfsek.terra.api.util.ConstantRange;
-import com.dfsek.terra.api.util.Range;


 public record GenerationSettings(ConstantRange height, Integer sealevel, Boolean mobGeneration) {
@@ -17,11 +17,6 @@

 package com.dfsek.terra.mod.generation;

-import com.dfsek.terra.api.util.ConstantRange;
-import com.dfsek.terra.api.util.Range;
-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;
@@ -44,7 +39,6 @@ import net.minecraft.world.gen.GenerationStep.Carver;
 import net.minecraft.world.gen.StructureAccessor;
 import net.minecraft.world.gen.StructureWeightSampler;
 import net.minecraft.world.gen.chunk.Blender;
-import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 import net.minecraft.world.gen.chunk.VerticalBlockSample;
 import net.minecraft.world.gen.densityfunction.DensityFunction.UnblendedNoisePos;
 import net.minecraft.world.gen.noise.NoiseConfig;
@@ -64,8 +64,8 @@ public class MinecraftWorldHandle implements WorldHandle {

    @Override
    public @NotNull EntityType getEntity(@NotNull String id) {
-        if (!id.contains(":")) { //TODO: remove in 7.0
-            String newid = "minecraft:" + id.toLowerCase();;
+        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 preform this rename in your config packs as this translation will be removed in the next major " +
@@ -1,9 +1,5 @@
 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;
@@ -11,31 +7,34 @@ import net.minecraft.util.math.random.Random;
 import java.util.HashMap;
 import java.util.Map;

+import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.mod.util.MinecraftAdapter;
+

 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());
@@ -59,7 +59,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity {

    public void terra$setSpawnedType(@NotNull EntityType creatureType) {
        Random rand;
-        if (hasWorld()) {
+        if(hasWorld()) {
            rand = world.getRandom();
        } else {
            rand = Random.create();
@@ -3,8 +3,6 @@ package com.dfsek.terra.mod.mixin.lifecycle;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKeys;
-import com.dfsek.terra.mod.util.MinecraftUtil;
-
 import net.minecraft.server.DataPackContents;
 import net.minecraft.world.biome.Biome;
 import org.spongepowered.asm.mixin.Mixin;
@@ -1,34 +1,25 @@
 package com.dfsek.terra.mod.util;

-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.mod.ModPlatform;
-import com.dfsek.terra.mod.config.MonsterSettingsConfig;
-import com.dfsek.terra.mod.config.VanillaBiomeProperties;
-import com.dfsek.terra.mod.config.VanillaWorldProperties;
-
-import com.dfsek.terra.mod.implmentation.TerraIntProvider;
-
-import net.minecraft.registry.BuiltinRegistries;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.tag.TagKey;
-import net.minecraft.util.Identifier;
-
-import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.dimension.DimensionType.MonsterSettings;
 import org.jetbrains.annotations.NotNull;

 import java.util.OptionalLong;

+import com.dfsek.terra.mod.ModPlatform;
+import com.dfsek.terra.mod.config.MonsterSettingsConfig;
+import com.dfsek.terra.mod.config.VanillaWorldProperties;
+import com.dfsek.terra.mod.implmentation.TerraIntProvider;
+

 public class DimensionUtil {
-    public static DimensionType createDimension(VanillaWorldProperties vanillaWorldProperties, DimensionType defaultDimension, ModPlatform platform) {
+    public static DimensionType createDimension(VanillaWorldProperties vanillaWorldProperties, DimensionType defaultDimension,
+                                                ModPlatform platform) {

        MonsterSettingsConfig monsterSettingsConfig;
-        if (vanillaWorldProperties.getMonsterSettings() != null) {
+        if(vanillaWorldProperties.getMonsterSettings() != null) {
            monsterSettingsConfig = vanillaWorldProperties.getMonsterSettings();
        } else {
            monsterSettingsConfig = new MonsterSettingsConfig();
@@ -43,13 +34,21 @@ public class DimensionUtil {
            vanillaWorldProperties.getHasCeiling() == null ? defaultDimension.hasCeiling() : vanillaWorldProperties.getHasCeiling(),
            vanillaWorldProperties.getUltraWarm() == null ? defaultDimension.ultrawarm() : vanillaWorldProperties.getUltraWarm(),
            vanillaWorldProperties.getNatural() == null ? defaultDimension.natural() : vanillaWorldProperties.getNatural(),
-            vanillaWorldProperties.getCoordinateScale() == null ? defaultDimension.coordinateScale() : vanillaWorldProperties.getCoordinateScale(),
+            vanillaWorldProperties.getCoordinateScale() == null
+            ? defaultDimension.coordinateScale()
+            : vanillaWorldProperties.getCoordinateScale(),
            vanillaWorldProperties.getBedWorks() == null ? defaultDimension.bedWorks() : vanillaWorldProperties.getBedWorks(),
-            vanillaWorldProperties.getRespawnAnchorWorks() == null ? defaultDimension.respawnAnchorWorks() : vanillaWorldProperties.getRespawnAnchorWorks(),
+            vanillaWorldProperties.getRespawnAnchorWorks() == null
+            ? defaultDimension.respawnAnchorWorks()
+            : vanillaWorldProperties.getRespawnAnchorWorks(),
            vanillaWorldProperties.getHeight() == null ? defaultDimension.minY() : vanillaWorldProperties.getHeight().getMin(),
            vanillaWorldProperties.getHeight() == null ? defaultDimension.height() : vanillaWorldProperties.getHeight().getRange(),
-            vanillaWorldProperties.getLogicalHeight() == null ? defaultDimension.logicalHeight() : vanillaWorldProperties.getLogicalHeight(),
-            vanillaWorldProperties.getInfiniburn() == null ? defaultDimension.infiniburn() : TagKey.of(RegistryKeys.BLOCK, vanillaWorldProperties.getInfiniburn()),
+            vanillaWorldProperties.getLogicalHeight() == null
+            ? defaultDimension.logicalHeight()
+            : vanillaWorldProperties.getLogicalHeight(),
+            vanillaWorldProperties.getInfiniburn() == null
+            ? defaultDimension.infiniburn()
+            : TagKey.of(RegistryKeys.BLOCK, vanillaWorldProperties.getInfiniburn()),
            vanillaWorldProperties.getEffects() == null ? defaultDimension.effects() : vanillaWorldProperties.getEffects(),
            vanillaWorldProperties.getAmbientLight() == null ? defaultDimension.ambientLight() : vanillaWorldProperties.getAmbientLight(),
            monsterSettings
@@ -66,7 +65,9 @@ public class DimensionUtil {
            monsterSettingsConfig.getHasRaids() == null ? defaultMonsterSettings.hasRaids() : monsterSettingsConfig.getHasRaids(),
            monsterSettingsConfig.getMonsterSpawnLight() == null ? defaultMonsterSettings.monsterSpawnLightTest() : new TerraIntProvider(
                monsterSettingsConfig.getMonsterSpawnLight()),
-            monsterSettingsConfig.getMonsterSpawnBlockLightLimit() == null ? defaultMonsterSettings.monsterSpawnBlockLightLimit() : monsterSettingsConfig.getMonsterSpawnBlockLightLimit()
+            monsterSettingsConfig.getMonsterSpawnBlockLightLimit() == null
+            ? defaultMonsterSettings.monsterSpawnBlockLightLimit()
+            : monsterSettingsConfig.getMonsterSpawnBlockLightLimit()
        );
        return monsterSettings;
    }
@@ -21,11 +21,11 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.random.Random;
 import net.minecraft.world.HeightLimitView;

+import java.util.random.RandomGenerator;
+
 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 {

@@ -56,44 +56,44 @@ 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);
@@ -1,10 +1,5 @@
 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;
@@ -15,14 +10,11 @@ import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
-
 import net.minecraft.util.math.intprovider.IntProviderType;
-
 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.GenerationSettings;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.feature.ConfiguredFeature;
@@ -41,7 +33,10 @@ import com.dfsek.terra.api.block.entity.Container;
 import com.dfsek.terra.api.block.entity.MobSpawner;
 import com.dfsek.terra.api.block.entity.Sign;
 import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.util.ConstantRange;
 import com.dfsek.terra.mod.config.VanillaBiomeProperties;
+import com.dfsek.terra.mod.data.Codecs;
+import com.dfsek.terra.mod.implmentation.TerraIntProvider;
 import com.dfsek.terra.mod.mixin.access.BiomeAccessor;
 import com.dfsek.terra.mod.mixin_ifaces.FloraFeatureHolder;

@@ -102,14 +97,14 @@ public final class MinecraftUtil {
        return Map.copyOf(TERRA_BIOME_MAP);
    }

-    
+
    public static void registerIntProviderTypes() {
        IntProviderType<TerraIntProvider> CONSTANT = IntProviderType.register("terra:constant_range",
-                                                                              Codecs.TERRA_CONSTANT_RANGE_INT_PROVIDER_TYPE);
-        
+            Codecs.TERRA_CONSTANT_RANGE_INT_PROVIDER_TYPE);
+
        TerraIntProvider.TERRA_RANGE_TYPE_TO_INT_PROVIDER_TYPE.put(ConstantRange.class, CONSTANT);
    }
-    
+
    public static RegistryKey<Biome> registerBiomeKey(Identifier identifier) {
        return RegistryKey.of(RegistryKeys.BIOME, identifier);
    }
@@ -1,22 +1,22 @@
 package com.dfsek.terra.mod.util;

-import com.dfsek.terra.api.util.ConstantRange;
-import com.dfsek.terra.mod.config.VanillaWorldProperties;
-
-import com.dfsek.terra.mod.generation.GenerationSettings;
-
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.source.MultiNoiseBiomeSource;
+import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterList;
+import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterLists;
+import net.minecraft.world.biome.source.TheEndBiomeSource;
 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.chunk.ChunkGenerator;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
+import net.minecraft.world.gen.chunk.NoiseChunkGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -27,17 +27,14 @@ import java.util.Locale;

 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.MetaPack;
+import com.dfsek.terra.api.util.ConstantRange;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.mod.ModPlatform;
+import com.dfsek.terra.mod.config.VanillaWorldProperties;
+import com.dfsek.terra.mod.generation.GenerationSettings;
 import com.dfsek.terra.mod.generation.MinecraftChunkGeneratorWrapper;
 import com.dfsek.terra.mod.generation.TerraBiomeSource;

-import net.minecraft.world.biome.source.MultiNoiseBiomeSource;
-import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterList;
-import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterLists;
-import net.minecraft.world.biome.source.TheEndBiomeSource;
-import net.minecraft.world.gen.chunk.NoiseChunkGenerator;
-

 public class PresetUtil {
    private static final Logger LOGGER = LoggerFactory.getLogger(PresetUtil.class);
@@ -59,7 +56,8 @@ public class PresetUtil {

        insertCustom(platform, "minecraft:overworld", pack, dimensionTypeRegistry, chunkGeneratorSettingsRegistry, dimensionMap);

-        insertDefaults(dimensionTypeRegistry, chunkGeneratorSettingsRegistry, multiNoiseBiomeSourceParameterLists, platform.biomeRegistry(), dimensionMap);
+        insertDefaults(dimensionTypeRegistry, chunkGeneratorSettingsRegistry, multiNoiseBiomeSourceParameterLists, platform.biomeRegistry(),
+            dimensionMap);

        WorldPreset preset = new WorldPreset(dimensionMap);
        LOGGER.info("Created world type \"{}\"", generatorID);
@@ -72,8 +70,9 @@ public class PresetUtil {
        Registry<MultiNoiseBiomeSourceParameterList> multiNoiseBiomeSourceParameterLists =
            platform.multiNoiseBiomeSourceParameterListRegistry();

-        Identifier generatorID = Identifier.of("terra", metaPack.getID().toLowerCase(Locale.ROOT) + "/" + metaPack.getNamespace().toLowerCase(
-            Locale.ROOT));
+        Identifier generatorID = Identifier.of("terra",
+            metaPack.getID().toLowerCase(Locale.ROOT) + "/" + metaPack.getNamespace().toLowerCase(
+                Locale.ROOT));

        PRESETS.add(generatorID);

@@ -83,7 +82,8 @@ public class PresetUtil {
            insertCustom(platform, key, pack, dimensionTypeRegistry, chunkGeneratorSettingsRegistry, dimensionMap);
        });

-        insertDefaults(dimensionTypeRegistry, chunkGeneratorSettingsRegistry, multiNoiseBiomeSourceParameterLists, platform.biomeRegistry(), dimensionMap);
+        insertDefaults(dimensionTypeRegistry, chunkGeneratorSettingsRegistry, multiNoiseBiomeSourceParameterLists, platform.biomeRegistry(),
+            dimensionMap);

        WorldPreset preset = new WorldPreset(dimensionMap);
        LOGGER.info("Created world type \"{}\"", generatorID);
@@ -97,7 +97,7 @@ public class PresetUtil {

        VanillaWorldProperties vanillaWorldProperties;

-        if (pack.getContext().has(VanillaWorldProperties.class)) {
+        if(pack.getContext().has(VanillaWorldProperties.class)) {
            vanillaWorldProperties = pack.getContext().get(VanillaWorldProperties.class);
        } else {
            vanillaWorldProperties = new VanillaWorldProperties();
@@ -108,8 +108,9 @@ public class PresetUtil {
        assert defaultDimension != null;

        DimensionType dimensionType = DimensionUtil.createDimension(vanillaWorldProperties, defaultDimension, platform);
-        RegistryKey<DimensionType> dimensionTypeRegistryKey = MinecraftUtil.registerDimensionTypeKey(new Identifier("terra", pack.getID().toLowerCase(
-            Locale.ROOT)));
+        RegistryKey<DimensionType> dimensionTypeRegistryKey = MinecraftUtil.registerDimensionTypeKey(
+            new Identifier("terra", pack.getID().toLowerCase(
+                Locale.ROOT)));

        Registry.registerReference(dimensionTypeRegistry, dimensionTypeRegistryKey, dimensionType);

@@ -117,12 +118,19 @@ public class PresetUtil {

        TerraBiomeSource biomeSource = new TerraBiomeSource(pack);

-        RegistryEntry<ChunkGeneratorSettings> defaultGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(chunkGeneratorSettingsRegistry.get(new Identifier(vanillaWorldProperties.getVanillaGeneration())));
+        RegistryEntry<ChunkGeneratorSettings> defaultGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(
+            chunkGeneratorSettingsRegistry.get(new Identifier(vanillaWorldProperties.getVanillaGeneration())));

        GenerationSettings generatorSettings = new GenerationSettings(
-            vanillaWorldProperties.getHeight() == null ? new ConstantRange(defaultGeneratorSettings.value().generationShapeConfig().minimumY(), defaultGeneratorSettings.value().generationShapeConfig().height()) : vanillaWorldProperties.getHeight(),
-            vanillaWorldProperties.getSealevel() == null ? defaultGeneratorSettings.value().seaLevel() : vanillaWorldProperties.getSealevel(),
-            vanillaWorldProperties.getMobGeneration() == null ? !defaultGeneratorSettings.value().mobGenerationDisabled() : vanillaWorldProperties.getMobGeneration());
+            vanillaWorldProperties.getHeight() == null ? new ConstantRange(
+                defaultGeneratorSettings.value().generationShapeConfig().minimumY(),
+                defaultGeneratorSettings.value().generationShapeConfig().height()) : vanillaWorldProperties.getHeight(),
+            vanillaWorldProperties.getSealevel() == null
+            ? defaultGeneratorSettings.value().seaLevel()
+            : vanillaWorldProperties.getSealevel(),
+            vanillaWorldProperties.getMobGeneration() == null
+            ? !defaultGeneratorSettings.value().mobGenerationDisabled()
+            : vanillaWorldProperties.getMobGeneration());

        ChunkGenerator generator = new MinecraftChunkGeneratorWrapper(biomeSource, pack, generatorSettings);

@@ -131,41 +139,52 @@ public class PresetUtil {
        dimensionMap.put(dimensionOptionsRegistryKey, dimensionOptions);
    }

-    private static void insertDefaults(Registry<DimensionType> dimensionTypeRegistry, Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry, Registry<MultiNoiseBiomeSourceParameterList> multiNoiseBiomeSourceParameterLists, Registry<Biome> biomeRegistry, HashMap<RegistryKey<DimensionOptions>, DimensionOptions> map) {
-        if (!map.containsKey(DimensionOptions.OVERWORLD)) {
+    private static void insertDefaults(Registry<DimensionType> dimensionTypeRegistry,
+                                       Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry,
+                                       Registry<MultiNoiseBiomeSourceParameterList> multiNoiseBiomeSourceParameterLists,
+                                       Registry<Biome> biomeRegistry, HashMap<RegistryKey<DimensionOptions>, DimensionOptions> map) {
+        if(!map.containsKey(DimensionOptions.OVERWORLD)) {
            RegistryEntry<DimensionType> overworldDimensionType = dimensionTypeRegistry.getEntry(DimensionTypes.OVERWORLD).orElseThrow();

-            RegistryEntry.Reference<MultiNoiseBiomeSourceParameterList> overworldChunkBiomeReference = multiNoiseBiomeSourceParameterLists.getEntry(
-                MultiNoiseBiomeSourceParameterLists.OVERWORLD).orElseThrow();
+            RegistryEntry.Reference<MultiNoiseBiomeSourceParameterList> overworldChunkBiomeReference =
+                multiNoiseBiomeSourceParameterLists.getEntry(
+                    MultiNoiseBiomeSourceParameterLists.OVERWORLD).orElseThrow();

-            RegistryEntry<ChunkGeneratorSettings> overworldChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(ChunkGeneratorSettings.OVERWORLD)
+            RegistryEntry<ChunkGeneratorSettings> overworldChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(
+                    ChunkGeneratorSettings.OVERWORLD)
                .orElseThrow();


-            DimensionOptions overworldDimensionOptions = new DimensionOptions(overworldDimensionType, (new NoiseChunkGenerator(MultiNoiseBiomeSource.create(overworldChunkBiomeReference), overworldChunkGeneratorSettings)));
+            DimensionOptions overworldDimensionOptions = new DimensionOptions(overworldDimensionType,
+                (new NoiseChunkGenerator(MultiNoiseBiomeSource.create(overworldChunkBiomeReference), overworldChunkGeneratorSettings)));
            map.put(DimensionOptions.OVERWORLD, overworldDimensionOptions);
        }
-        if (!map.containsKey(DimensionOptions.NETHER)) {
+        if(!map.containsKey(DimensionOptions.NETHER)) {
            RegistryEntry<DimensionType> netherDimensionType = dimensionTypeRegistry.getEntry(DimensionTypes.THE_NETHER).orElseThrow();

-            RegistryEntry.Reference<MultiNoiseBiomeSourceParameterList> netherChunkBiomeReference = multiNoiseBiomeSourceParameterLists.getEntry(
-                MultiNoiseBiomeSourceParameterLists.NETHER).orElseThrow();
+            RegistryEntry.Reference<MultiNoiseBiomeSourceParameterList> netherChunkBiomeReference =
+                multiNoiseBiomeSourceParameterLists.getEntry(
+                    MultiNoiseBiomeSourceParameterLists.NETHER).orElseThrow();

-            RegistryEntry<ChunkGeneratorSettings> netherChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(ChunkGeneratorSettings.NETHER)
+            RegistryEntry<ChunkGeneratorSettings> netherChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(
+                    ChunkGeneratorSettings.NETHER)
                .orElseThrow();


-            DimensionOptions overworldDimensionOptions = new DimensionOptions(netherDimensionType, (new NoiseChunkGenerator(MultiNoiseBiomeSource.create(netherChunkBiomeReference), netherChunkGeneratorSettings)));
+            DimensionOptions overworldDimensionOptions = new DimensionOptions(netherDimensionType,
+                (new NoiseChunkGenerator(MultiNoiseBiomeSource.create(netherChunkBiomeReference), netherChunkGeneratorSettings)));
            map.put(DimensionOptions.NETHER, overworldDimensionOptions);
        }
-        if (!map.containsKey(DimensionOptions.END)) {
+        if(!map.containsKey(DimensionOptions.END)) {
            RegistryEntry<DimensionType> endDimensionType = dimensionTypeRegistry.getEntry(DimensionTypes.THE_END).orElseThrow();

-            RegistryEntry<ChunkGeneratorSettings> endChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(ChunkGeneratorSettings.END)
+            RegistryEntry<ChunkGeneratorSettings> endChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(
+                    ChunkGeneratorSettings.END)
                .orElseThrow();


-            DimensionOptions overworldDimensionOptions = new DimensionOptions(endDimensionType, (new NoiseChunkGenerator(TheEndBiomeSource.createVanilla(biomeRegistry.getReadOnlyWrapper()), endChunkGeneratorSettings)));
+            DimensionOptions overworldDimensionOptions = new DimensionOptions(endDimensionType,
+                (new NoiseChunkGenerator(TheEndBiomeSource.createVanilla(biomeRegistry.getReadOnlyWrapper()), endChunkGeneratorSettings)));
            map.put(DimensionOptions.END, overworldDimensionOptions);
        }
    }