From 74d96e4670b25fe97e04166c35cb29b5fc22e068 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 21 Jan 2020 16:29:10 +0300 Subject: [PATCH] Fix hologram for distillation tower. --- .../DistillationTowerBlockEntity.java | 4 +-- .../FluidReplicatorBlockEntity.java | 2 +- .../ImplosionCompressorBlockEntity.java | 6 ++-- .../IndustrialGrinderBlockEntity.java | 2 +- .../IndustrialSawmillBlockEntity.java | 2 +- .../machine/multiblock/MultiblockChecker.java | 6 ++-- .../multiblock/VacuumFreezerBlockEntity.java | 6 ++-- .../client/gui/GuiDistillationTower.java | 36 +++++++++---------- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java index 438cbf391..6d01844c4 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java @@ -56,9 +56,9 @@ public class DistillationTowerBlockEntity extends GenericMachineBlockEntity impl return false; } final boolean layer0 = multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, MultiblockChecker.ZERO_OFFSET); - final boolean layer1 = multiblockChecker.checkRingY(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, 1, 0)); + final boolean layer1 = multiblockChecker.checkRingY(1, 1, MultiblockChecker.INDUSTRIAL_CASING, new BlockPos(0, 1, 0)); final boolean layer2 = multiblockChecker.checkRingY(1, 1, MultiblockChecker.STANDARD_CASING, new BlockPos(0, 2, 0)); - final boolean layer3 = multiblockChecker.checkRectY(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, 3, 0)); + final boolean layer3 = multiblockChecker.checkRectY(1, 1, MultiblockChecker.INDUSTRIAL_CASING, new BlockPos(0, 3, 0)); final Material centerBlock1 = multiblockChecker.getBlock(0, 1, 0).getMaterial(); final Material centerBlock2 = multiblockChecker.getBlock(0, 2, 0).getMaterial(); final boolean center1 = (centerBlock1 == Material.AIR); diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java index 270310fe9..e9cd3be27 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java @@ -66,7 +66,7 @@ public class FluidReplicatorBlockEntity extends GenericMachineBlockEntity implem if (multiblockChecker == null) { return false; } - final boolean ring = multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, + final boolean ring = multiblockChecker.checkRingY(1, 1, MultiblockChecker.ADVANCED_CASING, MultiblockChecker.ZERO_OFFSET); return ring; } diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java index 034febd6e..a80022c84 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java @@ -54,9 +54,9 @@ public class ImplosionCompressorBlockEntity extends GenericMachineBlockEntity im if(multiblockChecker == null){ return false; } - final boolean down = multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, MultiblockChecker.ZERO_OFFSET); - final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 2, 0)); - final boolean chamber = multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); + final boolean down = multiblockChecker.checkRectY(1, 1, MultiblockChecker.ADVANCED_CASING, MultiblockChecker.ZERO_OFFSET); + final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, 2, 0)); + final boolean chamber = multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, 1, 0)); return down && chamber && up; } diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java index 41004dd64..dcc6699bd 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java @@ -70,7 +70,7 @@ public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity impl } final boolean down = multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, MultiblockChecker.ZERO_OFFSET); final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, new BlockPos(0, 2, 0)); - final boolean blade = multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); + final boolean blade = multiblockChecker.checkRingY(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, 1, 0)); final BlockState centerBlock = multiblockChecker.getBlock(0, 1, 0); final boolean center = ((centerBlock.getBlock() instanceof FluidBlock || centerBlock.getBlock() instanceof FluidBlock) diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java index dfaeac680..0cf66b047 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java @@ -70,7 +70,7 @@ public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity impl } final boolean down = multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, MultiblockChecker.ZERO_OFFSET); final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, new BlockPos(0, 2, 0)); - final boolean blade = multiblockChecker.checkRingY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); + final boolean blade = multiblockChecker.checkRingY(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, 1, 0)); final BlockState centerBlock = multiblockChecker.getBlock(0, 1, 0); final boolean center = ((centerBlock.getBlock() instanceof FluidBlock || centerBlock.getBlock() instanceof FluidBlock) diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/MultiblockChecker.java b/src/main/java/techreborn/blockentity/machine/multiblock/MultiblockChecker.java index a241b080b..b6dc2a03b 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/MultiblockChecker.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/MultiblockChecker.java @@ -35,8 +35,8 @@ public class MultiblockChecker { public static final BlockPos ZERO_OFFSET = BlockPos.ORIGIN; public static final String STANDARD_CASING = "standard"; - public static final String REINFORCED_CASING = "reinforced"; public static final String ADVANCED_CASING = "advanced"; + public static final String INDUSTRIAL_CASING = "industrial"; public static final String CASING_ANY = "any"; private final World world; @@ -56,10 +56,10 @@ public class MultiblockChecker { } else if ( type == "standard" && block == TRContent.MachineBlocks.BASIC.getCasing()) { return true; } - else if (type == "reinforced" && block == TRContent.MachineBlocks.ADVANCED.getCasing()) { + else if (type == "advanced" && block == TRContent.MachineBlocks.ADVANCED.getCasing()) { return true; } - else if (type == "advanced" && block == TRContent.MachineBlocks.INDUSTRIAL.getCasing()) { + else if (type == "industrial" && block == TRContent.MachineBlocks.INDUSTRIAL.getCasing()) { return true; } } diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java index 520021276..6f138478d 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java @@ -54,9 +54,9 @@ public class VacuumFreezerBlockEntity extends GenericMachineBlockEntity implemen if (multiblockChecker == null) { return false; } - final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, MultiblockChecker.ZERO_OFFSET); - final boolean down = multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, -2, 0)); - final boolean chamber = multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, -1, 0)); + final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.ADVANCED_CASING, MultiblockChecker.ZERO_OFFSET); + final boolean down = multiblockChecker.checkRectY(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, -2, 0)); + final boolean chamber = multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.INDUSTRIAL_CASING, new BlockPos(0, -1, 0)); return down && chamber && up; } diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index a7d13993b..a6d3c0751 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -87,7 +87,7 @@ public class GuiDistillationTower extends GuiBase { { // This code here makes a basic multiblock and then sets to the selected one. final Multiblock multiblock = new Multiblock(); - BlockState advancedCasing = TRContent.MachineBlocks.ADVANCED.getCasing().getDefaultState(); + BlockState industrialCasing = TRContent.MachineBlocks.INDUSTRIAL.getCasing().getDefaultState(); BlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState(); addComponent(0, 0, 0, standardCasing, multiblock); @@ -100,14 +100,14 @@ public class GuiDistillationTower extends GuiBase { addComponent(1, 0, -1, standardCasing, multiblock); addComponent(1, 0, 1, standardCasing, multiblock); - addComponent(1, 1, 0, advancedCasing, multiblock); - addComponent(0, 1, 1, advancedCasing, multiblock); - addComponent(-1, 1, 0, advancedCasing, multiblock); - addComponent(0, 1, -1, advancedCasing, multiblock); - addComponent(-1, 1, -1, advancedCasing, multiblock); - addComponent(-1, 1, 1, advancedCasing, multiblock); - addComponent(1, 1, -1, advancedCasing, multiblock); - addComponent(1, 1, 1, advancedCasing, multiblock); + addComponent(1, 1, 0, industrialCasing, multiblock); + addComponent(0, 1, 1, industrialCasing, multiblock); + addComponent(-1, 1, 0, industrialCasing, multiblock); + addComponent(0, 1, -1, industrialCasing, multiblock); + addComponent(-1, 1, -1, industrialCasing, multiblock); + addComponent(-1, 1, 1, industrialCasing, multiblock); + addComponent(1, 1, -1, industrialCasing, multiblock); + addComponent(1, 1, 1, industrialCasing, multiblock); addComponent(1, 2, 0, standardCasing, multiblock); addComponent(0, 2, 1, standardCasing, multiblock); @@ -118,15 +118,15 @@ public class GuiDistillationTower extends GuiBase { addComponent(1, 2, -1, standardCasing, multiblock); addComponent(1, 2, 1, standardCasing, multiblock); - addComponent(0, 3, 0, advancedCasing, multiblock); - addComponent(1, 3, 0, advancedCasing, multiblock); - addComponent(0, 3, 1, advancedCasing, multiblock); - addComponent(-1, 3, 0, advancedCasing, multiblock); - addComponent(0, 3, -1, advancedCasing, multiblock); - addComponent(-1, 3, -1, advancedCasing, multiblock); - addComponent(-1, 3, 1, advancedCasing, multiblock); - addComponent(1, 3, -1, advancedCasing, multiblock); - addComponent(1, 3, 1, advancedCasing, multiblock); + addComponent(0, 3, 0, industrialCasing, multiblock); + addComponent(1, 3, 0, industrialCasing, multiblock); + addComponent(0, 3, 1, industrialCasing, multiblock); + addComponent(-1, 3, 0, industrialCasing, multiblock); + addComponent(0, 3, -1, industrialCasing, multiblock); + addComponent(-1, 3, -1, industrialCasing, multiblock); + addComponent(-1, 3, 1, industrialCasing, multiblock); + addComponent(1, 3, -1, industrialCasing, multiblock); + addComponent(1, 3, 1, industrialCasing, multiblock); blockEntity.renderMultiblock = multiblock; }