From 814c9226b1aca9fd5cfd653df189d424c0090612 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Sat, 4 Jul 2020 00:22:59 +1000 Subject: [PATCH] Updated gen features (except trees) --- .../common/block/DoublePlantBlockBOP.java | 2 +- .../common/block/DoubleWaterPlantBlock.java | 2 +- .../block/DoubleWatersidePlantBlock.java | 2 +- .../common/block/FoliageBlockBOP.java | 2 +- .../common/block/PlantBlockBOP.java | 2 +- .../common/block/TallFlowerBlockBOP.java | 2 +- .../common/block/WatersidePlantBlock.java | 2 +- .../common/block/WhiteSandBlock.java | 14 +++--- .../common/command/CommandTpBiome.java | 2 +- .../common/util/block/BlockUtil.java | 6 +-- .../world/gen/feature/AshSplatterFeature.java | 6 +-- .../feature/BOPBigBrownMushroomFeature.java | 8 ++-- .../gen/feature/BOPBigRedMushroomFeature.java | 8 ++-- .../world/gen/feature/BOPBiomeFeatures.java | 32 +++++++------- .../world/gen/feature/BigPumpkinFeature.java | 7 +-- .../world/gen/feature/BogSurfaceBuilder.java | 5 +-- .../world/gen/feature/BoneSpineFeature.java | 12 +++--- .../world/gen/feature/BrambleFeature.java | 11 +++-- .../gen/feature/BrushlandSurfaceBuilder.java | 5 +-- .../gen/feature/ChaparralFlowersFeature.java | 5 --- .../gen/feature/ChaparralSurfaceBuilder.java | 5 +-- .../CherryBlossomGroveFlowersFeature.java | 5 --- .../gen/feature/ColdDesertSurfaceBuilder.java | 5 +-- .../ConiferousForestFlowersFeature.java | 5 --- .../feature/DeepTopLayerSurfaceBuilder.java | 5 +-- .../DefaultFlowersFeatureNoConfig.java | 5 --- .../gen/feature/ExtendedFlowersFeature.java | 5 --- .../world/gen/feature/FernGrassFeature.java | 9 ++-- .../gen/feature/FleshSplatterFeature.java | 9 ++-- .../feature/FlowerMeadowFlowersFeature.java | 5 --- .../world/gen/feature/HeathFeature.java | 15 +++---- .../gen/feature/HugeGlowshroomFeature.java | 12 +++--- .../gen/feature/HugeToadstoolFeature.java | 10 ++--- .../gen/feature/JungleFlowersFeature.java | 5 --- .../gen/feature/LavenderFlowersFeature.java | 5 --- .../feature/LushGrasslandFlowersFeature.java | 5 --- .../gen/feature/LushSwampFlowersFeature.java | 5 --- .../world/gen/feature/MangroveFeature.java | 43 +++++++++---------- .../gen/feature/MangroveSurfaceBuilder.java | 5 +-- .../gen/feature/MarshSurfaceBuilder.java | 5 +-- .../gen/feature/MeadowFlowersFeature.java | 5 --- .../world/gen/feature/MoorFlowersFeature.java | 5 --- .../world/gen/feature/MudSurfaceBuilder.java | 5 +-- .../gen/feature/MyceliumSplatterFeature.java | 9 ++-- .../feature/MysticGroveFlowersFeature.java | 5 --- .../world/gen/feature/NetherVinesFeature.java | 8 ++-- .../world/gen/feature/NetherWartFeature.java | 17 ++++---- .../feature/OminousWoodsFlowersFeature.java | 5 --- .../gen/feature/OrangeCosmosFeature.java | 5 --- .../gen/feature/OriginFlowersFeature.java | 5 --- .../gen/feature/PodzolSplatterFeature.java | 10 ++--- .../gen/feature/PodzolSurfaceBuilder.java | 5 +-- .../world/gen/feature/PoppyFeature.java | 1 - .../gen/feature/PoppyFieldSurfaceBuilder.java | 5 +-- .../gen/feature/PumpkinPatchFeature.java | 29 ++++++------- .../gen/feature/RainforestFlowersFeature.java | 5 --- .../gen/feature/ScatteredRocksFeature.java | 19 ++++---- .../world/gen/feature/ScrubFeature.java | 15 +++---- .../world/gen/feature/ShortBambooFeature.java | 11 +++-- .../gen/feature/ShrublandFlowersFeature.java | 5 --- .../feature/SmallBrownMushroomFeature.java | 17 +++++--- .../gen/feature/SmallGlowshroomFeature.java | 10 ++--- .../gen/feature/SmallRedMushroomFeature.java | 10 ++--- .../gen/feature/SmallToadstoolFeature.java | 10 ++--- .../gen/feature/SnowyFlowersFeature.java | 5 --- .../gen/feature/StandardGrassFeature.java | 10 ++--- .../gen/feature/TerracottaSurfaceBuilder.java | 5 +-- .../gen/feature/TropicsFlowersFeature.java | 5 --- .../world/gen/feature/VioletFeature.java | 5 --- .../feature/VolcanoEdgeSurfaceBuilder.java | 5 +-- .../gen/feature/WastelandFlowersFeature.java | 5 --- .../gen/feature/WastelandGrassFeature.java | 9 ++-- .../gen/feature/WetlandFlowersFeature.java | 5 --- .../world/gen/feature/WildflowerFeature.java | 5 --- .../feature/XericShrublandFlowersFeature.java | 5 --- .../gen/feature/tree/TreeFeatureBase.java | 2 +- .../common/world/layer/NetherBiomeLayer.java | 2 +- .../java/biomesoplenty/core/ClientProxy.java | 4 +- 78 files changed, 219 insertions(+), 377 deletions(-) diff --git a/src/main/java/biomesoplenty/common/block/DoublePlantBlockBOP.java b/src/main/java/biomesoplenty/common/block/DoublePlantBlockBOP.java index 173f81252..b8fa30a38 100644 --- a/src/main/java/biomesoplenty/common/block/DoublePlantBlockBOP.java +++ b/src/main/java/biomesoplenty/common/block/DoublePlantBlockBOP.java @@ -23,6 +23,6 @@ public class DoublePlantBlockBOP extends DoublePlantBlock @Override public PlantType getPlantType(IBlockReader world, BlockPos pos) { - return PlantType.Plains; + return PlantType.PLAINS; } } diff --git a/src/main/java/biomesoplenty/common/block/DoubleWaterPlantBlock.java b/src/main/java/biomesoplenty/common/block/DoubleWaterPlantBlock.java index d985d9d07..84ade976c 100644 --- a/src/main/java/biomesoplenty/common/block/DoubleWaterPlantBlock.java +++ b/src/main/java/biomesoplenty/common/block/DoubleWaterPlantBlock.java @@ -87,7 +87,7 @@ public class DoubleWaterPlantBlock extends DoublePlantBlock implements IWaterLog @Override public PlantType getPlantType(IBlockReader world, BlockPos pos) { - return PlantType.Plains; + return PlantType.PLAINS; } @Override diff --git a/src/main/java/biomesoplenty/common/block/DoubleWatersidePlantBlock.java b/src/main/java/biomesoplenty/common/block/DoubleWatersidePlantBlock.java index ff7046caa..8fdb34b4b 100644 --- a/src/main/java/biomesoplenty/common/block/DoubleWatersidePlantBlock.java +++ b/src/main/java/biomesoplenty/common/block/DoubleWatersidePlantBlock.java @@ -31,7 +31,7 @@ public class DoubleWatersidePlantBlock extends DoublePlantBlockBOP @Override public PlantType getPlantType(IBlockReader world, BlockPos pos) { - return PlantType.Beach; + return PlantType.BEACH; } @Override diff --git a/src/main/java/biomesoplenty/common/block/FoliageBlockBOP.java b/src/main/java/biomesoplenty/common/block/FoliageBlockBOP.java index 7973314b5..009d78c70 100644 --- a/src/main/java/biomesoplenty/common/block/FoliageBlockBOP.java +++ b/src/main/java/biomesoplenty/common/block/FoliageBlockBOP.java @@ -104,6 +104,6 @@ public class FoliageBlockBOP extends BushBlock implements IPlantable @Override public PlantType getPlantType(IBlockReader world, BlockPos pos) { - return PlantType.Plains; + return PlantType.PLAINS; } } diff --git a/src/main/java/biomesoplenty/common/block/PlantBlockBOP.java b/src/main/java/biomesoplenty/common/block/PlantBlockBOP.java index 0c775e1b8..c92d11e29 100644 --- a/src/main/java/biomesoplenty/common/block/PlantBlockBOP.java +++ b/src/main/java/biomesoplenty/common/block/PlantBlockBOP.java @@ -66,6 +66,6 @@ public class PlantBlockBOP extends BushBlock implements IPlantable @Override public PlantType getPlantType(IBlockReader world, BlockPos pos) { - return PlantType.Plains; + return PlantType.PLAINS; } } diff --git a/src/main/java/biomesoplenty/common/block/TallFlowerBlockBOP.java b/src/main/java/biomesoplenty/common/block/TallFlowerBlockBOP.java index 458280958..1f38bd969 100644 --- a/src/main/java/biomesoplenty/common/block/TallFlowerBlockBOP.java +++ b/src/main/java/biomesoplenty/common/block/TallFlowerBlockBOP.java @@ -22,6 +22,6 @@ public class TallFlowerBlockBOP extends TallFlowerBlock @Override public PlantType getPlantType(IBlockReader world, BlockPos pos) { - return PlantType.Plains; + return PlantType.PLAINS; } } diff --git a/src/main/java/biomesoplenty/common/block/WatersidePlantBlock.java b/src/main/java/biomesoplenty/common/block/WatersidePlantBlock.java index c58dcfc6a..20474f443 100644 --- a/src/main/java/biomesoplenty/common/block/WatersidePlantBlock.java +++ b/src/main/java/biomesoplenty/common/block/WatersidePlantBlock.java @@ -32,7 +32,7 @@ public class WatersidePlantBlock extends PlantBlockBOP { Block block = world.getBlockState(pos).getBlock(); - return PlantType.Beach; + return PlantType.BEACH; } @Override diff --git a/src/main/java/biomesoplenty/common/block/WhiteSandBlock.java b/src/main/java/biomesoplenty/common/block/WhiteSandBlock.java index 9d7ca6afc..7a1001344 100644 --- a/src/main/java/biomesoplenty/common/block/WhiteSandBlock.java +++ b/src/main/java/biomesoplenty/common/block/WhiteSandBlock.java @@ -22,13 +22,13 @@ public class WhiteSandBlock extends SandBlock PlantType type = plantable.getPlantType(world, pos.relative(facing)); switch (type) { - case Desert: return true; - case Nether: return false; - case Crop: return false; - case Cave: return true; - case Plains: return false; - case Water: return false; - case Beach: + case DESERT: return true; + case NETHER: return false; + case CROP: return false; + case CAVE: return true; + case PLAINS: return false; + case WATER: return false; + case BEACH: boolean hasWater = (world.getBlockState(pos.east()).getMaterial() == Material.WATER || world.getBlockState(pos.west()).getMaterial() == Material.WATER || world.getBlockState(pos.north()).getMaterial() == Material.WATER || diff --git a/src/main/java/biomesoplenty/common/command/CommandTpBiome.java b/src/main/java/biomesoplenty/common/command/CommandTpBiome.java index a4435b3cc..141efa532 100644 --- a/src/main/java/biomesoplenty/common/command/CommandTpBiome.java +++ b/src/main/java/biomesoplenty/common/command/CommandTpBiome.java @@ -62,7 +62,7 @@ public class CommandTpBiome double y = (double) BlockUtil.getTopSolidOrLiquidBlock(world, closestBiomePos.getX(), closestBiomePos.getZ()).getY(); double z = (double)closestBiomePos.getZ(); - if (!world.getDimension().isNaturalDimension()) + if (!world.dimensionType().natural()) { y = (double)getTopBlockNonOverworld(world, closestBiomePos).getY(); } diff --git a/src/main/java/biomesoplenty/common/util/block/BlockUtil.java b/src/main/java/biomesoplenty/common/util/block/BlockUtil.java index 97013c434..3d6402b68 100644 --- a/src/main/java/biomesoplenty/common/util/block/BlockUtil.java +++ b/src/main/java/biomesoplenty/common/util/block/BlockUtil.java @@ -8,7 +8,7 @@ package biomesoplenty.common.util.block; import net.minecraft.block.BlockState; -import net.minecraft.state.IProperty; +import net.minecraft.state.Property; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; @@ -21,9 +21,9 @@ import java.util.Collection; public class BlockUtil { // Given a blockstate for some block which has an axis orientation (such as logs), try to determine the axis property - public static IProperty getAxisProperty(BlockState log) + public static Property getAxisProperty(BlockState log) { - for (IProperty property : log.getProperties()) + for (Property property : log.getProperties()) { Collection allowedValues = property.getPossibleValues(); if (allowedValues.contains(Direction.Axis.X) && allowedValues.contains(Direction.Axis.Y) && allowedValues.contains(Direction.Axis.Z)) diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/AshSplatterFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/AshSplatterFeature.java index dbd8fc931..b95f08984 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/AshSplatterFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/AshSplatterFeature.java @@ -1,21 +1,17 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ISeedReader; -import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class AshSplatterFeature extends Feature { public AshSplatterFeature(Codec deserializer) { @@ -23,7 +19,7 @@ public class AshSplatterFeature extends Feature { } @Override - public boolean place(IWorld worldIn, ChunkGenerator p_212245_2_, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(ISeedReader worldIn, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; int j = rand.nextInt(8 - 2) + 2; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBigBrownMushroomFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBigBrownMushroomFeature.java index 5920edcb3..b898dccc8 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBigBrownMushroomFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBigBrownMushroomFeature.java @@ -7,8 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import biomesoplenty.core.BiomesOPlenty; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -21,11 +20,10 @@ import net.minecraft.world.gen.feature.BigBrownMushroomFeature; import net.minecraft.world.gen.feature.BigMushroomFeatureConfig; import java.util.Random; -import java.util.function.Function; public class BOPBigBrownMushroomFeature extends BigBrownMushroomFeature { - public BOPBigBrownMushroomFeature(Function, ? extends BigMushroomFeatureConfig> deserializer) + public BOPBigBrownMushroomFeature(Codec deserializer) { super(deserializer); } @@ -80,7 +78,7 @@ public class BOPBigBrownMushroomFeature extends BigBrownMushroomFeature protected boolean isValidPosition(IWorld world, BlockPos pos, int height, BlockPos.Mutable mutablePos, BigMushroomFeatureConfig config) { int i = pos.getY(); - if (i >= 1 && i + height + 1 < world.getMaxHeight()) + if (i >= 1 && i + height + 1 < world.getMaxBuildHeight()) { Block groundBlock = world.getBlockState(pos.below()).getBlock(); // Allow growth in the nether diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBigRedMushroomFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBigRedMushroomFeature.java index 1c58b747e..d4635b6da 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBigRedMushroomFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBigRedMushroomFeature.java @@ -7,8 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import biomesoplenty.core.BiomesOPlenty; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -21,11 +20,10 @@ import net.minecraft.world.gen.feature.BigMushroomFeatureConfig; import net.minecraft.world.gen.feature.BigRedMushroomFeature; import java.util.Random; -import java.util.function.Function; public class BOPBigRedMushroomFeature extends BigRedMushroomFeature { - public BOPBigRedMushroomFeature(Function, ? extends BigMushroomFeatureConfig> deserializer) + public BOPBigRedMushroomFeature(Codec deserializer) { super(deserializer); } @@ -80,7 +78,7 @@ public class BOPBigRedMushroomFeature extends BigRedMushroomFeature protected boolean isValidPosition(IWorld world, BlockPos pos, int height, BlockPos.Mutable mutablePos, BigMushroomFeatureConfig config) { int i = pos.getY(); - if (i >= 1 && i + height + 1 < world.getMaxHeight()) + if (i >= 1 && i + height + 1 < world.getMaxBuildHeight()) { Block groundBlock = world.getBlockState(pos.below()).getBlock(); // Allow growth in the Nether diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java index 092a2b8e0..635e3ddbf 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BOPBiomeFeatures.java @@ -8,13 +8,15 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import biomesoplenty.common.world.gen.feature.tree.BigTreeFeature; import biomesoplenty.common.world.gen.feature.tree.*; import net.minecraft.block.Blocks; import net.minecraft.block.LeavesBlock; import net.minecraft.block.SaplingBlock; import net.minecraft.util.Direction; -import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.feature.BaseTreeFeatureConfig; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.FlowersFeature; +import net.minecraft.world.gen.feature.NoFeatureConfig; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; @@ -159,19 +161,19 @@ public class BOPBiomeFeatures public static final FlowersFeature WETLAND_FLOWERS = new WetlandFlowersFeature(); //Surfaces - public static final SurfaceBuilder BOG_SURFACE_BUILDER = new BogSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder BRUSHLAND_SURFACE_BUILDER = new BrushlandSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder CHAPARRAL_SURFACE_BUILDER = new ChaparralSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder COLD_DESERT_SURFACE_BUILDER = new ColdDesertSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder TERRACOTTA_SURFACE_BUILDER = new TerracottaSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder MARSH_SURFACE_BUILDER = new MarshSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder MANGROVE_SURFACE_BUILDER = new MangroveSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder MUD_SURFACE_BUILDER = new MudSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder PODZOL_SURFACE_BUILDER = new PodzolSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder VOLCANO_SURFACE_BUILDER = new VolcanoSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder VOLCANO_EDGE_SURFACE_BUILDER = new VolcanoEdgeSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder DEEP_TOP_LAYER = new DeepTopLayerSurfaceBuilder(SurfaceBuilderConfig::deserialize); - public static final SurfaceBuilder POPPY_FIELD_SURFACE_BUILDER = new PoppyFieldSurfaceBuilder(SurfaceBuilderConfig::deserialize); + public static final SurfaceBuilder BOG_SURFACE_BUILDER = new BogSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder BRUSHLAND_SURFACE_BUILDER = new BrushlandSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder CHAPARRAL_SURFACE_BUILDER = new ChaparralSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder COLD_DESERT_SURFACE_BUILDER = new ColdDesertSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder TERRACOTTA_SURFACE_BUILDER = new TerracottaSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder MARSH_SURFACE_BUILDER = new MarshSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder MANGROVE_SURFACE_BUILDER = new MangroveSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder MUD_SURFACE_BUILDER = new MudSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder PODZOL_SURFACE_BUILDER = new PodzolSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder VOLCANO_SURFACE_BUILDER = new VolcanoSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder VOLCANO_EDGE_SURFACE_BUILDER = new VolcanoEdgeSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder DEEP_TOP_LAYER = new DeepTopLayerSurfaceBuilder(SurfaceBuilderConfig.CODEC); + public static final SurfaceBuilder POPPY_FIELD_SURFACE_BUILDER = new PoppyFieldSurfaceBuilder(SurfaceBuilderConfig.CODEC); public static final SurfaceBuilderConfig ASH_SURFACE = new SurfaceBuilderConfig(BOPBlocks.ash_block.defaultBlockState(), BOPBlocks.ash_block.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()); public static final SurfaceBuilderConfig TERRACOTTA_SURFACE = new SurfaceBuilderConfig(Blocks.TERRACOTTA.defaultBlockState(), Blocks.TERRACOTTA.defaultBlockState(), Blocks.GRAVEL.defaultBlockState()); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BigPumpkinFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/BigPumpkinFeature.java index 25c2d2524..9e0f5104e 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BigPumpkinFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BigPumpkinFeature.java @@ -1,16 +1,17 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.LeavesBlock; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; import java.util.function.Function; @@ -26,7 +27,7 @@ public class BigPumpkinFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos startPos, NoFeatureConfig config) { while (startPos.getY() > 1 && this.replace.matches(world, startPos)) {startPos = startPos.below();} diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BogSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/BogSurfaceBuilder.java index c48f98e3d..1f9dc0d9e 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BogSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BogSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; @@ -17,11 +17,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class BogSurfaceBuilder extends SurfaceBuilder { - public BogSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public BogSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BoneSpineFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/BoneSpineFeature.java index f2352ceff..4b48a3708 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BoneSpineFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BoneSpineFeature.java @@ -2,20 +2,18 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.RotatedPillarBlock; -import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class BoneSpineFeature extends Feature { @@ -29,7 +27,7 @@ public class BoneSpineFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager p_230362_2_, ChunkGenerator p_230362_3_, Random rand, BlockPos startPos, NoFeatureConfig p_230362_6_) { while (startPos.getY() > 1 && this.replace.matches(world, startPos)) {startPos = startPos.below();} @@ -47,7 +45,7 @@ public class BoneSpineFeature extends Feature BlockPos pos = startPos.above(); - int height = 1 + p_212245_3_.nextInt(maxHeight - 1); + int height = 1 + rand.nextInt(maxHeight - 1); for (int y = 0; y <= height; y++) { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BrambleFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/BrambleFeature.java index 56c3fb163..cd73f02e2 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BrambleFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BrambleFeature.java @@ -11,7 +11,7 @@ import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.block.BrambleBlock; import biomesoplenty.common.util.biome.GeneratorUtil; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.LeavesBlock; @@ -19,14 +19,13 @@ import net.minecraft.block.SaplingBlock; import net.minecraft.block.material.Material; import net.minecraft.util.Direction; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class BrambleFeature extends Feature { @@ -35,7 +34,7 @@ public class BrambleFeature extends Feature super(deserializer); } - protected IBlockPosQuery placeOn = (world, pos) -> + protected IBlockPosQuery placeOn = (world, pos) -> { BlockState state = world.getBlockState(pos); return state.canSustainPlant(world, pos, Direction.UP, (SaplingBlock)Blocks.OAK_SAPLING) || state.getBlock() == Blocks.NETHERRACK; @@ -44,7 +43,7 @@ public class BrambleFeature extends Feature protected IBlockPosQuery replace = (world, pos) -> world.getBlockState(pos).getMaterial() == Material.AIR; @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2, Random rand, BlockPos startPos, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos startPos, NoFeatureConfig config) { for (int i = 0; i < 128; ++i) { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BrushlandSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/BrushlandSurfaceBuilder.java index df3d16706..436854969 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BrushlandSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BrushlandSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunk; @@ -15,11 +15,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class BrushlandSurfaceBuilder extends SurfaceBuilder { - public BrushlandSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public BrushlandSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralFlowersFeature.java index 0c3e81b38..43d63a2fe 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralFlowersFeature.java @@ -8,20 +8,15 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class ChaparralFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralSurfaceBuilder.java index fb84fea75..f15125de4 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunk; @@ -15,11 +15,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class ChaparralSurfaceBuilder extends SurfaceBuilder { - public ChaparralSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public ChaparralSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/CherryBlossomGroveFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/CherryBlossomGroveFlowersFeature.java index b9f87a5db..636bd0fab 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/CherryBlossomGroveFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/CherryBlossomGroveFlowersFeature.java @@ -8,17 +8,12 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class CherryBlossomGroveFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ColdDesertSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/ColdDesertSurfaceBuilder.java index 2cbc108ff..0f7001d4e 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ColdDesertSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ColdDesertSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunk; @@ -15,11 +15,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class ColdDesertSurfaceBuilder extends SurfaceBuilder { - public ColdDesertSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public ColdDesertSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ConiferousForestFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/ConiferousForestFlowersFeature.java index ff2ab14f0..245e2e8cf 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ConiferousForestFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ConiferousForestFlowersFeature.java @@ -7,17 +7,12 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class ConiferousForestFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/DeepTopLayerSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/DeepTopLayerSurfaceBuilder.java index f20c6ff54..ca93c31e6 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/DeepTopLayerSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/DeepTopLayerSurfaceBuilder.java @@ -1,6 +1,6 @@ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; @@ -10,10 +10,9 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class DeepTopLayerSurfaceBuilder extends SurfaceBuilder { - public DeepTopLayerSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> p_i51315_1_) { + public DeepTopLayerSurfaceBuilder(Codec p_i51315_1_) { super(p_i51315_1_); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/DefaultFlowersFeatureNoConfig.java b/src/main/java/biomesoplenty/common/world/gen/feature/DefaultFlowersFeatureNoConfig.java index fdbc2771d..bac1f39aa 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/DefaultFlowersFeatureNoConfig.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/DefaultFlowersFeatureNoConfig.java @@ -7,17 +7,12 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; -import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; import net.minecraft.world.gen.feature.FlowersFeature; -import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public abstract class DefaultFlowersFeatureNoConfig extends FlowersFeature { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ExtendedFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/ExtendedFlowersFeature.java index 916598077..9a3bccda4 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ExtendedFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ExtendedFlowersFeature.java @@ -7,17 +7,12 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class ExtendedFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/FernGrassFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/FernGrassFeature.java index dbd89d176..bfa41566e 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/FernGrassFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/FernGrassFeature.java @@ -7,19 +7,18 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.tags.BlockTags; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class FernGrassFeature extends Feature { @@ -34,7 +33,7 @@ public class FernGrassFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator generator, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { BlockState BlockState = this.chooseGrassState(rand); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/FleshSplatterFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/FleshSplatterFeature.java index e0c41a9a8..73c9265fd 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/FleshSplatterFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/FleshSplatterFeature.java @@ -1,18 +1,17 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class FleshSplatterFeature extends Feature { @@ -22,7 +21,7 @@ public class FleshSplatterFeature extends Feature } @Override - public boolean place(IWorld worldIn, ChunkGenerator p_212245_2_, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(ISeedReader worldIn, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; int j = rand.nextInt(8 - 2) + 2; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/FlowerMeadowFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/FlowerMeadowFlowersFeature.java index 025387dfc..6b4ce67a2 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/FlowerMeadowFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/FlowerMeadowFlowersFeature.java @@ -7,20 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class FlowerMeadowFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/HeathFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/HeathFeature.java index 47b559a69..014fb7d5e 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/HeathFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/HeathFeature.java @@ -1,18 +1,17 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.Blocks; import net.minecraft.block.LeavesBlock; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class HeathFeature extends Feature { @@ -22,16 +21,16 @@ public class HeathFeature extends Feature } @Override - public boolean place(IWorld p_212245_1_, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; for(int j = 0; j < 64; ++j) { - BlockPos blockpos = p_212245_4_.offset(p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8), p_212245_3_.nextInt(4) - p_212245_3_.nextInt(4), p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8)); - if (p_212245_1_.getBlockState(blockpos).canBeReplacedByLeaves(p_212245_1_, blockpos) && p_212245_1_.getBlockState(blockpos.below()).getBlock() == Blocks.GRASS_BLOCK) + BlockPos blockpos = pos.offset(rand.nextInt(8) - rand.nextInt(8), rand.nextInt(4) - rand.nextInt(4), rand.nextInt(8) - rand.nextInt(8)); + if (world.getBlockState(blockpos).canBeReplacedByLeaves(world, blockpos) && world.getBlockState(blockpos.below()).getBlock() == Blocks.GRASS_BLOCK) { - p_212245_1_.setBlock(blockpos, BOPBlocks.jacaranda_leaves.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); + world.setBlock(blockpos, BOPBlocks.jacaranda_leaves.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); ++i; } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/HugeGlowshroomFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/HugeGlowshroomFeature.java index 64e9cc789..8aee06768 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/HugeGlowshroomFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/HugeGlowshroomFeature.java @@ -2,20 +2,20 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.BushBlock; import net.minecraft.block.HugeMushroomBlock; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class HugeGlowshroomFeature extends Feature { @@ -28,7 +28,7 @@ public class HugeGlowshroomFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_) { + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos startPos, NoFeatureConfig config) { while (startPos.getY() > 1 && this.replace.matches(world, startPos)) { startPos = startPos.below(); } @@ -45,8 +45,8 @@ public class HugeGlowshroomFeature extends Feature BlockPos pos = startPos.above(); - int height = 6 + p_212245_3_.nextInt(10); - int radius = 2 + p_212245_3_.nextInt(2); + int height = 6 + rand.nextInt(10); + int radius = 2 + rand.nextInt(2); for (int y = 0; y < height; y++) { this.setBlock(world, pos.above(y), Blocks.MUSHROOM_STEM.defaultBlockState()); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/HugeToadstoolFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/HugeToadstoolFeature.java index abaa4b7d8..4b12136b4 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/HugeToadstoolFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/HugeToadstoolFeature.java @@ -2,20 +2,20 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.BushBlock; import net.minecraft.block.HugeMushroomBlock; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class HugeToadstoolFeature extends Feature { @@ -28,7 +28,7 @@ public class HugeToadstoolFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_) { + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos startPos, NoFeatureConfig config) { while (startPos.getY() > 1 && this.replace.matches(world, startPos)) { startPos = startPos.below(); } @@ -45,7 +45,7 @@ public class HugeToadstoolFeature extends Feature BlockPos pos = startPos.above(); - int height = 3 + p_212245_3_.nextInt(5); + int height = 3 + rand.nextInt(5); int radius = 2; for (int y = 0; y < height; y++) { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/JungleFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/JungleFlowersFeature.java index 47dec2654..cc3f65b3f 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/JungleFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/JungleFlowersFeature.java @@ -8,17 +8,12 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class JungleFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/LavenderFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/LavenderFlowersFeature.java index 953c713a8..2facef2da 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/LavenderFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/LavenderFlowersFeature.java @@ -8,19 +8,14 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class LavenderFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/LushGrasslandFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/LushGrasslandFlowersFeature.java index 86ad025c5..032dff27c 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/LushGrasslandFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/LushGrasslandFlowersFeature.java @@ -8,17 +8,12 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class LushGrasslandFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/LushSwampFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/LushSwampFlowersFeature.java index 304c02ae4..c15ef727c 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/LushSwampFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/LushSwampFlowersFeature.java @@ -7,20 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class LushSwampFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MangroveFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/MangroveFeature.java index c3e9aca22..32f63b7d6 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MangroveFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MangroveFeature.java @@ -1,21 +1,20 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.DoublePlantBlock; import net.minecraft.block.LeavesBlock; import net.minecraft.block.material.Material; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class MangroveFeature extends Feature { @@ -25,16 +24,16 @@ public class MangroveFeature extends Feature { } @Override - public boolean place(IWorld p_212245_1_, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; BlockState blockstate = BOPBlocks.mangrove_root.defaultBlockState(); for(int j = 0; j < 64; ++j) { - BlockPos blockpos = p_212245_4_.offset(p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8), p_212245_3_.nextInt(4) - p_212245_3_.nextInt(4), p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8)); - if (p_212245_1_.getBlockState(blockpos).getMaterial() == Material.WATER && p_212245_1_.isEmptyBlock(blockpos.above()) && (!p_212245_1_.getDimension().isHasCeiling() || blockpos.getY() < p_212245_1_.getLevel().getHeight() - 1) && blockstate.canSurvive(p_212245_1_, blockpos)) { - p_212245_1_.setBlock(blockpos, blockstate, 2); - ((DoublePlantBlock)blockstate.getBlock()).placeAt(p_212245_1_, blockpos, 2); + BlockPos blockpos = pos.offset(rand.nextInt(8) - rand.nextInt(8), rand.nextInt(4) - rand.nextInt(4), rand.nextInt(8) - rand.nextInt(8)); + if (world.getBlockState(blockpos).getMaterial() == Material.WATER && world.isEmptyBlock(blockpos.above()) && (!world.dimensionType().hasCeiling() || blockpos.getY() < world.getLevel().getHeight() - 1) && blockstate.canSurvive(world, blockpos)) { + world.setBlock(blockpos, blockstate, 2); + ((DoublePlantBlock)blockstate.getBlock()).placeAt(world, blockpos, 2); BlockPos leaves1 = blockpos.above().above(); BlockPos leaves2 = leaves1.north(); @@ -43,32 +42,32 @@ public class MangroveFeature extends Feature { BlockPos leaves5 = leaves1.west(); BlockPos leaves6 = leaves1.above(); - if (p_212245_1_.getBlockState(leaves1).canBeReplacedByLeaves(p_212245_1_, leaves1)) + if (world.getBlockState(leaves1).canBeReplacedByLeaves(world, leaves1)) { - p_212245_1_.setBlock(leaves1, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); + world.setBlock(leaves1, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); } - if (p_212245_3_.nextInt(2) == 0) + if (rand.nextInt(2) == 0) { - if (p_212245_1_.getBlockState(leaves2).canBeReplacedByLeaves(p_212245_1_, leaves2)) + if (world.getBlockState(leaves2).canBeReplacedByLeaves(world, leaves2)) { - p_212245_1_.setBlock(leaves2, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); + world.setBlock(leaves2, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); } - if (p_212245_1_.getBlockState(leaves3).canBeReplacedByLeaves(p_212245_1_, leaves3)) + if (world.getBlockState(leaves3).canBeReplacedByLeaves(world, leaves3)) { - p_212245_1_.setBlock(leaves3, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); + world.setBlock(leaves3, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); } - if (p_212245_1_.getBlockState(leaves4).canBeReplacedByLeaves(p_212245_1_, leaves4)) + if (world.getBlockState(leaves4).canBeReplacedByLeaves(world, leaves4)) { - p_212245_1_.setBlock(leaves4, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); + world.setBlock(leaves4, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); } - if (p_212245_1_.getBlockState(leaves5).canBeReplacedByLeaves(p_212245_1_, leaves5)) + if (world.getBlockState(leaves5).canBeReplacedByLeaves(world, leaves5)) { - p_212245_1_.setBlock(leaves5, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); + world.setBlock(leaves5, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); } - if (p_212245_1_.getBlockState(leaves6).canBeReplacedByLeaves(p_212245_1_, leaves6)) + if (world.getBlockState(leaves6).canBeReplacedByLeaves(world, leaves6)) { - p_212245_1_.setBlock(leaves6, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); + world.setBlock(leaves6, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); } } ++i; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MangroveSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/MangroveSurfaceBuilder.java index bcbcd71a3..001873a80 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MangroveSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MangroveSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; @@ -16,11 +16,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class MangroveSurfaceBuilder extends SurfaceBuilder { - public MangroveSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public MangroveSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java index 8124aa6fa..bb95ea8eb 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; @@ -16,11 +16,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class MarshSurfaceBuilder extends SurfaceBuilder { - public MarshSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public MarshSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MeadowFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/MeadowFlowersFeature.java index f57a745c6..ab35860bb 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MeadowFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MeadowFlowersFeature.java @@ -7,20 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class MeadowFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MoorFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/MoorFlowersFeature.java index 9a7f2f483..c502322e7 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MoorFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MoorFlowersFeature.java @@ -8,17 +8,12 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class MoorFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MudSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/MudSurfaceBuilder.java index 8be2c98dc..c379cf202 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MudSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MudSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunk; @@ -15,11 +15,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class MudSurfaceBuilder extends SurfaceBuilder { - public MudSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public MudSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MyceliumSplatterFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/MyceliumSplatterFeature.java index e4776ead8..ce2b71739 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MyceliumSplatterFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MyceliumSplatterFeature.java @@ -1,17 +1,16 @@ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class MyceliumSplatterFeature extends Feature { @@ -21,7 +20,7 @@ public class MyceliumSplatterFeature extends Feature } @Override - public boolean place(IWorld worldIn, ChunkGenerator p_212245_2_, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(ISeedReader worldIn, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; int j = rand.nextInt(8 - 2) + 2; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/MysticGroveFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/MysticGroveFlowersFeature.java index a77aab5c2..0a435e4df 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MysticGroveFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MysticGroveFlowersFeature.java @@ -8,20 +8,15 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class MysticGroveFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/NetherVinesFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/NetherVinesFeature.java index 9d0ab5685..33b31543b 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/NetherVinesFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/NetherVinesFeature.java @@ -2,21 +2,21 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.common.util.block.IBlockPosQuery; import com.google.common.collect.Lists; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.VineBlock; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.List; import java.util.Random; -import java.util.function.Function; public class NetherVinesFeature extends Feature { @@ -31,7 +31,7 @@ public class NetherVinesFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2_, Random rand, BlockPos startPos, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos startPos, NoFeatureConfig config) { while (startPos.getY() > 1 && this.replace.matches(world, startPos)) {startPos = startPos.below();} diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/NetherWartFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/NetherWartFeature.java index 3c9c5253b..0785c32bd 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/NetherWartFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/NetherWartFeature.java @@ -1,17 +1,16 @@ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.Blocks; import net.minecraft.block.NetherWartBlock; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class NetherWartFeature extends Feature { @@ -21,17 +20,17 @@ public class NetherWartFeature extends Feature } @Override - public boolean place(IWorld p_212245_1_, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; for(int j = 0; j < 64; ++j) { - BlockPos blockpos = p_212245_4_.offset(p_212245_3_.nextInt(4) - p_212245_3_.nextInt(4), p_212245_3_.nextInt(4) - p_212245_3_.nextInt(4), p_212245_3_.nextInt(4) - p_212245_3_.nextInt(4)); - if (p_212245_1_.getBlockState(blockpos).isAir(p_212245_1_, blockpos) && p_212245_1_.getBlockState(blockpos.below()).getBlock() == Blocks.NETHERRACK && p_212245_1_.getBlockState(blockpos.below().east()).getBlock() == Blocks.NETHERRACK && p_212245_1_.getBlockState(blockpos.below().west()).getBlock() == Blocks.NETHERRACK && p_212245_1_.getBlockState(blockpos.below().north()).getBlock() == Blocks.NETHERRACK && p_212245_1_.getBlockState(blockpos.below().south()).getBlock() == Blocks.NETHERRACK) + BlockPos blockpos = pos.offset(rand.nextInt(4) - rand.nextInt(4), rand.nextInt(4) - rand.nextInt(4), rand.nextInt(4) - rand.nextInt(4)); + if (world.getBlockState(blockpos).isAir(world, blockpos) && world.getBlockState(blockpos.below()).getBlock() == Blocks.NETHERRACK && world.getBlockState(blockpos.below().east()).getBlock() == Blocks.NETHERRACK && world.getBlockState(blockpos.below().west()).getBlock() == Blocks.NETHERRACK && world.getBlockState(blockpos.below().north()).getBlock() == Blocks.NETHERRACK && world.getBlockState(blockpos.below().south()).getBlock() == Blocks.NETHERRACK) { - p_212245_1_.setBlock(blockpos.below(), Blocks.SOUL_SAND.defaultBlockState(), 2); - p_212245_1_.setBlock(blockpos, Blocks.NETHER_WART.defaultBlockState().setValue(NetherWartBlock.AGE, p_212245_3_.nextInt(4)), 2); + world.setBlock(blockpos.below(), Blocks.SOUL_SAND.defaultBlockState(), 2); + world.setBlock(blockpos, Blocks.NETHER_WART.defaultBlockState().setValue(NetherWartBlock.AGE, rand.nextInt(4)), 2); ++i; } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/OminousWoodsFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/OminousWoodsFlowersFeature.java index 49e5dc9e4..69f18fe28 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/OminousWoodsFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/OminousWoodsFlowersFeature.java @@ -7,20 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class OminousWoodsFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/OrangeCosmosFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/OrangeCosmosFeature.java index bc3012832..57de75577 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/OrangeCosmosFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/OrangeCosmosFeature.java @@ -8,19 +8,14 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class OrangeCosmosFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/OriginFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/OriginFlowersFeature.java index a4087ef8c..66955a25e 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/OriginFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/OriginFlowersFeature.java @@ -8,17 +8,12 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class OriginFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/PodzolSplatterFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/PodzolSplatterFeature.java index 53c747e25..d13a47bbb 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/PodzolSplatterFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/PodzolSplatterFeature.java @@ -1,18 +1,16 @@ package biomesoplenty.common.world.gen.feature; -import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class PodzolSplatterFeature extends Feature { @@ -22,7 +20,7 @@ public class PodzolSplatterFeature extends Feature } @Override - public boolean place(IWorld worldIn, ChunkGenerator p_212245_2_, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(ISeedReader worldIn, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; int j = rand.nextInt(8 - 2) + 2; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/PodzolSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/PodzolSurfaceBuilder.java index 87bafbb7a..709faaa78 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/PodzolSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/PodzolSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunk; @@ -15,11 +15,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class PodzolSurfaceBuilder extends SurfaceBuilder { - public PodzolSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public PodzolSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/PoppyFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/PoppyFeature.java index 88e8aacc7..2e74927ec 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/PoppyFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/PoppyFeature.java @@ -7,7 +7,6 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import biomesoplenty.api.block.BOPBlocks; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/PoppyFieldSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/PoppyFieldSurfaceBuilder.java index 6cc486254..bf37b3f0c 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/PoppyFieldSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/PoppyFieldSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunk; @@ -15,11 +15,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class PoppyFieldSurfaceBuilder extends SurfaceBuilder { - public PoppyFieldSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public PoppyFieldSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/PumpkinPatchFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/PumpkinPatchFeature.java index f57f64edb..21bbdb5f9 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/PumpkinPatchFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/PumpkinPatchFeature.java @@ -1,19 +1,18 @@ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.Blocks; import net.minecraft.block.CarvedPumpkinBlock; import net.minecraft.block.LeavesBlock; import net.minecraft.util.Direction; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class PumpkinPatchFeature extends Feature { @@ -23,36 +22,36 @@ public class PumpkinPatchFeature extends Feature } @Override - public boolean place(IWorld p_212245_1_, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; for(int j = 0; j < 64; ++j) { - BlockPos blockpos = p_212245_4_.offset(p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8), p_212245_3_.nextInt(4) - p_212245_3_.nextInt(4), p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8)); - if (p_212245_1_.getBlockState(blockpos).canBeReplacedByLeaves(p_212245_1_, blockpos) && p_212245_1_.getBlockState(blockpos.below()).getBlock() == Blocks.GRASS_BLOCK) + BlockPos blockpos = pos.offset(rand.nextInt(8) - rand.nextInt(8), rand.nextInt(4) - rand.nextInt(4), rand.nextInt(8) - rand.nextInt(8)); + if (world.getBlockState(blockpos).canBeReplacedByLeaves(world, blockpos) && world.getBlockState(blockpos.below()).getBlock() == Blocks.GRASS_BLOCK) { - if (p_212245_3_.nextInt(3) == 0) + if (rand.nextInt(3) == 0) { - int rand = p_212245_3_.nextInt(50); + int num = rand.nextInt(50); - if (rand > 10) + if (num > 10) { - p_212245_1_.setBlock(blockpos, Blocks.PUMPKIN.defaultBlockState(), 2); + world.setBlock(blockpos, Blocks.PUMPKIN.defaultBlockState(), 2); } - else if (rand > 1) + else if (num > 1) { - p_212245_1_.setBlock(blockpos, Blocks.CARVED_PUMPKIN.defaultBlockState().setValue(CarvedPumpkinBlock.FACING, Direction.from3DDataValue(2 + p_212245_3_.nextInt(4))), 2); + world.setBlock(blockpos, Blocks.CARVED_PUMPKIN.defaultBlockState().setValue(CarvedPumpkinBlock.FACING, Direction.from3DDataValue(2 + rand.nextInt(4))), 2); } else { - p_212245_1_.setBlock(blockpos, Blocks.JACK_O_LANTERN.defaultBlockState().setValue(CarvedPumpkinBlock.FACING, Direction.from3DDataValue(2 + p_212245_3_.nextInt(4))), 2); + world.setBlock(blockpos, Blocks.JACK_O_LANTERN.defaultBlockState().setValue(CarvedPumpkinBlock.FACING, Direction.from3DDataValue(2 + rand.nextInt(4))), 2); } } else { - p_212245_1_.setBlock(blockpos, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); + world.setBlock(blockpos, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); } ++i; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/RainforestFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/RainforestFlowersFeature.java index 42f47709f..f089a5c48 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/RainforestFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/RainforestFlowersFeature.java @@ -8,20 +8,15 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class RainforestFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ScatteredRocksFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/ScatteredRocksFeature.java index 2349a570f..87b36cb7b 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ScatteredRocksFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ScatteredRocksFeature.java @@ -1,16 +1,15 @@ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.Blocks; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class ScatteredRocksFeature extends Feature { @@ -20,23 +19,23 @@ public class ScatteredRocksFeature extends Feature } @Override - public boolean place(IWorld p_212245_1_, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; for(int j = 0; j < 32; ++j) { - BlockPos blockpos = p_212245_4_.offset(p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8), p_212245_3_.nextInt(4) - p_212245_3_.nextInt(4), p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8)); - if (p_212245_1_.getBlockState(blockpos).canBeReplacedByLeaves(p_212245_1_, blockpos) && p_212245_1_.getBlockState(blockpos.below()).getBlock() == Blocks.GRASS_BLOCK) + BlockPos blockpos = pos.offset(rand.nextInt(8) - rand.nextInt(8), rand.nextInt(4) - rand.nextInt(4), rand.nextInt(8) - rand.nextInt(8)); + if (world.getBlockState(blockpos).canBeReplacedByLeaves(world, blockpos) && world.getBlockState(blockpos.below()).getBlock() == Blocks.GRASS_BLOCK) { - if (p_212245_3_.nextInt(3) == 0) + if (rand.nextInt(3) == 0) { - p_212245_1_.setBlock(blockpos, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 2); + world.setBlock(blockpos, Blocks.MOSSY_COBBLESTONE.defaultBlockState(), 2); } else { - p_212245_1_.setBlock(blockpos, Blocks.COBBLESTONE.defaultBlockState(), 2); + world.setBlock(blockpos, Blocks.COBBLESTONE.defaultBlockState(), 2); } ++i; diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ScrubFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/ScrubFeature.java index 97234fcf9..e3709eca1 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ScrubFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ScrubFeature.java @@ -1,17 +1,16 @@ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.Blocks; import net.minecraft.block.LeavesBlock; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class ScrubFeature extends Feature { @@ -21,16 +20,16 @@ public class ScrubFeature extends Feature } @Override - public boolean place(IWorld p_212245_1_, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { int i = 0; for(int j = 0; j < 64; ++j) { - BlockPos blockpos = p_212245_4_.offset(p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8), p_212245_3_.nextInt(4) - p_212245_3_.nextInt(4), p_212245_3_.nextInt(8) - p_212245_3_.nextInt(8)); - if (p_212245_1_.getBlockState(blockpos).canBeReplacedByLeaves(p_212245_1_, blockpos) && p_212245_1_.getBlockState(blockpos.below()).getBlock() == Blocks.GRASS_BLOCK) + BlockPos blockpos = pos.offset(rand.nextInt(8) - rand.nextInt(8), rand.nextInt(4) - rand.nextInt(4), rand.nextInt(8) - rand.nextInt(8)); + if (world.getBlockState(blockpos).canBeReplacedByLeaves(world, blockpos) && world.getBlockState(blockpos.below()).getBlock() == Blocks.GRASS_BLOCK) { - p_212245_1_.setBlock(blockpos, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); + world.setBlock(blockpos, Blocks.OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true), 2); ++i; } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ShortBambooFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/ShortBambooFeature.java index c723a1700..a4154d61d 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ShortBambooFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ShortBambooFeature.java @@ -1,21 +1,20 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BambooBlock; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.state.properties.BambooLeaves; import net.minecraft.util.Direction; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class ShortBambooFeature extends Feature { @@ -32,7 +31,7 @@ public class ShortBambooFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator generator, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { while (pos.getY() > 1 && this.replace.matches(world, pos)) {pos = pos.below();} @@ -44,7 +43,7 @@ public class ShortBambooFeature extends Feature pos = pos.above(); - BlockPos.Mutable blockpos$mutableblockpos = new BlockPos.Mutable(pos); + BlockPos.Mutable blockpos$mutableblockpos = new BlockPos.Mutable(pos.getX(), pos.getY(), pos.getZ()); if (world.isEmptyBlock(blockpos$mutableblockpos)) { if (Blocks.BAMBOO.defaultBlockState().canSurvive(world, blockpos$mutableblockpos)) diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/ShrublandFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/ShrublandFlowersFeature.java index b7de21a47..601393b49 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ShrublandFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ShrublandFlowersFeature.java @@ -7,20 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class ShrublandFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/SmallBrownMushroomFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/SmallBrownMushroomFeature.java index a1ec7f590..735afe61f 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/SmallBrownMushroomFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/SmallBrownMushroomFeature.java @@ -1,17 +1,20 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; -import net.minecraft.block.*; +import com.mojang.serialization.Codec; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.BushBlock; +import net.minecraft.block.HugeMushroomBlock; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class SmallBrownMushroomFeature extends Feature { @@ -24,7 +27,7 @@ public class SmallBrownMushroomFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_) { + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos startPos, NoFeatureConfig config) { while (startPos.getY() > 1 && this.replace.matches(world, startPos)) { startPos = startPos.below(); } @@ -41,7 +44,7 @@ public class SmallBrownMushroomFeature extends Feature BlockPos pos = startPos.above(); - int height = 1 + p_212245_3_.nextInt(2); + int height = 1 + rand.nextInt(2); for (int y = 0; y < height; y++) { this.setBlock(world, pos.above(y), Blocks.MUSHROOM_STEM.defaultBlockState()); @@ -53,7 +56,7 @@ public class SmallBrownMushroomFeature extends Feature this.setBlock(world, pos.offset(0, height, -1), Blocks.BROWN_MUSHROOM_BLOCK.defaultBlockState().setValue(HugeMushroomBlock.DOWN, false)); this.setBlock(world, pos.offset(0, height, 1), Blocks.BROWN_MUSHROOM_BLOCK.defaultBlockState().setValue(HugeMushroomBlock.DOWN, false)); - if (p_212245_3_.nextInt(2) == 0) + if (rand.nextInt(2) == 0) { this.setBlock(world, pos.offset(1, height, 1), Blocks.BROWN_MUSHROOM_BLOCK.defaultBlockState().setValue(HugeMushroomBlock.DOWN, false)); this.setBlock(world, pos.offset(-1, height, -1), Blocks.BROWN_MUSHROOM_BLOCK.defaultBlockState().setValue(HugeMushroomBlock.DOWN, false)); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/SmallGlowshroomFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/SmallGlowshroomFeature.java index 63e1550fb..0dbf602ec 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/SmallGlowshroomFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/SmallGlowshroomFeature.java @@ -2,20 +2,20 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.BushBlock; import net.minecraft.block.HugeMushroomBlock; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class SmallGlowshroomFeature extends Feature { @@ -28,7 +28,7 @@ public class SmallGlowshroomFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_) { + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos startPos, NoFeatureConfig config) { while (startPos.getY() > 1 && this.replace.matches(world, startPos)) { startPos = startPos.below(); } @@ -45,7 +45,7 @@ public class SmallGlowshroomFeature extends Feature BlockPos pos = startPos.above(); - int height = 1 + p_212245_3_.nextInt(4); + int height = 1 + rand.nextInt(4); for (int y = 0; y < height; y++) { this.setBlock(world, pos.above(y), Blocks.MUSHROOM_STEM.defaultBlockState()); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/SmallRedMushroomFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/SmallRedMushroomFeature.java index 109f4120d..9c4f16a00 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/SmallRedMushroomFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/SmallRedMushroomFeature.java @@ -1,20 +1,20 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.BushBlock; import net.minecraft.block.HugeMushroomBlock; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class SmallRedMushroomFeature extends Feature { @@ -27,7 +27,7 @@ public class SmallRedMushroomFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_) { + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos startPos, NoFeatureConfig config) { while (startPos.getY() > 1 && this.replace.matches(world, startPos)) { startPos = startPos.below(); } @@ -44,7 +44,7 @@ public class SmallRedMushroomFeature extends Feature BlockPos pos = startPos.above(); - int height = 1 + p_212245_3_.nextInt(2); + int height = 1 + rand.nextInt(2); for (int y = 0; y < height; y++) { this.setBlock(world, pos.above(y), Blocks.MUSHROOM_STEM.defaultBlockState()); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/SmallToadstoolFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/SmallToadstoolFeature.java index d19d0dbbb..6a7476fd4 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/SmallToadstoolFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/SmallToadstoolFeature.java @@ -2,20 +2,20 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; import biomesoplenty.common.util.block.IBlockPosQuery; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.BushBlock; import net.minecraft.block.HugeMushroomBlock; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ISeedReader; import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class SmallToadstoolFeature extends Feature { @@ -28,7 +28,7 @@ public class SmallToadstoolFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_) { + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos startPos, NoFeatureConfig config) { while (startPos.getY() > 1 && this.replace.matches(world, startPos)) { startPos = startPos.below(); } @@ -45,7 +45,7 @@ public class SmallToadstoolFeature extends Feature BlockPos pos = startPos.above(); - int height = 1 + p_212245_3_.nextInt(2); + int height = 1 + rand.nextInt(2); for (int y = 0; y < height; y++) { this.setBlock(world, pos.above(y), Blocks.MUSHROOM_STEM.defaultBlockState()); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/SnowyFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/SnowyFlowersFeature.java index 482c79052..bea03b56c 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/SnowyFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/SnowyFlowersFeature.java @@ -8,17 +8,12 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class SnowyFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/StandardGrassFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/StandardGrassFeature.java index f255f83d0..d4886c4d6 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/StandardGrassFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/StandardGrassFeature.java @@ -7,23 +7,21 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.tags.BlockTags; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class StandardGrassFeature extends Feature -{Codec +{ public StandardGrassFeature(Codec deserializer) { super(deserializer); @@ -35,7 +33,7 @@ public class StandardGrassFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator generator, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { BlockState BlockState = this.chooseGrassState(rand); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/TerracottaSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/TerracottaSurfaceBuilder.java index 1d75c8445..3749ecf64 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/TerracottaSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/TerracottaSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunk; @@ -15,11 +15,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class TerracottaSurfaceBuilder extends SurfaceBuilder { - public TerracottaSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public TerracottaSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/TropicsFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/TropicsFlowersFeature.java index 0a683697c..f0539dcee 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/TropicsFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/TropicsFlowersFeature.java @@ -8,20 +8,15 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class TropicsFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/VioletFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/VioletFeature.java index 260682b73..71d1b9867 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/VioletFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/VioletFeature.java @@ -8,19 +8,14 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class VioletFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoEdgeSurfaceBuilder.java b/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoEdgeSurfaceBuilder.java index 779bf7788..db3bb96cd 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoEdgeSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/VolcanoEdgeSurfaceBuilder.java @@ -7,7 +7,7 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunk; @@ -15,11 +15,10 @@ import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilders.SurfaceBuilderConfig; import java.util.Random; -import java.util.function.Function; public class VolcanoEdgeSurfaceBuilder extends SurfaceBuilder { - public VolcanoEdgeSurfaceBuilder(Function, ? extends SurfaceBuilderConfig> deserializer) + public VolcanoEdgeSurfaceBuilder(Codec deserializer) { super(deserializer); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/WastelandFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/WastelandFlowersFeature.java index 89b0f031a..0b028f556 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/WastelandFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/WastelandFlowersFeature.java @@ -8,19 +8,14 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class WastelandFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/WastelandGrassFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/WastelandGrassFeature.java index 5c39d62cb..d227c47a2 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/WastelandGrassFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/WastelandGrassFeature.java @@ -8,18 +8,17 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; +import com.mojang.serialization.Codec; import net.minecraft.block.BlockState; import net.minecraft.tags.BlockTags; 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.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; +import net.minecraft.world.gen.feature.structure.StructureManager; import java.util.Random; -import java.util.function.Function; public class WastelandGrassFeature extends Feature { @@ -34,7 +33,7 @@ public class WastelandGrassFeature extends Feature } @Override - public boolean place(IWorld world, ChunkGenerator generator, Random rand, BlockPos pos, NoFeatureConfig config) + public boolean place(ISeedReader world, StructureManager structureManager, ChunkGenerator chunkGenerator, Random rand, BlockPos pos, NoFeatureConfig config) { BlockState BlockState = this.chooseGrassState(rand); diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/WetlandFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/WetlandFlowersFeature.java index a53e0acdc..ba2d8a22d 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/WetlandFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/WetlandFlowersFeature.java @@ -7,20 +7,15 @@ ******************************************************************************/ package biomesoplenty.common.world.gen.feature; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class WetlandFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/WildflowerFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/WildflowerFeature.java index d33ab0ed4..c077a93e1 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/WildflowerFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/WildflowerFeature.java @@ -8,19 +8,14 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class WildflowerFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java index 7acbd233e..d49f51c52 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java @@ -8,19 +8,14 @@ package biomesoplenty.common.world.gen.feature; import biomesoplenty.api.block.BOPBlocks; -import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.feature.BlockClusterFeatureConfig; -import net.minecraft.world.gen.feature.DefaultFlowersFeature; -import net.minecraft.world.gen.feature.FlowersFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; -import java.util.function.Function; public class XericShrublandFlowersFeature extends DefaultFlowersFeatureNoConfig { diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/tree/TreeFeatureBase.java b/src/main/java/biomesoplenty/common/world/gen/feature/tree/TreeFeatureBase.java index b4c9fb278..136e76f32 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/tree/TreeFeatureBase.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/tree/TreeFeatureBase.java @@ -100,7 +100,7 @@ public abstract class TreeFeatureBase extends AbstractTreeFeature