diff options
4 files changed, 10 insertions, 93 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 7c1b854770..a11a172df5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -54,7 +54,6 @@ import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricLighter; import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricSnips; import gtPlusPlus.xmod.gregtech.loaders.ProcessingToolHeadChoocher; import gtPlusPlus.xmod.gregtech.loaders.misc.AddCustomMachineToPA; -import gtPlusPlus.xmod.gregtech.loaders.misc.WoodCentrifuging; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm; import gtPlusPlus.xmod.gregtech.recipes.RecipesToRemove; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits; @@ -154,7 +153,6 @@ public class HANDLER_GT { convertPyroToCokeOven(); Meta_GT_Proxy.fixIC2FluidNames(); RecipeLoader_AlgaeFarm.generateRecipes(); - WoodCentrifuging.processLogsForMethane(); } public static void addNewOrePrefixes() { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java index 2891741b2c..44c580fe4f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java @@ -244,7 +244,7 @@ public class StaticFields59 { if (aBlock == GregTech_API.sBlockCasings1 && (aMeta >= 12 && aMeta <= 14)) { return aMeta == 12 ? 1 : aMeta == 13 ? 2 : 3; } - else if (aBlock == getBlockCasings5() && (aMeta >= 0 && aMeta <= 8)) { + else if (aBlock == getBlockCasings5() && (aMeta >= 0 && aMeta <= 10)) { return aMeta; } return 0; @@ -285,15 +285,19 @@ public class StaticFields59 { case 8: mHeatingCapacity = 10800; break; + case 9: + mHeatingCapacity = 6300; + break; + case 10: + mHeatingCapacity = 9000; + break; default: Logger.INFO("Heating Coils are bad."); mHeatingCapacity = 0; } - if (CORE.GTNH && aCoilTier <= 6) { + if (CORE.GTNH && aCoilTier <= 10) { mHeatingCapacity += 1; } return mHeatingCapacity; } - - } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java index 0fc89ce7dd..01edbba2aa 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java @@ -113,7 +113,7 @@ extends GregtechMeta_MultiBlockBase { @Override public boolean checkRecipe(final ItemStack aStack) { - return checkRecipeGeneric((4* GT_Utility.getTier(this.getMaxInputVoltage())), 75, 400, 8800); + return checkRecipeGeneric((4* GT_Utility.getTier(this.getMaxInputVoltage())), 75, 400, 10000); } @Override @@ -263,4 +263,4 @@ extends GregtechMeta_MultiBlockBase { public boolean isOverclockerUpgradable() { return true; } -}
\ No newline at end of file +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/WoodCentrifuging.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/WoodCentrifuging.java deleted file mode 100644 index 2d7cd1b73b..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/WoodCentrifuging.java +++ /dev/null @@ -1,85 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders.misc; - -import java.util.ArrayList; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public class WoodCentrifuging { - - private static final ArrayList<ItemStack> aLogData; - private static final ArrayList<ItemStack> aRubberLogs; - private static final ArrayList<ItemStack> aRubberLogs2; - - static { - aLogData = OreDictionary.getOres("logWood"); - aRubberLogs = OreDictionary.getOres("logRubber"); - aRubberLogs2 = OreDictionary.getOres("woodRubber"); - } - - private static boolean isNormalLog(ItemStack aStack) { - if (aLogData.contains(aStack) & !isRubberLog(aStack)) { - return true; - } - return false; - } - - private static boolean isRubberLog(ItemStack aStack) { - if (aRubberLogs.contains(aStack)) { - return true; - } - else if (aRubberLogs2.contains(aStack)) { - return true; - } - return false; - } - - - private static boolean addCentrifugeRecipe(ItemStack aStack) { - if (isNormalLog(aStack)) { - return addNormalLogCentrifugeRecipe(aStack); - } - else if (isRubberLog(aStack)) { - return addRubberLogCentrifugeRecipe(aStack); - } - return false; - } - - private static boolean addNormalLogCentrifugeRecipe(ItemStack aStack) { - GT_Recipe aFoundRecipe = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe(null, false, gregtech.api.enums.GT_Values.V[1], null, new ItemStack[]{aStack}); - if (aFoundRecipe == null && GT_Values.RA.addCentrifugeRecipe(GT_Utility.copyAmount(1L, aStack), null, null, Materials.Methane.getGas(60L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 200, 20)) { - Logger.INFO("Added methane extraction for "+ItemUtils.getItemName(aStack)); - return true; - } - return false; - } - private static boolean addRubberLogCentrifugeRecipe(ItemStack aStack) { - GT_Recipe aFoundRecipe = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe(null, false, gregtech.api.enums.GT_Values.V[1], null, new ItemStack[]{aStack}); - if (aFoundRecipe == null && GT_Values.RA.addCentrifugeRecipe(GT_Utility.copyAmount(1L, aStack), null, null, Materials.Methane.getGas(60L), ItemList.IC2_Resin.get(1L, new Object[0]), GT_ModHandler.getIC2Item("plantBall", 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), null, null, new int[] { 5000, 3750, 2500, 2500 }, 200, 20)) { - Logger.INFO("Added rubber plant based methane extraction for "+ItemUtils.getItemName(aStack)); - return true; - } - return false; - } - - public static void processLogsForMethane() { - //Try use all woods found, fix/add methane extraction. - if (!aLogData.isEmpty()) { - Logger.INFO("Fixing Methane output of centrifuged logs."); - for (ItemStack stack : aLogData) { - addCentrifugeRecipe(stack); - } - } - } - -} |