diff options
| author | OneEyeMaker <oneeyemaker@gmail.com> | 2016-07-18 09:06:26 +0300 |
|---|---|---|
| committer | OneEyeMaker <oneeyemaker@gmail.com> | 2016-07-18 09:06:26 +0300 |
| commit | ce1e6917e056c0a1300caefc175b10c68126832a (patch) | |
| tree | 041b8008a372022c9ab68eb6d56a6d1a2974c27e /src/main/java/gregtech/common/tileentities/machines | |
| parent | effe6699f520529b8dd5988e8725e031dc0675cf (diff) | |
| download | GT5-Unofficial-ce1e6917e056c0a1300caefc175b10c68126832a.tar.gz GT5-Unofficial-ce1e6917e056c0a1300caefc175b10c68126832a.tar.bz2 GT5-Unofficial-ce1e6917e056c0a1300caefc175b10c68126832a.zip | |
Preparations for moving all heating coils to another block.
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines')
2 files changed, 19 insertions, 13 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 0a90c00d0b..9fb73fb5c1 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,10 +159,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700;
break;
case 14:
- this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 3600;
- break;
- case 15:
- this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0;
+ this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 3600;
break;
default:
return false;
@@ -168,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 49212225f8..21f45ac54b 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;
@@ -130,7 +133,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) {
|