From 0ae40cb57713533d3e9441c100fa7511fd52ee18 Mon Sep 17 00:00:00 2001 From: Prometheus0000 Date: Fri, 11 Jun 2021 18:59:22 -0400 Subject: Disable log methane and rubber centrifuging --- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 7c1b854770..5d4ff5e394 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -154,7 +154,7 @@ public class HANDLER_GT { convertPyroToCokeOven(); Meta_GT_Proxy.fixIC2FluidNames(); RecipeLoader_AlgaeFarm.generateRecipes(); - WoodCentrifuging.processLogsForMethane(); + //WoodCentrifuging.processLogsForMethane(); } public static void addNewOrePrefixes() { -- cgit From 1f8ec4191ab43eda9df3ce99bf305eb35c462c7a Mon Sep 17 00:00:00 2001 From: Prometheus0000 Date: Sat, 12 Jun 2021 12:16:28 -0400 Subject: Remove class and references --- src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 2 - .../gregtech/loaders/misc/WoodCentrifuging.java | 85 ---------------------- 2 files changed, 87 deletions(-) delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/WoodCentrifuging.java (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 5d4ff5e394..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/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 aLogData; - private static final ArrayList aRubberLogs; - private static final ArrayList 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); - } - } - } - -} -- cgit