reformat

2026-06-17 14:21:08 +00:00 · 2024-09-24 10:06:57 -06:00
parent a95a1284a4
commit 581651e83b
50 changed files with 179 additions and 188 deletions
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;

 import java.util.List;
 import java.util.Random;
-import java.util.random.RandomGenerator;

 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.world;

-import com.dfsek.terra.api.world.info.WorldProperties;
-
 import org.bukkit.generator.WorldInfo;

+import com.dfsek.terra.api.world.info.WorldProperties;
+

 public class BukkitWorldProperties implements WorldProperties {
    private final WorldInfo delegate;
@@ -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
@@ -6,7 +6,6 @@ import com.dfsek.tectonic.api.exception.LoadException;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
-import net.minecraft.entity.boss.dragon.EnderDragonFight;
 import net.minecraft.registry.Registry;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.sound.BiomeAdditionsSound;
@@ -30,7 +29,6 @@ import org.jetbrains.annotations.NotNull;

 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.function.BiConsumer;

 import com.dfsek.terra.AbstractPlatform;
@@ -79,29 +77,29 @@ public abstract class ModPlatform extends AbstractPlatform {
    public void register(TypeRegistry registry) {
        super.register(registry);
        registry.registerLoader(PlatformBiome.class, (type, o, loader, depthTracker) -> parseBiome((String) o, depthTracker))
-                .registerLoader(Identifier.class, (type, o, loader, depthTracker) -> {
-                    Identifier identifier = Identifier.tryParse((String) o);
-                    if(identifier == null)
-                        throw new LoadException("Invalid identifier: " + o, depthTracker);
-                    return identifier;
-                })
-                .registerLoader(Precipitation.class, (type, o, loader, depthTracker) -> Precipitation.valueOf(((String) o).toUpperCase()))
-                .registerLoader(GrassColorModifier.class,
-                                (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)
-                .registerLoader(BiomeMoodSound.class, BiomeMoodSoundTemplate::new)
-                .registerLoader(BiomeAdditionsSound.class, BiomeAdditionsSoundTemplate::new)
-                .registerLoader(MusicSound.class, MusicSoundTemplate::new)
-                .registerLoader(EntityType.class, EntityTypeTemplate::new)
-                .registerLoader(SpawnCostConfig.class, SpawnCostConfig::new)
-                .registerLoader(SpawnEntry.class, SpawnEntryTemplate::new)
-                .registerLoader(SpawnTypeConfig.class, SpawnTypeConfig::new)
-                .registerLoader(SpawnSettings.class, SpawnSettingsTemplate::new)
-                .registerLoader(VillagerType.class, VillagerTypeTemplate::new);
+            .registerLoader(Identifier.class, (type, o, loader, depthTracker) -> {
+                Identifier identifier = Identifier.tryParse((String) o);
+                if(identifier == null)
+                    throw new LoadException("Invalid identifier: " + o, depthTracker);
+                return identifier;
+            })
+            .registerLoader(Precipitation.class, (type, o, loader, depthTracker) -> Precipitation.valueOf(((String) o).toUpperCase()))
+            .registerLoader(GrassColorModifier.class,
+                (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)
+            .registerLoader(BiomeMoodSound.class, BiomeMoodSoundTemplate::new)
+            .registerLoader(BiomeAdditionsSound.class, BiomeAdditionsSoundTemplate::new)
+            .registerLoader(MusicSound.class, MusicSoundTemplate::new)
+            .registerLoader(EntityType.class, EntityTypeTemplate::new)
+            .registerLoader(SpawnCostConfig.class, SpawnCostConfig::new)
+            .registerLoader(SpawnEntry.class, SpawnEntryTemplate::new)
+            .registerLoader(SpawnTypeConfig.class, SpawnTypeConfig::new)
+            .registerLoader(SpawnSettings.class, SpawnSettingsTemplate::new)
+            .registerLoader(VillagerType.class, VillagerTypeTemplate::new);
    }

    private ProtoPlatformBiome parseBiome(String id, DepthTracker tracker) throws LoadException {
@@ -3,23 +3,22 @@ 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 net.minecraft.registry.Registries;
 import net.minecraft.sound.MusicSound;
 import net.minecraft.sound.SoundEvent;

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

 public class MusicSoundTemplate implements ObjectTemplate<MusicSound> {
    @Value("sound")
    @Default
    private SoundEvent sound = null;
-    
+
    @Value("delay")
    @Default
    private Range delay = null;
-    
+
    @Value("replace-current-music")
    @Default
    private Boolean replaceCurrentMusic = null;
@@ -3,12 +3,11 @@ 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 net.minecraft.entity.EntityType;
 import net.minecraft.world.biome.SpawnSettings.SpawnEntry;

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

 public class SpawnEntryTemplate implements ObjectTemplate<SpawnEntry> {
    @Value("type")
@@ -18,11 +17,11 @@ public class SpawnEntryTemplate implements ObjectTemplate<SpawnEntry> {
    @Value("weight")
    @Default
    private Integer weight = null;
-    
+
    @Value("group-size")
    @Default
    private Range groupSize = null;
-    
+
    @Override
    public SpawnEntry get() {
        return new SpawnEntry(type, weight, groupSize.getMin(), groupSize.getMax());
@@ -71,9 +71,10 @@ public final class Codecs {
                MinecraftChunkGeneratorWrapper::new))
        );

-    public static final MapCodec<TerraIntProvider> TERRA_CONSTANT_RANGE_INT_PROVIDER_TYPE = RecordCodecBuilder.mapCodec(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)))));
+    public static final MapCodec<TerraIntProvider> TERRA_CONSTANT_RANGE_INT_PROVIDER_TYPE = RecordCodecBuilder.mapCodec(
+        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)))));
 }
@@ -35,7 +35,6 @@ import net.minecraft.world.StructureWorldAccess;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.BiomeAccess;
 import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.dimension.NetherPortal;
 import net.minecraft.world.gen.GenerationStep.Carver;
 import net.minecraft.world.gen.StructureAccessor;
 import net.minecraft.world.gen.StructureWeightSampler;
@@ -1,36 +1,21 @@
 package com.dfsek.terra.mod.mixin.generalize;


-import net.minecraft.block.entity.SignText;
-import net.minecraft.client.render.DimensionEffects;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.WorldGenerationProgressListener;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.random.RandomSequencesState;
 import net.minecraft.util.profiler.Profiler;
 import net.minecraft.village.raid.RaidManager;
 import net.minecraft.world.MutableWorldProperties;
 import net.minecraft.world.World;
-import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.dimension.DimensionTypes;
-import net.minecraft.world.level.ServerWorldProperties;
-import net.minecraft.world.level.storage.LevelStorage;
-import net.minecraft.world.level.storage.LevelStorage.Session;
-import net.minecraft.world.spawner.SpecialSpawner;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;

-import java.util.List;
-import java.util.concurrent.Executor;
 import java.util.function.Supplier;


@@ -43,18 +28,23 @@ public abstract class ServerWorldMixin extends World {
            maxChainedNeighborUpdates);
    }

-    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/registry/entry/RegistryEntry;matchesKey(Lnet/minecraft/registry/RegistryKey;)Z"))
+    @Redirect(method = "<init>",
+              at = @At(value = "INVOKE",
+                       target = "Lnet/minecraft/registry/entry/RegistryEntry;matchesKey(Lnet/minecraft/registry/RegistryKey;)Z"))
    public <T> boolean matchesKeyProxy(RegistryEntry<T> instance, RegistryKey<T> tRegistryKey) {
-        if (tRegistryKey == DimensionTypes.THE_END) {
+        if(tRegistryKey == DimensionTypes.THE_END) {
            return (this.getRegistryKey() == World.END);
        }
        return instance.matchesKey(tRegistryKey);
    }

-    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/village/raid/RaidManager;nameFor(Lnet/minecraft/registry/entry/RegistryEntry;)Ljava/lang/String;"))
+    @Redirect(method = "<init>",
+              at = @At(value = "INVOKE",
+                       target = "Lnet/minecraft/village/raid/RaidManager;nameFor(Lnet/minecraft/registry/entry/RegistryEntry;)" +
+                                "Ljava/lang/String;"))
    public String nameForProxy(RegistryEntry<DimensionType> dimensionTypeEntry) {
        RegistryEntry<DimensionType> entry = dimensionTypeEntry;
-        if (this.getRegistryKey() == World.END) {
+        if(this.getRegistryKey() == World.END) {
            entry = getRegistryManager().get(RegistryKeys.DIMENSION_TYPE).getEntry(DimensionTypes.THE_NETHER).orElseThrow();
        }
        return RaidManager.nameFor(entry);
@@ -1,10 +1,5 @@
 package com.dfsek.terra.mod.util;

-import com.dfsek.terra.mod.CommonPlatform;
-
-import com.dfsek.terra.mod.config.PreLoadCompatibilityOptions;
-import com.dfsek.terra.mod.config.ProtoPlatformBiome;
-
 import net.minecraft.block.entity.LootableContainerBlockEntity;
 import net.minecraft.block.entity.MobSpawnerBlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
@@ -39,6 +34,9 @@ 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.CommonPlatform;
+import com.dfsek.terra.mod.config.PreLoadCompatibilityOptions;
+import com.dfsek.terra.mod.config.ProtoPlatformBiome;
 import com.dfsek.terra.mod.config.VanillaBiomeProperties;
 import com.dfsek.terra.mod.data.Codecs;
 import com.dfsek.terra.mod.implmentation.TerraIntProvider;
@@ -77,7 +75,7 @@ public final class MinecraftUtil {

        CommonPlatform.get().getConfigRegistry().forEach(pack -> { // Register all Terra biomes.
            PreLoadCompatibilityOptions compatibilityOptions = pack.getContext().get(PreLoadCompatibilityOptions.class);
-            if (compatibilityOptions.isInjectFlora()) {
+            if(compatibilityOptions.isInjectFlora()) {
                pack.getCheckedRegistry(com.dfsek.terra.api.world.biome.Biome.class)
                    .forEach((id, biome) -> {
                        registerFlora(biome, pack, id, biomeRegistry);
@@ -88,28 +86,30 @@ public final class MinecraftUtil {

    }

-    public static void registerFlora(com.dfsek.terra.api.world.biome.Biome biome, ConfigPack pack, com.dfsek.terra.api.registry.key.RegistryKey id, Registry<net.minecraft.world.biome.Biome> biomeRegistry) {
+    public static void registerFlora(com.dfsek.terra.api.world.biome.Biome biome, ConfigPack pack,
+                                     com.dfsek.terra.api.registry.key.RegistryKey id,
+                                     Registry<net.minecraft.world.biome.Biome> biomeRegistry) {
        RegistryKey<net.minecraft.world.biome.Biome> vanillaKey = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(biomeRegistry);
-            biomeRegistry.getOrEmpty(vanillaKey)
-                .ifPresentOrElse(vanillaBiome -> {
-                        Identifier terraBiomeIdentifier = Identifier.of("terra", MinecraftUtil.createBiomeID(pack, id));
-                        biomeRegistry.getOrEmpty(terraBiomeIdentifier).ifPresentOrElse(
-                            terraBiome -> {
-                                                                    List<ConfiguredFeature<?, ?>> flowerFeatures = List.copyOf(
-                                                                        vanillaBiome.getGenerationSettings()
-                                                                            .getFlowerFeatures());
-                                                                    logger.debug("Injecting flora into biome" +
-                                                                                 " {} : {}", terraBiomeIdentifier,
-                                                                        flowerFeatures);
-                                                                    ((FloraFeatureHolder) terraBiome.getGenerationSettings()).setFloraFeatures(
-                                                                        flowerFeatures);
-                            },
-                                                            () -> logger.error(
-                                                                "No such biome: {}",
-                                                                terraBiomeIdentifier)
-                        );
-                    },
-                    () -> logger.error("No vanilla biome: {}", vanillaKey));
+        biomeRegistry.getOrEmpty(vanillaKey)
+            .ifPresentOrElse(vanillaBiome -> {
+                    Identifier terraBiomeIdentifier = Identifier.of("terra", MinecraftUtil.createBiomeID(pack, id));
+                    biomeRegistry.getOrEmpty(terraBiomeIdentifier).ifPresentOrElse(
+                        terraBiome -> {
+                            List<ConfiguredFeature<?, ?>> flowerFeatures = List.copyOf(
+                                vanillaBiome.getGenerationSettings()
+                                    .getFlowerFeatures());
+                            logger.debug("Injecting flora into biome" +
+                                         " {} : {}", terraBiomeIdentifier,
+                                flowerFeatures);
+                            ((FloraFeatureHolder) terraBiome.getGenerationSettings()).setFloraFeatures(
+                                flowerFeatures);
+                        },
+                        () -> logger.error(
+                            "No such biome: {}",
+                            terraBiomeIdentifier)
+                    );
+                },
+                () -> logger.error("No vanilla biome: {}", vanillaKey));
    }

    public static Map<Identifier, List<Identifier>> getTerraBiomeMap() {
@@ -47,8 +47,9 @@ public class PresetUtil {
            platform.multiNoiseBiomeSourceParameterListRegistry();


-        Identifier generatorID = Identifier.tryParse("terra:" + pack.getID().toLowerCase(Locale.ROOT) + "/" + pack.getNamespace().toLowerCase(
-            Locale.ROOT));
+        Identifier generatorID = Identifier.tryParse(
+            "terra:" + pack.getID().toLowerCase(Locale.ROOT) + "/" + pack.getNamespace().toLowerCase(
+                Locale.ROOT));

        PRESETS.add(generatorID);

@@ -1,8 +1,5 @@
 package com.dfsek.terra.lifecycle;

-import com.dfsek.terra.api.command.CommandSender;
-import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
-
 import net.minecraft.server.command.ServerCommandSource;
 import org.incendo.cloud.SenderMapper;
 import org.incendo.cloud.execution.ExecutionCoordinator;
@@ -10,6 +7,9 @@ import org.incendo.cloud.fabric.FabricServerCommandManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import com.dfsek.terra.api.command.CommandSender;
+import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
+

 public final class LifecycleEntryPoint {
    private static final Logger logger = LoggerFactory.getLogger(LifecycleEntryPoint.class);
@@ -4,8 +4,8 @@ import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.parser.tokenizer.ParseException;
 import ca.solostudios.strata.version.Version;
 import net.minecraft.MinecraftVersion;
-import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.enchantment.Enchantment;
+import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.MinecraftServer;