Reformat

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -27,7 +27,8 @@ fun Project.configureDistribution() {
         group = "terra"
         doFirst {
             file("${buildDir}/resources/main/packs/").deleteRecursively()
-            val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip")
+            val defaultPackUrl =
+                URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip")
             downloadPack(defaultPackUrl, project)
         }
     }

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/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/command-structures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java

@@ -6,6 +6,8 @@ import cloud.commandframework.arguments.standard.EnumArgument;
 import cloud.commandframework.arguments.standard.LongArgument;
 import cloud.commandframework.context.CommandContext;
 
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
@@ -21,8 +23,6 @@ import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.util.Rotation;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
-import java.util.random.RandomGenerator;
-import java.util.random.RandomGeneratorFactory;
 
 public class StructureCommandAddon implements AddonInitializer {
     @Inject

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.ore.utils;
 
+import java.util.random.RandomGenerator;
+
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.util.collection.MaterialSet;
 import com.dfsek.terra.api.world.WritableWorld;
 
-import java.util.random.RandomGenerator;
-
 
 public class VanillaOreUtils {
     private static boolean shouldExpose(RandomGenerator random, double exposedChance) {
@@ -14,7 +14,8 @@ public class VanillaOreUtils {
         return random.nextFloat() < exposedChance;
     }
 
-    public static boolean shouldPlace(MaterialSet replaceable, BlockType type, Double exposedChance, RandomGenerator 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/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.RandomGenerator;
-
 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;

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

@@ -10,6 +10,9 @@ package com.dfsek.terra.addons.terrascript.script.functions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+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;
 import com.dfsek.terra.addons.terrascript.parser.lang.Scope;
@@ -28,9 +31,6 @@ import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.util.vector.Vector2;
 import com.dfsek.terra.api.util.vector.Vector3;
 
-import java.util.random.RandomGenerator;
-import java.util.random.RandomGeneratorFactory;
-
 
 public class LootFunction implements Function<Void> {
     private static final Logger LOGGER = LoggerFactory.getLogger(LootFunction.class);

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

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.api;
 
-import com.dfsek.terra.api.config.MetaPack;
-
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
@@ -16,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;

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

@@ -2,6 +2,8 @@ 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;
@@ -9,8 +11,6 @@ import com.dfsek.terra.api.registry.meta.RegistryProvider;
 import com.dfsek.terra.api.tectonic.ConfigLoadingDelegate;
 import com.dfsek.terra.api.tectonic.LoaderRegistrar;
 
-import java.util.Map;
-
 
 public interface MetaPack extends LoaderRegistrar,
                                   ConfigLoadingDelegate,

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

@@ -18,10 +18,6 @@
 package com.dfsek.terra;
 
 import com.dfsek.tectonic.api.TypeRegistry;
-
-import com.dfsek.terra.api.config.MetaPack;
-import com.dfsek.terra.registry.master.MetaConfigRegistry;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.jetbrains.annotations.NotNull;
@@ -55,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;
@@ -77,6 +74,7 @@ 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;
 
 
 /**
@@ -168,7 +166,6 @@ public abstract class AbstractPlatform implements Platform {
             .global();
 
 
-
         logger.info("Terra addons successfully loaded.");
         logger.info("Finished initialization.");
     }

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

@@ -1,8 +1,16 @@
 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.awt.image.BufferedImage;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
@@ -18,58 +26,34 @@ import java.util.Map;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
-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 com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.ConfigType;
 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.tectonic.ConfigLoadingDelegate;
 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.config.loaders.config.BufferedImageLoader;
 import com.dfsek.terra.registry.CheckedRegistryImpl;
 import com.dfsek.terra.registry.OpenRegistryImpl;
-
 import com.dfsek.terra.registry.master.ConfigRegistry;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 
 public class MetaPackImpl implements MetaPack {
 
     private static final Pattern PATTERN = Pattern.compile(", ");
-    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 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;
 

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

@@ -18,7 +18,6 @@
 package com.dfsek.terra.registry.master;
 
 import java.io.IOException;
-import java.io.Serial;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -26,10 +25,8 @@ import java.util.List;
 import java.util.stream.Stream;
 
 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.util.reflection.TypeKey;
-import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.config.pack.MetaPackImpl;
 import com.dfsek.terra.registry.OpenRegistryImpl;
 import com.dfsek.terra.registry.master.ConfigRegistry.PackLoadFailuresException;

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

@@ -5,12 +5,12 @@ import org.bukkit.generator.LimitedRegion;
 import org.bukkit.generator.WorldInfo;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Random;
+
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.bukkit.world.BukkitProtoWorld;
 
-import java.util.Random;
-
 
 public class BukkitBlockPopulator extends BlockPopulator {
     private final BlockState air;

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

@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.random.RandomGenerator;
-import java.util.stream.Collectors;
 
 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

@@ -62,7 +62,7 @@ public class BukkitWorldHandle implements WorldHandle {
     @Override
     public @NotNull EntityType getEntity(@NotNull String id) {
         if(!id.contains(":")) { //TODO: remove in 7.0
-            String newid = "minecraft:" + id.toLowerCase();;
+            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 backs as this translation will be removed in the next major " +

platforms/cli/src/main/java/com/dfsek/terra/cli/handle/CLIItemHandle.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.cli.handle;
 
-import java.util.Set;
-
 import com.dfsek.terra.api.handle.ItemHandle;
 import com.dfsek.terra.api.inventory.Item;
 import com.dfsek.terra.api.inventory.item.Enchantment;
 
+import java.util.Set;
+
 
 public class CLIItemHandle implements ItemHandle {
     @Override

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

@@ -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 {

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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)))));
 }

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

@@ -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) {

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

@@ -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;

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

@@ -65,7 +65,7 @@ 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();;
+            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 " +

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

@@ -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,6 +7,9 @@ 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<>();

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

@@ -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;

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

@@ -1,31 +1,22 @@
 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) {
@@ -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.getLogicalHeight() == null
-            vanillaWorldProperties.getInfiniburn() == null ? defaultDimension.infiniburn() : TagKey.of(RegistryKeys.BLOCK, vanillaWorldProperties.getInfiniburn()),
+            ? 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;
     }

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

@@ -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 {
 

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

@@ -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;
 

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

@@ -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,7 +70,8 @@ public class PresetUtil {
         Registry<MultiNoiseBiomeSourceParameterList> multiNoiseBiomeSourceParameterLists =
             platform.multiNoiseBiomeSourceParameterListRegistry();
 
-        Identifier generatorID = Identifier.of("terra", metaPack.getID().toLowerCase(Locale.ROOT) + "/" + metaPack.getNamespace().toLowerCase(
+        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);
@@ -108,7 +108,8 @@ public class PresetUtil {
         assert defaultDimension != null;
 
         DimensionType dimensionType = DimensionUtil.createDimension(vanillaWorldProperties, defaultDimension, platform);
-        RegistryKey<DimensionType> dimensionTypeRegistryKey = MinecraftUtil.registerDimensionTypeKey(new Identifier("terra", pack.getID().toLowerCase(
+        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.getHeight() == null ? new ConstantRange(
-            vanillaWorldProperties.getSealevel() == null ? defaultGeneratorSettings.value().seaLevel() : vanillaWorldProperties.getSealevel(),
+                defaultGeneratorSettings.value().generationShapeConfig().minimumY(),
-            vanillaWorldProperties.getMobGeneration() == null ? !defaultGeneratorSettings.value().mobGenerationDisabled() : vanillaWorldProperties.getMobGeneration());
+                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) {
+    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(
+            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)) {
             RegistryEntry<DimensionType> netherDimensionType = dimensionTypeRegistry.getEntry(DimensionTypes.THE_NETHER).orElseThrow();
 
-            RegistryEntry.Reference<MultiNoiseBiomeSourceParameterList> netherChunkBiomeReference = multiNoiseBiomeSourceParameterLists.getEntry(
+            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)) {
             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);
         }
     }

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

@@ -5,14 +5,11 @@ import ca.solostudios.strata.parser.tokenizer.ParseException;
 import ca.solostudios.strata.version.Version;
 import net.minecraft.MinecraftVersion;
 import net.minecraft.registry.DynamicRegistryManager;
-import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterList;
-import net.minecraft.world.dimension.DimensionOptions;
-import net.minecraft.world.dimension.DimensionOptionsRegistryHolder;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 import org.slf4j.Logger;

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

@@ -7,7 +7,6 @@ import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryLoader;
 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;

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

@@ -2,11 +2,10 @@ package com.dfsek.terra.lifecycle.util;
 
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import com.dfsek.terra.mod.util.MinecraftUtil;
-
 import net.minecraft.util.Identifier;
 
 import com.dfsek.terra.mod.data.Codecs;
+import com.dfsek.terra.mod.util.MinecraftUtil;
 
 
 public final class RegistryUtil {