diff --git a/gradle.properties b/gradle.properties index 1c1c4ef54..f42cb96ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,4 @@ minecraft_version_toml=15 forge_version=30.0.15 forge_version_toml=30 forge_group=net.minecraftforge -mappings_version=2-1.15.1 +mappings_version=3-1.15.1 diff --git a/mappings/build.gradle b/mappings/build.gradle index 0de6529d3..14f90ab1f 100644 --- a/mappings/build.gradle +++ b/mappings/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java' apply plugin: 'maven' ext.channel = 'snapshot' -ext.dlVersion = '2' +ext.dlVersion = '3' ext.mcVersion = '1.15.1' group = 'de.oceanlabs.mcp' @@ -11,7 +11,7 @@ archivesBaseName = 'mcp_' + ext.channel def downloadCSV(name) { mkdir 'mcp' - def out = new File('mcp/' + name) + def out = new File("$projectDir/mcp/" + name) new URL('http://export.mcpbot.bspk.rs/' + name).withInputStream{ i -> out.withOutputStream{ it << i }} } diff --git a/mappings/custom/fields.csv b/mappings/custom/fields.csv new file mode 100644 index 000000000..0225b7c4b --- /dev/null +++ b/mappings/custom/fields.csv @@ -0,0 +1,19 @@ +searge,name,side,desc +field_226832_a_,noiseBiomeSource,2, +field_226833_b_,biomeZoomSeed,2, +field_226834_c_,zoomer,2, +field_226837_c_,possibleBiomes,2, +field_227244_A_,BLOCK_PILE,2, +field_227245_q_,NO_OP,2, +field_227246_s_,ACACIA_TREE,2, +field_227248_z_,RANDOM_PATCH,2, +field_227368_m_,trunkProvider,2, +field_227369_n_,leavesProvider,2, +field_227370_o_,decorators,2, +field_227371_p_,baseHeight,2, +field_227372_q_,fromSapling,2, +field_227377_a_,trunkProvider,2, +field_227378_b_,leavesProvider,2, +field_227379_c_,decorators,2, +field_227380_d_,baseHeight,2, +field_227393_a_,type,2, diff --git a/mappings/custom/methods.csv b/mappings/custom/methods.csv index 505206524..93d6e4358 100644 --- a/mappings/custom/methods.csv +++ b/mappings/custom/methods.csv @@ -1,2 +1,30 @@ searge,name,side,desc +func_208521_b,setBlock,2, +func_214584_a,setDirtAt,2, +func_214587_a,isFree,2, +func_214840_a,deserialize,2, +func_222365_c,getHeightValue,2, +func_225526_b_,getNoiseBiome,2, +func_225530_a_,getBiomesWithin,2, +func_225531_a_,findBiomeHorizontal,2, +func_225532_a_,getBiome,2, +func_225557_a_,doPlace,2, +func_225559_a_,isValid,2, +func_225560_a_,getCount,2, +func_225561_a_,getPos,2, +func_225562_b_,getRandomFlower,2, func_225566_b_,configured,2, +func_225568_b_,build,2, +func_225569_d_,baseHeight,2, +func_225574_a_,getState,2, +func_226835_a_,withDifferentSource,2, +func_226836_a_,getBiome,2, +func_227214_a_,updateLeaves,2, +func_227216_a_,placeLog,2, +func_227217_a_,setBlock,2, +func_227219_b_,placeLeaf,2, +func_227222_d_,isVine,2, +func_227227_a_,weighted,2, +func_227228_a_,decorated,2, +func_227373_a_,setFromSapling,2, +func_227376_b_,deserialize,2, diff --git a/src/main/java/biomesoplenty/client/util/BiomeMapColours.java b/src/main/java/biomesoplenty/client/util/BiomeMapColours.java index 5ac0efad8..5d13b2725 100644 --- a/src/main/java/biomesoplenty/client/util/BiomeMapColours.java +++ b/src/main/java/biomesoplenty/client/util/BiomeMapColours.java @@ -157,7 +157,7 @@ public class BiomeMapColours public static int getTopColour(Biome biome) { - BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos(0,64,0); + BlockPos.Mutable pos = new BlockPos.Mutable(0,64,0); return getBiomeBlockColourForCoords(biome, pos); } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java b/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java index f14029cc6..ef4d19578 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/SilkgladeBiome.java @@ -82,7 +82,7 @@ public class SilkgladeBiome extends BiomeBOP @OnlyIn(Dist.CLIENT) @Override public int getGrassColor(BlockPos pos) { - double d0 = INFO_NOISE.getValue((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double d0 = INFO_NOISE.noiseAt((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return d0 < -0.1D ? 0xB2B39F : 0x939F76; } @@ -90,7 +90,7 @@ public class SilkgladeBiome extends BiomeBOP @Override public int getFoliageColor(BlockPos pos) { - double d0 = INFO_NOISE.getValue((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); + double d0 = INFO_NOISE.noiseAt((double)pos.getX() * 0.0225D, (double)pos.getZ() * 0.0225D); return d0 < -0.1D ? 0xDEE1C6 : 0xBCCD98; } } diff --git a/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java b/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java index df5f7a573..255dfccc9 100644 --- a/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java +++ b/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java @@ -373,7 +373,7 @@ public class BoatEntityBOP extends BoatEntity { int i1 = MathHelper.floor(axisalignedbb.minZ); int j1 = MathHelper.ceil(axisalignedbb.maxZ); - try (BlockPos.PooledMutableBlockPos blockpos$pooledmutableblockpos = BlockPos.PooledMutableBlockPos.retain()) { + try (BlockPos.PooledMutable blockpos$pooledmutableblockpos = BlockPos.PooledMutable.retain()) { label161: for (int k1 = k; k1 < l; ++k1) { float f = 0.0F; @@ -420,7 +420,7 @@ public class BoatEntityBOP extends BoatEntity { float f = 0.0F; int k1 = 0; - try (BlockPos.PooledMutableBlockPos blockpos$pooledmutableblockpos = BlockPos.PooledMutableBlockPos.retain()) { + try (BlockPos.PooledMutable blockpos$pooledmutableblockpos = BlockPos.PooledMutable.retain()) { for (int l1 = i; l1 < j; ++l1) { for (int i2 = i1; i2 < j1; ++i2) { int j2 = (l1 != i && l1 != j - 1 ? 0 : 1) + (i2 != i1 && i2 != j1 - 1 ? 0 : 1); @@ -454,7 +454,7 @@ public class BoatEntityBOP extends BoatEntity { boolean flag = false; this.waterLevel = Double.MIN_VALUE; - try (BlockPos.PooledMutableBlockPos blockpos$pooledmutableblockpos = BlockPos.PooledMutableBlockPos.retain()) { + try (BlockPos.PooledMutable blockpos$pooledmutableblockpos = BlockPos.PooledMutable.retain()) { for (int k1 = i; k1 < j; ++k1) { for (int l1 = k; l1 < l; ++l1) { for (int i2 = i1; i2 < j1; ++i2) { @@ -488,7 +488,7 @@ public class BoatEntityBOP extends BoatEntity { int j1 = MathHelper.ceil(axisalignedbb.maxZ); boolean flag = false; - try (BlockPos.PooledMutableBlockPos blockpos$pooledmutableblockpos = BlockPos.PooledMutableBlockPos.retain()) { + try (BlockPos.PooledMutable blockpos$pooledmutableblockpos = BlockPos.PooledMutable.retain()) { for (int k1 = i; k1 < j; ++k1) { for (int l1 = k; l1 < l; ++l1) { for (int i2 = i1; i2 < j1; ++i2) { diff --git a/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java b/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java index f4d44f992..ef4cd9cca 100644 --- a/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java +++ b/src/main/java/biomesoplenty/common/world/WorldTypeBOP.java @@ -30,8 +30,7 @@ public class WorldTypeBOP extends WorldType if (world.getDimension().getType() == DimensionType.OVERWORLD) { OverworldGenSettings overworldGenSettings = new OverworldGenSettings(); - OverworldBiomeProviderSettings biomeProviderSettings = new OverworldBiomeProviderSettings(); - biomeProviderSettings.setWorldInfo(world.getWorldInfo()); + OverworldBiomeProviderSettings biomeProviderSettings = new OverworldBiomeProviderSettings(world.getWorldInfo()); biomeProviderSettings.setGeneratorSettings(overworldGenSettings); return new ChunkGeneratorOverworldBOP(world, new BOPBiomeProvider(biomeProviderSettings), overworldGenSettings); @@ -43,8 +42,7 @@ public class WorldTypeBOP extends WorldType nethergensettings.setDefaultFluid(Blocks.LAVA.getDefaultState()); // The nether shares biome provider settings with the overworld - OverworldBiomeProviderSettings biomeProviderSettings = new OverworldBiomeProviderSettings(); - biomeProviderSettings.setWorldInfo(world.getWorldInfo()); + OverworldBiomeProviderSettings biomeProviderSettings = new OverworldBiomeProviderSettings(world.getWorldInfo()); return ChunkGeneratorType.CAVES.create(world, new NetherBiomeProvider(biomeProviderSettings), nethergensettings); } diff --git a/src/main/java/biomesoplenty/common/world/gen/feature/BigBrownMushroomNetherFeature.java b/src/main/java/biomesoplenty/common/world/gen/feature/BigBrownMushroomNetherFeature.java index c8f1d07a1..79c59fed6 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/BigBrownMushroomNetherFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/BigBrownMushroomNetherFeature.java @@ -34,7 +34,7 @@ public class BigBrownMushroomNetherFeature extends Feature @Override public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) { - double d0 = Biome.INFO_NOISE.getValue((double)x * 0.25D, (double)z * 0.25D); + double d0 = Biome.INFO_NOISE.noiseAt((double)x * 0.25D, (double)z * 0.25D, false); if (d0 > 0.1D) { int i = x & 15; int j = z & 15; - BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(); - BlockPos.MutableBlockPos blockposdown$mutableblockpos = new BlockPos.MutableBlockPos(); - BlockPos.MutableBlockPos blockposup$mutableblockpos = new BlockPos.MutableBlockPos(); + BlockPos.Mutable blockpos$mutableblockpos = new BlockPos.Mutable(); + BlockPos.Mutable blockposdown$mutableblockpos = new BlockPos.Mutable(); + BlockPos.Mutable blockposup$mutableblockpos = new BlockPos.Mutable(); for(int k = startHeight; k >= 0; --k) { 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 c6dd4a07b..d53cfa2da 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ChaparralFlowersFeature.java @@ -33,7 +33,7 @@ public class ChaparralFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D, false)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 e77ec60eb..662659a1c 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/DeepTopLayerSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/DeepTopLayerSurfaceBuilder.java @@ -24,7 +24,7 @@ public class DeepTopLayerSurfaceBuilder extends SurfaceBuilder @Override public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) { - double d0 = Biome.INFO_NOISE.getValue((double)x * 0.25D, (double)z * 0.25D); + double d0 = Biome.INFO_NOISE.noiseAt((double)x * 0.25D, (double)z * 0.25D); if (d0 > 0.2D) { int i = x & 15; int j = z & 15; - BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(); + BlockPos.Mutable blockpos$mutableblockpos = new BlockPos.Mutable(); for(int k = startHeight; k >= 0; --k) { blockpos$mutableblockpos.setPos(i, k, j); 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 37b22a0aa..d7f883445 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MarshSurfaceBuilder.java @@ -28,11 +28,11 @@ public class MarshSurfaceBuilder extends SurfaceBuilder @Override public void buildSurface(Random random, IChunk chunkIn, Biome biomeIn, int x, int z, int startHeight, double noise, BlockState defaultBlock, BlockState defaultFluid, int seaLevel, long seed, SurfaceBuilderConfig config) { - double d0 = Biome.INFO_NOISE.getValue((double)x * 0.25D, (double)z * 0.25D); + double d0 = Biome.INFO_NOISE.noiseAt((double)x * 0.25D, (double)z * 0.25D); if (d0 > 0.0D) { int i = x & 15; int j = z & 15; - BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(); + BlockPos.Mutable blockpos$mutableblockpos = new BlockPos.Mutable(); for(int k = startHeight; k >= 0; --k) { blockpos$mutableblockpos.setPos(i, k, j); 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 8d8f26c95..bdc963ecf 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MeadowFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MeadowFlowersFeature.java @@ -32,7 +32,7 @@ public class MeadowFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 3ce80f377..e05dbb84c 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/MysticGroveFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/MysticGroveFlowersFeature.java @@ -33,7 +33,7 @@ public class MysticGroveFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 b92bfbdfc..1143eb8fd 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/OminousWoodsFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/OminousWoodsFlowersFeature.java @@ -32,7 +32,7 @@ public class OminousWoodsFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 2398bff82..b83d7c3b2 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/OrangeCosmosFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/OrangeCosmosFeature.java @@ -32,7 +32,7 @@ public class OrangeCosmosFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 3df9ec159..1df494590 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/RainforestFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/RainforestFlowersFeature.java @@ -33,7 +33,7 @@ public class RainforestFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 e4dd16db8..0c90fe1ea 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ShortBambooFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ShortBambooFeature.java @@ -44,7 +44,7 @@ public class ShortBambooFeature extends Feature pos = pos.up(); - BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos(pos); + BlockPos.Mutable blockpos$mutableblockpos = new BlockPos.Mutable(pos); if (world.isAirBlock(blockpos$mutableblockpos)) { if (Blocks.BAMBOO.getDefaultState().isValidPosition(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 329958ee0..425f51616 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/ShrublandFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/ShrublandFlowersFeature.java @@ -32,7 +32,7 @@ public class ShrublandFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 5f614838d..286ec1b34 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/TropicsFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/TropicsFlowersFeature.java @@ -33,7 +33,7 @@ public class TropicsFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 5287cdf30..a45ef26b0 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/VioletFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/VioletFeature.java @@ -32,7 +32,7 @@ public class VioletFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 93df00aab..96deee7af 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/WastelandFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/WastelandFlowersFeature.java @@ -32,7 +32,7 @@ public class WastelandFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 b3950346e..6ff1ee31a 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/WetlandFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/WetlandFlowersFeature.java @@ -32,7 +32,7 @@ public class WetlandFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 08a1cd2f6..12f5d2b80 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/WildflowerFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/WildflowerFeature.java @@ -32,7 +32,7 @@ public class WildflowerFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 1f08edb65..f6e703b62 100644 --- a/src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java +++ b/src/main/java/biomesoplenty/common/world/gen/feature/XericShrublandFlowersFeature.java @@ -32,7 +32,7 @@ public class XericShrublandFlowersFeature extends FlowersFeature @Override public BlockState getRandomFlower(Random p_202355_1_, BlockPos p_202355_2_) { - double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.getValue((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); + double d0 = MathHelper.clamp((1.0D + Biome.INFO_NOISE.noiseAt((double)p_202355_2_.getX() / 48.0D, (double)p_202355_2_.getZ() / 48.0D)) / 2.0D, 0.0D, 0.9999D); Block block = FLOWERS[(int)(d0 * (double)FLOWERS.length)]; return block.getDefaultState(); } 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 93cdd1ff3..03161d3f1 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 @@ -19,12 +19,13 @@ import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.world.IWorld; import net.minecraft.world.gen.IWorldGenerationReader; import net.minecraft.world.gen.feature.AbstractTreeFeature; +import net.minecraft.world.gen.feature.BaseTreeFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; import java.util.Random; import java.util.Set; -public abstract class TreeFeatureBase extends AbstractTreeFeature +public abstract class TreeFeatureBase extends AbstractTreeFeature { protected static abstract class BuilderBase { @@ -104,7 +105,7 @@ public abstract class TreeFeatureBase extends AbstractTreeFeature