MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More fixes

Browse source
This commit is contained in:
paulevsGitch 2020-10-04 15:06:21 +03:00
parent 26eb6165a7
commit e7a6bdaa93
1 changed files with 71 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

100
src/main/java/ru/betterend/util/BlocksHelper.java
View file

@ -7,6 +7,7 @@ import java.util.Random;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.FallingBlock;
import net.minecraft.state.property.Property; import net.minecraft.state.property.Property;
import net.minecraft.util.BlockMirror; import net.minecraft.util.BlockMirror;
import net.minecraft.util.BlockRotation; import net.minecraft.util.BlockRotation;
@ -114,42 +115,83 @@ public class BlocksHelper {
} }
public static void fixBlocks(WorldAccess world, BlockPos start, BlockPos end) { public static void fixBlocks(WorldAccess world, BlockPos start, BlockPos end) {
synchronized (world) { BlockState state;
BlockState state; for (int x = start.getX(); x <= end.getX(); x++) {
for (int x = start.getX(); x <= end.getX(); x++) { POS.setX(x);
POS.setX(x); for (int z = start.getZ(); z <= end.getZ(); z++) {
for (int z = start.getZ(); z <= end.getZ(); z++) { POS.setZ(z);
POS.setZ(z); for (int y = start.getY(); y <= end.getY(); y++) {
for (int y = start.getY(); y <= end.getY(); y++) { POS.setY(y);
POS.setY(y); state = world.getBlockState(POS);
// Falling blocks
if (state.getBlock() instanceof FallingBlock) {
POS.setY(POS.getY() - 1);
state = world.getBlockState(POS); state = world.getBlockState(POS);
if (!state.canPlaceAt(world, POS)) { if (state.getMaterial().isReplaceable()) {
// Is blue Vine BlocksHelper.setWithoutUpdate(world, POS, Blocks.END_STONE.getDefaultState());
if (state.getBlock() instanceof BlockBlueVine) { if (world.getRandom().nextBoolean()) {
while (!state.canPlaceAt(world, POS)) { POS.setY(POS.getY() - 1);
BlocksHelper.setWithoutUpdate(world, POS, AIR); state = world.getBlockState(POS);
for (Direction dir : HORIZONTAL) { if (state.getMaterial().isReplaceable()) {
BlockPos p = POS.offset(dir).up(); BlocksHelper.setWithoutUpdate(world, POS, Blocks.END_STONE.getDefaultState());
state = world.getBlockState(p);
if (state.getBlock() instanceof BlockGlowingFur) {
BlocksHelper.setWithoutUpdate(world, p, AIR);
}
}
POS.setY(POS.getY() + 1);
state = world.getBlockState(POS);
} }
} }
// Double plants }
if (state.getBlock() instanceof BlockDoublePlant) { }
// Fluid fixes
else if (!state.getFluidState().isEmpty()) {
BlockState liquid = state;
BlockPos pos = POS.down();
state = world.getBlockState(pos);
boolean update = state.getMaterial().isReplaceable() && !state.getMaterial().isLiquid();
pos = POS.north();
state = world.getBlockState(pos);
update |= state.getMaterial().isReplaceable() && state.getFluidState().isEmpty();
pos = POS.south();
state = world.getBlockState(pos);
update |= state.getMaterial().isReplaceable() && state.getFluidState().isEmpty();
pos = POS.east();
state = world.getBlockState(pos);
update |= state.getMaterial().isReplaceable() && state.getFluidState().isEmpty();
pos = POS.west();
state = world.getBlockState(pos);
update |= state.getMaterial().isReplaceable() && state.getFluidState().isEmpty();
if (update) {
world.setBlockState(POS, liquid, 1 | 2 | 8);
}
}
else if (!state.canPlaceAt(world, POS)) {
// Is blue Vine
if (state.getBlock() instanceof BlockBlueVine) {
while (!state.canPlaceAt(world, POS)) {
BlocksHelper.setWithoutUpdate(world, POS, AIR); BlocksHelper.setWithoutUpdate(world, POS, AIR);
for (Direction dir : HORIZONTAL) {
BlockPos p = POS.offset(dir).up();
state = world.getBlockState(p);
if (state.getBlock() instanceof BlockGlowingFur) {
BlocksHelper.setWithoutUpdate(world, p, AIR);
}
}
POS.setY(POS.getY() + 1); POS.setY(POS.getY() + 1);
BlocksHelper.setWithoutUpdate(world, POS, AIR); state = world.getBlockState(POS);
}
// Common plants & blocks
else {
BlocksHelper.setWithoutUpdate(world, POS, AIR);
} }
} }
// Double plants
if (state.getBlock() instanceof BlockDoublePlant) {
BlocksHelper.setWithoutUpdate(world, POS, AIR);
POS.setY(POS.getY() + 1);
BlocksHelper.setWithoutUpdate(world, POS, AIR);
}
// Common plants & blocks
else {
BlocksHelper.setWithoutUpdate(world, POS, AIR);
}
} }
} }
} }