From 23494ade8145f1a70d4c533d74815b77b990314a Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Wed, 22 May 2024 18:05:41 +0100 Subject: Cleaning! (#881) * Remove fluorite from sandstone references * Remove some unused content, rogue useless configs * Remove more junk * Remove more * Remove RF converter, I think this is disabled anyway? Or should be? * Opps missed this * Cleaning * Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI? * Delete unused Australia textures * Unused texture loading * Bulk remove seemingly unused textures. * Remove xpjuice, seemingly no use? Change the localised name of mobessence to Mob Essence. Remove EnchantingUtils, no longer needed. * Clean * Unused tooltips * Remove hydrogen blob * Spotless apply for branch Cleaning! for #881 (#882) spotlessApply Co-authored-by: GitHub GTNH Actions <> * More cleaning * Lots of unused code. * Some reflection cleanup * Revert "Remove sick blaze, I can't even get this to spawn? The spawn egg also isn't in NEI?" This reverts commit d244b7dba00a9aee42b4a0596e842956acb36c5a. * Restore random conversion recipes * Unused texture * Unused stuff * Restore some missing textures * Spotless apply for branch Cleaning! for #881 (#883) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Conditionally enable xpjuice recipe on OpenBlocks loaded * Spotless apply for branch Cleaning! for #881 (#884) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz --- .../gregtech/loaders/RecipeGen_FluidCanning.java | 40 +++------------------- 1 file changed, 5 insertions(+), 35 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java index 5447f71848..ae6304a0c8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java @@ -58,20 +58,6 @@ public class RecipeGen_FluidCanning implements Runnable { return isValid; } - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid) { - this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, null, null); - } - - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, - FluidStack aFluidOut) { - this(aExtracting, aEmpty, aFull, aFluidIn, aFluidOut, null, null); - } - - public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluid, - Integer aDuration, Integer aEUt) { - this(aExtracting, aEmpty, aFull, aFluid, GT_Values.NF, aDuration, aEUt); - } - // Alternative Constructor public RecipeGen_FluidCanning(boolean aExtracting, ItemStack aEmpty, ItemStack aFull, FluidStack aFluidIn, FluidStack aFluidOut, Integer aDuration, Integer aEUt) { @@ -163,7 +149,6 @@ public class RecipeGen_FluidCanning implements Runnable { private void generateRecipes() { if (isValid && recipe != null) { - // Logger.INFO("Processing "+(disableOptional ? "Extracting" : "Canning")+" Recipe."); if (this.disableOptional) { addFluidExtractionRecipe(recipe); } else { @@ -172,8 +157,7 @@ public class RecipeGen_FluidCanning implements Runnable { } } - private boolean addFluidExtractionRecipe(GT_Recipe aRecipe) { - boolean result = false; + private void addFluidExtractionRecipe(GT_Recipe aRecipe) { CORE.crash(); Logger.INFO( "[FE-Debug] " + aRecipe.mFluidOutputs[0].amount @@ -189,13 +173,7 @@ public class RecipeGen_FluidCanning implements Runnable { int aCount2 = aCount1; RecipeMaps.fluidExtractionRecipes.addRecipe(aRecipe); aCount1 = getMapSize(RecipeMaps.fluidExtractionRecipes); - result = aCount1 > aCount2; - if (result) { - // Logger.INFO("[FIND] Added Extraction recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); - } else { + if (aCount1 <= aCount2) { Logger.INFO( "[ERROR] Failed adding Extraction recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) + ", " @@ -206,22 +184,15 @@ public class RecipeGen_FluidCanning implements Runnable { + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); dumpStack(); } - return result; } - private boolean addFluidCannerRecipe(GT_Recipe aRecipe) { - boolean result = false; + private void addFluidCannerRecipe(GT_Recipe aRecipe) { + boolean result; int aCount1 = getMapSize(RecipeMaps.fluidCannerRecipes); int aCount2 = aCount1; RecipeMaps.fluidCannerRecipes.addRecipe(aRecipe); aCount1 = getMapSize(RecipeMaps.fluidCannerRecipes); - result = aCount1 > aCount2; - if (result) { - // Logger.INFO("[FIND] Added Canning recipe for "+ItemUtils.getArrayStackNames(aRecipe.mInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mOutputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidInputs)+", - // "+ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); - } else { + if (aCount1 <= aCount2) { Logger.INFO( "[ERROR] Failed adding Canning recipe for " + ItemUtils.getArrayStackNames(aRecipe.mInputs) + ", " @@ -232,7 +203,6 @@ public class RecipeGen_FluidCanning implements Runnable { + ItemUtils.getArrayStackNames(aRecipe.mFluidOutputs)); dumpStack(); } - return result; } private void dumpStack() { -- cgit