From 21d77a2d7d0061e51fcdb1f520d014bd8301c89a Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 20 Aug 2019 02:52:16 +0300 Subject: [PATCH] Lava now works for blast furnace. Closes #1800 --- .../multiblock/IndustrialBlastFurnaceBlockEntity.java | 4 ++-- src/main/java/techreborn/multiblocks/MultiBlockCasing.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java index 2021abf3f..94ea08015 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java @@ -83,8 +83,8 @@ public class IndustrialBlastFurnaceBlockEntity extends GenericMachineBlockEntity heat += BlockMachineCasing.getHeatFromState(part.getCachedState()); } - if (world.getBlockState(location.offset(Direction.UP, 1)).getBlock().getTranslationKey().equals("blockEntity.lava") - && world.getBlockState(location.offset(Direction.UP, 2)).getBlock().getTranslationKey().equals("blockEntity.lava")) { + if (world.getBlockState(location.offset(Direction.UP, 1)).getMaterial().equals(Material.LAVA) + && world.getBlockState(location.offset(Direction.UP, 2)).getMaterial().equals(Material.LAVA)) { heat += 500; } return heat; diff --git a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java index 7d25663f9..3a91e7212 100644 --- a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java +++ b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java @@ -26,6 +26,7 @@ package techreborn.multiblocks; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.BlockPos; @@ -323,10 +324,10 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase { @Override protected void isBlockGoodForInterior(World world, int x, int y, int z) throws MultiblockValidationException { BlockState state = world.getBlockState(new BlockPos(x, y, z)); - Block block = state.getBlock(); - if (state.isAir()) { - } else if (block.getTranslationKey().equals("blockEntity.lava")) { + if (state.getMaterial().equals(Material.AIR)) { + + } else if (state.getMaterial().equals(Material.LAVA)) { hasLava = true; } else { super.isBlockGoodForInterior(world, x, y, z);