From 368a67cc4627c58c13a47ef5b51594f4b50f3360 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Jun 2020 16:02:32 -0500 Subject: [PATCH] Fix worldgen --- .../botania/api/item/IFlowerlessBiome.java | 21 ------ .../botania/api/item/IFlowerlessWorld.java | 22 ------- .../java/vazkii/botania/common/Botania.java | 1 - .../botania/common/world/ModFeatures.java | 12 ++-- .../common/world/MysticalFlowerConfig.java | 66 +++++++++++++------ .../common/world/MysticalFlowerFeature.java | 27 ++------ .../common/world/MysticalMushroomFeature.java | 20 +----- src/main/resources/META-INF/mods.toml | 8 +-- 8 files changed, 61 insertions(+), 116 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java delete mode 100644 src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java diff --git a/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java b/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java deleted file mode 100644 index 402249506..000000000 --- a/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This class is distributed as part of the Botania Mod. - * Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.item; - -import net.minecraft.world.IWorld; - -/** - * A Biome that implements this will not have Botania flowers generated. - */ -public interface IFlowerlessBiome { - /** - * @return Should this world be allowed to generate flowers? - */ - public boolean canGenerateFlowers(IWorld world, int x, int z); -} diff --git a/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java b/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java deleted file mode 100644 index 61fe2920d..000000000 --- a/src/main/java/vazkii/botania/api/item/IFlowerlessWorld.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This class is distributed as part of the Botania Mod. - * Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - */ -package vazkii.botania.api.item; - -import net.minecraft.world.IWorld; - -/** - * A {@link net.minecraft.world.dimension.Dimension} that implements this will not have Botania flowers generated. - */ -public interface IFlowerlessWorld { - - /** - * @return Should this world be allowed to generate flowers? - */ - public boolean generateFlowers(IWorld world); -} diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 0c4b3c81b..1dcce9788 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -140,7 +140,6 @@ public class Botania { modBus.addListener(IMCHandler::handle); modBus.addListener(this::loadComplete); modBus.addListener(DataGenerators::gatherData); - modBus.addGenericListener(ChunkGeneratorType.class, ModFeatures::registerChunkGenerators); modBus.addGenericListener(Feature.class, ModFeatures::registerFeatures); modBus.addGenericListener(Item.class, ModItems::registerItems); modBus.addGenericListener(ContainerType.class, ModItems::registerContainers); diff --git a/src/main/java/vazkii/botania/common/world/ModFeatures.java b/src/main/java/vazkii/botania/common/world/ModFeatures.java index 11a049641..11baa6ab2 100644 --- a/src/main/java/vazkii/botania/common/world/ModFeatures.java +++ b/src/main/java/vazkii/botania/common/world/ModFeatures.java @@ -25,8 +25,8 @@ import java.util.Set; import static vazkii.botania.common.block.ModBlocks.register; public class ModFeatures { - public static final Feature MYSTICAL_FLOWERS = new MysticalFlowerFeature(MysticalFlowerConfig::deserialize); - public static final Feature MYSTICAL_MUSHROOMS = new MysticalMushroomFeature(MysticalFlowerConfig::deserialize); + public static final Feature MYSTICAL_FLOWERS = new MysticalFlowerFeature(); + public static final Feature MYSTICAL_MUSHROOMS = new MysticalMushroomFeature(); public static final Set TYPE_BLACKLIST = ImmutableSet.of( BiomeDictionary.Type.DEAD, @@ -44,16 +44,12 @@ public class ModFeatures { register(r, "mystical_mushrooms", MYSTICAL_MUSHROOMS); } - public static void registerChunkGenerators(RegistryEvent.Register> evt) { - register(evt.getRegistry(), "garden_of_glass", SkyblockChunkGenerator.TYPE); - } - public static void addWorldgen() { for (Biome biome : Registry.BIOME) { if (BiomeDictionary.getTypes(biome).stream().noneMatch(TYPE_BLACKLIST::contains)) { - biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_FLOWERS.withConfiguration(new MysticalFlowerConfig()).withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))); + biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_FLOWERS.withConfiguration(MysticalFlowerConfig.fromConfig()).withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))); } - biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_MUSHROOMS.withConfiguration(new MysticalFlowerConfig()).withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))); + biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_MUSHROOMS.withConfiguration(MysticalFlowerConfig.fromConfig()).withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))); } } } diff --git a/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java b/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java index 1027fddbf..a786c830d 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java +++ b/src/main/java/vazkii/botania/common/world/MysticalFlowerConfig.java @@ -9,46 +9,70 @@ package vazkii.botania.common.world; -import com.mojang.serialization.Dynamic; -import com.mojang.serialization.DynamicOps; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.world.gen.feature.IFeatureConfig; import vazkii.botania.common.core.handler.ConfigHandler; -import javax.annotation.Nonnull; - public class MysticalFlowerConfig implements IFeatureConfig { - public int getPatchSize() { - return ConfigHandler.COMMON.flowerPatchSize.get(); + public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( + Codec.INT.fieldOf("flower_patch_size").forGetter(MysticalFlowerConfig::getFlowerPatchSize), + Codec.INT.fieldOf("mushroom_patch_size").forGetter(MysticalFlowerConfig::getMushroomPatchSize), + Codec.INT.fieldOf("patch_count").forGetter(MysticalFlowerConfig::getPatchCount), + Codec.INT.fieldOf("patch_density").forGetter(MysticalFlowerConfig::getPatchDensity), + Codec.INT.fieldOf("patch_chance").forGetter(MysticalFlowerConfig::getPatchChance), + Codec.DOUBLE.fieldOf("tall_chance").forGetter(MysticalFlowerConfig::getTallChance) + ).apply(instance, MysticalFlowerConfig::new)); + + private final int flowerPatchSize; + private final int mushroomPatchSize; + private final int patchCount; + private final int patchDensity; + private final int patchChance; + private final double tallChance; + + public static MysticalFlowerConfig fromConfig() { + return new MysticalFlowerConfig( + ConfigHandler.COMMON.flowerPatchSize.get(), + ConfigHandler.COMMON.mushroomQuantity.get(), + ConfigHandler.COMMON.flowerPatchSize.get(), + ConfigHandler.COMMON.flowerDensity.get(), + ConfigHandler.COMMON.flowerPatchChance.get(), + ConfigHandler.COMMON.flowerTallChance.get() + ); + } + + public MysticalFlowerConfig(int flowerPatchSize, int mushroomPatchSize, int patchCount, int patchDensity, int patchChance, double tallChance) { + this.flowerPatchSize = flowerPatchSize; + this.mushroomPatchSize = mushroomPatchSize; + this.patchCount = patchCount; + this.patchDensity = patchDensity; + this.patchChance = patchChance; + this.tallChance = tallChance; + } + + public int getFlowerPatchSize() { + return flowerPatchSize; } public int getPatchCount() { - return ConfigHandler.COMMON.flowerQuantity.get(); + return patchCount; } public int getPatchDensity() { - return ConfigHandler.COMMON.flowerDensity.get(); + return patchDensity; } public int getPatchChance() { - return ConfigHandler.COMMON.flowerPatchChance.get(); + return patchChance; } public double getTallChance() { - return ConfigHandler.COMMON.flowerTallChance.get(); + return tallChance; } public int getMushroomPatchSize() { - return ConfigHandler.COMMON.mushroomQuantity.get(); - } - - @Nonnull - @Override - public Dynamic serialize(@Nonnull DynamicOps ops) { - return new Dynamic<>(ops); - } - - public static MysticalFlowerConfig deserialize(Dynamic dynamic) { - return new MysticalFlowerConfig(); + return mushroomPatchSize; } } diff --git a/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java b/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java index e6f2b88de..a947f4d11 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java +++ b/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java @@ -8,48 +8,33 @@ */ package vazkii.botania.common.world; -import com.mojang.serialization.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.DoublePlantBlock; import net.minecraft.item.DyeColor; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; +import net.minecraft.world.ISeedReader; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.Heightmap; import net.minecraft.world.gen.feature.Feature; -import vazkii.botania.api.item.IFlowerlessBiome; -import vazkii.botania.api.item.IFlowerlessWorld; +import net.minecraft.world.gen.feature.structure.StructureManager; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; import java.util.Random; -import java.util.function.Function; public class MysticalFlowerFeature extends Feature { - public MysticalFlowerFeature(Function, ? extends MysticalFlowerConfig> configFactoryIn) { - super(configFactoryIn); + public MysticalFlowerFeature() { + super(MysticalFlowerConfig.CODEC); } @Override - public boolean place(@Nonnull IWorld world, @Nonnull ChunkGenerator generator, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull MysticalFlowerConfig config) { - boolean flowers = true; - if (world.getDimension() instanceof IFlowerlessWorld) { - flowers = ((IFlowerlessWorld) world.getDimension()).generateFlowers(world); - } else if (world.getBiome(pos) instanceof IFlowerlessBiome) { - flowers = ((IFlowerlessBiome) world.getBiome(pos)).canGenerateFlowers(world, pos.getX(), pos.getZ()); - } - - if (!flowers) { - return false; - } - + public boolean func_230362_a_(@Nonnull ISeedReader world, @Nonnull StructureManager structures, @Nonnull ChunkGenerator generator, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull MysticalFlowerConfig config) { boolean any = false; - int dist = Math.min(8, Math.max(1, config.getPatchSize())); + int dist = Math.min(8, Math.max(1, config.getFlowerPatchSize())); for (int i = 0; i < config.getPatchCount(); i++) { if (rand.nextInt(config.getPatchChance()) == 0) { int x = pos.getX() + rand.nextInt(16); diff --git a/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java b/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java index db7e3cc40..2d7dcb774 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java +++ b/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java @@ -18,33 +18,17 @@ import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.structure.StructureManager; -import vazkii.botania.api.item.IFlowerlessBiome; -import vazkii.botania.api.item.IFlowerlessWorld; import vazkii.botania.common.block.ModBlocks; -import javax.annotation.Nonnull; - import java.util.Random; -import java.util.function.Function; public class MysticalMushroomFeature extends Feature { - public MysticalMushroomFeature(Function, ? extends MysticalFlowerConfig> configFactory) { - super(configFactory); + public MysticalMushroomFeature() { + super(MysticalFlowerConfig.CODEC); } @Override public boolean func_230362_a_(ISeedReader world, StructureManager structureManager, ChunkGenerator generator, Random rand, BlockPos pos, MysticalFlowerConfig config) { - boolean spawn = true; - if (world.getDimension() instanceof IFlowerlessWorld) { - spawn = ((IFlowerlessWorld) world.getDimension()).generateFlowers(world); - } else if (world.getBiome(pos) instanceof IFlowerlessBiome) { - spawn = ((IFlowerlessBiome) world.getBiome(pos)).canGenerateFlowers(world, pos.getX(), pos.getZ()); - } - - if (!spawn) { - return false; - } - boolean any = false; for (int i = 0; i < config.getMushroomPatchSize(); i++) { int x = pos.getX() + rand.nextInt(16) + 8; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index abac49333..ff382aa8d 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" #mandatory -loaderVersion="[31,)" +loaderVersion="[32,)" issueTrackerURL="https://github.com/Vazkii/Botania/issues" #optional displayURL="https://botaniamod.net" #optional logoFile="logo.png" #optional @@ -16,19 +16,19 @@ Botania is a mod that adds nature magic to Minecraft''' [[dependencies.botania]] modId="forge" mandatory=true - versionRange="[31.2.13,)" + versionRange="[32.0.24,)" ordering="NONE" side="BOTH" [[dependencies.botania]] modId="patchouli" mandatory=true - versionRange="[1.15.2-1.2-32,)" + versionRange="[1.16-36,)" side="BOTH" [[dependencies.botania]] modId="curios" - mandatory=true + mandatory=false versionRange="[FORGE-1.15.2-2.0,)" ordering="AFTER" side="BOTH"