diff options
| author | OneEyeMaker <oneeyemaker@gmail.com> | 2016-07-18 10:05:44 +0300 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-07-25 22:48:54 +0200 |
| commit | 6121acb8434ce7298b4aacd068baf6a50c1aaa43 (patch) | |
| tree | c4e18ce7ae146891b2248bf36db70388304459b0 /src/main/java/gregtech/common/tileentities/machines | |
| parent | f3653773320ed592c336c19ba7dffe68f5146f29 (diff) | |
| download | GT5-Unofficial-6121acb8434ce7298b4aacd068baf6a50c1aaa43.tar.gz GT5-Unofficial-6121acb8434ce7298b4aacd068baf6a50c1aaa43.tar.bz2 GT5-Unofficial-6121acb8434ce7298b4aacd068baf6a50c1aaa43.zip | |
8bf5b61dea476ce950ed523293658780217b203f
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
3 files changed, 25 insertions, 36 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index 6588a3126a..b98cef385e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -144,41 +144,35 @@ public class GT_MetaTileEntity_ElectricBlastFurnace addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), 11); byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir); - boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 2, zDir) == GregTech_API.sBlockCasings5; switch (tUsedMeta) { - case 4: - this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 0; + case 0: + this.mHeatingCapacity = 1800; break; - case 5: - this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0; + case 1: + this.mHeatingCapacity = 2700; break; - case 12: - this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 1800; + case 2: + this.mHeatingCapacity = 3600; break; - case 13: - this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700; + case 3: + this.mHeatingCapacity = 4500; break; - case 14: - this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 3600; + case 4: + this.mHeatingCapacity = 9001; break; default: return false; } - if (this.mHeatingCapacity == 0) { - return false; - } for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if ((i != 0) || (j != 0)) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || - aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 2, zDir + j) != tUsedMeta) { return false; } - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || - aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index 39d38e9bd3..35d8ce77dc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -39,12 +39,12 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC @Override public Block getFusionCoil() { - return GregTech_API.sBlockCasings1; + return GregTech_API.sBlockCasings5; } @Override public int getFusionCoilMeta() { - return 15; + return 5; } public String[] getDescription() { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index 615a0b7adc..229934ce78 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -106,34 +106,29 @@ public class GT_MetaTileEntity_MultiFurnace addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 2, zDir), 11); byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 1, zDir); - boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 1, zDir) == GregTech_API.sBlockCasings5; switch (tUsedMeta) { - case 4: - this.mLevel = tUseAdvancedCoils ? 8 : 0; + case 0: + this.mLevel = 1; break; - case 5: - this.mLevel = tUseAdvancedCoils ? 16 : 0; + case 1: + this.mLevel = 2; break; - case 12: - this.mLevel = tUseAdvancedCoils ? 0 : 1; + case 2: + this.mLevel = 4; break; - case 13: - this.mLevel = tUseAdvancedCoils ? 0 : 2; + case 3: + this.mLevel = 8; break; - case 14: - this.mLevel = tUseAdvancedCoils ? 0 : 4; + case 4: + this.mLevel = 16; break; default: return false; } - if (this.mLevel == 0) { - return false; - } for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if ((i != 0) || (j != 0)) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || - aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { |