diff options
3 files changed, 6 insertions, 9 deletions
diff --git a/build.properties b/build.properties index 715d85c4ff..d0d35c40a2 100644 --- a/build.properties +++ b/build.properties @@ -3,6 +3,6 @@ forge.version=10.13.4.1614-1.7.10 ic2.version=2.2.817-experimental gt.version=5.09.37 ae2.version=rv3-beta-22 -gtpp.version=1.7.10 +gtpp.version=1.7.11 commit.hash=aa9f04218e5298414f900b9fe61131f7ed26b8f1 structurelib.version=1.0.6 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; |