From af2f74dadaed2d993b4aa4e3cf8a1e303f23094d Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 22 Dec 2015 11:42:39 +0100 Subject: [PATCH] increase hot coolant energy output 4x (Blood Asp) Fix reprocessing exploit (Blood Asp) --- .../api/util/GT_RecipeRegistrator.java | 2 +- .../GT_MetaTileEntity_HeatExchanger.java | 2 +- .../postload/GT_MachineRecipeLoader.java | 29 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index ab35b292..1d391cd8 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -244,7 +244,7 @@ public class GT_RecipeRegistrator { if (aAllowHammer) for (MaterialStack tMaterial : aData.getAllMaterialStacks()) if (tMaterial.mMaterial.contains(SubTag.CRYSTAL) && !tMaterial.mMaterial.contains(SubTag.METAL)) { - if (RA.addForgeHammerRecipe(GT_Utility.copyAmount(1, aStack), GT_OreDictUnificator.getGem(aData.mMaterial), 200, 32)) + if (RA.addForgeHammerRecipe(GT_Utility.copyAmount(1, aStack), GT_OreDictUnificator.getDust(aData.mMaterial), 200, 32)) break; } ItemStack tDust = GT_OreDictUnificator.getDust(aData.mMaterial); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java index d3c72835..ce9d8fad 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java @@ -99,7 +99,7 @@ public class GT_MetaTileEntity_HeatExchanger extends GT_MetaTileEntity_MultiBloc superheated_threshold /= 4; do_lava = true; } else if (mInputHotFluidHatch.getFluid().isFluidEqual(FluidRegistry.getFluidStack("ic2hotcoolant", 1))) { - steam_output_multiplier = 0.5f; + steam_output_multiplier = 2f; } else { // If we're working with neither, fail out return false; diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 0bd58194..60433a13 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -7,6 +7,9 @@ import gregtech.api.enums.*; import gregtech.api.objects.MaterialStack; import gregtech.api.util.*; import gregtech.common.GT_DummyWorld; +import ic2.api.recipe.ILiquidHeatExchangerManager; +import ic2.api.recipe.ILiquidHeatExchangerManager.HeatExchangeProperty; +import ic2.api.recipe.Recipes; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -17,6 +20,8 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; //import gregtech.api.enums.TC_Aspects.TC_AspectStack; @@ -1500,5 +1505,29 @@ public class GT_MachineRecipeLoader GT_ModHandler.addAlloySmelterRecipe(tDust1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false); } } + + try { + Map tLiqExchange = ic2.api.recipe.Recipes.liquidCooldownManager.getHeatExchangeProperties(); + Iterator> tIterator = tLiqExchange.entrySet().iterator(); + while (tIterator.hasNext()) { + Map.Entry tEntry = tIterator.next(); + if(tEntry.getKey().equals("ic2hotcoolant")){ + tIterator.remove(); + Recipes.liquidCooldownManager.addFluid("ic2hotcoolant", "ic2coolant", 80); + } + } + } catch (Throwable e) {/*Do nothing*/} + + try { + Map tLiqExchange = ic2.api.recipe.Recipes.liquidHeatupManager.getHeatExchangeProperties(); + Iterator> tIterator = tLiqExchange.entrySet().iterator(); + while (tIterator.hasNext()) { + Map.Entry tEntry = tIterator.next(); + if(tEntry.getKey().equals("ic2coolant")){ + tIterator.remove(); + Recipes.liquidHeatupManager.addFluid("ic2coolant", "ic2hotcoolant", 80); + } + } + } catch (Throwable e) {/*Do nothing*/} } }