etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated to 1.14.3

Browse source
This commit is contained in:
Adubbz 2019-06-25 18:58:34 +10:00
parent 9fdd228178
commit 3bc801338a
14 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gradle.properties
View file

@ -5,9 +5,9 @@ org.gradle.daemon=false
mod_version=9.0.0
minecraft_version=1.14.2
minecraft_version=1.14.3
minecraft_version_toml=14
forge_version=26.0.3
forge_version=27.0.2
forge_version_toml=26
forge_group=net.minecraftforge
mappings_version=20190616-1.14.2
mappings_version=20190625-1.14.3

2
src/main/java/biomesoplenty/common/util/biome/BiomeUtil.java
View file

@ -35,7 +35,7 @@ public class BiomeUtil
{
if (maxDist <= 0 || sampleSpace <= 0) {throw new IllegalArgumentException("maxDist and sampleSpace must be positive");}
BiomeProvider chunkManager = world.getChunkProvider().getChunkGenerator().getBiomeProvider();
BiomeProvider chunkManager = world.func_72863_F().getChunkGenerator().getBiomeProvider();
double a = sampleSpace / Math.sqrt(Math.PI);
double b = 2 * Math.sqrt(Math.PI);
double x = 0;

7
src/main/java/biomesoplenty/common/util/block/BlockUtil.java
View file

@ -7,16 +7,17 @@
******************************************************************************/
package biomesoplenty.common.util.block;
import java.util.Collection;
import net.minecraft.block.BlockState;
import net.minecraft.state.IProperty;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.IChunk;
import net.minecraft.world.gen.Heightmap;
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
@ -35,7 +36,7 @@ public class BlockUtil
public static BlockPos getTopSolidOrLiquidBlock(IWorld world, int x, int z)
{
IChunk chunk = world.getChunk(x >> 4, z >> 4);
IChunk chunk = world.getChunk(x >> 4, z >> 4, ChunkStatus.FULL);
return new BlockPos(x, chunk.getTopBlockY(Heightmap.Type.MOTION_BLOCKING, x & 15, z & 15), z);
}
}

2
src/main/java/biomesoplenty/common/world/gen/feature/BigPumpkinFeature.java
View file

@ -26,7 +26,7 @@ public class BigPumpkinFeature extends Feature<NoFeatureConfig>
}
@Override
public boolean place(IWorld world, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_)
public boolean func_212245_a(IWorld world, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos startPos, NoFeatureConfig p_212245_5_)
{
while (startPos.getY() > 1 && this.replace.matches(world, startPos)) {startPos = startPos.down();}

2
src/main/java/biomesoplenty/common/world/gen/feature/BrambleFeature.java
View file

@ -44,7 +44,7 @@ public class BrambleFeature extends Feature<NoFeatureConfig>
protected IBlockPosQuery replace = (world, pos) -> world.getBlockState(pos).getMaterial() == Material.AIR;
@Override
public boolean place(IWorld world, ChunkGenerator<? extends GenerationSettings> p_212245_2, Random rand, BlockPos startPos, NoFeatureConfig p_212245_5_)
public boolean func_212245_a(IWorld world, ChunkGenerator<? extends GenerationSettings> p_212245_2, Random rand, BlockPos startPos, NoFeatureConfig p_212245_5_)
{
for (int i = 0; i < 128; ++i)
{

2
src/main/java/biomesoplenty/common/world/gen/feature/FernGrassFeature.java
View file

@ -34,7 +34,7 @@ public class FernGrassFeature extends Feature<NoFeatureConfig>
}
@Override
public boolean place(IWorld world, ChunkGenerator<? extends GenerationSettings> generator, Random rand, BlockPos pos, NoFeatureConfig config)
public boolean func_212245_a(IWorld world, ChunkGenerator<? extends GenerationSettings> generator, Random rand, BlockPos pos, NoFeatureConfig config)
{
BlockState BlockState = this.chooseGrassState(rand);

2
src/main/java/biomesoplenty/common/world/gen/feature/HeathFeature.java
View file

@ -22,7 +22,7 @@ public class HeathFeature extends Feature<NoFeatureConfig>
}
@Override
public boolean place(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
public boolean func_212245_a(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
{
int i = 0;

2
src/main/java/biomesoplenty/common/world/gen/feature/MangroveFeature.java
View file

@ -23,7 +23,7 @@ public class MangroveFeature extends Feature<NoFeatureConfig> {
}
@Override
public boolean place(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
public boolean func_212245_a(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
{
int i = 0;
BlockState BlockState = BOPBlocks.mangrove_root.getDefaultState();

2
src/main/java/biomesoplenty/common/world/gen/feature/PumpkinPatchFeature.java
View file

@ -23,7 +23,7 @@ public class PumpkinPatchFeature extends Feature<NoFeatureConfig>
}
@Override
public boolean place(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
public boolean func_212245_a(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
{
int i = 0;

2
src/main/java/biomesoplenty/common/world/gen/feature/ScrubFeature.java
View file

@ -21,7 +21,7 @@ public class ScrubFeature extends Feature<NoFeatureConfig>
}
@Override
public boolean place(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
public boolean func_212245_a(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, NoFeatureConfig p_212245_5_)
{
int i = 0;

2
src/main/java/biomesoplenty/common/world/gen/feature/SplotchFeature.java
View file

@ -19,7 +19,7 @@ public class SplotchFeature extends Feature<SplotchConfig>
}
@Override
public boolean place(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, SplotchConfig p_212245_5_)
public boolean func_212245_a(IWorld p_212245_1_, ChunkGenerator<? extends GenerationSettings> p_212245_2_, Random p_212245_3_, BlockPos p_212245_4_, SplotchConfig p_212245_5_)
{
int i = 0;
int j = p_212245_3_.nextInt(p_212245_5_.radius - 2) + 2;

2
src/main/java/biomesoplenty/common/world/gen/feature/StandardGrassFeature.java
View file

@ -34,7 +34,7 @@ public class StandardGrassFeature extends Feature<NoFeatureConfig>
}
@Override
public boolean place(IWorld world, ChunkGenerator<? extends GenerationSettings> generator, Random rand, BlockPos pos, NoFeatureConfig config)
public boolean func_212245_a(IWorld world, ChunkGenerator<? extends GenerationSettings> generator, Random rand, BlockPos pos, NoFeatureConfig config)
{
BlockState BlockState = this.chooseGrassState(rand);

2
src/main/java/biomesoplenty/common/world/gen/feature/WastelandGrassFeature.java
View file

@ -34,7 +34,7 @@ public class WastelandGrassFeature extends Feature<NoFeatureConfig>
}
@Override
public boolean place(IWorld world, ChunkGenerator<? extends GenerationSettings> generator, Random rand, BlockPos pos, NoFeatureConfig config)
public boolean func_212245_a(IWorld world, ChunkGenerator<? extends GenerationSettings> generator, Random rand, BlockPos pos, NoFeatureConfig config)
{
BlockState BlockState = this.chooseGrassState(rand);

2
src/main/java/biomesoplenty/common/world/gen/feature/tree/TreeFeatureBase.java
View file

@ -194,7 +194,7 @@ public abstract class TreeFeatureBase extends AbstractTreeFeature<NoFeatureConfi
@Override
protected boolean place(Set<BlockPos> changedBlocks, IWorldGenerationReader world, Random rand, BlockPos position, MutableBoundingBox boundingBox)
{
return place(changedBlocks, world, rand, position, boundingBox);
return place(changedBlocks, (IWorld)world, rand, position, boundingBox);
}
protected boolean place(Set<BlockPos> changedBlocks, IWorld world, Random rand, BlockPos position, MutableBoundingBox boundingBox)