diff options
| author | OneEyeMaker <oneeyemaker@gmail.com> | 2016-07-18 09:06:26 +0300 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-07-25 22:29:30 +0200 |
| commit | e3d576468463c7a562c0a8d4202d0ae855d44c52 (patch) | |
| tree | 8993dffd6d4a9a402cd1b2b5de038a0b858a2bfb /src/main/java/gregtech/common/tileentities | |
| parent | b3777e1eca04cc304da3b419d584e2aa0861c66c (diff) | |
| download | GT5-Unofficial-e3d576468463c7a562c0a8d4202d0ae855d44c52.tar.gz GT5-Unofficial-e3d576468463c7a562c0a8d4202d0ae855d44c52.tar.bz2 GT5-Unofficial-e3d576468463c7a562c0a8d4202d0ae855d44c52.zip | |
ce1e6917e056c0a1300caefc175b10c68126832a
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
2 files changed, 19 insertions, 17 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 d38aea5c0d..6588a3126a 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,8 +144,14 @@ 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.sBlockCasings4; + boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 2, zDir) == GregTech_API.sBlockCasings5; switch (tUsedMeta) { + case 4: + this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 0; + break; + case 5: + this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0; + break; case 12: this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 1800; break; @@ -153,15 +159,8 @@ public class GT_MetaTileEntity_ElectricBlastFurnace this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700; break; case 14: - this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 3600; + this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 3600; break; - case 15: - this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0; - break; - case 15: - this.mHeatingCapacity = 9000; - break; - default: return false; } @@ -172,14 +171,14 @@ public class GT_MetaTileEntity_ElectricBlastFurnace 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.sBlockCasings4 && tUseAdvancedCoils) { + aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { 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.sBlockCasings4 && tUseAdvancedCoils) { + aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { 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 5fa64b3217..cbd427d6d4 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,8 +106,14 @@ 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.sBlockCasings4; + boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 1, zDir) == GregTech_API.sBlockCasings5; switch (tUsedMeta) { + case 4: + this.mLevel = tUseAdvancedCoils ? 8 : 0; + break; + case 5: + this.mLevel = tUseAdvancedCoils ? 16 : 0; + break; case 12: this.mLevel = tUseAdvancedCoils ? 0 : 1; break; @@ -115,10 +121,7 @@ public class GT_MetaTileEntity_MultiFurnace this.mLevel = tUseAdvancedCoils ? 0 : 2; break; case 14: - this.mLevel = tUseAdvancedCoils ? 8 : 4; - break; - case 15: - this.mLevel = tUseAdvancedCoils ? 16 : 0; + this.mLevel = tUseAdvancedCoils ? 0 : 4; break; default: return false; @@ -131,7 +134,7 @@ public class GT_MetaTileEntity_MultiFurnace 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.sBlockCasings4 && tUseAdvancedCoils) { + aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { |