Fix hologram for distillation tower.

This commit is contained in:
drcrazy 2020-01-21 16:29:10 +03:00
parent d023329de9
commit 74d96e4670
8 changed files with 32 additions and 32 deletions

View file

@ -56,9 +56,9 @@ public class DistillationTowerBlockEntity extends GenericMachineBlockEntity impl
return false; return false;
} }
final boolean layer0 = multiblockChecker.checkRectY(1, 1, MultiblockChecker.STANDARD_CASING, MultiblockChecker.ZERO_OFFSET); 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 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 centerBlock1 = multiblockChecker.getBlock(0, 1, 0).getMaterial();
final Material centerBlock2 = multiblockChecker.getBlock(0, 2, 0).getMaterial(); final Material centerBlock2 = multiblockChecker.getBlock(0, 2, 0).getMaterial();
final boolean center1 = (centerBlock1 == Material.AIR); final boolean center1 = (centerBlock1 == Material.AIR);

View file

@ -66,7 +66,7 @@ public class FluidReplicatorBlockEntity extends GenericMachineBlockEntity implem
if (multiblockChecker == null) { if (multiblockChecker == null) {
return false; 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); MultiblockChecker.ZERO_OFFSET);
return ring; return ring;
} }

View file

@ -54,9 +54,9 @@ public class ImplosionCompressorBlockEntity extends GenericMachineBlockEntity im
if(multiblockChecker == null){ if(multiblockChecker == null){
return false; return false;
} }
final boolean down = multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, MultiblockChecker.ZERO_OFFSET); final boolean down = multiblockChecker.checkRectY(1, 1, MultiblockChecker.ADVANCED_CASING, MultiblockChecker.ZERO_OFFSET);
final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 2, 0)); final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, 2, 0));
final boolean chamber = multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, 1, 0)); final boolean chamber = multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.ADVANCED_CASING, new BlockPos(0, 1, 0));
return down && chamber && up; return down && chamber && up;
} }

View file

@ -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 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 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 BlockState centerBlock = multiblockChecker.getBlock(0, 1, 0);
final boolean center = ((centerBlock.getBlock() instanceof FluidBlock final boolean center = ((centerBlock.getBlock() instanceof FluidBlock
|| centerBlock.getBlock() instanceof FluidBlock) || centerBlock.getBlock() instanceof FluidBlock)

View file

@ -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 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 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 BlockState centerBlock = multiblockChecker.getBlock(0, 1, 0);
final boolean center = ((centerBlock.getBlock() instanceof FluidBlock final boolean center = ((centerBlock.getBlock() instanceof FluidBlock
|| centerBlock.getBlock() instanceof FluidBlock) || centerBlock.getBlock() instanceof FluidBlock)

View file

@ -35,8 +35,8 @@ public class MultiblockChecker {
public static final BlockPos ZERO_OFFSET = BlockPos.ORIGIN; public static final BlockPos ZERO_OFFSET = BlockPos.ORIGIN;
public static final String STANDARD_CASING = "standard"; 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 ADVANCED_CASING = "advanced";
public static final String INDUSTRIAL_CASING = "industrial";
public static final String CASING_ANY = "any"; public static final String CASING_ANY = "any";
private final World world; private final World world;
@ -56,10 +56,10 @@ public class MultiblockChecker {
} else if ( type == "standard" && block == TRContent.MachineBlocks.BASIC.getCasing()) { } else if ( type == "standard" && block == TRContent.MachineBlocks.BASIC.getCasing()) {
return true; return true;
} }
else if (type == "reinforced" && block == TRContent.MachineBlocks.ADVANCED.getCasing()) { else if (type == "advanced" && block == TRContent.MachineBlocks.ADVANCED.getCasing()) {
return true; return true;
} }
else if (type == "advanced" && block == TRContent.MachineBlocks.INDUSTRIAL.getCasing()) { else if (type == "industrial" && block == TRContent.MachineBlocks.INDUSTRIAL.getCasing()) {
return true; return true;
} }
} }

View file

@ -54,9 +54,9 @@ public class VacuumFreezerBlockEntity extends GenericMachineBlockEntity implemen
if (multiblockChecker == null) { if (multiblockChecker == null) {
return false; return false;
} }
final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, MultiblockChecker.ZERO_OFFSET); final boolean up = multiblockChecker.checkRectY(1, 1, MultiblockChecker.ADVANCED_CASING, MultiblockChecker.ZERO_OFFSET);
final boolean down = multiblockChecker.checkRectY(1, 1, MultiblockChecker.REINFORCED_CASING, new BlockPos(0, -2, 0)); final boolean down = 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)); final boolean chamber = multiblockChecker.checkRingYHollow(1, 1, MultiblockChecker.INDUSTRIAL_CASING, new BlockPos(0, -1, 0));
return down && chamber && up; return down && chamber && up;
} }

View file

@ -87,7 +87,7 @@ public class GuiDistillationTower extends GuiBase<BuiltContainer> {
{ {
// This code here makes a basic multiblock and then sets to the selected one. // This code here makes a basic multiblock and then sets to the selected one.
final Multiblock multiblock = new Multiblock(); 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(); BlockState standardCasing = TRContent.MachineBlocks.BASIC.getCasing().getDefaultState();
addComponent(0, 0, 0, standardCasing, multiblock); addComponent(0, 0, 0, standardCasing, multiblock);
@ -100,14 +100,14 @@ public class GuiDistillationTower extends GuiBase<BuiltContainer> {
addComponent(1, 0, -1, standardCasing, multiblock); addComponent(1, 0, -1, standardCasing, multiblock);
addComponent(1, 0, 1, standardCasing, multiblock); addComponent(1, 0, 1, standardCasing, multiblock);
addComponent(1, 1, 0, advancedCasing, multiblock); addComponent(1, 1, 0, industrialCasing, multiblock);
addComponent(0, 1, 1, advancedCasing, multiblock); addComponent(0, 1, 1, industrialCasing, multiblock);
addComponent(-1, 1, 0, advancedCasing, multiblock); addComponent(-1, 1, 0, industrialCasing, multiblock);
addComponent(0, 1, -1, advancedCasing, multiblock); addComponent(0, 1, -1, industrialCasing, multiblock);
addComponent(-1, 1, -1, advancedCasing, multiblock); addComponent(-1, 1, -1, industrialCasing, multiblock);
addComponent(-1, 1, 1, advancedCasing, multiblock); addComponent(-1, 1, 1, industrialCasing, multiblock);
addComponent(1, 1, -1, advancedCasing, multiblock); addComponent(1, 1, -1, industrialCasing, multiblock);
addComponent(1, 1, 1, advancedCasing, multiblock); addComponent(1, 1, 1, industrialCasing, multiblock);
addComponent(1, 2, 0, standardCasing, multiblock); addComponent(1, 2, 0, standardCasing, multiblock);
addComponent(0, 2, 1, standardCasing, multiblock); addComponent(0, 2, 1, standardCasing, multiblock);
@ -118,15 +118,15 @@ public class GuiDistillationTower extends GuiBase<BuiltContainer> {
addComponent(1, 2, -1, standardCasing, multiblock); addComponent(1, 2, -1, standardCasing, multiblock);
addComponent(1, 2, 1, standardCasing, multiblock); addComponent(1, 2, 1, standardCasing, multiblock);
addComponent(0, 3, 0, advancedCasing, multiblock); addComponent(0, 3, 0, industrialCasing, multiblock);
addComponent(1, 3, 0, advancedCasing, multiblock); addComponent(1, 3, 0, industrialCasing, multiblock);
addComponent(0, 3, 1, advancedCasing, multiblock); addComponent(0, 3, 1, industrialCasing, multiblock);
addComponent(-1, 3, 0, advancedCasing, multiblock); addComponent(-1, 3, 0, industrialCasing, multiblock);
addComponent(0, 3, -1, advancedCasing, multiblock); addComponent(0, 3, -1, industrialCasing, multiblock);
addComponent(-1, 3, -1, advancedCasing, multiblock); addComponent(-1, 3, -1, industrialCasing, multiblock);
addComponent(-1, 3, 1, advancedCasing, multiblock); addComponent(-1, 3, 1, industrialCasing, multiblock);
addComponent(1, 3, -1, advancedCasing, multiblock); addComponent(1, 3, -1, industrialCasing, multiblock);
addComponent(1, 3, 1, advancedCasing, multiblock); addComponent(1, 3, 1, industrialCasing, multiblock);
blockEntity.renderMultiblock = multiblock; blockEntity.renderMultiblock = multiblock;
} }