common-ify LifecycleUtil

2026-04-14 11:46:06 +00:00 · 2022-06-21 18:21:54 -07:00
parent 6ba4a48e29
commit 3b156586dc
12 changed files with 97 additions and 158 deletions
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeEntryPoint.java
+++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeEntryPoint.java
@@ -17,8 +17,12 @@

 package com.dfsek.terra.forge;

+import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
+import com.dfsek.terra.forge.util.BiomeUtil;
+
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
+import net.minecraft.world.biome.Biome;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -28,12 +32,12 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.registries.ForgeRegistries.Keys;
 import net.minecraftforge.registries.RegisterEvent;
+import net.minecraftforge.registries.RegisterEvent.RegisterHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import com.dfsek.terra.forge.AwfulForgeHacks.RegistrySanityCheck;
 import com.dfsek.terra.forge.AwfulForgeHacks.RegistryStep;
-import com.dfsek.terra.forge.util.LifecycleUtil;
 import com.dfsek.terra.mod.data.Codecs;


@@ -62,11 +66,17 @@ public class ForgeEntryPoint {
        modEventBus.register(this);
    }
    
+    public static void initialize(RegisterHelper<Biome> helper) {
+        getPlatform().getEventManager().callEvent(
+                new PlatformInitializationEvent());
+        BiomeUtil.registerBiomes(helper);
+    }
+    
    @SubscribeEvent(priority = EventPriority.LOWEST)
    public void registerBiomes(RegisterEvent event) {
        event.register(Keys.BLOCKS, helper -> sanityCheck.progress(RegistryStep.BLOCK, () -> logger.debug("Block registration detected.")));
-        event.register(Keys.BIOMES, helper -> sanityCheck.progress(RegistryStep.BIOME, () -> LifecycleUtil.initialize(helper)));
-        event.register(Registry.WORLD_PRESET_KEY, helper -> sanityCheck.progress(RegistryStep.WORLD_TYPE, () -> LifecycleUtil.registerWorldTypes(helper)));
+        event.register(Keys.BIOMES, helper -> sanityCheck.progress(RegistryStep.BIOME, () -> initialize(helper)));
+        event.register(Registry.WORLD_PRESET_KEY, helper -> sanityCheck.progress(RegistryStep.WORLD_TYPE, () -> TERRA_PLUGIN.registerWorldTypes(helper::register)));
        
        
        event.register(Registry.CHUNK_GENERATOR_KEY, helper -> helper.register(new Identifier("terra:terra"), Codecs.MINECRAFT_CHUNK_GENERATOR_WRAPPER));
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/PlatformImpl.java
+++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/PlatformImpl.java
@@ -20,8 +20,13 @@ package com.dfsek.terra.forge;
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.parser.tokenizer.ParseException;
 import ca.solostudios.strata.version.Version;
+
+import com.dfsek.terra.mod.util.PresetUtil;
+
 import net.minecraft.MinecraftVersion;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.Identifier;
+import net.minecraft.world.gen.WorldPreset;
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.server.ServerLifecycleHooks;
 import org.jetbrains.annotations.NotNull;
@@ -31,6 +36,7 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.BiConsumer;

 import com.dfsek.terra.addon.EphemeralAddon;
 import com.dfsek.terra.api.addon.BaseAddon;
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/util/LifecycleUtil.java
+++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/util/LifecycleUtil.java
@@ -1,102 +0,0 @@
-package com.dfsek.terra.forge.util;
-
-import net.minecraft.structure.StructureSet;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.noise.DoublePerlinNoiseSampler.NoiseParameters;
-import net.minecraft.util.registry.BuiltinRegistries;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryEntry;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.source.MultiNoiseBiomeSource;
-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 net.minecraftforge.registries.RegisterEvent.RegisterHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent;
-import com.dfsek.terra.forge.ForgeEntryPoint;
-import com.dfsek.terra.mod.generation.MinecraftChunkGeneratorWrapper;
-import com.dfsek.terra.mod.generation.TerraBiomeSource;
-
-
-public class LifecycleUtil {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LifecycleUtil.class);
-    
-    private static final List<Identifier> PRESETS = new ArrayList<>();
-    public static void initialize(RegisterHelper<Biome> helper) {
-        ForgeEntryPoint.getPlatform().getEventManager().callEvent(
-                new PlatformInitializationEvent());
-        BiomeUtil.registerBiomes(helper);
-    }
-    
-    public static void registerWorldTypes(RegisterHelper<WorldPreset> helper) {
-        LOGGER.info("Registering Terra world types...");
-    
-        Registry<DimensionType> dimensionTypeRegistry = BuiltinRegistries.DIMENSION_TYPE;
-        Registry<ChunkGeneratorSettings> chunkGeneratorSettingsRegistry = BuiltinRegistries.CHUNK_GENERATOR_SETTINGS;
-        Registry<StructureSet> structureSetRegistry = BuiltinRegistries.STRUCTURE_SET;
-        Registry<NoiseParameters> noiseParametersRegistry = BuiltinRegistries.NOISE_PARAMETERS;
-        Registry<Biome> biomeRegistry = BuiltinRegistries.BIOME;
-    
-        RegistryEntry<DimensionType> theNetherDimensionType = dimensionTypeRegistry.getOrCreateEntry(DimensionTypes.THE_NETHER);
-        RegistryEntry<ChunkGeneratorSettings>
-                netherChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getOrCreateEntry(ChunkGeneratorSettings.NETHER);
-        DimensionOptions netherDimensionOptions = new DimensionOptions(theNetherDimensionType,
-                                                                       new NoiseChunkGenerator(structureSetRegistry,
-                                                                                               noiseParametersRegistry,
-                                                                                               MultiNoiseBiomeSource.Preset.NETHER.getBiomeSource(
-                                                                                                       biomeRegistry),
-                                                                                               netherChunkGeneratorSettings));
-        RegistryEntry<DimensionType> theEndDimensionType = dimensionTypeRegistry.getOrCreateEntry(DimensionTypes.THE_END);
-        RegistryEntry<ChunkGeneratorSettings> endChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getOrCreateEntry(
-                ChunkGeneratorSettings.END);
-        DimensionOptions endDimensionOptions = new DimensionOptions(theEndDimensionType,
-                                                                    new NoiseChunkGenerator(structureSetRegistry, noiseParametersRegistry,
-                                                                                            new TheEndBiomeSource(biomeRegistry),
-                                                                                            endChunkGeneratorSettings));
-    
-        RegistryEntry<DimensionType> overworldDimensionType = dimensionTypeRegistry.getOrCreateEntry(DimensionTypes.OVERWORLD);
-    
-        RegistryEntry<ChunkGeneratorSettings> overworld = chunkGeneratorSettingsRegistry.getOrCreateEntry(ChunkGeneratorSettings.OVERWORLD);
-        ForgeEntryPoint
-                .getPlatform()
-                .getRawConfigRegistry()
-                .forEach((id, pack) -> {
-                             Identifier generatorID = Identifier.of("terra", pack.getID().toLowerCase(Locale.ROOT) + "/" + pack.getNamespace().toLowerCase(
-                                     Locale.ROOT));
-                
-                             PRESETS.add(generatorID);
-                
-                             TerraBiomeSource biomeSource = new TerraBiomeSource(biomeRegistry, pack);
-                             ChunkGenerator generator = new MinecraftChunkGeneratorWrapper(structureSetRegistry, biomeSource, pack, overworld);
-                
-                             DimensionOptions dimensionOptions = new DimensionOptions(overworldDimensionType, generator);
-                             WorldPreset preset = new WorldPreset(
-                                     Map.of(
-                                             DimensionOptions.OVERWORLD, dimensionOptions,
-                                             DimensionOptions.NETHER, netherDimensionOptions,
-                                             DimensionOptions.END, endDimensionOptions
-                                           )
-                             );
-                             helper.register(generatorID, preset);
-                             LOGGER.info("Registered world type \"{}\"", generatorID);
-                         }
-                        );
-    }
-    
-    public static List<Identifier> getPresets() {
-        return PRESETS;
-    }
-}
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/util/TagUtil.java
+++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/util/TagUtil.java
@@ -2,6 +2,8 @@ package com.dfsek.terra.forge.util;

 import com.dfsek.terra.mod.util.MinecraftUtil;

+import com.dfsek.terra.mod.util.PresetUtil;
+
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.tag.TagKey;
 import net.minecraft.tag.WorldPresetTags;
@@ -38,7 +40,7 @@ public final class TagUtil {
        logger.info("Doing preset tag garbage....");
        Map<TagKey<WorldPreset>, List<RegistryEntry<WorldPreset>>> collect = tagsToMutableMap(registry);
        
-        LifecycleUtil
+        PresetUtil
                .getPresets()
                .forEach(id -> MinecraftUtil
                        .getEntry(registry, id)