diff options
Diffstat (limited to 'src/main/java/gtPlusPlus')
32 files changed, 219 insertions, 214 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java index 29868f4617..2c04c75fe3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java @@ -153,13 +153,18 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { } public void damageTurbine(int aEUt, int damageFactorLow, float damageFactorHigh) { + damageTurbine((long) aEUt, damageFactorLow, damageFactorHigh); + } + + public void damageTurbine(long aEUt, int damageFactorLow, float damageFactorHigh) { if (hasTurbine() && MathUtils.randInt(0, 1) == 0) { ItemStack aTurbine = getTurbine(); ((GT_MetaGenerated_Tool) aTurbine.getItem()) .doDamage( aTurbine, (long) getDamageToComponent(aTurbine) - * (long) Math.min(aEUt / damageFactorLow, Math.pow(aEUt, damageFactorHigh))); + * (long) Math.min( + (float) aEUt / (float) damageFactorLow, Math.pow(aEUt, damageFactorHigh))); } } @@ -207,7 +212,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { GregtechMetaTileEntity_LargerTurbineBase x = getController(); if (x != null) { // Logger.INFO("Checking Status of Controller. Running? "+(x.mEUt > 0)); - return x.mEUt > 0; + return x.lEUt > 0; } // Logger.INFO("Status of Controller failed, controller is null."); return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 3ab92abf4d..7cfe59fa06 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -85,8 +85,8 @@ import org.apache.commons.lang3.ArrayUtils; // so any method in GregtechMetaTileEntity_IndustrialDehydrator would see generic field declared in // GregtechMeta_MultiBlockBase without generic parameter -public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> - extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> { +public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T>> + extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> { public static final boolean DEBUG_DISABLE_CORES_TEMPORARILY = true; @@ -237,14 +237,14 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En + EnumChatFormatting.RESET + " EU")); } - if (-mEUt > 0) { + if (-lEUt > 0) { mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.usage") + ":"); mInfo.add(StatCollector.translateToLocal( - "" + EnumChatFormatting.RED + Integer.toString(-mEUt) + EnumChatFormatting.RESET + " EU/t")); + "" + EnumChatFormatting.RED + (-lEUt) + EnumChatFormatting.RESET + " EU/t")); } else { mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.generation") + ":"); mInfo.add(StatCollector.translateToLocal( - "" + EnumChatFormatting.GREEN + Integer.toString(mEUt) + EnumChatFormatting.RESET + " EU/t")); + "" + EnumChatFormatting.GREEN + lEUt + EnumChatFormatting.RESET + " EU/t")); } mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.problems") + ": " + EnumChatFormatting.RED @@ -718,7 +718,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En * log("Control core found."); } * * - * // Reset outputs and progress stats this.mEUt = 0; this.mMaxProgresstime = 0; + * // Reset outputs and progress stats this.lEUt = 0; this.mMaxProgresstime = 0; * this.mOutputItems = new ItemStack[]{}; this.mOutputFluids = new * FluidStack[]{}; * @@ -776,19 +776,19 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En * tTimeFactor * 10000); * * int aTempEu = (int) Math.floor(tTotalEUt); log("EU4: "+aTempEu); - * this.mEUt = (int) aTempEu; + * this.lEUt = (long) aTempEu; * * * this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); * this.mEfficiencyIncrease = 10000; * - * // Overclock if (this.mEUt <= 16) { this.mEUt = (this.mEUt * (1 << tTier - 1) + * // Overclock if (this.lEUt <= 16) { this.lEUt = (this.lEUt * (1 << tTier - 1) * * (1 << tTier - 1)); this.mMaxProgresstime = (this.mMaxProgresstime / (1 << - * tTier - 1)); } else { while (this.mEUt <= - * gregtech.api.enums.GT_Values.V[(tTier - 1)]) { this.mEUt *= 4; + * tTier - 1)); } else { while (this.lEUt <= + * gregtech.api.enums.GT_Values.V[(tTier - 1)]) { this.lEUt *= 4; * this.mMaxProgresstime /= 2; } } * - * if (this.mEUt > 0) { this.mEUt = (-this.mEUt); } + * if (this.lEUt > 0) { this.lEUt = (-this.lEUt); } * * this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); * @@ -864,7 +864,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En // Based on the Processing Array. A bit overkill, but very flexible. // Reset outputs and progress stats - this.mEUt = 0; + this.lEUt = 0; this.mMaxProgresstime = 0; this.mOutputItems = new ItemStack[] {}; this.mOutputFluids = new FluidStack[] {}; @@ -975,18 +975,18 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor); - this.mEUt = (int) Math.ceil(tTotalEUt); + this.lEUt = (long) Math.ceil(tTotalEUt); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; // Overclock - if (this.mEUt <= 16) { - this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + if (this.lEUt <= 16) { + this.lEUt = (this.lEUt * (1L << tTier - 1) * (1L << tTier - 1)); this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); } else { - while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { - this.mEUt *= 4; + while (this.lEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.lEUt *= 4; if (hasPerfectOverclock()) { this.mMaxProgresstime /= 4; } else { @@ -995,8 +995,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En } } - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); + if (this.lEUt > 0) { + this.lEUt = (-this.lEUt); } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); @@ -1285,24 +1285,24 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor); - this.mEUt = (int) Math.ceil(tTotalEUt); + this.lEUt = (long) Math.ceil(tTotalEUt); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; // Overclock - if (this.mEUt <= 16) { - this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + if (this.lEUt <= 16) { + this.lEUt = (this.lEUt * (1L << tTier - 1) * (1L << tTier - 1)); this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); } else { - while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { - this.mEUt *= 4; + while (this.lEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.lEUt *= 4; this.mMaxProgresstime /= 2; } } - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); + if (this.lEUt > 0) { + this.lEUt = (-this.lEUt); } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java index d077c8ed78..6aaa37f4ac 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java @@ -101,7 +101,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu int aOutputChanceRoll = 10000; // Reset outputs and progress stats - this.mEUt = 0; + this.lEUt = 0; this.mMaxProgresstime = 0; this.mOutputItems = new ItemStack[] {}; this.mOutputFluids = new FluidStack[] {}; @@ -151,15 +151,15 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor * 1.5f); - this.mEUt = (int) Math.ceil(tTotalEUt * 1.33f); + this.lEUt = (long) Math.ceil(tTotalEUt * 1.33f); // this.mEUt = (3 * tRecipe.mEUt); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); + if (this.lEUt > 0) { + this.lEUt = (-this.lEUt); } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); @@ -267,8 +267,8 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu */ public boolean onRunningTick(ItemStack aStack) { fixAllMaintenanceIssue(); - if (mEUt < 0) { - long aSteamVal = (((long) -mEUt * 10000) / Math.max(1000, mEfficiency)); + if (lEUt < 0) { + long aSteamVal = ((-lEUt * 10000) / Math.max(1000, mEfficiency)); // Logger.INFO("Trying to drain "+aSteamVal+" steam per tick."); if (!tryConsumeSteam((int) aSteamVal)) { stopMachine(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java index 4030f7cc11..64ff058568 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java @@ -189,7 +189,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon if (tOutputStack != null && this.allowPutStack(tOutputStack, schematicStack)) { final ItemStack input = inputStack; --input.stackSize; - this.mEUt = 32 * (1 << this.mTier - 1) * (1 << this.mTier - 1); + this.lEUt = 32 * (1L << this.mTier - 1) * (1L << this.mTier - 1); // this.mMaxProgresstime = 16 / (1 << this.mTier - 1); this.mMaxProgresstime = 2; this.addOutput(tOutputStack); @@ -203,7 +203,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon if (tOutputStack != null && this.allowPutStack(tOutputStack, schematicStack)) { final ItemStack input2 = inputStack; input2.stackSize -= 4; - this.mEUt = 32 * (1 << this.mTier - 1) * (1 << this.mTier - 1); + this.lEUt = 32 * (1L << this.mTier - 1) * (1L << this.mTier - 1); // this.mMaxProgresstime = 32 / (1 << this.mTier - 1); this.mMaxProgresstime = 4; this.addOutput(tOutputStack); @@ -226,7 +226,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon if (tOutputStack != null && this.allowPutStack(tOutputStack, schematicStack)) { final ItemStack input3 = inputStack; input3.stackSize -= 9; - this.mEUt = 32 * (1 << this.mTier - 1) * (1 << this.mTier - 1); + this.lEUt = 32 * (1L << this.mTier - 1) * (1L << this.mTier - 1); // this.mMaxProgresstime = 64 / (1 << this.mTier - 1); this.mMaxProgresstime = 6; this.addOutput(tOutputStack); @@ -251,7 +251,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon // Based on the Processing Array. A bit overkill, but very flexible. // Reset outputs and progress stats - this.mEUt = 0; + this.lEUt = 0; this.mMaxProgresstime = 0; this.mOutputItems = new ItemStack[] {}; this.mOutputFluids = new FluidStack[] {}; @@ -318,25 +318,25 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase<GMTE_Amazon float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor); - this.mEUt = (int) Math.ceil(tTotalEUt); + this.lEUt = (long) Math.ceil(tTotalEUt); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; // Overclock - if (this.mEUt <= 16) { - this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + if (this.lEUt <= 16) { + this.lEUt = (this.lEUt * (1L << tTier - 1) * (1L << tTier - 1)); this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); } else { - while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { - this.mEUt *= 4; + while (this.lEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.lEUt *= 4; if (this.hasPerfectOverclock()) this.mMaxProgresstime /= 4; else this.mMaxProgresstime /= 2; } } - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); + if (this.lEUt > 0) { + this.lEUt = (-this.lEUt); } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java index 2100ec132a..6b6eb30594 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java @@ -221,7 +221,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter // Based on the Processing Array. A bit overkill, but very flexible. // Reset outputs and progress stats - this.mEUt = 0; + this.lEUt = 0; this.mMaxProgresstime = 0; this.mOutputItems = new ItemStack[] {}; this.mOutputFluids = new FluidStack[] {}; @@ -286,23 +286,23 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor); int rInt = 2; - this.mEUt = (int) Math.max(Math.ceil(tTotalEUt), 1); + this.lEUt = (long) Math.max(Math.ceil(tTotalEUt), 1); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; // Overclock - if (this.mEUt <= 16) { - this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + if (this.lEUt <= 16) { + this.lEUt = (this.lEUt * (1L << tTier - 1) * (1L << tTier - 1)); this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); } else { - while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { - this.mEUt *= 4; + while (this.lEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.lEUt *= 4; this.mMaxProgresstime /= (tHeatCapacityDivTiers >= rInt ? 4 : 2); } } - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); + if (this.lEUt > 0) { + this.lEUt = (-this.lEUt); } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java index 1f12e10fca..6250d34dab 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java @@ -243,7 +243,7 @@ public class GregtechMetaTileEntity_IndustrialChisel FluidStack[] aFluidInputs = new FluidStack[] {}; // Reset outputs and progress stats - this.mEUt = 0; + this.lEUt = 0; this.mMaxProgresstime = 0; this.mOutputItems = new ItemStack[] {}; this.mOutputFluids = new FluidStack[] {}; @@ -306,24 +306,24 @@ public class GregtechMetaTileEntity_IndustrialChisel float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor); - this.mEUt = (int) Math.ceil(tTotalEUt); + this.lEUt = (long) Math.ceil(tTotalEUt); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; // Overclock - if (this.mEUt <= 16) { - this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + if (this.lEUt <= 16) { + this.lEUt = (this.lEUt * (1L << tTier - 1) * (1L << tTier - 1)); this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); } else { - while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { - this.mEUt *= 4; + while (this.lEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.lEUt *= 4; this.mMaxProgresstime /= 2; } } - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); + if (this.lEUt > 0) { + this.lEUt = (-this.lEUt); } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index d29c9d13e8..320ff62f29 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -198,7 +198,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator // Based on the Processing Array. A bit overkill, but very flexible. // Reset outputs and progress stats - this.mEUt = 0; + this.lEUt = 0; this.mMaxProgresstime = 0; this.mOutputItems = new ItemStack[] {}; this.mOutputFluids = new FluidStack[] {}; @@ -263,27 +263,27 @@ public class GregtechMetaTileEntity_IndustrialDehydrator this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor); int rInt = 2; - this.mEUt = (int) Math.ceil(tTotalEUt); + this.lEUt = (long) Math.ceil(tTotalEUt); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; // Overclock - if (this.mEUt <= 16) { - this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + if (this.lEUt <= 16) { + this.lEUt = (this.lEUt * (1L << tTier - 1) * (1L << tTier - 1)); this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); } else { - while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { - this.mEUt *= 4; + while (this.lEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.lEUt *= 4; this.mMaxProgresstime /= (tHeatCapacityDivTiers >= rInt ? 4 : 2); } } if (tHeatCapacityDivTiers > 0) { - this.mEUt = (int) (this.mEUt * (Math.pow(0.95, tHeatCapacityDivTiers))); + this.lEUt = (long) (this.lEUt * (Math.pow(0.95, tHeatCapacityDivTiers))); } - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); + if (this.lEUt > 0) { + this.lEUt = (-this.lEUt); } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 10567f817e..8045f703ef 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -328,7 +328,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine Logger.MACHINE_INFO("Mode: " + tCircuitID); // Reset outputs and progress stats - this.mEUt = 0; + this.lEUt = 0; this.mMaxProgresstime = 0; this.mOutputItems = new ItemStack[] {}; this.mOutputFluids = new FluidStack[] {}; @@ -404,24 +404,24 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor); - this.mEUt = (int) Math.ceil(tTotalEUt); + this.lEUt = (long) Math.ceil(tTotalEUt); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; // Overclock - if (this.mEUt <= 16) { - this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + if (this.lEUt <= 16) { + this.lEUt = (this.lEUt * (1L << tTier - 1) * (1L << tTier - 1)); this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); |