From 8773c414c537b3b0f369e487966bc7251c528b15 Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 16 Dec 2021 22:50:48 -0700 Subject: [PATCH] remove vanilla methods from ConfigPack --- .../dfsek/terra/api/config/ConfigPack.java | 8 -- .../terra/config/pack/ConfigPackImpl.java | 20 ----- .../BukkitChunkGeneratorWrapper.java | 12 ++- .../FabricChunkGeneratorWrapper.java | 77 ++++++++----------- .../dfsek/terra/fabric/util/FabricUtil.java | 8 -- 5 files changed, 42 insertions(+), 83 deletions(-) diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java index c532c1c88..2c2274401 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java @@ -31,14 +31,6 @@ public interface ConfigPack extends LoaderRegistrar, LoaderHolder, RegistryHolde Map addons(); - boolean vanillaMobs(); - - boolean vanillaStructures(); - - boolean vanillaCaves(); - - boolean vanillaFlora(); - BiomeProvider getBiomeProvider(); CheckedRegistry getOrCreateRegistry(Type clazz); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index 5f8e02d23..5bdc46365 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -265,26 +265,6 @@ public class ConfigPackImpl implements ConfigPack { return addons; } - @Override - public boolean vanillaMobs() { - return template.vanillaMobs(); - } - - @Override - public boolean vanillaStructures() { - return template.vanillaStructures(); - } - - @Override - public boolean vanillaCaves() { - return template.vanillaCaves(); - } - - @Override - public boolean vanillaFlora() { - return template.vanillaDecorations(); - } - @Override public BiomeProvider getBiomeProvider() { return seededBiomeProvider; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java index ecc52ecf1..476d193bb 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java @@ -79,22 +79,26 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener @Override public boolean shouldGenerateCaves() { - return pack.vanillaCaves(); + return false; + //return pack.vanillaCaves(); } @Override public boolean shouldGenerateDecorations() { - return pack.vanillaFlora(); + return false; + //return pack.vanillaFlora(); } @Override public boolean shouldGenerateMobs() { - return pack.vanillaMobs(); + return true; + //return pack.vanillaMobs(); } @Override public boolean shouldGenerateStructures() { - return pack.vanillaStructures(); + return false; + //return pack.vanillaStructures(); } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java index 829623215..707be7ae1 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java @@ -17,42 +17,6 @@ package com.dfsek.terra.fabric.generation; -import com.mojang.serialization.Codec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import net.minecraft.block.BlockState; -import net.minecraft.entity.SpawnGroup; -import net.minecraft.util.collection.Pool; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.ChunkRegion; -import net.minecraft.world.HeightLimitView; -import net.minecraft.world.Heightmap; -import net.minecraft.world.SpawnHelper; -import net.minecraft.world.StructureWorldAccess; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.SpawnSettings; -import net.minecraft.world.biome.source.BiomeAccess; -import net.minecraft.world.biome.source.util.MultiNoiseUtil; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.StructureAccessor; -import net.minecraft.world.gen.chunk.Blender; -import net.minecraft.world.gen.chunk.StructuresConfig; -import net.minecraft.world.gen.chunk.VerticalBlockSample; -import net.minecraft.world.gen.feature.NetherFortressFeature; -import net.minecraft.world.gen.feature.OceanMonumentFeature; -import net.minecraft.world.gen.feature.PillagerOutpostFeature; -import net.minecraft.world.gen.feature.StructureFeature; -import net.minecraft.world.gen.feature.SwampHutFeature; -import net.minecraft.world.gen.random.AtomicSimpleRandom; -import net.minecraft.world.gen.random.ChunkRandom; -import net.minecraft.world.gen.random.RandomSeed; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; - import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; @@ -64,6 +28,34 @@ import com.dfsek.terra.fabric.FabricEntryPoint; import com.dfsek.terra.fabric.block.FabricBlockState; import com.dfsek.terra.fabric.mixin.access.StructureAccessorAccessor; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.block.BlockState; +import net.minecraft.entity.SpawnGroup; +import net.minecraft.util.collection.Pool; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.world.*; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.SpawnSettings; +import net.minecraft.world.biome.source.BiomeAccess; +import net.minecraft.world.biome.source.util.MultiNoiseUtil; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.StructureAccessor; +import net.minecraft.world.gen.chunk.Blender; +import net.minecraft.world.gen.chunk.StructuresConfig; +import net.minecraft.world.gen.chunk.VerticalBlockSample; +import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.random.AtomicSimpleRandom; +import net.minecraft.world.gen.random.ChunkRandom; +import net.minecraft.world.gen.random.RandomSeed; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; + public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.ChunkGenerator implements GeneratorWrapper { public static final Codec PACK_CODEC = RecordCodecBuilder.create( @@ -128,13 +120,12 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C @Override public void populateEntities(ChunkRegion region) { - if(pack.vanillaMobs()) { - ChunkPos chunkPos = region.getCenterPos(); - Biome biome = region.getBiome(chunkPos.getStartPos().withY(region.getTopY() - 1)); - ChunkRandom chunkRandom = new ChunkRandom(new AtomicSimpleRandom(RandomSeed.getSeed())); - chunkRandom.setPopulationSeed(region.getSeed(), chunkPos.getStartX(), chunkPos.getStartZ()); - SpawnHelper.populateEntities(region, biome, chunkPos, chunkRandom); - } + ChunkPos chunkPos = region.getCenterPos(); + Biome biome = region.getBiome(chunkPos.getStartPos().withY(region.getTopY() - 1)); + ChunkRandom chunkRandom = new ChunkRandom(new AtomicSimpleRandom(RandomSeed.getSeed())); + chunkRandom.setPopulationSeed(region.getSeed(), chunkPos.getStartX(), chunkPos.getStartZ()); + SpawnHelper.populateEntities(region, biome, chunkPos, chunkRandom); + } @Override diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java index a8d1635c1..7aa6cfbfc 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java @@ -74,14 +74,6 @@ public final class FabricUtil { net.minecraft.world.biome.Biome vanilla = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(biomeRegistry); GenerationSettings.Builder generationSettings = new GenerationSettings.Builder(); - - if(pack.vanillaCaves()) { - for(GenerationStep.Carver carver : GenerationStep.Carver.values()) { - for(Supplier> configuredCarverSupplier : vanilla.getGenerationSettings().getCarversForStep(carver)) { - generationSettings.carver(carver, configuredCarverSupplier.get()); - } - } - } /* Pair pair = fabricAddon.getTemplates().get(pack);