aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorGlodBlock <1356392126@qq.com>2021-11-04 15:03:10 +0800
committerGlodBlock <1356392126@qq.com>2021-11-04 15:03:10 +0800
commit78e0bff4ad7aeefb2f14d56eb1c7d4bfa30a604b (patch)
treea89d01d459dbbec42427d689559cdbe60e98f645 /src/Java
parent0f0aacbe6f7ed9fe07448229dcd3bc5b4d5357ea (diff)
downloadGT5-Unofficial-78e0bff4ad7aeefb2f14d56eb1c7d4bfa30a604b.tar.gz
GT5-Unofficial-78e0bff4ad7aeefb2f14d56eb1c7d4bfa30a604b.tar.bz2
GT5-Unofficial-78e0bff4ad7aeefb2f14d56eb1c7d4bfa30a604b.zip
fix large alloy smelter
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java11
2 files changed, 5 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index a11a172df5..f623fe7405 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -145,7 +145,7 @@ public class HANDLER_GT {
public static void onLoadComplete(FMLLoadCompleteEvent event) {
removeCrudeTurbineRotors();
- cleanAssemblyLineRecipeMap();
+ //cleanAssemblyLineRecipeMap();
if (ConfigSwitches.enableHarderRecipesForHighTierCasings) {
removeOldHighTierCasingRecipes();
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
index 1e7e5cfcf2..599c2eb68d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
@@ -127,7 +127,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_
@Override
public int getEuDiscountForParallelism() {
- return 0;
+ return 100;
}
@Override
@@ -215,7 +215,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_
}
public boolean checkRecipe(ItemStack aStack) {
- return checkRecipeGeneric(this.getMaxParallelRecipes(), 0, 5 * this.mLevel); // Will have to clone the logic from parent class to handle heating coil
+ return checkRecipeGeneric(this.getMaxParallelRecipes(), 100, 5 * this.mLevel); // Will have to clone the logic from parent class to handle heating coil
// tiers.
}
@@ -256,9 +256,6 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_
// EU discount
float tRecipeEUt = (tRecipe.mEUt * aEUPercent) / 100.0f;
int tHeatCapacityDivTiers = mHeatingCapacity / 900;
- if (tHeatCapacityDivTiers > 0) {
- tRecipeEUt = (int) (tRecipeEUt * (Math.pow(0.95, tHeatCapacityDivTiers)));
- }
float tTotalEUt = 0.0f;
int parallelRecipes = 0;
@@ -282,12 +279,12 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_
// Convert speed bonus to duration multiplier
// e.g. 100% speed bonus = 200% speed = 100%/200% = 50% recipe duration.
- aSpeedBonusPercent = Math.max(-99, aSpeedBonusPercent);
+ aSpeedBonusPercent = Math.max(-99, mLevel * 5);
float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent);
this.mMaxProgresstime = (int) (tRecipe.mDuration * tTimeFactor);
int rInt = 2;
- this.mEUt = (int) Math.ceil(tTotalEUt);
+ this.mEUt = (int) Math.max(Math.ceil(tTotalEUt), 1);
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;