diff options
Diffstat (limited to 'src/main')
29 files changed, 647 insertions, 897 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 90791c95f2..2569ff3b53 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -51,7 +51,6 @@ import gregtech.api.GregTech_API; import gregtech.api.enchants.Enchantment_EnderDamage; import gregtech.api.enchants.Enchantment_Hazmat; import gregtech.api.enchants.Enchantment_Radioactivity; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -439,14 +438,12 @@ public class GT_Mod implements IGT_Mod { null, null), new ItemData(Materials.Tin, 10886400L)); - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.storageblockcrafting, "tile.glowstone", false)) { - GT_ModHandler.removeRecipe( - new ItemStack(Items.glowstone_dust, 1), - new ItemStack(Items.glowstone_dust, 1), - null, - new ItemStack(Items.glowstone_dust, 1), - new ItemStack(Items.glowstone_dust, 1)); - } + GT_ModHandler.removeRecipe( + new ItemStack(Items.glowstone_dust, 1), + new ItemStack(Items.glowstone_dust, 1), + null, + new ItemStack(Items.glowstone_dust, 1), + new ItemStack(Items.glowstone_dust, 1)); GT_ModHandler.removeRecipeDelayed( new ItemStack(Blocks.wooden_slab, 1, 0), new ItemStack(Blocks.wooden_slab, 1, 1), @@ -484,9 +481,7 @@ public class GT_Mod implements IGT_Mod { .getDisplayName())); } new GT_CraftingRecipeLoader().run(); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "ic2forgehammer", true)) { - GT_ModHandler.removeRecipeByOutput(ItemList.IC2_ForgeHammer.getWildcard(1L)); - } + GT_ModHandler.removeRecipeByOutput(ItemList.IC2_ForgeHammer.getWildcard(1L)); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("machine", 1L)); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("machine", 1L), @@ -517,8 +512,6 @@ public class GT_Mod implements IGT_Mod { new String[] { "blastfurnace", "blockcutter", "inductionFurnace", "generator", "windMill", "waterMill", "solarPanel", "centrifuge", "electrolyzer", "compressor", "electroFurnace", "extractor", "macerator", "recycler", "metalformer", "orewashingplant", "massFabricator", "replicator", }) - .filter( - tName -> GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, aTextIC2 + tName, true)) .map(tName -> GT_ModHandler.getIC2Item(tName, 1L)) .forEach(GT_ModHandler::removeRecipeByOutputDelayed); diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index 47c99403ab..e80bc7345b 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -279,8 +279,8 @@ public class GregTech_API { /** * The Configuration Objects */ - public static GT_Config sRecipeFile = null, sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null, - sUnification = null, sSpecialFile = null, sClientDataFile, sOPStuff = null; + public static GT_Config sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null, sUnification = null, + sSpecialFile = null, sClientDataFile, sOPStuff = null; public static int TICKS_FOR_LAG_AVERAGING = 25, MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = 100; /** diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java index a85d569d74..83deec4f58 100644 --- a/src/main/java/gregtech/api/enums/ConfigCategories.java +++ b/src/main/java/gregtech/api/enums/ConfigCategories.java @@ -20,14 +20,12 @@ public enum ConfigCategories { } public enum Recipes { - researches, harderrecipes, gregtechrecipes, disabledrecipes, recipereplacements, storageblockcrafting, - storageblockdecrafting, - crops + storageblockdecrafting } public enum Machines { diff --git a/src/main/java/gregtech/api/recipe/RecipeMapBackend.java b/src/main/java/gregtech/api/recipe/RecipeMapBackend.java index cbc2e8b73f..a539067e93 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMapBackend.java +++ b/src/main/java/gregtech/api/recipe/RecipeMapBackend.java @@ -174,8 +174,7 @@ public class RecipeMapBackend { if (properties.recipeConfigCategory != null) { assert properties.recipeConfigKeyConvertor != null; String configKey = properties.recipeConfigKeyConvertor.apply(recipe); - if (configKey != null && (recipe.mDuration = GregTech_API.sRecipeFile - .get(properties.recipeConfigCategory, configKey, recipe.mDuration)) <= 0) { + if (configKey != null && recipe.mDuration <= 0) { continue; } } diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GT_BaseCrop.java index c379cec52a..d8608c85a0 100644 --- a/src/main/java/gregtech/api/util/GT_BaseCrop.java +++ b/src/main/java/gregtech/api/util/GT_BaseCrop.java @@ -115,12 +115,10 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { mStats[4] = aStatWeed; mAttributes = aAttributes; mBlock = aBlock; - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.crops, aCropName, true)) { - if (!Crops.instance.registerCrop(this, aID)) - throw new GT_ItsNotMyFaultException("Make sure the Crop ID is valid!"); - if (aBaseSeed != null) Crops.instance.registerBaseSeed(aBaseSeed, this, 1, 1, 1, 1); - sCropList.add(this); - } + if (!Crops.instance.registerCrop(this, aID)) + throw new GT_ItsNotMyFaultException("Make sure the Crop ID is valid!"); + if (aBaseSeed != null) Crops.instance.registerBaseSeed(aBaseSeed, this, 1, 1, 1, 1); + sCropList.add(this); } if (bIc2NeiLoaded) { try { @@ -226,7 +224,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { /** * Checks if the crop needs a block below it - * + * * @return True if the crop needs a block below it to grow to its max size */ public boolean needsBlockBelow() { @@ -263,7 +261,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { /** * An isolated function to check if an item stack is a block that should be below this crop - * + * * @param aItem a stack of the block placed under the crop * @return The result of the check */ diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index 0ada5df764..70dc2f30b0 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -58,7 +58,6 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -494,8 +493,6 @@ public class GT_ModHandler { if (aOutput == null || aChance <= 0) return false; aOutput.stackSize = 1; if (GT_Config.troll && !GT_Utility.areStacksEqual(aOutput, new ItemStack(Items.wooden_hoe, 1, 0))) return false; - aChance = (float) GregTech_API.sRecipeFile.get(ConfigCategories.Machines.scrapboxdrops, aOutput, aChance); - if (aChance <= 0) return false; try { GT_Utility.callMethod( GT_Utility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true), @@ -538,7 +535,6 @@ public class GT_ModHandler { public static boolean addSmeltingRecipe(ItemStack aInput, ItemStack aOutput) { aOutput = GT_OreDictUnificator.get(true, aOutput); if (aInput == null || aOutput == null) return false; - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.smelting, aInput, true)) return false; FurnaceRecipes.smelting() .func_151394_a(aInput, GT_Utility.copyOrNull(aOutput), 0.0F); return true; @@ -562,10 +558,6 @@ public class GT_ModHandler { || (OrePrefixes.gem.contains(aInput)))) { return false; } - int duration = GregTech_API.sRecipeFile.get("alloysmelting", input2 == null ? aInput : aOutput, 130); - if (duration <= 0) { - return false; - } GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); if (input2 == null) { recipeBuilder.itemInputs(aInput); @@ -573,7 +565,7 @@ public class GT_ModHandler { recipeBuilder.itemInputs(aInput, input2); } recipeBuilder.itemOutputs(aOutput) - .duration(duration * TICKS) + .duration(6 * SECONDS + 10 * TICKS) .eut(3) .recipeCategory(RecipeCategories.alloySmelterRecycling); if (hidden) { @@ -617,7 +609,6 @@ public class GT_ModHandler { public static boolean addExtractionRecipe(ItemStack aInput, ItemStack aOutput) { aOutput = GT_OreDictUnificator.get(true, aOutput); if (aInput == null || aOutput == null) return false; - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.extractor, aInput, true)) return false; RA.stdBuilder() .itemInputs(aInput) .itemOutputs(aOutput) @@ -894,7 +885,6 @@ public class GT_ModHandler { @Deprecated public static boolean addThermalCentrifugeRecipe(ItemStack aInput, int[] aChances, int aHeat, Object... aOutput) { if (aInput == null || aOutput == null || aOutput.length == 0 || aOutput[0] == null) return false; - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.thermalcentrifuge, aInput, true)) return false; RA.addThermalCentrifugeRecipe( aInput, (ItemStack) aOutput[0], @@ -909,7 +899,6 @@ public class GT_ModHandler { @Deprecated public static boolean addThermalCentrifugeRecipe(ItemStack aInput, int aHeat, Object... aOutput) { if (aInput == null || aOutput == null || aOutput.length == 0 || aOutput[0] == null) return false; - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.thermalcentrifuge, aInput, true)) return false; RA.addThermalCentrifugeRecipe( aInput, (ItemStack) aOutput[0], @@ -925,7 +914,6 @@ public class GT_ModHandler { */ public static boolean addOreWasherRecipe(ItemStack aInput, int[] aChances, int aWaterAmount, Object... aOutput) { if (aInput == null || aOutput == null || aOutput.length == 0 || aOutput[0] == null) return false; - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.orewashing, aInput, true)) return false; RA.stdBuilder() .itemInputs(aInput) .itemOutputs((ItemStack) aOutput[0], (ItemStack) aOutput[1], (ItemStack) aOutput[2]) @@ -948,7 +936,6 @@ public class GT_ModHandler { public static boolean addOreWasherRecipe(ItemStack aInput, int aWaterAmount, Object... aOutput) { if (aInput == null || aOutput == null || aOutput.length == 0 || aOutput[0] == null) return false; - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.orewashing, aInput, true)) return false; RA.stdBuilder() .itemInputs(aInput) .itemOutputs((ItemStack) aOutput[0], (ItemStack) aOutput[1], (ItemStack) aOutput[2]) @@ -982,7 +969,6 @@ public class GT_ModHandler { public static boolean addCompressionRecipe(ItemStack aInput, ItemStack aOutput, int duration, int EUPerTick) { aOutput = GT_OreDictUnificator.get(true, aOutput); if (aInput == null || aOutput == null || GT_Utility.areStacksEqual(aInput, aOutput, true)) return false; - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.compression, aInput, true)) return false; RA.addCompressorRecipe(aInput, aOutput, duration, EUPerTick); return true; } @@ -992,7 +978,6 @@ public class GT_ModHandler { */ public static boolean addIC2MatterAmplifier(ItemStack aAmplifier, int aValue) { if (aAmplifier == null || aValue <= 0) return false; - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.massfabamplifier, aAmplifier, true)) return false; try { NBTTagCompound tNBT = new NBTTagCompound(); tNBT.setInteger("amplification", aValue); diff --git a/src/main/java/gregtech/api/util/GT_RecipeConstants.java b/src/main/java/gregtech/api/util/GT_RecipeConstants.java index 8e728030f2..d9d6c7d7d2 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeConstants.java +++ b/src/main/java/gregtech/api/util/GT_RecipeConstants.java @@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.interfaces.IRecipeMap; @@ -105,7 +104,7 @@ public class GT_RecipeConstants { if (!GT_Utility.isArrayOfLength(builder.getItemInputsBasic(), 1) || GT_Utility.isArrayEmptyOrNull(builder.getItemOutputs())) return Collections.emptyList(); int aDuration = builder.getDuration(); - if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", builder.getItemInputBasic(0), aDuration)) <= 0) { + if (aDuration <= 0) { return Collections.emptyList(); } builder.duration(aDuration); @@ -291,10 +290,7 @@ public class GT_RecipeConstants { if (!builder.isValid()) return Collections.emptyList(); Integer fuelType = builder.getMetadata(FUEL_TYPE); if (fuelType == null) return Collections.emptyList(); - builder.metadata( - FUEL_VALUE, - GregTech_API.sRecipeFile - .get("fuel_" + fuelType, builder.getItemInputBasic(0), builder.getMetadataOrDefault(FUEL_VALUE, 0))); + builder.metadata(FUEL_VALUE, builder.getMetadataOrDefault(FUEL_VALUE, 0)); return FuelType.get(fuelType) .getTarget() .doAdd(builder); diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index e36e9c68af..f4490b59b0 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -54,7 +54,6 @@ import com.google.common.collect.SetMultimap; import cpw.mods.fml.relauncher.ReflectionHelper; import gregtech.GT_Mod; import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -183,19 +182,19 @@ public class GT_RecipeRegistrator { || GT_Utility.getFluidForFilledItem(aStack, false) != null || aData.mMaterial.mMaterial.mSubTags.contains(SubTag.NO_RECIPES)) return; registerReverseMacerating(GT_Utility.copyAmount(1, aStack), aData, aData.mPrefix == null); - registerReverseSmelting( - GT_Utility.copyAmount(1, aStack), - aData.mMaterial.mMaterial, - aData.mMaterial.mAmount, - true); if (!GT_Utility.areStacksEqual(GT_ModHandler.getIC2Item("iridiumOre", 1L), aStack)) { + registerReverseSmelting( + GT_Utility.copyAmount(1, aStack), + aData.mMaterial.mMaterial, + aData.mMaterial.mAmount, + true); registerReverseFluidSmelting( GT_Utility.copyAmount(1, aStack), aData.mMaterial.mMaterial, aData.mMaterial.mAmount, aData.getByProduct(0)); + registerReverseArcSmelting(GT_Utility.copyAmount(1, aStack), aData); } - registerReverseArcSmelting(GT_Utility.copyAmount(1, aStack), aData); } /** @@ -604,30 +603,26 @@ public class GT_RecipeRegistrator { if (aRecipeReplacing && aPlate != null && sShapesA[i] != null && sShapesA[i].length > 1) { assert aItemData != null; - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.recipereplacements, - aItemData.mMaterial.mMaterial + "." + sShapesA[i][0], - true)) { - if (null != (tStack = GT_ModHandler.removeRecipe(tRecipe.shape))) { - switch (sShapesA[i].length) { - case 2 -> GT_ModHandler.addCraftingRecipe( - tStack, - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { sShapesA[i][1], s_P.charAt(0), aPlate, s_R.charAt(0), - OrePrefixes.stick.get(tMaterial), s_I.charAt(0), aItemData }); - case 3 -> GT_ModHandler.addCraftingRecipe( - tStack, - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { sShapesA[i][1], sShapesA[i][2], s_P.charAt(0), aPlate, - s_R.charAt(0), OrePrefixes.stick.get(tMaterial), s_I.charAt(0), - aItemData }); - default -> GT_ModHandler.addCraftingRecipe( - tStack, - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { sShapesA[i][1], sShapesA[i][2], sShapesA[i][3], - s_P.charAt(0), aPlate, s_R.charAt(0), OrePrefixes.stick.get(tMaterial), - s_I.charAt(0), aItemData }); - } + + if (null != (tStack = GT_ModHandler.removeRecipe(tRecipe.shape))) { + switch (sShapesA[i].length) { + case 2 -> GT_ModHandler.addCraftingRecipe( + tStack, + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { sShapesA[i][1], s_P.charAt(0), aPlate, s_R.charAt(0), + OrePrefixes.stick.get(tMaterial), s_I.charAt(0), aItemData }); + case 3 -> GT_ModHandler.addCraftingRecipe( + tStack, + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { sShapesA[i][1], sShapesA[i][2], s_P.charAt(0), aPlate, + s_R.charAt(0), OrePrefixes.stick.get(tMaterial), s_I.charAt(0), + aItemData }); + default -> GT_ModHandler.addCraftingRecipe( + tStack, + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { sShapesA[i][1], sShapesA[i][2], sShapesA[i][3], s_P.charAt(0), + aPlate, s_R.charAt(0), OrePrefixes.stick.get(tMaterial), s_I.charAt(0), + aItemData }); } } } diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 4c682e9135..d236bbc4f2 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -19,7 +19,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -57,13 +56,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aInput1 == null || aInput2 == null || aOutput1 == null || aDuration < 1 || aEUt < 1 || aStartEU < 1) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get( - "fusion", - aOutput1.getFluid() - .getName(), - aDuration)) <= 0) { - return false; - } RecipeMaps.fusionRecipes.addRecipe( null, new FluidStack[] { aInput1, aInput2 }, @@ -162,14 +154,10 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { return false; } - if ((aInput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("centrifuge", aInput1, aDuration)) <= 0)) { + if ((aInput1 != null) && (aDuration <= 0)) { return false; } - if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile.get( - "centrifuge", - aFluidInput.getFluid() - .getName(), - aDuration)) <= 0)) { + if ((aFluidInput != null) && (aDuration <= 0)) { return false; } if (!GT_Mod.gregtechproxy.mEnableCleanroom) { @@ -234,7 +222,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("compressor", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.compressorRecipes.addRecipe( @@ -278,15 +266,10 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { return false; } - if ((aInput1 != null) - && ((aDuration = GregTech_API.sRecipeFile.get("electrolyzer", aInput1, aDuration)) <= 0)) { + if ((aInput1 != null) && (aDuration <= 0)) { return false; } - if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile.get( - "electrolyzer", - aFluidInput.getFluid() - .getName(), - aDuration)) <= 0)) { + if ((aFluidInput != null) && (aDuration <= 0)) { return false; } RecipeMaps.electrolyzerRecipes.addRecipe( @@ -400,15 +383,10 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { || ((aOutput == null) && (aOutput2 == null) && (aFluidOutput == null))) { return false; } - if ((aOutput != null || aOutput2 != null) - && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aOutput, aDuration)) <= 0)) { + if ((aOutput != null || aOutput2 != null) && (aDuration <= 0)) { return false; } - if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get( - "chemicalreactor", - aFluidOutput.getFluid() - .getName(), - aDuration)) <= 0)) { + if ((aFluidOutput != null) && (aDuration <= 0)) { return false; } if (aEUtick <= 0) { @@ -452,15 +430,10 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { || ((aOutput == null) && (aOutput2 == null) && (aFluidOutput == null))) { return false; } - if ((aOutput != null || aOutput2 != null) - && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aOutput, aDuration)) <= 0)) { + if ((aOutput != null || aOutput2 != null) && (aDuration <= 0)) { return false; } - if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get( - "chemicalreactor", - aFluidOutput.getFluid() - .getName(), - aDuration)) <= 0)) { + if ((aFluidOutput != null) && (aDuration <= 0)) { return false; } if (aEUtick <= 0) { @@ -544,7 +517,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("blastfurnace", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.blastFurnaceRecipes.addRecipe( @@ -568,7 +541,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("blastfurnace", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.blastFurnaceRecipes.addRecipe( @@ -613,7 +586,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aCoalAmount <= 0) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("primitiveblastfurnace", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } Materials[] coals = new Materials[] { Materials.Coal, Materials.Charcoal }; @@ -735,7 +708,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("canning", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.cannerRecipes.addRecipe( @@ -770,8 +743,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { || (OrePrefixes.gem.contains(aInput1)))) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("alloysmelting", aInput2 == null ? aInput1 : aOutput1, aDuration)) - <= 0) { + if (aDuration <= 0) { return false; } GT_Recipe tRecipe = new GT_Recipe( @@ -798,7 +770,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("lathe", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.latheRecipes.addRecipe( @@ -822,7 +794,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aLubricant == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("cutting", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.cutterRecipes.addRecipe( @@ -905,7 +877,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { .noneMatch(Objects::nonNull)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("cutting", aInputs[0], aDuration)) <= 0) { + if (aDuration <= 0) { return false; } if (!GT_Mod.gregtechproxy.mEnableCleanroom && aSpecial == -200) { @@ -1026,7 +998,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("assembling", aOutput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } @@ -1072,7 +1044,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("assembling", aOutput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } @@ -1103,7 +1075,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("wiremill", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.wiremillRecipes.addRecipe( @@ -1125,7 +1097,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("wiremill", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.wiremillRecipes.addRecipe( @@ -1147,7 +1119,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("polarizer", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.polarizerRecipes.addRecipe( @@ -1169,7 +1141,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("bender", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.benderRecipes.addRecipe( @@ -1192,7 +1164,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("bender", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } GT_Recipe tRecipe = new GT_Recipe( @@ -1215,7 +1187,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aShape == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("extruder", aOutput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.extruderRecipes.addRecipe( @@ -1237,7 +1209,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aShape == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("slicer", aOutput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.slicerRecipes.addRecipe( @@ -1261,7 +1233,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { || ((aOutput1 == null) || (aOutput2 == null) || (aOutput3 == null))) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("orewasher", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.oreWasherRecipes.addRecipe( @@ -1285,7 +1257,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { || ((aOutput1 == null) || (aOutput2 == null) || (aOutput3 == null))) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("orewasher", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.oreWasherRecipes.addRecipe( @@ -1308,7 +1280,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aInput2 = GregTech_API.sRecipeFile.get("implosion", aInput1, aInput2)) <= 0) { + if (aInput2 <= 0) { return false; } int tExplosives = Math.min(aInput2, 64); @@ -1395,7 +1367,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aInput == null || aOutputs == null || aOutputs.length < 1 || aOutputs.length > 11) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("distillation", aInput.getUnlocalizedName(), aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.distillationTowerRecipes.addRecipe( @@ -1418,7 +1390,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aInput == null || aOutputs == null || aOutputs.length < 1 || aOutputs.length > 11) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("distillation", aInput.getUnlocalizedName(), aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.distillationTowerRecipes.addRecipe( @@ -1450,7 +1422,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("vacuumfreezer", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.vacuumFreezerRecipes.addRecipe( @@ -1477,7 +1449,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("vacuumfreezer", aInput1, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } addVacuumFreezerRecipe(aInput1, aOutput1, aDuration, 120); @@ -1538,14 +1510,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aInput1 == null) { return false; } - new GT_Recipe( - aInput1, - aOutput1, - null, - null, - null, - GregTech_API.sRecipeFile.get("fuel_" + aType, aInput1, aEU), - aType); + new GT_Recipe(aInput1, aOutput1, null, null, null, aEU, aType); return true; } @@ -1578,9 +1543,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 == null) || (aOutput1 == null)) { return false; } - if (!GregTech_API.sRecipeFile.get("forgehammer", aOutput1, true)) { - return false; - } RecipeMaps.hammerRecipes.addRecipe( true, new ItemStack[] { aInput1 }, @@ -1619,9 +1581,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aContainedItem == null) || (aFullBox == null)) { return false; } - if (!GregTech_API.sRecipeFile.get("boxing", aFullBox, true)) { - return false; - } RecipeMaps.packagerRecipes.addRecipe( true, new ItemStack[] { aContainedItem, aEmptyBox }, @@ -1642,9 +1601,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aFullBox == null) || (aContainedItem == null)) { return false; } - if (!GregTech_API.sRecipeFile.get("unboxing", aFullBox, true)) { - return false; - } RecipeMaps.unpackagerRecipes.addRecipe( true, new ItemStack[] { aFullBox }, @@ -1665,9 +1621,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput1 == null)) { return false; } - if (!GregTech_API.sRecipeFile.get("thermalcentrifuge", aInput, true)) { - return false; - } RecipeMaps.thermalCentrifugeRecipes.addRecipe( true, new ItemStack[] { aInput }, @@ -1688,9 +1641,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput1 == null)) { return false; } - if (!GregTech_API.sRecipeFile.get("thermalcentrifuge", aInput, true)) { - return false; - } RecipeMaps.thermalCentrifugeRecipes.addRecipe( true, new ItemStack[] { aInput }, @@ -1711,9 +1661,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aAmplifierItem == null) || (aAmplifierAmountOutputted <= 0)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("amplifier", aAmplifierItem, aDuration)) <= 0) { - return false; - } RecipeMaps.amplifierRecipes.addRecipe( true, new ItemStack[] { aAmplifierItem }, @@ -1734,9 +1681,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aIngredient == null) || (aInput == null) || (aOutput == null)) { return false; } - if (!GregTech_API.sRecipeFile.get("brewing", aOutput.getUnlocalizedName(), true)) { - return false; - } GT_Recipe tRecipe = RecipeMaps.brewingRecipes.addRecipe( false, new ItemStack[] { aIngredient }, @@ -1766,9 +1710,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if (!GregTech_API.sRecipeFile.get("brewing", aOutput.getUnlocalizedName(), true)) { - return false; - } GT_Recipe tRecipe = RecipeMaps.brewingRecipes.addRecipe( false, new ItemStack[] { aIngredient }, @@ -1792,11 +1733,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get( - "fermenting", - aOutput.getFluid() - .getUnlocalizedName(), - aDuration)) <= 0) { + if (aDuration <= 0) { return false; } GT_Recipe tRecipe = RecipeMaps.fermentingRecipes.addRecipe( @@ -1828,11 +1765,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get( - "distillery", - aOutput.getFluid() - .getUnlocalizedName(), - aDuration)) <= 0) { + if (aDuration <= 0) { return false; } // reduce the batch size if fluid amount is exceeding @@ -1941,7 +1874,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aInput.isFluidEqual(Materials.PhasedIron.getMolten(144))) { aInput = Materials.PulsatingIron.getMolten(aInput.amount); } - if ((aDuration = GregTech_API.sRecipeFile.get("fluidsolidifier", aOutput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.fluidSolidifierRecipes.addRecipe( @@ -1977,7 +1910,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))) { aOutput = Materials.PulsatingIron.getMolten(aOutput.amount); } - if ((aDuration = GregTech_API.sRecipeFile.get("fluidsmelter", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } GT_Recipe tRecipe = RecipeMaps.fluidExtractionRecipes.addRecipe( @@ -2010,7 +1943,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))) { aOutput = Materials.PulsatingIron.getMolten(aOutput.amount); } - if ((aDuration = GregTech_API.sRecipeFile.get("fluidextractor", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.fluidExtractionRecipes.addRecipe( @@ -2036,10 +1969,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aInput == null || aOutput == null) { return false; } - if (!GregTech_API.sRecipeFile.get("fluidcanner", aOutput, true)) { - return false; - } - if ((aDuration = GregTech_API.sRecipeFile.get("fluidcanner", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.fluidCannerRecipes.addRecipe( @@ -2062,10 +1992,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aInput == null || aOutput == null) { return false; } - if (!GregTech_API.sRecipeFile.get("fluidcanner", aOutput, true)) { - return false; - } - if ((aDuration = GregTech_API.sRecipeFile.get("fluidcanner", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.fluidCannerRecipes.addRecipe( @@ -2088,7 +2015,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aBathingFluid == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("chemicalbath", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.chemicalBathRecipes.addRecipe( @@ -2112,7 +2039,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aBathingFluid == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("chemicalbath", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.chemicalBathRecipes.addRecipe( @@ -2136,7 +2063,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput1 == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("electromagneticseparator", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.electroMagneticSeparatorRecipes.addRecipe( @@ -2159,7 +2086,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("extractor", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.extractorRecipes.addRecipe( @@ -2182,7 +2109,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aFluid == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("printer", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.printerRecipes.addRecipe( @@ -2233,7 +2160,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aFluidIn == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("autoclave", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } if (!GT_Mod.gregtechproxy.mEnableCleanroom) { @@ -2267,7 +2194,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aFluid == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("autoclave", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } if (!GT_Mod.gregtechproxy.mEnableCleanroom) { @@ -2294,7 +2221,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aFluidIn == null) || (aOutputs == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("autoclave", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } if (!GT_Mod.gregtechproxy.mEnableCleanroom) { @@ -2365,14 +2292,10 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput == null) && (aFluidOutput == null))) { return false; } - if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("mixer", aOutput, aDuration)) <= 0)) { + if ((aOutput != null) && (aDuration <= 0)) { return false; } - if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get( - "mixer", - aFluidOutput.getFluid() - .getName(), - aDuration)) <= 0)) { + if ((aFluidOutput != null) && (aDuration <= 0)) { return false; } RecipeMaps.mixerRecipes.addRecipe( @@ -2512,14 +2435,10 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { return false; } - if ((aOutput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("mixer", aOutput1, aDuration)) <= 0)) { + if ((aOutput1 != null) && (aDuration <= 0)) { return false; } - if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get( - "mixer", - aFluidOutput.getFluid() - .getName(), - aDuration)) <= 0)) { + if ((aFluidOutput != null) && (aDuration <= 0)) { return false; } RecipeMaps.mixerRecipes.addRecipe( @@ -2580,7 +2499,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aItemToEngrave == null) || (aLens == null) || (aEngravedItem == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("laserengraving", aEngravedItem, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } if (!GT_Mod.gregtechproxy.mEnableCleanroom) { @@ -2624,7 +2543,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aItemToImprint == null) || (aForm == null) || (aImprintedItem == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("press", aImprintedItem, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.formingPressRecipes.addRecipe( @@ -2658,11 +2577,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aItem == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get( - "fluidheater", - aOutput.getFluid() - .getUnlocalizedName(), - aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.fluidHeaterRecipes.addRecipe( @@ -2685,11 +2600,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get( - "fluidheater", - aOutput.getFluid() - .getUnlocalizedName(), - aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.fluidHeaterRecipes.addRecipe( @@ -2714,7 +2625,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } for (ItemStack tStack : aSiftedItems) { if (tStack != null) { - if ((aDuration = GregTech_API.sRecipeFile.get("sifter", aItemToSift, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.sifterRecipes.addRecipe( @@ -2769,7 +2680,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } for (ItemStack tStack : aOutputs) { if (tStack != null) { - if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } GT_Recipe sRecipe = RecipeMaps.arcFurnaceRecipes.addRecipe( @@ -2820,7 +2731,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } for (ItemStack tStack : aOutputs) { if (tStack != null) { - if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.arcFurnaceRecipes.addRecipe( @@ -2849,7 +2760,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } for (ItemStack tStack : aOutputs) { if (tStack != null) { - if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.plasmaArcFurnaceRecipes.addRecipe( @@ -2878,7 +2789,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } for (ItemStack tStack : aOutputs) { if (tStack != null) { - if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.plasmaArcFurnaceRecipes.addRecipe( @@ -2914,7 +2825,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } for (ItemStack tStack : aOutputs) { if (tStack != null) { - if ((aDuration = GregTech_API.sRecipeFile.get("pulveriser", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } GT_Recipe tRecipe = RecipeMaps.maceratorRecipes.addRecipe( @@ -2944,7 +2855,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aInput == null) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("pyrolyse", aInput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.pyrolyseRecipes.addRecipe( @@ -2974,7 +2885,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null && aInput2 == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("cracking", aInput.getUnlocalizedName(), aDuration)) <= 0) { + if (aDuration <= 0) { return false; } RecipeMaps.crackingRecipes.addRecipe( @@ -3002,7 +2913,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { || aInputs.length < 4) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } for (ItemStack tItem : aInputs) { @@ -3059,7 +2970,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { || aInputs.length < 4) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } ItemStack[] tInputs = new ItemStack[aInputs.length]; @@ -3178,7 +3089,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("circuitassembler", aOutput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } @@ -3217,7 +3128,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInputs == null) || (aOutput == null) || aInputs.length > 6 || aInputs.length < 1) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("circuitassembler", aOutput, aDuration)) <= 0) { + if (aDuration <= 0) { return false; } if (!GT_Mod.gregtechproxy.mEnableCleanroom) { diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java index 6804beb402..43c3dce569 100644 --- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java +++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java @@ -1,6 +1,7 @@ package gregtech.common; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -10,8 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.TC_Aspects; import gregtech.api.interfaces.internal.IThaumcraftCompat; import gregtech.api.util.GT_LanguageManager; @@ -134,9 +133,6 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { public Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches, String aCategory, ItemStack aIcon, int aComplexity, int aType, int aX, int aY, List<TC_Aspects.TC_AspectStack> aAspects, ItemStack[] aResearchTriggers, Object[] aPages) { - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.researches, aResearch, true)) { - return null; - } ResearchCategoryList tCategory = ResearchCategories.getResearchList(aCategory); if (tCategory == null) { return null; @@ -196,11 +192,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { } if (aParentResearches != null) { ArrayList<String> tParentResearches = new ArrayList<>(); - for (String tParent : aParentResearches) { - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.researches, aResearch, true)) { - tParentResearches.add(tParent); - } - } + Collections.addAll(tParentResearches, aParentResearches); if (tParentResearches.size() > 0) { rResearch.setParents(tParentResearches.toArray(new String[0])); rResearch.setConcealed(); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 786764a3b2..875c4e9861 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -2670,14 +2670,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { .addTo(maceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.melon_block, 1, 0)) - .itemOutputs(new ItemStack(Items.melon, 8, 0), new ItemStack(Items.melon_seeds, 1)) - .outputChances(10000, 8000) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.pumpkin, 1, 0)) .itemOutputs(new ItemStack(Items.pumpkin_seeds, 4, 0)) .duration(20 * SECONDS) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java index 14af94d70e..309507f2a9 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java @@ -798,36 +798,27 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.IronWood), 'S', OrePrefixes.stick.get(Materials.IronWood) }); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true)) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) }); - } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Clay", true)) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.clay, 1) }); - } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Wheat", true)) { - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.wheat, 1) }); - } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Flint", true)) { - GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Items.flint, 1), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.gravel, 1) }); - } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Blaze", true)) { - GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Items.blaze_powder, 2), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.blaze_rod, 1) }); - } + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.clay, 1) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.wheat, 1) }); + GT_ModHandler.addShapelessCraftingRecipe( + new ItemStack(Items.flint, 1), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.gravel, 1) }); + GT_ModHandler.addShapelessCraftingRecipe( + new ItemStack(Items.blaze_powder, 2), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.blaze_rod, 1) }); + } } } diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index 9098144114..26534f5414 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -17,7 +17,6 @@ import net.minecraftforge.fluids.IFluidContainerItem; import buildcraft.api.tools.IToolWrench; import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -174,25 +173,17 @@ public class GT_ItemIterator implements Runnable { } if ((tItem instanceof IToolCrowbar)) { - if ((!tItem.isDamageable()) && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { - if ((GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "infiniteDurabilityRCCrowbars", false)) - && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, WILDCARD)))) { - GT_Log.out.println("GT_Mod: Removed infinite RC Crowbar: " + tName); + if ((tItem.isDamageable()) || (GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { + if (GregTech_API.registerCrowbar(new ItemStack(tItem, 1, WILDCARD))) { + GT_Log.out.println("GT_Mod: Registered valid RC Crowbar: " + tName); } - } else if (GregTech_API.registerCrowbar(new ItemStack(tItem, 1, WILDCARD))) { - GT_Log.out.println("GT_Mod: Registered valid RC Crowbar: " + tName); } } if ((tItem instanceof IToolWrench)) { - if ((!tItem.isDamageable()) && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { - if ((GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "infiniteDurabilityBCWrenches", false)) - && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, WILDCARD)))) { - GT_Log.out.println("GT_Mod: Removed infinite BC Wrench: " + tName); + if ((tItem.isDamageable()) || (GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { + if (GregTech_API.registerWrench(new ItemStack(tItem, 1, WILDCARD))) { + GT_Log.out.println("GT_Mod: Registered valid BC Wrench: " + tName); } - } else if (GregTech_API.registerWrench(new ItemStack(tItem, 1, WILDCARD))) { - GT_Log.out.println("GT_Mod: Registered valid BC Wrench: " + tName); } } Block tBlock = GT_Utility.getBlockFromStack(new ItemStack(tItem, 1, 0)); @@ -302,12 +293,8 @@ public class GT_ItemIterator implements Runnable { .registerOre(OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0)); // buildcraft - case "tile.pumpBlock" -> { - GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0)); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) { - GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 0)); - } - } + case "tile.pumpBlock" -> GT_OreDictUnificator + .registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0)); // buildcraft case "tile.tankBlock" -> GT_OreDictUnificator diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index b948f251f0..b9926b188b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -1,6 +1,5 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; @@ -11,8 +10,6 @@ import static gregtech.api.util.GT_Utility.calculateRecipeEU; import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -33,6 +30,10 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + if (aMaterial == Materials.Ichorium) { + return; + } + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { @@ -146,23 +147,7 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist } } } - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.storageblockcrafting, - OrePrefixes.block.get(aMaterial) - .toString(), - false)) { - if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.dust.get(aMaterial) }); - if (tStack2 != null) GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.gem.get(aMaterial) }); - if (tStack1 != null) { - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.ingot.get(aMaterial) }); - } - } + if (tStack1 != null) tStack1.stackSize = 9; if (tStack2 != null) tStack2.stackSize = 9; if (tStack3 != null) tStack3.stackSize = 9; @@ -176,15 +161,10 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .addTo(hammerRecipes); } - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.storageblockdecrafting, - OrePrefixes.block.get(aMaterial) - .toString(), - tStack2 != null)) { + if (tStack2 != null && aMaterial != Materials.NetherQuartz) { if (tStack3 != null) GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); - if (tStack2 != null) - GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) }); + GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) }); if (tStack1 != null) GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) }); } @@ -202,12 +182,6 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist switch (aMaterial.mName) { case "Mercury" -> System.err.println( "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); - case "Iron", "WroughtIron", "Steel" -> GT_Values.RA.stdBuilder() - .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8L), GT_Utility.copyAmount(1, aStack)) - .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1L)) - .duration(20 * SECONDS) - .eut(4) - .addTo(assemblerRecipes); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index a7b14e1d69..5a6bdfcf13 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -189,18 +189,241 @@ public class ProcessingCell implements IOreRecipeRegistrator { // Switch case to set manual values for specific plasmas and escape the formula based on mass // when it doesn't make sense for powergen balance. switch (aMaterial.mName) { - case "Tin": - recipeBuilder.metadata(FUEL_VALUE, 150_000) - .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); - case "Force": - recipeBuilder.metadata(FUEL_VALUE, 150_000) - .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); - default: - recipeBuilder.metadata(FUEL_VALUE, (int) Math.max(1024L, 1024L * aMaterial.getMass())) - .metadata(FUEL_TYPE, 4) - .addTo(GT_RecipeConstants.Fuel); + case "Aluminium" -> recipeBuilder.metadata(FUEL_VALUE, 159_744) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Americium" -> recipeBuilder.metadata(FUEL_VALUE, 501_760) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Antimony" -> recipeBuilder.metadata(FUEL_VALUE, 309_760) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Argon" -> recipeBuilder.metadata(FUEL_VALUE, 188_416) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Arsenic" -> recipeBuilder.metadata(FUEL_VALUE, 230_400) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Barium" -> recipeBuilder.metadata(FUEL_VALUE, 342_302) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Beryllium" -> recipeBuilder.metadata(FUEL_VALUE, 110_592) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Bismuth" -> recipeBuilder.metadata(FUEL_VALUE, 425_984) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Boron" -> recipeBuilder.metadata(FUEL_VALUE, 112_640) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Cadmium" -> recipeBuilder.metadata(FUEL_VALUE, 293_601) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Caesium" -> recipeBuilder.metadata(FUEL_VALUE, 332_513) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Calcium" -> recipeBuilder.metadata(FUEL_VALUE, 188_416) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Cerium" -> recipeBuilder.metadata(FUEL_VALUE, 346_931) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Chlorine" -> recipeBuilder.metadata(FUEL_VALUE, 172_032) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Chrome" -> recipeBuilder.metadata(FUEL_VALUE, 202_342) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Cobalt" -> recipeBuilder.metadata(FUEL_VALUE, 217_497) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Copper" -> recipeBuilder.metadata(FUEL_VALUE, 219_340) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Deuterium" -> recipeBuilder.metadata(FUEL_VALUE, 40_960) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Erbium" -> recipeBuilder.metadata(FUEL_VALUE, 376_217) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Europium" -> recipeBuilder.metadata(FUEL_VALUE, 355_635) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Fluorine" -> recipeBuilder.metadata(FUEL_VALUE, 147_456) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Force" -> recipeBuilder.metadata(FUEL_VALUE, 150_000) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Gadolinium" -> recipeBuilder.metadata(FUEL_VALUE, 366_551) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Gallium" -> recipeBuilder.metadata(FUEL_VALUE, 229_376) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Gold" -> recipeBuilder.metadata(FUEL_VALUE, 401_408) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Helium_3" -> recipeBuilder.metadata(FUEL_VALUE, 61_440) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Helium" -> recipeBuilder.metadata(FUEL_VALUE, 81_920) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Holmium" -> recipeBuilder.metadata(FUEL_VALUE, 376_176) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Hydrogen" -> recipeBuilder.metadata(FUEL_VALUE, 20_480) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Indium" -> recipeBuilder.metadata(FUEL_VALUE, 296_509) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Iridium" -> recipeBuilder.metadata(FUEL_VALUE, 397_148) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Iron" -> recipeBuilder.metadata(FUEL_VALUE, 206_438) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Lanthanum" -> recipeBuilder.metadata(FUEL_VALUE, 344_801) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Lead" -> recipeBuilder.metadata(FUEL_VALUE, 423_936) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Lithium" -> recipeBuilder.metadata(FUEL_VALUE, 100_352) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Lutetium" -> recipeBuilder.metadata(FUEL_VALUE, 381_296) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Magnesium" -> recipeBuilder.metadata(FUEL_VALUE, 152_371) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Manganese" -> recipeBuilder.metadata(FUEL_VALUE, 202_752) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Mercury" -> recipeBuilder.metadata(FUEL_VALUE, 409_600) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Molybdenum" -> recipeBuilder.metadata(FUEL_VALUE, 272_384) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Neodymium" -> recipeBuilder.metadata(FUEL_VALUE, 347_996) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Nickel" -> recipeBuilder.metadata(FUEL_VALUE, 213_811) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Niobium" -> recipeBuilder.metadata(FUEL_VALUE, 269_516) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Nitrogen" -> recipeBuilder.metadata(FUEL_VALUE, 129_024) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Osmium" -> recipeBuilder.metadata(FUEL_VALUE, 393_659) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Oxygen" -> recipeBuilder.metadata(FUEL_VALUE, 131_072) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Palladium" -> recipeBuilder.metadata(FUEL_VALUE, 282_214) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Phosphor" -> recipeBuilder.metadata(FUEL_VALUE, 165_888) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Platinum" -> recipeBuilder.metadata(FUEL_VALUE, 399_360) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Plutonium241" -> recipeBuilder.metadata(FUEL_VALUE, 497_664) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Plutonium" -> recipeBuilder.metadata(FUEL_VALUE, 503_808) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Potassium" -> recipeBuilder.metadata(FUEL_VALUE, 183_705) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Praseodymium" -> recipeBuilder.metadata(FUEL_VALUE, 346_931) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Promethium" -> recipeBuilder.metadata(FUEL_VALUE, 347_996) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Radon" -> recipeBuilder.metadata(FUEL_VALUE, 450_560) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Rubidium" -> recipeBuilder.metadata(FUEL_VALUE, 243_712) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Samarium" -> recipeBuilder.metadata(FUEL_VALUE, 353_280) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Scandium" -> recipeBuilder.metadata(FUEL_VALUE, 193_536) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Silicon" -> recipeBuilder.metadata(FUEL_VALUE, 160_563) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Silver" -> recipeBuilder.metadata(FUEL_VALUE, 282_685) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Sodium" -> recipeBuilder.metadata(FUEL_VALUE, 148_684) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Strontium" -> recipeBuilder.metadata(FUEL_VALUE, 249_446) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Sulfur" -> recipeBuilder.metadata(FUEL_VALUE, 170_393) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Tantalum" -> recipeBuilder.metadata(FUEL_VALUE, 384_000) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Terbium" -> recipeBuilder.metadata(FUEL_VALUE, 368_885) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Thorium" -> recipeBuilder.metadata(FUEL_VALUE, 471_040) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Thulium" -> recipeBuilder.metadata(FUEL_VALUE, 378_470) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Tin" -> recipeBuilder.metadata(FUEL_VALUE, 150_000) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Titanium" -> recipeBuilder.metadata(FUEL_VALUE, 196_608) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Tritium" -> recipeBuilder.metadata(FUEL_VALUE, 61_440) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Tungsten" -> recipeBuilder.metadata(FUEL_VALUE, 384_778) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Uranium235" -> recipeBuilder.metadata(FUEL_VALUE, 481_280) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Uranium" -> recipeBuilder.metadata(FUEL_VALUE, 487_424) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Vanadium" -> recipeBuilder.metadata(FUEL_VALUE, 198_451) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Ytterbium" -> recipeBuilder.metadata(FUEL_VALUE, 379_695) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Yttrium" -> recipeBuilder.metadata(FUEL_VALUE, 255_180) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + case "Zinc" -> recipeBuilder.metadata(FUEL_VALUE, 226_304) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); + default -> recipeBuilder + .metadata(FUEL_VALUE, (int) Math.max(1024L, 1024L * aMaterial.getMass())) + .metadata(FUEL_TYPE, 4) + .addTo(GT_RecipeConstants.Fuel); } if (GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null) { GT_Values.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index f0f8aef8ba..7cb26f7c36 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -282,10 +282,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr case "NetherQuartz": case "Quartz": case "CertusQuartz": - if (gregtech.api.GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Recipes.disabledrecipes, - "QuartzDustSmeltingIntoAESilicon", - true)) GT_ModHandler.removeFurnaceSmelting(aStack); + GT_ModHandler.removeFurnaceSmelting(aStack); break; case "MeatRaw": GT_ModHandler.addSmeltingRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 0efa58a3c7..35bd3b8cfd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -1,9 +1,7 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; -import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.implosionRecipes; import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes; @@ -19,8 +17,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -51,8 +47,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); boolean aNoSmelting = aMaterial.contains(SubTag.NO_SMELTING); - boolean aSpecialRecipeReq = (aMaterial.contains(SubTag.MORTAR_GRINDABLE)) - && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true)); + boolean aSpecialRecipeReq = aMaterial.contains(SubTag.MORTAR_GRINDABLE); boolean aFuelPower = aMaterial.mFuelPower > 0; switch (aPrefix) { @@ -115,7 +110,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra } // Bender recipes - { + if (aMaterial != Materials.Iridium) { if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { // Plate GT_Values.RA.stdBuilder() @@ -260,32 +255,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra } } - switch (aMaterial.mName) { - case "NULL": - break; - case "Coal", "Charcoal": - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { - GT_ModHandler.removeRecipeDelayed( - GT_Utility.copyAmount(1, aStack), - null, - null, - new ItemStack(net.minecraft.init.Items.stick, 1, 0)); - } - break; - case "CertusQuartz": - // Electrolyzer recipe - { - GT_Values.RA.stdBuilder() - .itemInputs(aStack) - .itemOutputs( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)) - .duration(100 * SECONDS) - .eut(TierEU.RECIPE_LV) - .addTo(electrolyzerRecipes); - } - } - for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver // Laser engraver recipes { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index 48879067a8..0be31a7e1d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -12,8 +12,6 @@ import static gregtech.api.util.GT_Utility.calculateRecipeEU; import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -93,8 +91,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING) && !aMaterial.contains(SubTag.SMELTING_TO_GEM) - && aMaterial.contains(SubTag.MORTAR_GRINDABLE) - && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true)) { + && aMaterial.contains(SubTag.MORTAR_GRINDABLE)) { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), GT_Proxy.tBits, @@ -201,9 +198,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } // Enable crafting with hammer if tier is < IV. - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq - && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), GT_Proxy.tBits, @@ -230,9 +225,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist .addTo(benderRecipes); } - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq - && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), GT_Proxy.tBits, @@ -254,9 +247,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } // If tier < IV add manual crafting. - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq - && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), GT_Proxy.tBits, @@ -278,9 +269,7 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } // Crafting recipes - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq - && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV && aSpecialRecipeReq) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), GT_Proxy.tBits, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index 7d36af7de3..737ef4682a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -16,8 +16,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -129,20 +127,14 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack)); - } + GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack)); } for (int i = 0; i < 32767; i++) { if ((GT_Utility.areStacksEqual( GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { - GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); - } + GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } ItemStack tStack = GT_ModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i)); if (tStack == null) { @@ -219,10 +211,7 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack)); - } + GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack)); } ItemStack tStack = GT_ModHandler.getRecipeOutput(GT_Utility.copyAmount(1, aStack)); if (tStack != null) { @@ -293,8 +282,7 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack)); + GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1, aStack)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index 380d42f360..8d7ca9e518 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -41,7 +41,8 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis } if ((!aMaterial.contains(SubTag.SMELTING_TO_GEM)) - && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null) { + && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L) != null + && aMaterial != Materials.Aluminium) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Mold_Ingot.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)) diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java index b28b997a93..3b06babee6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java @@ -7,7 +7,6 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import gregtech.api.enums.GT_Values; @@ -64,12 +63,6 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist .duration(40 * SECONDS) .eut(4) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(6, aStack), new ItemStack(Items.book, 3)) - .itemOutputs(new ItemStack(Blocks.bookshelf, 1)) - .duration(20 * SECONDS) - .eut(4) - .addTo(assemblerRecipes); if (aStack.getItemDamage() == 32767) { for (byte i = 0; i < 64; i = (byte) (i + 1)) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 88f39309cf..be8322f30c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -1,6 +1,5 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.enums.ConfigCategories.Recipes.harderrecipes; import static gregtech.api.enums.GT_Values.L; import static gregtech.api.enums.GT_Values.NI; import static gregtech.api.enums.GT_Values.W; @@ -27,7 +26,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -125,17 +123,15 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist new Object[] { "hX", 'X', OrePrefixes.plate.get(aMaterial) }); if (aMaterial == Materials.Paper) { - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(GregTech_API.sRecipeFile.get(harderrecipes, aStack, true) ? 2 : 3, aStack), + GT_Utility.copyAmount(2, aStack), BUFFERED, new Object[] { "XXX", 'X', new ItemStack(Items.reeds, 1, W) }); } if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial) { - if (!aNoSmashing - && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { + if (!aNoSmashing) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( @@ -166,8 +162,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } } - if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) - && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) { + if (aMaterial.contains(SubTag.MORTAR_GRINDABLE)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -218,21 +213,13 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } if (!aNoSmashing) { - if (GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Tools.hammerdoubleplate, - OrePrefixes.plate.get(aMaterial) - .toString(), - true)) { - - Object aPlateStack = OrePrefixes.plate.get(aMaterial); - - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { "I", "B", "h", // craftingToolHardHammer - 'I', aPlateStack, 'B', aPlateStack }); - } + Object aPlateStack = OrePrefixes.plate.get(aMaterial); + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', aPlateStack, 'B', aPlateStack }); } } } @@ -276,28 +263,19 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } if (!aNoSmashing) { - if (GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Tools.hammertripleplate, - OrePrefixes.plate.get(aMaterial) - .toString(), - true)) { - - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - - Object aPlateStack = OrePrefixes.plate.get(aMaterial); - - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { "I", "B", "h", // craftingToolHardHammer - 'I', OrePrefixes.plateDouble.get(aMaterial), 'B', aPlateStack }); + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { + Object aPlateStack = OrePrefixes.plate.get(aMaterial); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateDouble.get(aMaterial), 'B', aPlateStack }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, - aPlateStack, aPlateStack }); - } + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, + aPlateStack }); } } @@ -366,27 +344,19 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .addTo(assemblerRecipes); } if (!aNoSmashing) { - if (GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Tools.hammerquadrupleplate, - OrePrefixes.plate.get(aMaterial) - .toString(), - true)) { - - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - Object aPlateStack = OrePrefixes.plate.get(aMaterial); - - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { "I", "B", "h", // craftingToolHardHammer - 'I', OrePrefixes.plateTriple.get(aMaterial), 'B', aPlateStack }); + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { + Object aPlateStack = OrePrefixes.plate.get(aMaterial); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateTriple.get(aMaterial), 'B', aPlateStack }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, - aPlateStack, aPlateStack, aPlateStack }); - } + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, + aPlateStack, aPlateStack }); } } } @@ -420,27 +390,19 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .addTo(assemblerRecipes); } if (!aNoSmashing) { - if (GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Tools.hammerquintupleplate, - OrePrefixes.plate.get(aMaterial) - .toString(), - true)) { - - if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - Object aPlateStack = OrePrefixes.plate.get(aMaterial); - - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { "I", "B", "h", // craftingToolHardHammer - 'I', OrePrefixes.plateQuadruple.get(aMaterial), 'B', aPlateStack }); + if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { + Object aPlateStack = OrePrefixes.plate.get(aMaterial); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateQuadruple.get(aMaterial), 'B', aPlateStack }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1, aStack), - DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, - new Object[] { ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack, - aPlateStack, aPlateStack }); - } + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack, + aPlateStack, aPlateStack }); } } } @@ -480,9 +442,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .addTo(fluidSolidifierRecipes); } - if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial - && !aNoSmashing - && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { + if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial && !aNoSmashing) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 3c25574798..5493aa9b8e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -50,7 +50,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } if (!OrePrefixes.block.isIgnored(aMaterial.mSmeltInto) - && (GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, 1L) != null)) { + && (GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, 1L) != null) + && aMaterial != Materials.Ichorium) { GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(9, aStack), ItemList.Shape_Extruder_Block.get(0L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, aMaterial.mSmeltInto, tAmount)) @@ -255,7 +256,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } } } - if (tAmount * 2 <= 64) { + if (tAmount * 2 <= 64 && aMaterial != Materials.Obsidian) { if (!(aMaterial == Materials.Aluminium)) { if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, 1L) != null) { GT_Values.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index 199feeb08e..840f49b4dd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -1,6 +1,5 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; @@ -12,7 +11,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; @@ -81,23 +79,6 @@ public class ProcessingStone implements IOreRecipeRegistrator { break; case "Obsidian": if (aBlock != Blocks.air) aBlock.setResistance(20.0F); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack), ItemList.IC2_Compressed_Coal_Ball.get(8L)) - .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1L)) - .duration(20 * SECONDS) - .eut(4) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) - .itemOutputs( - GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)) - .outputChances(10000, 1000) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); break; case "Concrete": GT_Values.RA.stdBuilder() diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 2aa5aed5b2..da749e5b31 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -16,8 +16,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -48,14 +46,8 @@ public class GT_CraftingRecipeLoader implements Runnable { new ItemStack(Items.bucket, 1), bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, new Object[] { "XhX", " X ", 'X', OrePrefixes.plate.get(Materials.AnyIron) }); - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Bucket", true)) { - GT_ModHandler.addCraftingRecipe( - new ItemStack(Items.bucket, 1), - bits_no_remove_buffered, - new Object[] { aTextIron1, " X ", 'X', OrePrefixes.ingot.get(Materials.AnyIron) }); - } ItemStack tMat = new ItemStack(Items.iron_ingot); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.PressurePlate", true)) { + { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) { GT_ModHandler.addCraftingRecipe( @@ -65,7 +57,7 @@ public class GT_CraftingRecipeLoader implements Runnable { OrePrefixes.screw.get(Materials.Steel), 'Z', OrePrefixes.spring.get(Materials.Steel) }); } } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Door", true)) { + { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, tMat, tMat, null, tMat, tMat, null))) { GT_ModHandler.addCraftingRecipe( @@ -75,7 +67,7 @@ public class GT_CraftingRecipeLoader implements Runnable { OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); } } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Cauldron", true)) { + { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, null, tMat, tMat, null, tMat, tMat, tMat, tMat))) { GT_ModHandler.addCraftingRecipe( @@ -85,7 +77,7 @@ public class GT_CraftingRecipeLoader implements Runnable { OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); } } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Hopper", true)) { + { ItemStack tStack; if (null != (tStack = GT_ModHandler .removeRecipe(tMat, null, tMat, tMat, new ItemStack(Blocks.chest, 1, 0), tMat, null, tMat, null))) { @@ -97,7 +89,7 @@ public class GT_CraftingRecipeLoader implements Runnable { "craftingChest" }); } } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Bars", true)) { + { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) { tStack.stackSize /= 2; @@ -108,6 +100,7 @@ public class GT_CraftingRecipeLoader implements Runnable { OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); } } + GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("ironFence", 6L), bits_no_remove_buffered | GT_ModHandler.RecipeBits.REVERSIBLE, @@ -115,7 +108,7 @@ public class GT_CraftingRecipeLoader implements Runnable { OrePrefixes.stick.get(Materials.Wood), 'I', OrePrefixes.ingot.get(Materials.AnyIron) }); tMat = new ItemStack(Items.gold_ingot); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Gold.PressurePlate", true)) { + { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, null, null, null, null, null, null, null))) { GT_ModHandler.addCraftingRecipe( @@ -126,7 +119,7 @@ public class GT_CraftingRecipeLoader implements Runnable { } } tMat = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Rubber.Sheet", true)) { + { ItemStack tStack; if (null != (tStack = GT_ModHandler.removeRecipe(tMat, tMat, tMat, tMat, tMat, tMat, null, null, null))) { GT_ModHandler.addCraftingRecipe( @@ -728,21 +721,9 @@ public class GT_CraftingRecipeLoader implements Runnable { null, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L)), - GT_OreDictUnificator.get( - OrePrefixes.ingot, - Materials.Bronze, - GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "bronzeingotcrafting", true) ? 1L - : 2L))) { + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L))) { GT_Log.out.println("GT_Mod: Changed Forestrys Bronze Recipe"); } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "enchantmenttable", false)) { - GT_Log.out.println( - "GT_Mod: Removing the Recipe of the Enchantment Table, to have more Fun at enchanting with the Anvil and Books from Dungeons."); - GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Blocks.enchanting_table, 1)); - } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "enderchest", false)) { - GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Blocks.ender_chest, 1)); - } tStack = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L); GT_ModHandler.addCraftingRecipe( @@ -1863,104 +1844,78 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_Log.out.println("GT_Mod: Applying harder Recipes for several Blocks."); // TODO: Not Buffered - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "blockbreaker", false)) { - tStack = GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.cobblestone, 1), - new ItemStack(Items.iron_pickaxe, 1), - new ItemStack(Blocks.cobblestone, 1), - new ItemStack(Blocks.cobblestone, 1), - new ItemStack(Blocks.piston, 1), - new ItemStack(Blocks.cobblestone, 1), - new ItemStack(Blocks.cobblestone, 1), - new ItemStack(Items.redstone, 1), - new ItemStack(Blocks.cobblestone, 1)); - GT_ModHandler.removeRecipeDelayed(tStack); - GT_ModHandler.addCraftingRecipe( - tStack, - bits_no_remove_buffered, - new Object[] { "RGR", "RPR", "RCR", 'G', OreDictNames.craftingGrinder, 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'R', OrePrefixes.plate.get(Materials.Steel), 'P', - OreDictNames.craftingPiston }); - } - if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "beryliumreflector", true))) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1), - bits_no_remove_buffered, - new Object[] { " N ", "NBN", " N ", 'B', OrePrefixes.plateDouble.get(Materials.Beryllium), 'N', - GT_ModHandler.getIC2Item("reactorReflector", 1L, 1) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1), - bits_no_remove_buffered, - new Object[] { " B ", "NCN", " B ", 'B', OrePrefixes.plate.get(Materials.Beryllium), 'N', - GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), 'C', - OrePrefixes.plate.get(Materials.TungstenCarbide) }); - } - if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "reflector", true))) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflector", 1L, 1)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), - bits_no_remove_buffered, - new Object[] { "TGT", "GSG", "TGT", 'T', OrePrefixes.plate.get(Materials.Tin), 'G', - OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plateDouble.get(Materials.Steel) }); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), - bits_no_remove_buffered, - new Object[] { "TTT", "GSG", "TTT", 'T', OrePrefixes.plate.get(Materials.TinAlloy), 'G', - OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plate.get(Materials.Beryllium) }); - } - if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "cropharvester", true))) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("crophavester", 1L)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("crophavester", 1L), - bits_no_remove_buffered, - new Object[] { "ACA", "PMS", "WOW", 'M', ItemList.Hull_MV, 'C', OrePrefixes.circuit.get(Materials.Good), - 'A', ItemList.Robot_Arm_LV, 'P', ItemList.Electric_Piston_LV, 'S', ItemList.Sensor_LV, 'W', - OrePrefixes.toolHeadSense.get(Materials.Aluminium), 'O', ItemList.Conveyor_Module_LV }); - } - if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "rtg", true))) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTGenerator", 1L)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("RTGenerator", 1L), - bits_no_remove_buffered, - new Object[] { "III", "IMI", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C', - OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV }); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1), + bits_no_remove_buffered, + new Object[] { " N ", "NBN", " N ", 'B', OrePrefixes.plateDouble.get(Materials.Beryllium), 'N', + GT_ModHandler.getIC2Item("reactorReflector", 1L, 1) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("reactorReflectorThick", 1L, 1), + bits_no_remove_buffered, + new Object[] { " B ", "NCN", " B ", 'B', OrePrefixes.plate.get(Materials.Beryllium), 'N', + GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), 'C', + OrePrefixes.plate.get(Materials.TungstenCarbide) }); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("reactorReflector", 1L, 1)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), + bits_no_remove_buffered, + new Object[] { "TGT", "GSG", "TGT", 'T', OrePrefixes.plate.get(Materials.Tin), 'G', + OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plateDouble.get(Materials.Steel) }); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), + bits_no_remove_buffered, + new Object[] { "TTT", "GSG", "TTT", 'T', OrePrefixes.plate.get(Materials.TinAlloy), 'G', + OrePrefixes.dust.get(Materials.Graphite), 'S', OrePrefixes.plate.get(Materials.Beryllium) }); + + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("crophavester", 1L)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("crophavester", 1L), + bits_no_remove_buffered, + new Object[] { "ACA", "PMS", "WOW", 'M', ItemList.Hull_MV, 'C', OrePrefixes.circuit.get(Materials.Good), + 'A', ItemList.Robot_Arm_LV, 'P', ItemList.Electric_Piston_LV, 'S', ItemList.Sensor_LV, 'W', + OrePrefixes.toolHeadSense.get(Materials.Aluminium), 'O', ItemList.Conveyor_Module_LV }); + + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTGenerator", 1L)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("RTGenerator", 1L), + bits_no_remove_buffered, + new Object[] { "III", "IMI", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C', + OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV }); + + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTHeatGenerator", 1L)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("RTHeatGenerator", 1L), + bits_no_remove_buffered, + new Object[] { "III", "IMB", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C', + OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV, 'B', + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1) }); + + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("carbonrotor", 1L)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("carbonrotor", 1L), + bits_no_remove_buffered, + new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("carbonrotorblade", 1), 'S', + OrePrefixes.screw.get(Materials.Iridium), 'T', GT_ModHandler.getIC2Item("steelshaft", 1) }); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("steelrotor", 1L)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("steelrotor", 1L), + bits_no_remove_buffered, + new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("steelrotorblade", 1), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) }); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("ironrotor", 1L)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("ironrotor", 1L), + bits_no_remove_buffered, + new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("ironrotorblade", 1), 'S', + OrePrefixes.screw.get(Materials.WroughtIron), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) }); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("woodrotor", 1L)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("woodrotor", 1L), + bits_no_remove_buffered, + new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("woodrotorblade", 1), 'S', + OrePrefixes.screw.get(Materials.WroughtIron), 'T', OrePrefixes.stickLong.get(Materials.WroughtIron) }); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTHeatGenerator", 1L)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("RTHeatGenerator", 1L), - bits_no_remove_buffered, - new Object[] { "III", "IMB", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C', - OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV, 'B', - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1) }); - } - if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "windRotor", true))) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("carbonrotor", 1L)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("carbonrotor", 1L), - bits_no_remove_buffered, - new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("carbonrotorblade", 1), 'S', - OrePrefixes.screw.get(Materials.Iridium), 'T', GT_ModHandler.getIC2Item("steelshaft", 1) }); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("steelrotor", 1L)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("steelrotor", 1L), - bits_no_remove_buffered, - new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("steelrotorblade", 1), 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) }); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("ironrotor", 1L)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("ironrotor", 1L), - bits_no_remove_buffered, - new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("ironrotorblade", 1), 'S', - OrePrefixes.screw.get(Materials.WroughtIron), 'T', GT_ModHandler.getIC2Item("ironshaft", 1) }); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("woodrotor", 1L)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("woodrotor", 1L), - bits_no_remove_buffered, - new Object[] { "dBS", "BTB", "SBw", 'B', GT_ModHandler.getIC2Item("woodrotorblade", 1), 'S', - OrePrefixes.screw.get(Materials.WroughtIron), 'T', - OrePrefixes.stickLong.get(Materials.WroughtIron) }); - } if (GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L) != null) { tStack = GT_ModHandler.getRecipeOutput( GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Iron, 1L), @@ -1972,57 +1927,45 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L), new ItemStack(Items.diamond_pickaxe, 1), GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Diamond, 1L)); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "quarry", true)) { - GT_ModHandler.removeRecipeByOutputDelayed(tStack); - GT_ModHandler.addCraftingRecipe( - tStack, - bits_no_remove_buffered, - new Object[] { "ICI", "GIG", "DPD", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'D', - OrePrefixes.gear.get(Materials.Diamond), 'G', OrePrefixes.gear.get(Materials.Gold), 'I', - OrePrefixes.gear.get(Materials.Steel), 'P', - GT_ModHandler.getIC2Item("diamondDrill", 1L, 32767) }); - } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "quarry", false)) { - GT_ModHandler.removeRecipeByOutputDelayed(tStack); - } - } - - if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "sugarpaper", true))) { - GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.paper)); - GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.sugar)); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 2), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SSS", " m ", 'S', new ItemStack(Items.reeds) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "Sm ", 'S', new ItemStack(Items.reeds) }); + GT_ModHandler.removeRecipeByOutputDelayed(tStack); GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.paper, Materials.Empty, 2), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { " C ", "SSS", " C ", 'S', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1), - 'C', new ItemStack(Blocks.stone_slab) }); + tStack, + bits_no_remove_buffered, + new Object[] { "ICI", "GIG", "DPD", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'D', + OrePrefixes.gear.get(Materials.Diamond), 'G', OrePrefixes.gear.get(Materials.Gold), 'I', + OrePrefixes.gear.get(Materials.Steel), 'P', GT_ModHandler.getIC2Item("diamondDrill", 1L, 32767) }); } + GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.paper)); + GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.sugar)); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 2), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SSS", " m ", 'S', new ItemStack(Items.reeds) }); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "Sm ", 'S', new ItemStack(Items.reeds) }); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.paper, Materials.Empty, 2), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { " C ", "SSS", " C ", 'S', GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1), + 'C', new ItemStack(Blocks.stone_slab) }); + GT_Log.out.println("GT_Mod: Applying Recipes for Tools"); - if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "nanosaber", true))) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("nanoSaber", 1L)); - GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getIC2Item("nanoSaber", 1L), - bits_no_remove_buffered, - new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.Master), 'I', - OrePrefixes.plateAlloy.get("Iridium"), 'P', OrePrefixes.plate.get(Materials.Platinum), 'C', - OrePrefixes.circuit.get(Materials.Elite) }); - } + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("nanoSaber", 1L)); + GT_ModHandler.addCraftingRecipe( + GT_ModHandler.getIC2Item("nanoSaber", 1L), + bits_no_remove_buffered, + new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.Master), 'I', + OrePrefixes.plateAlloy.get("Iridium"), 'P', OrePrefixes.plate.get(Materials.Platinum), 'C', + OrePrefixes.circuit.get(Materials.Elite) }); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "namefix", true)) { - GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.flint_and_steel, 1)); - GT_ModHandler.addCraftingRecipe( - new ItemStack(Items.flint_and_steel, 1), - bits_no_remove_buffered, - new Object[] { "S ", " F", 'F', new ItemStack(Items.flint, 1), 'S', "nuggetSteel" }); - } + GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.flint_and_steel, 1)); + GT_ModHandler.addCraftingRecipe( + new ItemStack(Items.flint_and_steel, 1), + bits_no_remove_buffered, + new Object[] { "S ", " F", 'F', new ItemStack(Items.flint, 1), 'S', "nuggetSteel" }); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("diamondDrill", 1L)); @@ -2034,20 +1977,6 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("electricTreetap", 1L)); - GT_Log.out.println("GT_Mod: Removing Q-Armor Recipes if configured."); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "QHelmet", false)) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("quantumHelmet", 1L)); - } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "QPlate", false)) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("quantumBodyarmor", 1L)); - } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "QLegs", false)) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("quantumLeggings", 1L)); - } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "QBoots", false)) { - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("quantumBoots", 1L)); - } - if (GraviSuite.isModLoaded()) { GT_ModHandler.removeRecipeByOutputDelayed( GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GT_Values.W)); diff --git a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java index 0d54398d79..35b18769f0 100644 --- a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java @@ -8,8 +8,6 @@ import net.minecraft.item.ItemStack; import com.glodblock.github.loader.ItemAndBlockHolder; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.ItemList; import gregtech.api.enums.Mods; import gregtech.api.util.GT_Log; @@ -20,88 +18,84 @@ public class GT_RecyclerBlacklistLoader implements Runnable { @Override public void run() { GT_Log.out.println("GT_Mod: Adding Stuff to the Recycler Blacklist."); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "easymobgrinderrecycling", true)) { - addToRecyclerBlackList(new ItemStack(Items.arrow, 1, 0)); - addToRecyclerBlackList(new ItemStack(Items.bone, 1, 0)); - addToRecyclerBlackList(ItemList.Dye_Bonemeal.get(1L)); + addToRecyclerBlackList(new ItemStack(Items.arrow, 1, 0)); + addToRecyclerBlackList(new ItemStack(Items.bone, 1, 0)); + addToRecyclerBlackList(ItemList.Dye_Bonemeal.get(1L)); - addToRecyclerBlackList(new ItemStack(Items.rotten_flesh, 1, 0)); + addToRecyclerBlackList(new ItemStack(Items.rotten_flesh, 1, 0)); - addToRecyclerBlackList(new ItemStack(Items.string, 1, 0)); + addToRecyclerBlackList(new ItemStack(Items.string, 1, 0)); - addToRecyclerBlackList(new ItemStack(Items.egg, 1, 0)); + addToRecyclerBlackList(new ItemStack(Items.egg, 1, 0)); + ItemStack tStack = new ItemStack(Blocks.cobblestone, 1, 0); + while (tStack != null) { + addToRecyclerBlackList(tStack); + tStack = GT_ModHandler + .getRecipeOutput(tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack); } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "easystonerecycling", true)) { - ItemStack tStack = new ItemStack(Blocks.cobblestone, 1, 0); - while (tStack != null) { - addToRecyclerBlackList(tStack); - tStack = GT_ModHandler - .getRecipeOutput(tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack); + addToRecyclerBlackList(new ItemStack(Blocks.gravel, 1, 32767)); + addToRecyclerBlackList(new ItemStack(Items.flint, 1, 32767)); + addToRecyclerBlackList(new ItemStack(Blocks.cobblestone_wall, 1, 32767)); + addToRecyclerBlackList(new ItemStack(Blocks.sandstone_stairs, 1, 32767)); + addToRecyclerBlackList(new ItemStack(Blocks.stone_stairs, 1, 32767)); + addToRecyclerBlackList(new ItemStack(Blocks.stone_brick_stairs, 1, 32767)); + addToRecyclerBlackList(GT_ModHandler.getSmeltingOutput(new ItemStack(Blocks.stone, 1, 0), false, null)); + addToRecyclerBlackList( + GT_ModHandler + .getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), null, null, new ItemStack(Blocks.glass, 1, 0))); + addToRecyclerBlackList( + GT_ModHandler + .getRecipeOutput(new ItemStack(Blocks.stone, 1, 0), null, null, new ItemStack(Blocks.stone, 1, 0))); + addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.cobblestone, 1, 0), + null, + null, + new ItemStack(Blocks.cobblestone, 1, 0))); + addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.stone, 1, 0), + null, + new ItemStack(Blocks.stone, 1, 0), + null, + new ItemStack(Blocks.stone, 1, 0))); + addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.stone, 1, 0), + new ItemStack(Blocks.glass, 1, 0), + new ItemStack(Blocks.stone, 1, 0))); + addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.cobblestone, 1, 0), + new ItemStack(Blocks.glass, 1, 0), + new ItemStack(Blocks.cobblestone, 1, 0))); + addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.glass, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0))); + addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.sand, 1, 0), + new ItemStack(Blocks.glass, 1, 0), + new ItemStack(Blocks.sand, 1, 0))); + addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0), + new ItemStack(Blocks.sandstone, 1, 0))); + addToRecyclerBlackList(GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0))); + addToRecyclerBlackList( + GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0))); + if (Mods.Chisel.isModLoaded()) { + for (int i = 1; i <= 15; i++) { + addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "cobblestone", 1, i)); } - addToRecyclerBlackList(new ItemStack(Blocks.gravel, 1, 32767)); - addToRecyclerBlackList(new ItemStack(Items.flint, 1, 32767)); - addToRecyclerBlackList(new ItemStack(Blocks.cobblestone_wall, 1, 32767)); - addToRecyclerBlackList(new ItemStack(Blocks.sandstone_stairs, 1, 32767)); - addToRecyclerBlackList(new ItemStack(Blocks.stone_stairs, 1, 32767)); - addToRecyclerBlackList(new ItemStack(Blocks.stone_brick_stairs, 1, 32767)); - addToRecyclerBlackList(GT_ModHandler.getSmeltingOutput(new ItemStack(Blocks.stone, 1, 0), false, null)); - addToRecyclerBlackList( - GT_ModHandler - .getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), null, null, new ItemStack(Blocks.glass, 1, 0))); - addToRecyclerBlackList( - GT_ModHandler - .getRecipeOutput(new ItemStack(Blocks.stone, 1, 0), null, null, new ItemStack(Blocks.stone, 1, 0))); - addToRecyclerBlackList( - GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.cobblestone, 1, 0), - null, - null, - new ItemStack(Blocks.cobblestone, 1, 0))); - addToRecyclerBlackList( - GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.stone, 1, 0), - null, - new ItemStack(Blocks.stone, 1, 0), - null, - new ItemStack(Blocks.stone, 1, 0))); - addToRecyclerBlackList( - GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.stone, 1, 0), - new ItemStack(Blocks.glass, 1, 0), - new ItemStack(Blocks.stone, 1, 0))); - addToRecyclerBlackList( - GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.cobblestone, 1, 0), - new ItemStack(Blocks.glass, 1, 0), - new ItemStack(Blocks.cobblestone, 1, 0))); - addToRecyclerBlackList( - GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.glass, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0))); - addToRecyclerBlackList( - GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.sand, 1, 0), - new ItemStack(Blocks.glass, 1, 0), - new ItemStack(Blocks.sand, 1, 0))); - addToRecyclerBlackList( - GT_ModHandler.getRecipeOutput( - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0), - new ItemStack(Blocks.sandstone, 1, 0))); - addToRecyclerBlackList(GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0))); - addToRecyclerBlackList( - GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0))); - if (Mods.Chisel.isModLoaded()) { - for (int i = 1; i <= 15; i++) { - addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "cobblestone", 1, i)); - } - for (int i = 0; i <= 15; i++) { - addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "stonebricksmooth", 1, i)); - } + for (int i = 0; i <= 15; i++) { + addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "stonebricksmooth", 1, i)); } } if (Mods.AE2FluidCraft.isModLoaded()) { diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 2e49773894..76fcbfe346 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -38,8 +38,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -999,25 +997,6 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(Forestry.ID, "sturdyMachine", 1L, 0), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 4)) - .itemOutputs(ItemList.FR_Casing_Hardened.get(1)) - .fluidInputs(Materials.Water.getFluid(5000)) - .duration(3 * SECONDS + 4 * TICKS) - .eut(32) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.FR_Casing_Sturdy.get(1)) - .duration(1 * SECONDS + 12 * TICKS) - .eut(16) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), new ItemStack(Blocks.wool, 1, 32767)) .itemOutputs(new ItemStack(Blocks.torch, 6, 0)) @@ -1667,16 +1646,14 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), - new ItemStack(Items.coal, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.torch, 4)) - .duration(2 * SECONDS) - .eut(20) - .addTo(assemblerRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), + new ItemStack(Items.coal, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.torch, 4)) + .duration(2 * SECONDS) + .eut(20) + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -1698,15 +1675,6 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 6), - GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Items.iron_door, 1)) - .duration(30 * SECONDS) - .eut(4) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 7), GT_Utility.getIntegratedCircuit(7)) .itemOutputs(new ItemStack(Items.cauldron, 1)) @@ -1734,15 +1702,6 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 6), - GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Items.iron_door, 1)) - .duration(30 * SECONDS) - .eut(4) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 7), GT_Utility.getIntegratedCircuit(7)) .itemOutputs(new ItemStack(Items.cauldron, 1)) @@ -2446,20 +2405,6 @@ public class AssemblerRecipes implements Runnable { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8), new ItemStack(Blocks.brick_block, 1)) - .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1)) - .duration(20 * SECONDS) - .eut(4) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("waterMill", 2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_ModHandler.getIC2Item("generator", 1)) - .duration(5 * MINUTES + 20 * SECONDS) - .eut(8) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() .itemInputs(GT_ModHandler.getIC2Item("batPack", 1L, 32767), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.IC2_ReBattery.get(6)) .duration(40 * SECONDS) @@ -2475,15 +2420,6 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 4), - GT_ModHandler.getIC2Item("generator", 1)) - .itemOutputs(GT_ModHandler.getIC2Item("waterMill", 2)) - .duration(5 * MINUTES + 20 * SECONDS) - .eut(8) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5), new ItemStack(Blocks.chest, 1, 32767)) .itemOutputs(new ItemStack(Blocks.hopper)) @@ -2520,15 +2456,6 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 2), - GT_ModHandler.getIC2Item("generator", 1)) - .itemOutputs(GT_ModHandler.getIC2Item("windMill", 1)) - .duration(5 * MINUTES + 20 * SECONDS) - .eut(8) - .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CobaltBrass, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1)) .itemOutputs(ItemList.Component_Sawblade_Diamond.get(1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java index 180e751d35..c24dd2dbae 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java +++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java @@ -463,13 +463,6 @@ public class Pulverizer implements Runnable { .duration(60 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(maceratorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.ID, "cube.crushed.obsidian", 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L)) - .duration(20 * SECONDS) - .eut(2) - .addTo(maceratorRecipes); } if (AppliedEnergistics2.isModLoaded()) { diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index f57b2e3b92..ba1edbd0e2 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -141,8 +141,6 @@ public class GT_PreLoad { GT_Config.sConfigFileIDs = new Configuration(tFile); GT_Config.sConfigFileIDs.load(); GT_Config.sConfigFileIDs.save(); - GregTech_API.sRecipeFile = new GT_Config( - new Configuration(new File(new File(configDir, "GregTech"), "Recipes.cfg"))); GregTech_API.sMachineFile = new GT_Config( new Configuration(new File(new File(configDir, "GregTech"), "MachineStats.cfg"))); GregTech_API.sWorldgenFile = new GT_Config( @@ -764,10 +762,6 @@ public class GT_PreLoad { .get("general", "LongDistancePipelineMinimalDistancePoints", 64) .getInt(64); - GregTech_API.mUseOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.harderrecipes, - "useonlygoodsolderingmaterials", - GregTech_API.mUseOnlyGoodSolderingMaterials); GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties .get("havestLevel", "activateHarvestLevelChange", false); // TODO CHECK if (GT_Mod.gregtechproxy.mChangeHarvestLevels) { |