diff --git a/src/main/java/vazkii/botania/common/world/ModFeatures.java b/src/main/java/vazkii/botania/common/world/ModFeatures.java index ed39d9913..b6d3e5f50 100644 --- a/src/main/java/vazkii/botania/common/world/ModFeatures.java +++ b/src/main/java/vazkii/botania/common/world/ModFeatures.java @@ -12,6 +12,7 @@ package vazkii.botania.common.world; import com.google.common.collect.ImmutableSet; import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.ChunkGeneratorType; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.placement.IPlacementConfig; @@ -49,6 +50,11 @@ public class ModFeatures { register(r, MYSTICAL_FLOWERS, "mystical_flowers"); register(r, MYSTICAL_MUSHROOMS, "mystical_mushrooms"); } + + @SubscribeEvent + public static void registerChunkGenerators(RegistryEvent.Register> evt) { + register(evt.getRegistry(), SkyblockChunkGenerator.TYPE, "garden_of_glass"); + } public static void addWorldgen() { for(Biome biome : ForgeRegistries.BIOMES) { diff --git a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java new file mode 100644 index 000000000..19b80ccfe --- /dev/null +++ b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java @@ -0,0 +1,30 @@ +package vazkii.botania.common.world; + +import net.minecraft.world.IWorld; +import net.minecraft.world.biome.provider.BiomeProvider; +import net.minecraft.world.chunk.IChunk; +import net.minecraft.world.gen.ChunkGeneratorType; +import net.minecraft.world.gen.GenerationStage; +import net.minecraft.world.gen.OverworldChunkGenerator; +import net.minecraft.world.gen.OverworldGenSettings; +import net.minecraft.world.gen.WorldGenRegion; + +public class SkyblockChunkGenerator extends OverworldChunkGenerator { + public static final ChunkGeneratorType TYPE = new ChunkGeneratorType<>(SkyblockChunkGenerator::new, false, OverworldGenSettings::new); + + private SkyblockChunkGenerator(IWorld worldIn, BiomeProvider provider, OverworldGenSettings settingsIn) { + super(worldIn, provider, settingsIn); + } + + @Override + public void makeBase(IWorld worldIn, IChunk chunkIn) {} + + @Override + public void generateSurface(IChunk chunkIn) {} + + @Override + public void decorate(WorldGenRegion region) {} + + @Override + public void carve(IChunk chunkIn, GenerationStage.Carving carvingSettings) {} +} diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index ce4460f8c..ff3d20af3 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -16,11 +16,13 @@ import net.minecraft.world.WorldType; import net.minecraft.world.biome.Biomes; import net.minecraft.world.biome.provider.BiomeProvider; import net.minecraft.world.biome.provider.BiomeProviderType; +import net.minecraft.world.biome.provider.OverworldBiomeProviderSettings; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.ChunkGeneratorType; import net.minecraft.world.gen.FlatGenerationSettings; import net.minecraft.world.gen.FlatLayerInfo; +import net.minecraft.world.gen.OverworldGenSettings; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -52,14 +54,9 @@ public class WorldTypeSkyblock extends WorldType { @Override public ChunkGenerator createChunkGenerator(@Nonnull World world) { if (world.dimension.getType() == DimensionType.OVERWORLD) { - FlatGenerationSettings settings = new FlatGenerationSettings(); - settings.setBiome(Biomes.PLAINS); - settings.getFlatLayers().add(new FlatLayerInfo(1, Blocks.AIR)); - settings.updateLayers(); - - BiomeProvider biomeProvider = BiomeProviderType.FIXED.create(BiomeProviderType.FIXED.createSettings().setBiome(settings.getBiome())); - - return ChunkGeneratorType.FLAT.create(world, biomeProvider, settings); + OverworldGenSettings genSettings = SkyblockChunkGenerator.TYPE.createSettings(); + OverworldBiomeProviderSettings biomeSettings = BiomeProviderType.VANILLA_LAYERED.createSettings().setWorldInfo(world.getWorldInfo()).setGeneratorSettings(genSettings); + return SkyblockChunkGenerator.TYPE.create(world, BiomeProviderType.VANILLA_LAYERED.create(biomeSettings), genSettings); } return super.createChunkGenerator(world); }