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