From c9bc17bce5bec26ec2795d12faeb02fcfcd9366e Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Sun, 17 Jul 2016 15:20:29 +0300 Subject: Added new heating coil blocks. --- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 27 ++++++++++++++------- .../multi/GT_MetaTileEntity_MultiFurnace.java | 28 ++++++++++++++-------- 2 files changed, 36 insertions(+), 19 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') 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 bdeaa4f2df..0a90c00d0b 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 @@ -1,5 +1,8 @@ package gregtech.common.tileentities.machines.multi; +import java.util.ArrayList; +import java.util.Arrays; + import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_GUIContainer_MultiMachine; @@ -15,9 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; -import java.util.Arrays; - public class GT_MetaTileEntity_ElectricBlastFurnace extends GT_MetaTileEntity_MultiBlockBase { private int mHeatingCapacity = 0; @@ -144,29 +144,38 @@ 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; switch (tUsedMeta) { case 12: - this.mHeatingCapacity = 1800; + this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 1800; break; case 13: - this.mHeatingCapacity = 2700; + this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700; break; case 14: - this.mHeatingCapacity = 3600; + this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 3600; + break; + case 15: + this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0; 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) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || + aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings4 && 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) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || + aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings4 && tUseAdvancedCoils) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { @@ -219,4 +228,4 @@ public class GT_MetaTileEntity_ElectricBlastFurnace public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } -} \ No newline at end of file +} 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 70a7249cae..7a7a30e446 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 @@ -1,5 +1,7 @@ package gregtech.common.tileentities.machines.multi; +import java.util.ArrayList; + import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_GUIContainer_MultiMachine; @@ -15,8 +17,6 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; - public class GT_MetaTileEntity_MultiFurnace extends GT_MetaTileEntity_MultiBlockBase { private int mLevel = 0; @@ -76,8 +76,8 @@ public class GT_MetaTileEntity_MultiFurnace byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage())); int j = 0; - this.mOutputItems = new ItemStack[6 * this.mLevel]; - for (int i = 0; (i < 100) && (j < this.mOutputItems.length); i++) { + this.mOutputItems = new ItemStack[8 * this.mLevel]; + for (int i = 0; (i < 256) && (j < this.mOutputItems.length); i++) { if (null != (this.mOutputItems[j] = GT_ModHandler.getSmeltingOutput((ItemStack) tInputList.get(i % tInputList.size()), true, null))) { j++; } @@ -86,7 +86,7 @@ public class GT_MetaTileEntity_MultiFurnace this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - this.mEUt = (-4 * (1 << tTier - 1) * (1 << tTier - 1) * this.mLevel); + this.mEUt = (-4 * (1 << tTier - 1) * (1 << tTier - 1) * Math.min(this.mLevel, 8)); this.mMaxProgresstime = Math.max(1, 512 / (1 << tTier - 1)); } updateSlots(); @@ -106,23 +106,31 @@ 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; switch (tUsedMeta) { case 12: - this.mLevel = 1; + this.mLevel = tUseAdvancedCoils ? 0 : 1; break; case 13: - this.mLevel = 2; + this.mLevel = tUseAdvancedCoils ? 0 : 2; break; case 14: - this.mLevel = 3; + this.mLevel = tUseAdvancedCoils ? 8 : 4; + break; + case 15: + this.mLevel = tUseAdvancedCoils ? 16 : 0; 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) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || + aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings4 && tUseAdvancedCoils) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { @@ -174,4 +182,4 @@ public class GT_MetaTileEntity_MultiFurnace public boolean explodesOnComponentBreak(ItemStack aStack) { return false; } -} \ No newline at end of file +} -- cgit From b780ef6c2cf222f84c2b426ae9c91071d54a8b15 Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Sun, 17 Jul 2016 16:16:43 +0300 Subject: Updated tooltips --- .../tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common/tileentities') 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 7a7a30e446..49212225f8 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 @@ -36,7 +36,7 @@ public class GT_MetaTileEntity_MultiFurnace public String[] getDescription() { return new String[]{ "Controller Block for the Multi Smelter", - "Smelts up to 6-18 Items at once", + "Smelts up to 8-128 Items at once", "Size(WxHxD): 3x3x3 (Hollow), Controller (Front middle at bottom)", "8x Heating Coils (Middle layer, hollow)", "1x Input Bus (One of bottom)", -- cgit From ce1e6917e056c0a1300caefc175b10c68126832a Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 09:06:26 +0300 Subject: Preparations for moving all heating coils to another block. --- .../multi/GT_MetaTileEntity_ElectricBlastFurnace.java | 17 ++++++++++------- .../machines/multi/GT_MetaTileEntity_MultiFurnace.java | 15 +++++++++------ 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') 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) { -- cgit From 8bf5b61dea476ce950ed523293658780217b203f Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 10:05:44 +0300 Subject: Moved all coils to another block. --- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 30 +++++++++------------- .../multi/GT_MetaTileEntity_FusionComputer1.java | 4 +-- .../multi/GT_MetaTileEntity_MultiFurnace.java | 27 ++++++++----------- .../multi/GT_MetaTileEntity_OilCracker.java | 14 +++++----- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 10 ++++---- 5 files changed, 37 insertions(+), 48 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') 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 9fb73fb5c1..dd91c58b42 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 21f45ac54b..9e5dd35faa 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) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index df62571864..19e7a5aa08 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -1,5 +1,7 @@ package gregtech.common.tileentities.machines.multi; +import java.util.ArrayList; + import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; @@ -17,8 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; - public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBase { public GT_MetaTileEntity_OilCracker(int aID, String aName, String aNameRegional) { @@ -120,10 +120,10 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa if (!(j == 0 && i == 0 && (h == -1 || h == 0 || h == 1))) { if (h == 1 || h == -1) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, j, h + zDir); - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, j, h + zDir) != GregTech_API.sBlockCasings1) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, j, h + zDir) != GregTech_API.sBlockCasings5) { return false; } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, j, h + zDir) != 12) { + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, j, h + zDir) != 0) { return false; } } @@ -167,10 +167,10 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa if (!(j == 0 && i == 0 && (h == -1 || h == 0 || h == 1))) { if (h == 1 || h == -1) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + h, j, i + zDir); - if (aBaseMetaTileEntity.getBlockOffset(xDir + h, j, i + zDir) != GregTech_API.sBlockCasings1) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + h, j, i + zDir) != GregTech_API.sBlockCasings5) { return false; } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir + h, j, i + zDir) != 12) { + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + h, j, i + zDir) != 0) { return false; } } @@ -246,4 +246,4 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa return new GT_MetaTileEntity_OilCracker(this.mName); } -} \ No newline at end of file +} diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index fa35f7f30f..a69fddc981 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -1,5 +1,7 @@ package gregtech.common.tileentities.machines.multi; +import java.util.ArrayList; + import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_GUIContainer_MultiMachine; @@ -15,8 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; - public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlockBase { public GT_MetaTileEntity_PyrolyseOven(int aID, String aName, String aNameRegional) { @@ -105,10 +105,10 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); if ((i != -2 && i != 2) && (j != -2 && j != 2)) {// innerer 3x3 ohne h�he if (h == 0) {// innen boden (kantal coils) - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings1) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings5) { return false; } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 13) { + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) { return false; } } else if (h == 3) {// innen decke (ulv casings + input + muffler) @@ -186,4 +186,4 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock return new GT_MetaTileEntity_PyrolyseOven(this.mName); } -} \ No newline at end of file +} -- cgit From ea5305f7dfbb06b7285ee50a7406e2d67b666147 Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 14:56:21 +0300 Subject: Restored broken compatibility. --- .../machines/multi/GT_MetaTileEntity_FusionComputer1.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') 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 35d8ce77dc..39d38e9bd3 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.sBlockCasings5; + return GregTech_API.sBlockCasings1; } @Override public int getFusionCoilMeta() { - return 5; + return 15; } public String[] getDescription() { -- cgit From f98e51a82f646fa34172ce079a4b432ef3affffd Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Wed, 20 Jul 2016 10:27:47 +0300 Subject: Added new tier of heating coils. //TODO: Find material for LuV coils. --- .../multi/GT_MetaTileEntity_ElectricBlastFurnace.java | 6 ++++++ .../multi/GT_MetaTileEntity_MultiFurnace.java | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') 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 dd91c58b42..c934baadef 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 @@ -158,6 +158,12 @@ public class GT_MetaTileEntity_ElectricBlastFurnace this.mHeatingCapacity = 4500; break; case 4: + this.mHeatingCapacity = 5400; + break; + case 5: + this.mHeatingCapacity = 7200; + break; + case 6: this.mHeatingCapacity = 9001; break; default: 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 9e5dd35faa..a1c18636f9 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 @@ -20,6 +20,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class GT_MetaTileEntity_MultiFurnace extends GT_MetaTileEntity_MultiBlockBase { private int mLevel = 0; + private int mCostDiscount = 1; public GT_MetaTileEntity_MultiFurnace(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -86,7 +87,7 @@ public class GT_MetaTileEntity_MultiFurnace this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - this.mEUt = (-4 * (1 << tTier - 1) * (1 << tTier - 1) * Math.min(this.mLevel, 8)); + this.mEUt = (-4 * (1 << tTier - 1) * (1 << tTier - 1) * this.mLevel / this.mCostDiscount); this.mMaxProgresstime = Math.max(1, 512 / (1 << tTier - 1)); } updateSlots(); @@ -100,6 +101,7 @@ public class GT_MetaTileEntity_MultiFurnace int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; this.mLevel = 0; + this.mCostDiscount = 1; if (!aBaseMetaTileEntity.getAirOffset(xDir, 1, zDir)) { return false; } @@ -109,18 +111,31 @@ public class GT_MetaTileEntity_MultiFurnace switch (tUsedMeta) { case 0: this.mLevel = 1; + this.mCostDiscount = 1; break; case 1: this.mLevel = 2; + this.mCostDiscount = 1; break; case 2: this.mLevel = 4; + this.mCostDiscount = 1; break; case 3: this.mLevel = 8; + this.mCostDiscount = 1; break; case 4: this.mLevel = 16; + this.mCostDiscount = 2; + break; + case 5: + this.mLevel = 16; + this.mCostDiscount = 4; + break; + case 6: + this.mLevel = 16; + this.mCostDiscount = 8; break; default: return false; @@ -174,7 +189,7 @@ public class GT_MetaTileEntity_MultiFurnace } public int getAmountOfOutputs() { - return 18; + return 128; } public boolean explodesOnComponentBreak(ItemStack aStack) { -- cgit From 4aaafe53f5048e89e347dc899c625aaf772156a1 Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Sun, 24 Jul 2016 10:27:03 +0300 Subject: Changed Blast Furnace temperatures of some materials. Now EV materials require HV+ heating coils, IV materials requires EV+ coils. --- .../machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common/tileentities') 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 c934baadef..d0fbe78643 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 @@ -208,7 +208,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace } } } - this.mHeatingCapacity += 100 * (GT_Utility.getTier(getMaxInputVoltage()) - 2); + this.mHeatingCapacity += 100 * (GT_Utility.getTier(getMaxInputVoltage()) - 3); return true; } -- cgit