Update ModuledChunkGenerator.java

NucleoidMC · Aug 11, 2023 · 9dc5f41 · 9dc5f41
1 parent 0d64aa4
commit 9dc5f41
Showing 1 changed file with 155 additions and 155 deletions.
diff --git a/src/main/java/com/hugman/uhc/map/ModuledChunkGenerator.java b/src/main/java/com/hugman/uhc/map/ModuledChunkGenerator.java
@@ -1,20 +1,15 @@
 package com.hugman.uhc.map;
 
-import com.hugman.uhc.UHC;
 import com.hugman.uhc.config.UHCConfig;
 import com.hugman.uhc.modifier.ModifierType;
 import com.hugman.uhc.modifier.PlacedFeaturesModifier;
 import com.hugman.uhc.util.ChunkGeneratorSettingsProvider;
 import com.mojang.datafixers.util.Pair;
-import com.mojang.serialization.Codec;
 import net.minecraft.SharedConstants;
 import net.minecraft.entity.SpawnGroup;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.registry.entry.RegistryEntryList;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.structure.StructureSet;
 import net.minecraft.util.collection.Pool;
@@ -36,7 +31,6 @@
 import net.minecraft.world.gen.StructureAccessor;
 import net.minecraft.world.gen.chunk.*;
 import net.minecraft.world.gen.chunk.placement.StructurePlacementCalculator;
-import net.minecraft.world.gen.feature.PlacedFeature;
 import net.minecraft.world.gen.noise.NoiseConfig;
 import net.minecraft.world.gen.structure.Structure;
 import org.jetbrains.annotations.Nullable;
@@ -48,154 +42,160 @@
 import java.util.function.Supplier;
 
 public class ModuledChunkGenerator extends GameChunkGenerator implements ChunkGeneratorSettingsProvider {
-	private final UHCConfig config;
-	private final long seed;
-	private final ChunkGenerator subGenerator;
-	private final ChunkGeneratorSettings settings;
-
-	public ModuledChunkGenerator(MinecraftServer server, UHCConfig config) {
-		super(config.mapConfig().dimension().chunkGenerator().getBiomeSource());
-		this.config = config;
-		this.seed = server.getOverworld().getRandom().nextLong();
-		this.subGenerator = config.mapConfig().dimension().chunkGenerator();
-		if(this.subGenerator instanceof NoiseChunkGenerator generator) {
-			this.settings = generator.getSettings().value();
+    private final UHCConfig config;
+    private final long seed;
+    private final ChunkGenerator subGenerator;
+    private final ChunkGeneratorSettings settings;
+
+    public ModuledChunkGenerator(BiomeSource biomeSource, UHCConfig config, long seed, ChunkGenerator subGenerator, ChunkGeneratorSettings settings) {
+        super(biomeSource);
+        this.config = config;
+        this.seed = seed;
+        this.subGenerator = subGenerator;
+        this.settings = settings;
+	}
+
+	public static ModuledChunkGenerator of(UHCConfig config, long seed) {
+        BiomeSource biomeSource = config.mapConfig().dimension().chunkGenerator().getBiomeSource();
+        ChunkGenerator subGenerator = config.mapConfig().dimension().chunkGenerator();
+		ChunkGeneratorSettings settings = null;
+		if (subGenerator instanceof NoiseChunkGenerator generator) {
+			settings = generator.getSettings().value();
 		}
-		else {
-			this.settings = null;
-		}
-	}
-
-	@Override
-	public void generateFeatures(StructureWorldAccess world, Chunk chunk, StructureAccessor structureAccessor) {
-		this.subGenerator.generateFeatures(world, chunk, structureAccessor);
-		var chunkPos = chunk.getPos();
-		if (SharedConstants.isOutsideGenerationArea(chunkPos)) {
-			return;
-		}
-		var blockPos = ChunkSectionPos.from(chunk.getPos(), world.getBottomSectionCoord()).getMinPos();
-
-		ChunkRandom chunkRandom = new ChunkRandom(new Xoroshiro128PlusPlusRandom(this.seed));
-		long popSeed = chunkRandom.setPopulationSeed(world.getSeed(), blockPos.getX(), blockPos.getZ());
-
-		List<PlacedFeaturesModifier> placedFeaturesModifiers = this.config.getModifiers(ModifierType.PLACED_FEATURES);
-		for (int i = 0; i < placedFeaturesModifiers.size(); i++) {
-			chunkRandom.setDecoratorSeed(popSeed, i, 0);
-			for(var placedFeatureEntry : placedFeaturesModifiers.get(i).features()) {
-				Supplier<String> s = () -> placedFeatureEntry.getKey().map(Object::toString).orElseGet(placedFeatureEntry::toString);
-				world.setCurrentlyGeneratingStructureName(s);
-				placedFeatureEntry.value().generate(world, this, chunkRandom, blockPos);
-			}
-		}
-		world.setCurrentlyGeneratingStructureName(null);
-	}
-
-	/*=================*/
-	/*  SUB OVERRIDES  */
-	/*=================*/
-
-	@Override
-	public CompletableFuture<Chunk> populateBiomes(Executor executor, NoiseConfig noiseConfig, Blender blender, StructureAccessor structureAccessor, Chunk chunk) {
-		return this.subGenerator.populateBiomes(executor, noiseConfig, blender, structureAccessor, chunk);
-	}
-
-	@Override
-	public BiomeSource getBiomeSource() {
-		return this.subGenerator.getBiomeSource();
-	}
-
-	@Override
-	public void buildSurface(ChunkRegion region, StructureAccessor structures, NoiseConfig noiseConfig, Chunk chunk) {
-		this.subGenerator.buildSurface(region, structures, noiseConfig, chunk);
-	}
-
-	@Override
-	public CompletableFuture<Chunk> populateNoise(Executor executor, Blender blender, NoiseConfig noiseConfig, StructureAccessor structureAccessor, Chunk chunk) {
-		return this.subGenerator.populateNoise(executor, blender, noiseConfig, structureAccessor, chunk);
-	}
-
-	@Override
-	public void carve(ChunkRegion chunkRegion, long seed, NoiseConfig noiseConfig, BiomeAccess world, StructureAccessor structureAccessor, Chunk chunk, GenerationStep.Carver carverStep) {
-		this.subGenerator.carve(chunkRegion, seed, noiseConfig, world, structureAccessor, chunk, carverStep);
-	}
-
-	@Override
-	public void populateEntities(ChunkRegion region) {
-		this.subGenerator.populateEntities(region);
-	}
-
-	@Nullable
-	@Override
-	public Pair<BlockPos, RegistryEntry<Structure>> locateStructure(ServerWorld world, RegistryEntryList<Structure> structures, BlockPos center, int radius, boolean skipReferencedStructures) {
-		return this.subGenerator.locateStructure(world, structures, center, radius, skipReferencedStructures);
-	}
-
-	@Override
-	public StructurePlacementCalculator createStructurePlacementCalculator(RegistryWrapper<StructureSet> structureSetRegistry, NoiseConfig noiseConfig, long seed) {
-		return this.subGenerator.createStructurePlacementCalculator(structureSetRegistry, noiseConfig, seed);
-	}
-
-	@Override
-	public int getHeight(int x, int z, Heightmap.Type heightmap, HeightLimitView world, NoiseConfig noiseConfig) {
-		return this.subGenerator.getHeight(x, z, heightmap, world, noiseConfig);
-	}
-
-	@Override
-	public int getHeightInGround(int x, int z, Heightmap.Type heightmap, HeightLimitView world, NoiseConfig noiseConfig) {
-		return this.subGenerator.getHeightInGround(x, z, heightmap, world, noiseConfig);
-	}
-
-	@Override
-	public int getHeightOnGround(int x, int z, Heightmap.Type heightmap, HeightLimitView world, NoiseConfig noiseConfig) {
-		return this.subGenerator.getHeightOnGround(x, z, heightmap, world, noiseConfig);
-	}
-
-	@Override
-	public int getWorldHeight() {
-		return this.subGenerator.getWorldHeight();
-	}
-
-	@Override
-	public int getSeaLevel() {
-		return this.subGenerator.getSeaLevel();
-	}
-
-	@Override
-	public int getMinimumY() {
-		return this.subGenerator.getMinimumY();
-	}
-
-	@Override
-	public void getDebugHudText(List<String> text, NoiseConfig noiseConfig, BlockPos pos) {
-		this.subGenerator.getDebugHudText(text, noiseConfig, pos);
-	}
-
-	@Override
-	public Pool<SpawnSettings.SpawnEntry> getEntitySpawnList(RegistryEntry<Biome> biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos) {
-		return this.subGenerator.getEntitySpawnList(biome, accessor, group, pos);
-	}
-
-	@Override
-	public VerticalBlockSample getColumnSample(int x, int z, HeightLimitView world, NoiseConfig noiseConfig) {
-		return this.subGenerator.getColumnSample(x, z, world, noiseConfig);
-	}
-
-	@Override
-	public int getSpawnHeight(HeightLimitView world) {
-		return this.subGenerator.getSpawnHeight(world);
-	}
-
-	@Override
-	public GenerationSettings getGenerationSettings(RegistryEntry<Biome> biomeEntry) {
-		return this.subGenerator.getGenerationSettings(biomeEntry);
-	}
-
-	private long getSeed() {
-		return seed;
-	}
-
-	@Override
-	public @Nullable ChunkGeneratorSettings getSettings() {
-		return this.settings;
-	}
+		return new ModuledChunkGenerator(biomeSource, config, seed, subGenerator, settings);
+	}
+
+    @Override
+    public void generateFeatures(StructureWorldAccess world, Chunk chunk, StructureAccessor structureAccessor) {
+        var chunkPos = chunk.getPos();
+        if (SharedConstants.isOutsideGenerationArea(chunkPos)) {
+            return;
+        }
+        var blockPos = ChunkSectionPos.from(chunk.getPos(), world.getBottomSectionCoord()).getMinPos();
+
+        ChunkRandom chunkRandom = new ChunkRandom(new Xoroshiro128PlusPlusRandom(this.seed));
+        long popSeed = chunkRandom.setPopulationSeed(world.getSeed(), blockPos.getX(), blockPos.getZ());
+
+        List<PlacedFeaturesModifier> placedFeaturesModifiers = this.config.getModifiers(ModifierType.PLACED_FEATURES);
+        int i = 0;
+        for(var modifier : placedFeaturesModifiers) {
+            for(var entry : modifier.features()) {
+                chunkRandom.setDecoratorSeed(popSeed, i++, 0);
+                Supplier<String> s = () -> entry.getKey().map(Object::toString).orElseGet(entry::toString);
+                world.setCurrentlyGeneratingStructureName(s);
+                entry.value().generate(world, this, chunkRandom, blockPos);
+            }
+        }
+        world.setCurrentlyGeneratingStructureName(null);
+        this.subGenerator.generateFeatures(world, chunk, structureAccessor);
+    }
+
+    /*=================*/
+    /*  SUB OVERRIDES  */
+    /*=================*/
+
+    @Override
+    public CompletableFuture<Chunk> populateBiomes(Executor executor, NoiseConfig noiseConfig, Blender blender, StructureAccessor structureAccessor, Chunk chunk) {
+        return this.subGenerator.populateBiomes(executor, noiseConfig, blender, structureAccessor, chunk);
+    }
+
+    @Override
+    public BiomeSource getBiomeSource() {
+        return this.subGenerator.getBiomeSource();
+    }
+
+    @Override
+    public void buildSurface(ChunkRegion region, StructureAccessor structures, NoiseConfig noiseConfig, Chunk chunk) {
+        this.subGenerator.buildSurface(region, structures, noiseConfig, chunk);
+    }
+
+    @Override
+    public CompletableFuture<Chunk> populateNoise(Executor executor, Blender blender, NoiseConfig noiseConfig, StructureAccessor structureAccessor, Chunk chunk) {
+        return this.subGenerator.populateNoise(executor, blender, noiseConfig, structureAccessor, chunk);
+    }
+
+    @Override
+    public void carve(ChunkRegion chunkRegion, long seed, NoiseConfig noiseConfig, BiomeAccess world, StructureAccessor structureAccessor, Chunk chunk, GenerationStep.Carver carverStep) {
+        this.subGenerator.carve(chunkRegion, seed, noiseConfig, world, structureAccessor, chunk, carverStep);
+    }
+
+    @Override
+    public void populateEntities(ChunkRegion region) {
+        this.subGenerator.populateEntities(region);
+    }
+
+    @Nullable
+    @Override
+    public Pair<BlockPos, RegistryEntry<Structure>> locateStructure(ServerWorld world, RegistryEntryList<Structure> structures, BlockPos center, int radius, boolean skipReferencedStructures) {
+        return this.subGenerator.locateStructure(world, structures, center, radius, skipReferencedStructures);
+    }
+
+    @Override
+    public StructurePlacementCalculator createStructurePlacementCalculator(RegistryWrapper<StructureSet> structureSetRegistry, NoiseConfig noiseConfig, long seed) {
+        return this.subGenerator.createStructurePlacementCalculator(structureSetRegistry, noiseConfig, seed);
+    }
+
+    @Override
+    public int getHeight(int x, int z, Heightmap.Type heightmap, HeightLimitView world, NoiseConfig noiseConfig) {
+        return this.subGenerator.getHeight(x, z, heightmap, world, noiseConfig);
+    }
+
+    @Override
+    public int getHeightInGround(int x, int z, Heightmap.Type heightmap, HeightLimitView world, NoiseConfig noiseConfig) {
+        return this.subGenerator.getHeightInGround(x, z, heightmap, world, noiseConfig);
+    }
+
+    @Override
+    public int getHeightOnGround(int x, int z, Heightmap.Type heightmap, HeightLimitView world, NoiseConfig noiseConfig) {
+        return this.subGenerator.getHeightOnGround(x, z, heightmap, world, noiseConfig);
+    }
+
+    @Override
+    public int getWorldHeight() {
+        return this.subGenerator.getWorldHeight();
+    }
+
+    @Override
+    public int getSeaLevel() {
+        return this.subGenerator.getSeaLevel();
+    }
+
+    @Override
+    public int getMinimumY() {
+        return this.subGenerator.getMinimumY();
+    }
+
+    @Override
+    public void getDebugHudText(List<String> text, NoiseConfig noiseConfig, BlockPos pos) {
+        this.subGenerator.getDebugHudText(text, noiseConfig, pos);
+    }
+
+    @Override
+    public Pool<SpawnSettings.SpawnEntry> getEntitySpawnList(RegistryEntry<Biome> biome, StructureAccessor accessor, SpawnGroup group, BlockPos pos) {
+        return this.subGenerator.getEntitySpawnList(biome, accessor, group, pos);
+    }
+
+    @Override
+    public VerticalBlockSample getColumnSample(int x, int z, HeightLimitView world, NoiseConfig noiseConfig) {
+        return this.subGenerator.getColumnSample(x, z, world, noiseConfig);
+    }
+
+    @Override
+    public int getSpawnHeight(HeightLimitView world) {
+        return this.subGenerator.getSpawnHeight(world);
+    }
+
+    @Override
+    public GenerationSettings getGenerationSettings(RegistryEntry<Biome> biomeEntry) {
+        return this.subGenerator.getGenerationSettings(biomeEntry);
+    }
+
+    private long getSeed() {
+        return seed;
+    }
+
+    @Override
+    public @Nullable ChunkGeneratorSettings getSettings() {
+        return this.settings;
+    }
 }