aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common
diff options
context:
space:
mode:
authorMaxim <maxim235@gmx.de>2023-01-07 13:09:22 +0100
committerGitHub <noreply@github.com>2023-01-07 13:09:22 +0100
commit105bd9f4d65b750804a7a1f45badf9f99dcd45e1 (patch)
tree96138c760dd3f5df26200372a4f64e513ce3e035 /src/main/java/gtPlusPlus/xmod/gregtech/common
parent04a4aa4ca39fa1bdf64923a515e00acefa732b3c (diff)
downloadGT5-Unofficial-105bd9f4d65b750804a7a1f45badf9f99dcd45e1.tar.gz
GT5-Unofficial-105bd9f4d65b750804a7a1f45badf9f99dcd45e1.tar.bz2
GT5-Unofficial-105bd9f4d65b750804a7a1f45badf9f99dcd45e1.zip
Use long MB base (#482)
* Use long MB base * Added some more casts * Replaced all occurences of mEUt with lEUt
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java22
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java8
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java2
29 files changed, 180 insertions, 180 deletions
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));
} 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_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
index d887e64579..931621cdde 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java
@@ -511,7 +511,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
// 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[] {};
@@ -588,24 +588,24 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase<
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 /= 4;
}
}
- 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_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
index 09a2fdf83d..1934a8e610 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java
@@ -210,7 +210,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
this.mEfficiencyIncrease = 10000;
// Reset outputs and progress stats
- this.mEUt = 0;
+ this.lEUt = 0;
this.mProgresstime = 0;
this.mMaxProgresstime = 0;
this.mOutputItems = new ItemStack[] {};
@@ -232,7 +232,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB
Logger.INFO("Did not find recipe!");
}
}
- this.mEUt = 0;
+ this.lEUt = 0;
this.mEfficiency = 0;
Logger.INFO("Did not find recipe! (2)");
return false;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java
index df3990530f..ff9c20b08d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java
@@ -204,7 +204,7 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
if (mMaxProgresstime <= 0) continue;
if (!tTag.hasKey("eu")) continue;
- mEUt = tTag.getInteger("eu");
+ lEUt = tTag.getLong("eu");
if (GT_Values.D1) System.out.println("Find avaiable recipe");
findRecipe = true;
@@ -231,17 +231,17 @@ public class GregtechMetaTileEntity_Adv_AssemblyLine
byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
- if (mEUt <= 16) {
- this.mEUt = (mEUt * (1 << tTier - 1) * (1 << tTier - 1));
+ if (lEUt <= 16) {
+ this.lEUt = (lEUt * (1 << tTier - 1) * (1 << tTier - 1));
this.mMaxProgresstime = (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);
updateSlots();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
index bafcc83cd0..4e1844f539 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
@@ -272,7 +272,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
// 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[] {};
@@ -338,18 +338,18 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor);
int tHalfHeatCapacityDivTiers = tHeatCapacityDivTiers / 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 * (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;
+ while (this.lEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
+ this.lEUt *= 4;
if (tHalfHeatCapacityDivTiers > 0) {
this.mMaxProgresstime = mMaxProgresstime / 4;
tHalfHeatCapacityDivTiers--;
@@ -361,8 +361,8 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
}
}
}
- 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/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
index 553a6a965c..00cd8e9c1f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java
@@ -225,7 +225,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
superheated_threshold * 2); // Don't consume too much hot fluid per second, maximum is 2x SH threshold.
mInputHotFluidHatch.drain(fluidAmountToConsume, true);
this.mMaxProgresstime = 20;
- this.mEUt = (int) (fluidAmountToConsume * steam_output_multiplier * efficiency);
+ this.lEUt = (long) (fluidAmountToConsume * steam_output_multiplier * efficiency);
if (do_lava) {
mOutputColdFluidHatch.fill(FluidRegistry.getFluidStack("ic2pahoehoelava", fluidAmountToConsume), true);
} else {
@@ -244,9 +244,9 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
@Override
public boolean onRunningTick(ItemStack aStack) {
- if (this.mEUt > 0) {
+ if (this.lEUt > 0) {
int tGeneratedEU =
- (int) (this.mEUt * 2L * this.mEfficiency / 10000L); // APPROXIMATELY how much steam to generate.
+ (int) (this.lEUt * 2L * this.mEfficiency / 10000L); // APPROXIMATELY how much steam to generate.
if (tGeneratedEU > 0) {
if (superheated) tGeneratedEU /= 2; // We produce half as much superheated steam if necessary
@@ -351,7 +351,7 @@ public class GregtechMetaTileEntity_Adv_HeatExchanger
StatCollector.translateToLocal("GT5U.multiblock.usage") + " "
+ StatCollector.translateToLocal("GT5U.LHE.steam") + ": "
+ (superheated ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW)
- + GT_Utility.formatNumbers(superheated ? -2 * mEUt : -mEUt) + EnumChatFormatting.RESET + " EU/t",
+ + GT_Utility.formatNumbers(superheated ? -2 * lEUt : -lEUt) + EnumChatFormatting.RESET + " EU/t",
StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + EnumChatFormatting.RED
+ (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " "
+ StatCollector.translateToLocal("GT5U.multiblock.efficiency")
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java
index f701b23e92..cf69ce12cd 100644
--- a/