diff --git a/src/main/java/com/dreammaster/avaritia/AvaritiaHelper.java b/src/main/java/com/dreammaster/avaritia/AvaritiaHelper.java index 669bbba09f..1251e7718e 100644 --- a/src/main/java/com/dreammaster/avaritia/AvaritiaHelper.java +++ b/src/main/java/com/dreammaster/avaritia/AvaritiaHelper.java @@ -8,7 +8,6 @@ public class AvaritiaHelper { - @SuppressWarnings("unchecked") public static void removeExtremeCraftingRecipe(ItemStack output) { ExtremeCraftingManager.getInstance().getRecipeList().removeIf( r -> r instanceof IRecipe && GTUtility.areStacksEqual(((IRecipe) r).getRecipeOutput(), output, true)); diff --git a/src/main/java/com/dreammaster/coremod/DownloadProgressDialog.java b/src/main/java/com/dreammaster/coremod/DownloadProgressDialog.java index 10b83328dc..1a78ecb071 100644 --- a/src/main/java/com/dreammaster/coremod/DownloadProgressDialog.java +++ b/src/main/java/com/dreammaster/coremod/DownloadProgressDialog.java @@ -25,7 +25,6 @@ class DownloadProgressDialog extends JDialog implements IDownloadProgress { private static final long serialVersionUID = 6041491111144915139L; public static final String WINDOW_TITLE = Refstrings.NAME; - private Thread netThread; private JProgressBar progressBar; @Override diff --git a/src/main/java/com/dreammaster/fluids/FluidList.java b/src/main/java/com/dreammaster/fluids/FluidList.java index 75b01cf9e8..55f03b1afe 100644 --- a/src/main/java/com/dreammaster/fluids/FluidList.java +++ b/src/main/java/com/dreammaster/fluids/FluidList.java @@ -1,7 +1,6 @@ package com.dreammaster.fluids; import net.minecraft.block.material.Material; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import com.dreammaster.creativetab.ModTabList; @@ -38,7 +37,6 @@ public enum FluidList { } public static boolean AddToItemManager(ModFluidManager pFluidManager) { - Fluid t = null; boolean tResult = true; for (FluidList il : FluidList.values()) { if (il.Fluid != null) { diff --git a/src/main/java/com/dreammaster/gthandler/DTPFCalculator.java b/src/main/java/com/dreammaster/gthandler/DTPFCalculator.java index 5b675fdb37..5b92266373 100644 --- a/src/main/java/com/dreammaster/gthandler/DTPFCalculator.java +++ b/src/main/java/com/dreammaster/gthandler/DTPFCalculator.java @@ -7,7 +7,6 @@ import java.util.Collection; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -38,9 +37,6 @@ public class DTPFCalculator { Collection ebfRecipes = blastFurnaceRecipes.getAllRecipes(); Collection freezerRecipes = vacuumFreezerRecipes.getAllRecipes(); private int[] catalystAmounts = new int[5]; - private static final FluidStack[] CATALYSTS = new FluidStack[] { Materials.ExcitedDTCC.getFluid(1), - Materials.ExcitedDTPC.getFluid(1), Materials.ExcitedDTRC.getFluid(1), Materials.ExcitedDTEC.getFluid(1), - Materials.ExcitedDTSC.getFluid(1) }; // These were calculated based on their respective mixer + laser engraver recipes & their plasma energy values private static final long[] CATALYST_ENERGY_VALUES = new long[] { 14_514_983L, 66_768_460L, 269_326_451L, 1_073_007_393L, 4_276_767_521L }; diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index fdeabaa4f5..646090a996 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -25,6 +25,7 @@ import static gregtech.api.enums.OrePrefixes.screw; import static gregtech.api.util.GTModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import static gtPlusPlus.core.material.MaterialsAlloy.AQUATIC_STEEL; import static gtPlusPlus.core.material.MaterialsAlloy.INCONEL_792; import static gtPlusPlus.core.material.MaterialsAlloy.LEAGRISIUM; @@ -64,7 +65,6 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; -import gregtech.common.GTProxy; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtneioreplugin.plugin.block.ModBlocks; import gtneioreplugin.util.DimensionHelper; @@ -1078,15 +1078,15 @@ public void run() { NHItemList.UnfiredClayBrick.get(8), GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "CCC", "CFC", "CCC", 'C', new ItemStack(Items.clay_ball, 1, 0), 'F', - new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) }); GTModHandler.addShapelessCraftingRecipe( NHItemList.UnfiredClayBrick.get(), GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { new ItemStack(Items.clay_ball, 1, 0), - new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) }); if (TinkerConstruct.isModLoaded()) { Recipe.of( - new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W), + new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD), ToolDictNames.craftingToolKnife, GTModHandler.getModItem(aTextTConstruct, "blankPattern", 1L, 0)) .provideTo(shapelessUnremovableGtRecipes()) @@ -1096,11 +1096,11 @@ public void run() { GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "GGG", "GFG", "GGG", 'G', GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 1), 'F', - new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) }); Recipe.of( NHItemList.UnfiredSearedBrick.get(), GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 1), - new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W)) + new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD)) .provideTo(shapelessUnremovableGtRecipes()) .provideTo(MANTLE.manualShapedCraftingRecipeNamed("unfiredsearedbrick")); GTModHandler.addCraftingRecipe( @@ -1108,19 +1108,19 @@ public void run() { GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "SSS", "SFS", "SSS", 'S', GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 6), 'F', - new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) }); GTModHandler.addShapelessCraftingRecipe( NHItemList.UnfiredSlimeSoilBrick.get(), GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { GTModHandler.getModItem(aTextTConstruct, "CraftedSoil", 1L, 6), - new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) }); } GTModHandler.addCraftingRecipe( NHItemList.UnfiredCokeOvenBrick.get(3), GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "CCC", "SFS", "SSS", 'C', new ItemStack(Items.clay_ball, 1, 0), 'S', GTOreDictUnificator.get("sand", 1L), 'F', - new ItemStack(NHItemList.WoodenBrickForm.item, 1, GTValues.W) }); + new ItemStack(NHItemList.WoodenBrickForm.item, 1, WILDCARD) }); GTModHandler.addCraftingRecipe( GTOreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L), @@ -1159,44 +1159,44 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L), GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { ToolDictNames.craftingToolMortar, - new ItemStack(Blocks.stained_hardened_clay, 1, GTValues.W) }); + new ItemStack(Blocks.stained_hardened_clay, 1, WILDCARD) }); GTModHandler.addShapelessCraftingRecipe( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L), GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.hardened_clay, 1) }); GTModHandler.addCraftingRecipe( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, GTValues.W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, WILDCARD), bits, new Object[] { "RCR", "RAR", "RTR", 'R', GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatREDischarged", 1, 0), 'C', OrePrefixes.circuit.get(Materials.LV), 'A', OrePrefixes.itemCasing.get(Materials.Aluminium), 'T', OrePrefixes.wireGt02.get(Materials.Tin) }); GTModHandler.addCraftingRecipe( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAdvBatpack", 1, GTValues.W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAdvBatpack", 1, WILDCARD), bits, new Object[] { "RCR", "RAR", "RTR", 'R', - GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1, GTValues.W), 'C', + GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1, WILDCARD), 'C', OrePrefixes.circuit.get(Materials.MV), 'A', - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, GTValues.W), 'T', + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, WILDCARD), 'T', OrePrefixes.wireGt04.get(Materials.AnnealedCopper) }); GTModHandler.addCraftingRecipe( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorEnergypack", 1, GTValues.W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorEnergypack", 1, WILDCARD), bits, new Object[] { "CSC", "EXE", "STS", 'E', - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1, GTValues.W), 'C', + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1, WILDCARD), 'C', OrePrefixes.circuit.get(Materials.HV), 'X', - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAdvBatpack", 1, GTValues.W), 'T', + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAdvBatpack", 1, WILDCARD), 'T', OrePrefixes.wireGt08.get(Materials.Gold), 'S', OrePrefixes.itemCasing.get(Materials.StainlessSteel) }); GTModHandler.addCraftingRecipe( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1, GTValues.W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1, WILDCARD), bits, new Object[] { "WdW", "HBH", "HXH", 'W', OrePrefixes.wireGt02.get(Materials.Copper), 'H', OrePrefixes.itemCasing.get(Materials.Copper), 'X', OrePrefixes.itemCasing.get(Materials.Lead), 'B', ItemList.Battery_Hull_MV }); if (GalacticraftCore.isModLoaded()) GTModHandler.addCraftingRecipe( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemNightvisionGoggles", 1, GTValues.W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemNightvisionGoggles", 1, WILDCARD), bits, new Object[] { "AXA", "RBR", "SdS", 'A', GTModHandler.getModItem(IndustrialCraft2.ID, "reactorHeatSwitchDiamond", 1, 1), 'X', @@ -1207,13 +1207,13 @@ public void run() { if (OpenComputers.isModLoaded()) GTModHandler.addCraftingRecipe( GTModHandler.getModItem(OpenComputers.ID, "wrench", 1, 0), - GTProxy.tBits, + GTModHandler.RecipeBits.BITS_STD, new Object[] { "IwI", "ICI", " I ", 'I', OrePrefixes.ingot.get(Materials.Iron), 'C', GTModHandler.getModItem(OpenComputers.ID, "item", 1, 24) }); if (OpenPrinters.isModLoaded()) GTModHandler.addCraftingRecipe( GTModHandler.getModItem(OpenPrinters.ID, "openprinter.folder", 1L, 0), - GTProxy.tBits, + GTModHandler.RecipeBits.BITS_STD, new Object[] { "PGP", " P ", 'P', new ItemStack(Items.paper, 1, 0), 'G', new ItemStack(Items.slime_ball, 1, 0) }); @@ -1244,7 +1244,7 @@ public void run() { } GTModHandler.addCraftingRecipe( new ItemStack(Items.clay_ball, 3, 0), - GTProxy.tBits, + GTModHandler.RecipeBits.BITS_STD, new Object[] { "CCC", "CBC", "CCC", 'C', OrePrefixes.dustSmall.get(Materials.Clay), 'B', waterBucket }); } @@ -1446,15 +1446,15 @@ public void run() { if (Mods.GraviSuite.isModLoaded()) { GTModHandler.addCraftingRecipe( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1, GTValues.W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1, WILDCARD), bits, new Object[] { "SCS", "MBM", "EWE", 'S', OrePrefixes.itemCasing.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.HV), 'M', ItemList.Electric_Motor_HV, 'B', - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, GTValues.W), 'W', + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorBatpack", 1, WILDCARD), 'W', OrePrefixes.wireGt04.get(Materials.AnnealedCopper), 'E', GTModHandler.getModItem(Mods.GraviSuite.ID, "itemSimpleItem", 1, 6) }); if ((BuildCraftFactory.isModLoaded()) && (AdventureBackpack.isModLoaded())) GTModHandler.addCraftingRecipe( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpack", 1, GTValues.W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpack", 1, WILDCARD), bits, new Object[] { "SXS", "TCT", "EZE", 'S', OrePrefixes.itemCasing.get(Materials.StainlessSteel), 'X', OrePrefixes.circuit.get(Materials.HV), 'T', @@ -1776,14 +1776,14 @@ public void run() { GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0), GTModHandler.RecipeBits.REVERSIBLE, new Object[] { " G ", "GDG", " G ", 'G', new ItemStack(Blocks.glass, 1), 'D', - new ItemStack(Items.dye, 1, GTValues.W) }); + new ItemStack(Items.dye, 1, WILDCARD) }); GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0)); // actual GTModHandler.addCraftingRecipe( GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0), bits4, new Object[] { "GGG", "GDG", "GGG", 'G', new ItemStack(Blocks.glass, 1), 'D', - new ItemStack(Items.dye, 1, GTValues.W) }); + new ItemStack(Items.dye, 1, WILDCARD) }); GTModHandler.addCraftingRecipe( GTModHandler.getModItem(ZTones.ID, "minicharcoal", 7L, 0), bits, diff --git a/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java b/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java index 78de82f139..cf88a90273 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java @@ -16,11 +16,11 @@ import static gregtech.api.enums.Mods.Translocator; import static gregtech.api.enums.Mods.ZTones; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.util.GTModHandler; @@ -257,13 +257,12 @@ public void run() { GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemAdvBat", 1L)); GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemNightvisionGoggles", 1L)); GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1L)); - GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemArmorJetpack", 1L, GTValues.W)); - GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatChargeRE", 1L, GTValues.W)); - GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatChargeAdv", 1L, GTValues.W)); + GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemArmorJetpack", 1L, WILDCARD)); + GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatChargeRE", 1L, WILDCARD)); + GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatChargeAdv", 1L, WILDCARD)); + GTModHandler.removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatChargeCrystal", 1L, WILDCARD)); GTModHandler - .removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatChargeCrystal", 1L, GTValues.W)); - GTModHandler.removeRecipeByOutputDelayed( - getModItem(IndustrialCraft2.ID, "itemBatChargeLamaCrystal", 1L, GTValues.W)); + .removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatChargeLamaCrystal", 1L, WILDCARD)); // Natural Compass GTModHandler .removeRecipeByOutputDelayed(getModItem(NaturesCompass.ID, "NaturesCompass", 1L, 0), true, false, true); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index c54cf3e5b8..a9879bca9b 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -2,8 +2,6 @@ import static bartworks.system.material.WerkstoffLoader.LuVTierMaterial; import static goodgenerator.loader.Loaders.advancedRadiationProtectionPlate; -import static gregtech.api.enums.GTValues.L; -import static gregtech.api.enums.GTValues.W; import static gregtech.api.enums.Mods.AE2FluidCraft; import static gregtech.api.enums.Mods.AE2Stuff; import static gregtech.api.enums.Mods.AdvancedSolarPanel; @@ -59,6 +57,7 @@ import static gregtech.api.enums.Mods.ZTones; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.INGOTS; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; @@ -449,20 +448,20 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorRubBoots", 1L, 0), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoBoots", 1L, W)) + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoBoots", 1L, WILDCARD)) .itemOutputs(NHItemList.NanoRubberBoots.get()).duration(40 * SECONDS).eut(TierEU.RECIPE_EV / 2) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoLegs", 1L, W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoLegs", 1L, WILDCARD), GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.StainlessSteel, 4L)) .itemOutputs(NHItemList.NanoPlatedLeggings.get()).duration(40 * SECONDS).eut(TierEU.RECIPE_EV / 2) .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoHelmet", 1L, W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoHelmet", 1L, WILDCARD), GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorHazmatHelmet", 1L, 0)) .itemOutputs(NHItemList.NanoScubaHelmet.get()).duration(40 * SECONDS).eut(TierEU.RECIPE_EV / 2) .addTo(assemblerRecipes); @@ -473,7 +472,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1L, W), + GTModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1L, WILDCARD), NHItemList.IridiumAlloyItemCasing.get(8)) .itemOutputs(NHItemList.QuantumPartChestplate.get()).duration(60 * SECONDS).eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); @@ -641,7 +640,7 @@ public void run() { // IC2 Charging Batteries GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatREDischarged", 4L, W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatREDischarged", 4L, WILDCARD), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1L), GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1L)) .circuit(1).itemOutputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatChargeRE", 1L, 0)) @@ -650,10 +649,10 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1L, W), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1L, W), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1L, W), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1L, W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1L, WILDCARD), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1L, WILDCARD), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1L, WILDCARD), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemAdvBat", 1L, WILDCARD), GTModHandler.getModItem(IndustrialCraft2.ID, "reactorHeatSwitchSpread", 1L, 1), GTModHandler.getModItem(IndustrialCraft2.ID, "reactorHeatSwitch", 1L, 1), GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.Copper, 1L)) @@ -663,10 +662,10 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, W), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, W), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, W), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, WILDCARD), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, WILDCARD), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, WILDCARD), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, WILDCARD), GTModHandler.getModItem(IndustrialCraft2.ID, "reactorHeatSwitchSpread", 1L, 1), GTModHandler.getModItem(IndustrialCraft2.ID, "reactorHeatSwitchSpread", 1L, 1), GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Gold, 1L)) @@ -676,10 +675,10 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1L, W), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1L, W), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1L, W), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1L, W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1L, WILDCARD), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1L, WILDCARD), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1L, WILDCARD), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1L, WILDCARD), GTModHandler.getModItem(IndustrialCraft2.ID, "reactorHeatSwitchDiamond", 1L, 1), GTModHandler.getModItem(IndustrialCraft2.ID, "reactorHeatSwitchDiamond", 1L, 1), GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.Aluminium, 1L)) @@ -1030,7 +1029,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( NHItemList.CarbonPartHelmet.get(), - GTModHandler.getModItem(IndustrialCraft2.ID, "itemNightvisionGoggles", 1L, W), + GTModHandler.getModItem(IndustrialCraft2.ID, "itemNightvisionGoggles", 1L, WILDCARD), NHItemList.NanoCrystal.get(), GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.EnergeticAlloy, 64L)) .circuit(1).itemOutputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoHelmet", 1)) @@ -1547,7 +1546,7 @@ public void run() { .itemInputs( alveary, GTModHandler.getModItem(Forestry.ID, "thermionicTubes", 4L, 2), - new ItemStack(Blocks.stained_glass, 4, W), + new ItemStack(Blocks.stained_glass, 4, WILDCARD), new ItemStack(Blocks.redstone_lamp, 1, 0)) .itemOutputs(GTModHandler.getModItem(ExtraBees.ID, "alveary", 1L, 3)) .fluidInputs(Materials.Honey.getFluid(7500L)).duration(60 * SECONDS).eut(TierEU.RECIPE_MV) @@ -2991,7 +2990,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 2L), ItemList.Reactor_Coolant_He_1.get(1), ItemList.Electric_Pump_MV.get(1)) - .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(INGOTS * 2)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_MV.get(1)).duration(10 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -3003,7 +3002,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Steel, 2L), ItemList.Reactor_Coolant_NaK_1.get(1), ItemList.Electric_Pump_MV.get(1)) - .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(INGOTS * 2)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_MV.get(1)).duration(10 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); @@ -3017,7 +3016,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.BlackSteel, 2L), ItemList.Reactor_Coolant_He_3.get(1), ItemList.Electric_Pump_HV.get(1)) - .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(INGOTS * 2)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_HV.get(1)).duration(10 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -3029,7 +3028,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.BlackSteel, 2L), ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Electric_Pump_HV.get(1)) - .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(INGOTS * 2)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_HV.get(1)).duration(10 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); @@ -3043,7 +3042,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, 2L), ItemList.Reactor_Coolant_He_6.get(1), ItemList.Electric_Pump_EV.get(1)) - .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(INGOTS * 2)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_EV.get(1)).duration(10 * SECONDS) .eut(TierEU.RECIPE_EV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() @@ -3055,7 +3054,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenSteel, 2L), ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Electric_Pump_EV.get(1)) - .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(INGOTS * 2)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_EV.get(1)).duration(10 * SECONDS) .eut(TierEU.RECIPE_EV).addTo(assemblerRecipes); @@ -3069,7 +3068,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.HSSG, 2L), ItemList.Reactor_Coolant_Sp_3.get(1), ItemList.Electric_Pump_IV.get(1)) - .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(L * 2)) + .circuit(6).fluidInputs(Materials.SolderingAlloy.getMolten(INGOTS * 2)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_IV.get(1)).duration(10 * SECONDS) .eut(TierEU.RECIPE_IV).addTo(assemblerRecipes); @@ -3158,8 +3157,8 @@ public void run() { .addTo(assemblerRecipes); if (IronChests.isModLoaded()) { - for (FluidStack fluid : new FluidStack[] { Materials.SolderingAlloy.getMolten(L / 2), - Materials.Tin.getMolten(L), Materials.Lead.getMolten(L * 2), }) { + for (FluidStack fluid : new FluidStack[] { Materials.SolderingAlloy.getMolten(INGOTS / 2), + Materials.Tin.getMolten(INGOTS), Materials.Lead.getMolten(INGOTS * 2), }) { GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.chest), @@ -5380,7 +5379,7 @@ private void makeForestryRecipes() { GTModHandler.getModItem(Forestry.ID, "frameImpregnated", 1L, 0), GTOreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 2L), GTOreDictUnificator.get(OrePrefixes.slab, Materials.Wood, 2L), - GTModHandler.getModItem(Forestry.ID, "beeCombs", 1L, W), + GTModHandler.getModItem(Forestry.ID, "beeCombs", 1L, WILDCARD), GTModHandler.getModItem(Forestry.ID, "apiculture", 2L, 2), stack.splitStack(2)) .itemOutputs(GTModHandler.getModItem(Forestry.ID, "apiculture", 1L, 0)) @@ -5396,7 +5395,7 @@ private void makeForestryRecipes() { GTModHandler.getModItem(Forestry.ID, "royalJelly", 1L, 0), GTModHandler.getModItem(Forestry.ID, "oakStick", 3L, 0), GTModHandler.getModItem(Forestry.ID, "beeswax", 2L, 0), - GTModHandler.getModItem(Forestry.ID, "pollen", 1L, W)) + GTModHandler.getModItem(Forestry.ID, "pollen", 1L, WILDCARD)) .itemOutputs(GTModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 6)) .fluidInputs(Materials.Honey.getFluid(1000L)).duration(60 * SECONDS).eut(TierEU.RECIPE_MV / 2) .addTo(assemblerRecipes); @@ -5468,7 +5467,7 @@ private void makeForestryRecipes() { alveary, GTModHandler.getModItem(Forestry.ID, "thermionicTubes", 4L, 9), GTModHandler.getModItem(Forestry.ID, "craftingMaterial", 4L, 3), - GTModHandler.getModItem(Forestry.ID, "pollenFertile", 1L, GTValues.W)) + GTModHandler.getModItem(Forestry.ID, "pollenFertile", 1L, WILDCARD)) .itemOutputs(GTModHandler.getModItem(Forestry.ID, "alveary", 1L, 7)) .fluidInputs(Materials.Honey.getFluid(5000L)).duration(60 * SECONDS).eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -6105,7 +6104,7 @@ private void makeOpenComputersRecipes() { GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(OpenPrinters.ID, "openprinter.printerInkBlack", 1L, W), + GTModHandler.getModItem(OpenPrinters.ID, "openprinter.printerInkBlack", 1L, WILDCARD), ItemList.Color_00.get(3L)) .circuit(2).itemOutputs(GTModHandler.getModItem(OpenPrinters.ID, "openprinter.printerInkBlack", 1L, 0)) .fluidInputs(Materials.Water.getFluid(1000L)).duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) @@ -6124,7 +6123,7 @@ private void makeOpenComputersRecipes() { GTValues.RA.stdBuilder() .itemInputs( - GTModHandler.getModItem(OpenPrinters.ID, "openprinter.printerInkColor", 1L, W), + GTModHandler.getModItem(OpenPrinters.ID, "openprinter.printerInkColor", 1L, WILDCARD), ItemList.Color_06.get(1L), ItemList.Color_11.get(1L), ItemList.Color_13.get(1L)) @@ -6390,7 +6389,7 @@ private void makeOpenComputersRecipes() { GTModHandler.getModItem(OpenComputers.ID, "screen3", 2L, 0), GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 10), GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 13)) - .circuit(1).itemOutputs(GTModHandler.getModItem(OpenGlasses.ID, "openglasses", 1L, W)) + .circuit(1).itemOutputs(GTModHandler.getModItem(OpenGlasses.ID, "openglasses", 1L, WILDCARD)) .fluidInputs(Materials.Polyethylene.getMolten(72L)).duration(15 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); @@ -6536,12 +6535,13 @@ private void makeZTonesRecipes() { .circuit(1).itemOutputs(GTModHandler.getModItem(ZTones.ID, "stoneTile", 8L, 0)).duration(8 * SECONDS) .eut(4).addTo(assemblerRecipes); - GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glass, 4), new ItemStack(Items.dye, 1, W)).circuit(1) - .itemOutputs(GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0)).duration(8 * SECONDS).eut(4) - .addTo(assemblerRecipes); + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glass, 4), new ItemStack(Items.dye, 1, WILDCARD)) + .circuit(1).itemOutputs(GTModHandler.getModItem(ZTones.ID, "auroraBlock", 8L, 0)).duration(8 * SECONDS) + .eut(4).addTo(assemblerRecipes); - GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sand, 4, W), new ItemStack(Blocks.dirt, 4, W)) - .circuit(2).itemOutputs(GTModHandler.getModItem(ZTones.ID, "cleanDirt", 8L, 0)) + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.sand, 4, WILDCARD), new ItemStack(Blocks.dirt, 4, WILDCARD)).circuit(2) + .itemOutputs(GTModHandler.getModItem(ZTones.ID, "cleanDirt", 8L, 0)) .fluidInputs(Materials.SeedOil.getFluid(5L)).duration(8 * SECONDS).eut(4).addTo(assemblerRecipes); GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stone_pressure_plate, 1)).circuit(1) @@ -9458,14 +9458,14 @@ private void makeNEIPlanetRecipes() { .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1), GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1)) - .fluidInputs(Materials.Bismuth.getMolten(GTValues.L)) + .fluidInputs(Materials.Bismuth.getMolten(INGOTS)) .itemOutputs(GTModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L)) .duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1), GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1)) - .fluidInputs(Materials.Lead.getMolten(GTValues.L)) + .fluidInputs(Materials.Lead.getMolten(INGOTS)) .itemOutputs(GTModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L)) .duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); } @@ -10048,7 +10048,7 @@ private void makeSolderingAlloyRecipes() { GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 100), GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 4L), ItemList.Electric_Piston_MV.get(2L)) - .circuit(1).itemOutputs(GTModHandler.getModItem(OpenComputers.ID, "hoverBoots", 1L, W)) + .circuit(1).itemOutputs(GTModHandler.getModItem(OpenComputers.ID, "hoverBoots", 1L, WILDCARD)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(17 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV / 2).addTo(assemblerRecipes); @@ -10148,7 +10148,7 @@ private void makeSolderingAlloyRecipes() { GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 33), GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2L), GTModHandler.getModItem(OpenComputers.ID, "item", 1L, 25), - new ItemStack(Items.firework_charge, 1, W)) + new ItemStack(Items.firework_charge, 1, WILDCARD)) .circuit(1).itemOutputs(GTModHandler.getModItem(Computronics.ID, "computronics.ocParts", 1L, 3)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java index 15391724ae..6e9390bf3b 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java @@ -2,7 +2,6 @@ import static bartworks.system.material.WerkstoffLoader.Californium; import static com.dreammaster.scripts.IScriptLoader.missing; -import static gregtech.api.enums.GTValues.L; import static gregtech.api.enums.Mods.AE2FluidCraft; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.Computronics; @@ -139,7 +138,7 @@ public void run() { .fluidInputs( Materials.GrowthMediumSterilized.getFluid(250L), Materials.UUMatter.getFluid(250L), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000)) + FluidRegistry.getFluidStack("ic2coolant", 1000)) .itemOutputs(ItemList.Circuit_Chip_NeuroCPU.get(1L)).eut(TierEU.RECIPE_ZPM).duration(30 * SECONDS) .addTo(AssemblyLine); @@ -157,7 +156,7 @@ public void run() { .fluidInputs( Materials.BioMediumSterilized.getFluid(500L), Materials.UUMatter.getFluid(500L), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000)) + FluidRegistry.getFluidStack("ic2coolant", 2000)) .itemOutputs(ItemList.Circuit_Chip_BioCPU.get(1L)).eut(TierEU.RECIPE_UHV / 2).duration(30 * SECONDS) .addTo(AssemblyLine); @@ -1451,7 +1450,7 @@ public void run() { ItemList.Reactor_Coolant_Sp_3.get(1), ItemList.Reactor_Coolant_Sp_3.get(1), ItemList.Electric_Pump_LuV.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, (int) (L * 4))) + .fluidInputs(new FluidStack(solderIndalloy, INGOTS * 4)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_LuV.get(1)).duration(20 * SECONDS) .eut(TierEU.RECIPE_LuV).addTo(AssemblyLine); @@ -1467,7 +1466,7 @@ public void run() { ItemList.Reactor_Coolant_Sp_6.get(1), ItemList.Reactor_Coolant_Sp_6.get(1), ItemList.Electric_Pump_ZPM.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, (int) (L * 4))) + .fluidInputs(new FluidStack(solderIndalloy, INGOTS * 4)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_ZPM.get(1)).duration(20 * SECONDS) .eut(TierEU.RECIPE_ZPM).addTo(AssemblyLine); @@ -1484,7 +1483,7 @@ public void run() { ItemList.Electric_Pump_UV.get(1)) .fluidInputs( new FluidStack(Materials.SuperCoolant.mFluid, 16000), - new FluidStack(solderIndalloy, (int) (L * 16))) + new FluidStack(solderIndalloy, INGOTS * 16)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UV.get(1)).duration(20 * SECONDS) .eut(TierEU.RECIPE_UV).addTo(AssemblyLine); @@ -1501,7 +1500,7 @@ public void run() { ItemList.Electric_Pump_UHV.get(1)) .fluidInputs( new FluidStack(Materials.SuperCoolant.mFluid, 64000), - new FluidStack(solderIndalloy, (int) (L * 64))) + new FluidStack(solderIndalloy, INGOTS * 64)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UHV.get(1)).duration(20 * SECONDS) .eut(TierEU.RECIPE_UHV).addTo(AssemblyLine); @@ -1518,7 +1517,7 @@ public void run() { ItemList.Electric_Pump_UEV.get(1)) .fluidInputs( new FluidStack(Materials.SuperCoolant.mFluid, 256000), - new FluidStack(solderUEV, (int) (L * 8))) + new FluidStack(solderUEV, INGOTS * 8)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UEV.get(1)).duration(20 * SECONDS) .eut(TierEU.RECIPE_UEV).addTo(AssemblyLine); @@ -1534,8 +1533,8 @@ public void run() { ItemList.Large_Fluid_Cell_Neutronium.get(1), ItemList.Electric_Pump_UIV.get(1)) .fluidInputs( - new FluidStack(Materials.TranscendentMetal.mStandardMoltenFluid, (int) (L * 32)), - new FluidStack(solderUEV, (int) (L * 32))) + new FluidStack(Materials.TranscendentMetal.mStandardMoltenFluid, INGOTS * 32), + new FluidStack(solderUEV, INGOTS * 32)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UIV.get(1)).duration(20 * SECONDS) .eut(TierEU.RECIPE_UIV).addTo(AssemblyLine); @@ -1551,8 +1550,8 @@ public void run() { ItemList.Large_Fluid_Cell_Neutronium.get(1), ItemList.Electric_Pump_UMV.get(1)) .fluidInputs( - new FluidStack(Materials.SpaceTime.mStandardMoltenFluid, (int) (L * 16)), - new FluidStack(solderUEV, (int) (L * 128))) + new FluidStack(Materials.SpaceTime.mStandardMoltenFluid, INGOTS * 16), + new FluidStack(solderUEV, INGOTS * 128)) .itemOutputs(ItemList.Superconducting_Magnet_Solenoid_UMV.get(1)).duration(20 * SECONDS) .eut(TierEU.RECIPE_UMV).addTo(AssemblyLine); } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/BrewingMachineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/BrewingMachineRecipes.java index fc8d445959..ddf440748b 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/BrewingMachineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/BrewingMachineRecipes.java @@ -8,13 +8,12 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; -import java.lang.reflect.Field; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import forestry.api.recipes.IFermenterRecipe; +import forestry.api.recipes.RecipeManagers; import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; @@ -52,44 +51,33 @@ public void run() { // Add fermenter recipes from forestry into gregtech if (Forestry.isModLoaded()) { - try { - Class forestryFermenterRecipeManager = Class.forName("forestry.factory.recipes.FermenterRecipeManager"); - Field fieldFermenterRecipes = forestryFermenterRecipeManager.getDeclaredField("recipes"); - fieldFermenterRecipes.setAccessible(true); - - Iterable recipes = (Iterable) fieldFermenterRecipes.get(null); + for (IFermenterRecipe recipe : RecipeManagers.fermenterManager.recipes()) { + ItemStack resource = recipe.getResource(); - for (IFermenterRecipe recipe : recipes) { - ItemStack resource = recipe.getResource(); + boolean alreadyHasRecipe = brewingRecipes.containsInput(resource); + boolean resultsInBiomass = recipe.getOutput().equals(FluidRegistry.getFluid("biomass")); - boolean alreadyHasRecipe = brewingRecipes.containsInput(resource); - boolean resultsInBiomass = recipe.getOutput().equals(FluidRegistry.getFluid("biomass")); + if (!alreadyHasRecipe && resultsInBiomass) { + int amountIn = recipe.getFermentationValue() * 2; + int amountOut = amountIn; - if (!alreadyHasRecipe && resultsInBiomass) { - int amountIn = recipe.getFermentationValue() * 2; - int amountOut = amountIn; + GTValues.RA.stdBuilder().itemInputs(resource) + .fluidInputs(FluidRegistry.getFluidStack("water", amountIn)) + .fluidOutputs(FluidRegistry.getFluidStack("biomass", amountOut)).duration(8 * amountOut) + .eut(3).addTo(brewingRecipes); - GTValues.RA.stdBuilder().itemInputs(resource) - .fluidInputs(FluidRegistry.getFluidStack("water", amountIn)) - .fluidOutputs(FluidRegistry.getFluidStack("biomass", amountOut)).duration(8 * amountOut) - .eut(3).addTo(brewingRecipes); + amountOut = (int) (amountOut * 1.5); - amountOut = (int) (amountOut * 1.5); + GTValues.RA.stdBuilder().itemInputs(resource) + .fluidInputs(FluidRegistry.getFluidStack("juice", amountIn)) + .fluidOutputs(FluidRegistry.getFluidStack("biomass", amountOut)).duration(8 * amountOut) + .eut(3).addTo(brewingRecipes); - GTValues.RA.stdBuilder().itemInputs(resource) - .fluidInputs(FluidRegistry.getFluidStack("juice", amountIn)) - .fluidOutputs(FluidRegistry.getFluidStack("biomass", amountOut)).duration(8 * amountOut) - .eut(3).addTo(brewingRecipes); + GTValues.RA.stdBuilder().itemInputs(resource).fluidInputs(Materials.Honey.getFluid(amountIn)) + .fluidOutputs(FluidRegistry.getFluidStack("biomass", amountOut)).duration(8 * amountOut) + .eut(3).addTo(brewingRecipes); - GTValues.RA.stdBuilder().itemInputs(resource).fluidInputs(Materials.Honey.getFluid(amountIn)) - .fluidOutputs(FluidRegistry.getFluidStack("biomass", amountOut)).duration(8 * amountOut) - .eut(3).addTo(brewingRecipes); - - } } - - } catch (Exception e) { - e.printStackTrace(); } } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java index 8dd71a460a..615a1688e0 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ChemicalReactorRecipes.java @@ -16,6 +16,7 @@ import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import net.minecraft.init.Blocks; @@ -317,7 +318,7 @@ public void run() { GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(Items.spawn_egg, 1, GTValues.W), + new ItemStack(Items.spawn_egg, 1, WILDCARD), GTModHandler.getModItem(Genetics.ID, "misc", 64L, 4)) .itemOutputs(NHItemList.TheBigEgg.get()) .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 1000)).requiresCleanRoom() diff --git a/src/main/java/com/dreammaster/gthandler/recipes/ExtractorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/ExtractorRecipes.java index 560162a082..a5fa9a9d26 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/ExtractorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/ExtractorRecipes.java @@ -11,6 +11,7 @@ import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -31,7 +32,7 @@ public class ExtractorRecipes implements Runnable { public void run() { if (IndustrialCraft2.isModLoaded()) { GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellHydrant", 1L, GTValues.W)) + .itemInputs(GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellHydrant", 1L, WILDCARD)) .itemOutputs(ItemList.Cell_Empty.get(1L)).duration(5 * SECONDS).eut(2).addTo(extractorRecipes); } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java index 6942cecec7..83e72d6397 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java @@ -16,6 +16,7 @@ import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -165,11 +166,11 @@ public void run() { .outputChances(10000).duration(15 * SECONDS).eut(2).addTo(maceratorRecipes); GTValues.RA.stdBuilder() - .itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "woodPattern", 1L, GTValues.W)) + .itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "woodPattern", 1L, WILDCARD)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)).outputChances(10000) .duration(10 * SECONDS).eut(2).addTo(maceratorRecipes); - GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "Pattern", 1L, GTValues.W)) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "Pattern", 1L, WILDCARD)) .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)).outputChances(10000) .duration(10 * SECONDS).eut(2).addTo(maceratorRecipes); // Oreberries diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index 3ebdcfbbb7..00535ec153 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -712,8 +712,9 @@ public void run() { .addTo(mixerRecipes); GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Clay, 2L)) - .circuit(2).itemOutputs(new ItemStack(Items.clay_ball, 1, 0)).fluidInputs(GTModHandler.getWater(250L)) - .duration(1 * SECONDS + 5 * TICKS).eut(TierEU.RECIPE_ULV).addTo(mixerRecipes); + .circuit(2).itemOutputs(new ItemStack(Items.clay_ball, 1, 0)) + .fluidInputs(Materials.Water.getFluid(250L)).duration(1 * SECONDS + 5 * TICKS).eut(TierEU.RECIPE_ULV) + .addTo(mixerRecipes); GTValues.RA.stdBuilder() .itemInputs( diff --git a/src/main/java/com/dreammaster/gthandler/recipes/RecipeRemoval.java b/src/main/java/com/dreammaster/gthandler/recipes/RecipeRemoval.java index d1909799fd..16503be5d1 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/RecipeRemoval.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/RecipeRemoval.java @@ -2,8 +2,8 @@ import static gregtech.api.enums.Mods.GraviSuite; import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; -import gregtech.api.enums.GTValues; import gregtech.api.util.GTModHandler; public class RecipeRemoval implements Runnable { @@ -12,14 +12,14 @@ public class RecipeRemoval implements Runnable { public void run() { if (IndustrialCraft2.isModLoaded()) { - GTModHandler.removeRecipeByOutput(GTModHandler.getIC2Item("quantumHelmet", 1, GTValues.W)); - GTModHandler.removeRecipeByOutput(GTModHandler.getIC2Item("quantumBodyarmor", 1, GTValues.W)); - GTModHandler.removeRecipeByOutput(GTModHandler.getIC2Item("quantumLeggings", 1, GTValues.W)); - GTModHandler.removeRecipeByOutput(GTModHandler.getIC2Item("quantumBoots", 1, GTValues.W)); + GTModHandler.removeRecipeByOutput(GTModHandler.getIC2Item("quantumHelmet", 1, WILDCARD)); + GTModHandler.removeRecipeByOutput(GTModHandler.getIC2Item("quantumBodyarmor", 1, WILDCARD)); + GTModHandler.removeRecipeByOutput(GTModHandler.getIC2Item("quantumLeggings", 1, WILDCARD)); + GTModHandler.removeRecipeByOutput(GTModHandler.getIC2Item("quantumBoots", 1, WILDCARD)); } if (GraviSuite.isModLoaded()) { - GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(GraviSuite.ID, "graviChestPlate", 1, GTValues.W)); - GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(GraviSuite.ID, "relocator", 1, GTValues.W)); + GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(GraviSuite.ID, "graviChestPlate", 1, WILDCARD)); + GTModHandler.removeRecipeByOutput(GTModHandler.getModItem(GraviSuite.ID, "relocator", 1, WILDCARD)); } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java index 806c0c1657..bc7f29d721 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/VacuumFurnaceRecipes.java @@ -11,7 +11,6 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.common.items.CombType; import gregtech.loaders.misc.GTBees; @@ -42,7 +41,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 64L), MaterialsElements.getInstance().GERMANIUM.getDust(15)) .fluidInputs(new FluidStack(GTPPFluids.SphaleriteFlotationFroth, 4000)) - .fluidOutputs(new FluidStack(GTPPFluids.RedMud, 2000), GTModHandler.getWater(2000)) + .fluidOutputs(new FluidStack(GTPPFluids.RedMud, 2000), Materials.Water.getFluid(2000)) .eut((int) TierEU.RECIPE_LuV).metadata(COIL_HEAT, 5500).duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); @@ -56,7 +55,7 @@ public void run() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cadmium, 50L), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 30L)) .fluidInputs(new FluidStack(GTPPFluids.ChalcopyriteFlotationFroth, 4000)) - .fluidOutputs(new FluidStack(GTPPFluids.RedMud, 2000), GTModHandler.getWater(2000)) + .fluidOutputs(new FluidStack(GTPPFluids.RedMud, 2000), Materials.Water.getFluid(2000)) .eut((int) TierEU.RECIPE_IV).metadata(COIL_HEAT, 4500).duration(2 * MINUTES) .addTo(vacuumFurnaceRecipes); } diff --git a/src/main/java/com/dreammaster/modbabychest/BlockBabyChest.java b/src/main/java/com/dreammaster/modbabychest/BlockBabyChest.java index ed82512510..7b2720da6b 100644 --- a/src/main/java/com/dreammaster/modbabychest/BlockBabyChest.java +++ b/src/main/java/com/dreammaster/modbabychest/BlockBabyChest.java @@ -79,7 +79,6 @@ public boolean onBlockActivated(World pWorld, int pX, int pY, int pZ, EntityPlay return true; } else { if (pWorld.getTileEntity(pX, pY, pZ) instanceof TileEntityBabyChest) { - TileEntityBabyChest tileEntity = (TileEntityBabyChest) pWorld.getTileEntity(pX, pY, pZ); pPlayer.openGui(MainRegistry.instance, GuiHandler.GUI_BABYCHEST, pWorld, pX, pY, pZ); } return true; diff --git a/src/main/java/com/dreammaster/modbabychest/ItemBlockBabyChest.java b/src/main/java/com/dreammaster/modbabychest/ItemBlockBabyChest.java index 09e023a2ce..ff69a91cf6 100644 --- a/src/main/java/com/dreammaster/modbabychest/ItemBlockBabyChest.java +++ b/src/main/java/com/dreammaster/modbabychest/ItemBlockBabyChest.java @@ -25,7 +25,7 @@ public int getMetadata(int meta) { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack pItemStack, EntityPlayer pEntityPlayer, List pList, boolean pFlag) { + public void addInformation(ItemStack pItemStack, EntityPlayer pEntityPlayer, List pList, boolean pFlag) { if (Block.getBlockFromItem(pItemStack.getItem()) != Blocks.air && Block.getBlockFromItem(pItemStack.getItem()) instanceof BlockBabyChest) { pList.add("Aww, so tiny!"); diff --git a/src/main/java/com/dreammaster/modbabychest/RenderBabyChest.java b/src/main/java/com/dreammaster/modbabychest/RenderBabyChest.java index cf09324f49..f8cc7dcf7d 100644 --- a/src/main/java/com/dreammaster/modbabychest/RenderBabyChest.java +++ b/src/main/java/com/dreammaster/modbabychest/RenderBabyChest.java @@ -30,7 +30,6 @@ public void renderTileEntityAt(TileEntity pTileEntity, double pX, double pY, dou .getBlock(tTileEntityBabyChest.xCoord, tTileEntityBabyChest.yCoord, tTileEntityBabyChest.zCoord); if (tBlock instanceof BlockBabyChest) { - BlockBabyChest blockBabyChest = (BlockBabyChest) tBlock; bindTexture(new ResourceLocation("minecraft:textures/entity/chest/normal.png")); } diff --git a/src/main/java/com/dreammaster/modcustomfuels/CustomFuelsHandler.java b/src/main/java/com/dreammaster/modcustomfuels/CustomFuelsHandler.java index 88601937b1..ef59017018 100644 --- a/src/main/java/com/dreammaster/modcustomfuels/CustomFuelsHandler.java +++ b/src/main/java/com/dreammaster/modcustomfuels/CustomFuelsHandler.java @@ -106,8 +106,6 @@ public int getBurnTime(ItemStack pIS) { if (fuelValue != null) return fuelValue; try { - int tReturnValue = 0; - CustomFuels.FuelItem tFI = _mCustomFuels.FindFuelValue(pIS); if (tFI != null) { return tFI.getBurnTime(); diff --git a/src/main/java/com/dreammaster/modfixes/minetweaker/MinetweakerFurnaceFix.java b/src/main/java/com/dreammaster/modfixes/minetweaker/MinetweakerFurnaceFix.java index 23edfdcf41..ab57e88af8 100644 --- a/src/main/java/com/dreammaster/modfixes/minetweaker/MinetweakerFurnaceFix.java +++ b/src/main/java/com/dreammaster/modfixes/minetweaker/MinetweakerFurnaceFix.java @@ -11,6 +11,7 @@ /** * Created by Rio on 4/8/2018. */ +@SuppressWarnings("deprecation") public class MinetweakerFurnaceFix extends ModFixBase { public MinetweakerFurnaceFix() { diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index 32c3009754..5ee3aac9fb 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -155,6 +155,7 @@ private static void flushBuffer() { MainRegistry.LOGGER.info("Removed {} recipes!", i - list.size()); } + @SuppressWarnings("unchecked") private static HashSet getItemsHashed(Object item, boolean includeWildcardVariants) { HashSet hashedItems = new HashSet<>(); if (item instanceof ItemStack stack) { @@ -179,7 +180,6 @@ private static HashSet getItemsHashed(Object item, boolean inc } } } else if (item instanceof ArrayList) { - // noinspection unchecked for (ItemStack stack : (ArrayList) item) { // avoid copying the tag to remove it right after final NBTTagCompound nbt = stack.stackTagCompound; diff --git a/src/main/java/com/dreammaster/recipes/ShapedUniversalRecipe.java b/src/main/java/com/dreammaster/recipes/ShapedUniversalRecipe.java index 374d0c937b..459161c89f 100644 --- a/src/main/java/com/dreammaster/recipes/ShapedUniversalRecipe.java +++ b/src/main/java/com/dreammaster/recipes/ShapedUniversalRecipe.java @@ -130,6 +130,7 @@ public boolean matches(InventoryCrafting inv, World world) { return false; } + @SuppressWarnings("unchecked") private boolean matches(InventoryCrafting inv, int offsetX, int offsetY) { for (int y = 0; y < 3; y++) { for (int x = 0; x < 3; x++) { @@ -142,10 +143,8 @@ private boolean matches(InventoryCrafting inv, int offsetX, int offsetY) { } else if (r instanceof HashSet) { ItemStack copy = stack.copy(); copy.stackTagCompound = null; - // noinspection unchecked if (!((HashSet) r).contains(GTUtility.ItemId.createNoCopy(copy))) { Items.feather.setDamage(copy, wildcard); - // noinspection unchecked if (!((HashSet) r).contains(GTUtility.ItemId.createNoCopy(copy))) return false; } diff --git a/src/main/java/com/dreammaster/recipes/ShapelessUniversalRecipe.java b/src/main/java/com/dreammaster/recipes/ShapelessUniversalRecipe.java index b506585089..6b54fc0a4d 100644 --- a/src/main/java/com/dreammaster/recipes/ShapelessUniversalRecipe.java +++ b/src/main/java/com/dreammaster/recipes/ShapelessUniversalRecipe.java @@ -95,6 +95,7 @@ public ShapelessUniversalRecipe(ItemStack result, Object... recipe) { } } + @SuppressWarnings("unchecked") @Override public boolean matches(InventoryCrafting inv, World world) { ArrayList required = new ArrayList<>(recipe); diff --git a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java index 8d0ae7c873..89ebbd97b4 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java @@ -13,9 +13,7 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -56,7 +54,6 @@ public List getDependencies() { @Override public void loadRecipes() { final ItemStack AE2_INTERFACE = getModItem(AppliedEnergistics2.ID, "tile.BlockInterface", 1); - final ItemStack AE2_PROCESS_ENG = getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24); final ItemStack AE2_STORAGE_BUS = getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 220); final ItemStack AE2_GLASS_CABLE = getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 16); final ItemStack AE2_PROCESS_CAL = getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23); @@ -185,26 +182,21 @@ public void loadRecipes() { RecipeBits.BUFFERED, new Object[] { "dCW", "S-S", "WAh", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', "plateStainlessSteel", 'A', "plateAluminium" }); - for (Map.Entry entry : new HashMap() { - - { - put(CELL_1, COMPONENT_1); - put(CELL_4, COMPONENT_4); - put(CELL_16, COMPONENT_16); - put(CELL_64, COMPONENT_64); - } - }.entrySet()) { + + ItemStack[][] stacksSmallCells = { { CELL_1, COMPONENT_1 }, { CELL_4, COMPONENT_4 }, { CELL_16, COMPONENT_16 }, + { CELL_64, COMPONENT_64 } }; + for (ItemStack[] stacks : stacksSmallCells) { GTModHandler.addCraftingRecipe( - entry.getKey(), + stacks[0], RecipeBits.BUFFERED | RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, new Object[] { "hCW", "SKS", "WAd", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', - "plateStainlessSteel", 'A', "plateAluminium", 'K', entry.getValue() }); + "plateStainlessSteel", 'A', "plateAluminium", 'K', stacks[1] }); GTModHandler.addCraftingRecipe( - entry.getKey(), + stacks[0], RecipeBits.BUFFERED, new Object[] { "dCW", "SKS", "WAh", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', - "plateStainlessSteel", 'A', "plateAluminium", 'K', entry.getValue() }); - addShapelessRecipe(entry.getKey(), AE2FC_FLUID_STORAGE_HOUSING, entry.getValue()); + "plateStainlessSteel", 'A', "plateAluminium", 'K', stacks[1] }); + addShapelessRecipe(stacks[0], AE2FC_FLUID_STORAGE_HOUSING, stacks[1]); } // AE2FC_MULTI_FLUID_STORAGE_HOUSING @@ -218,26 +210,21 @@ public void loadRecipes() { RecipeBits.BUFFERED, new Object[] { "dCW", "S-S", "WAh", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', "plateTungstenSteel", 'A', "plateStainlessSteel" }); - for (Map.Entry entry : new HashMap() { - - { - put(CELL_1M, COMPONENT_1); - put(CELL_4M, COMPONENT_4); - put(CELL_16M, COMPONENT_16); - put(CELL_64M, COMPONENT_64); - } - }.entrySet()) { + + ItemStack[][] stacksSmallMultiCells = { { CELL_1M, COMPONENT_1 }, { CELL_4M, COMPONENT_4 }, + { CELL_16M, COMPONENT_16 }, { CELL_64M, COMPONENT_64 } }; + for (ItemStack[] stacks : stacksSmallMultiCells) { GTModHandler.addCraftingRecipe( - entry.getKey(), + stacks[0], RecipeBits.BUFFERED | RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, new Object[] { "hCW", "SKS", "WAd", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', - "plateTungstenSteel", 'A', "plateStainlessSteel", 'K', entry.getValue() }); + "plateTungstenSteel", 'A', "plateStainlessSteel", 'K', stacks[1] }); GTModHandler.addCraftingRecipe( - entry.getKey(), + stacks[0], RecipeBits.BUFFERED, new Object[] { "dCW", "SKS", "WAh", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', - "plateTungstenSteel", 'A', "plateStainlessSteel", 'K', entry.getValue() }); - addShapelessRecipe(entry.getKey(), AE2FC_MULTI_FLUID_STORAGE_HOUSING, entry.getValue()); + "plateTungstenSteel", 'A', "plateStainlessSteel", 'K', stacks[1] }); + addShapelessRecipe(stacks[0], AE2FC_MULTI_FLUID_STORAGE_HOUSING, stacks[1]); } // AE2FC_ADVANCED_FLUID_STORAGE_HOUSING @@ -251,26 +238,21 @@ public void loadRecipes() { RecipeBits.BUFFERED, new Object[] { "dCW", "S-S", "WAh", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', nitinolPlate, 'A', "plateStainlessSteel" }); - for (Map.Entry entry : new HashMap() { - - { - put(CELL_256, COMPONENT_256); - put(CELL_1024, COMPONENT_1024); - put(CELL_4096, COMPONENT_4096); - put(CELL_16384, COMPONENT_16384); - } - }.entrySet()) { + + ItemStack[][] stacksBigCells = { { CELL_256, COMPONENT_256 }, { CELL_1024, COMPONENT_1024 }, + { CELL_4096, COMPONENT_4096 }, { CELL_16384, COMPONENT_16384 } }; + for (ItemStack[] stacks : stacksBigCells) { GTModHandler.addCraftingRecipe( - entry.getKey(), + stacks[0], RecipeBits.BUFFERED | RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, new Object[] { "hCW", "SKS", "WAd", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', - nitinolPlate, 'A', "plateStainlessSteel", 'K', entry.getValue() }); + nitinolPlate, 'A', "plateStainlessSteel", 'K', stacks[1] }); GTModHandler.addCraftingRecipe( - entry.getKey(), + stacks[0], RecipeBits.BUFFERED, new Object[] { "dCW", "SKS", "WAh", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', - nitinolPlate, 'A', "plateStainlessSteel", 'K', entry.getValue() }); - addShapelessRecipe(entry.getKey(), AE2FC_ADVANCED_FLUID_STORAGE_HOUSING, entry.getValue()); + nitinolPlate, 'A', "plateStainlessSteel", 'K', stacks[1] }); + addShapelessRecipe(stacks[0], AE2FC_ADVANCED_FLUID_STORAGE_HOUSING, stacks[1]); } // AE2FC_ADVANCED_MULTI_FLUID_STORAGE_HOUSING @@ -284,26 +266,21 @@ public void loadRecipes() { RecipeBits.BUFFERED, new Object[] { "dCW", "S-S", "WAh", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', zeronPlate, 'A', "plateTungstenSteel" }); - for (Map.Entry entry : new HashMap() { - - { - put(CELL_256M, COMPONENT_256); - put(CELL_1024M, COMPONENT_1024); - put(CELL_4096M, COMPONENT_4096); - put(CELL_16384M, COMPONENT_16384); - } - }.entrySet()) { + + ItemStack[][] stacksBigMultiCells = { { CELL_256M, COMPONENT_256 }, { CELL_1024M, COMPONENT_1024 }, + { CELL_4096M, COMPONENT_4096 }, { CELL_16384M, COMPONENT_16384 } }; + for (ItemStack[] stacks : stacksBigMultiCells) { GTModHandler.addCraftingRecipe( - entry.getKey(), + stacks[0], RecipeBits.BUFFERED | RecipeBits.DELETE_ALL_OTHER_SHAPED_RECIPES, new Object[] { "hCW", "SKS", "WAd", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', - zeronPlate, 'A', "plateTungstenSteel", 'K', entry.getValue() }); + zeronPlate, 'A', "plateTungstenSteel", 'K', stacks[1] }); GTModHandler.addCraftingRecipe( - entry.getKey(), + stacks[0], RecipeBits.BUFFERED, new Object[] { "dCW", "SKS", "WAh", 'C', "plateCertusQuartz", 'W', "screwCertusQuartz", 'S', - zeronPlate, 'A', "plateTungstenSteel", 'K', entry.getValue() }); - addShapelessRecipe(entry.getKey(), AE2FC_ADVANCED_MULTI_FLUID_STORAGE_HOUSING, entry.getValue()); + zeronPlate, 'A', "plateTungstenSteel", 'K', stacks[1] }); + addShapelessRecipe(stacks[0], AE2FC_ADVANCED_MULTI_FLUID_STORAGE_HOUSING, stacks[1]); } // recursive components for those who want to do this weird stuff diff --git a/src/main/java/com/dreammaster/scripts/ScriptFether.java b/src/main/java/com/dreammaster/scripts/ScriptFether.java new file mode 100644 index 0000000000..8322698ed0 --- /dev/null +++ b/src/main/java/com/dreammaster/scripts/ScriptFether.java @@ -0,0 +1,194 @@ +package com.dreammaster.scripts; + +import static com.dreammaster.oredict.OreDictHelper.removeOreDict; +import static gregtech.api.enums.Mods.Fether; +import static gregtech.api.recipe.RecipeMaps.cutterRecipes; +import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; + +import java.util.Collections; +import java.util.List; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; + +import gregtech.api.enums.GTValues; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeBuilder; + +public class ScriptFether implements IScriptLoader { + + @Override + public String getScriptName() { + return "Fether"; + } + + @Override + public List getDependencies() { + return Collections.singletonList(Fether.ID); + } + + @Override + public void loadRecipes() { + addShapelessRecipe( + getModItem(Fether.ID, "nether_planks", 2, 0, missing), + getModItem(Fether.ID, "nether_log", 1, GTRecipeBuilder.WILDCARD, missing)); + + addShapedRecipe( + getModItem(Fether.ID, "nether_planks", 4, 0, missing), + "craftingToolSaw", + getModItem(Fether.ID, "nether_log", 1, GTRecipeBuilder.WILDCARD, missing), + null); + + addShapedRecipe( + getModItem(Fether.ID, "nether_bed", 1, 0, missing), + getModItem(Fether.ID, "blood_leaf", 1, 0, missing), + getModItem(Fether.ID, "blood_leaf", 1, 0, missing), + getModItem(Fether.ID, "blood_leaf", 1, 0, missing), + getModItem(Fether.ID, "nether_planks", 1, 0, missing), + getModItem(Fether.ID, "nether_planks", 1, 0, missing), + getModItem(Fether.ID, "nether_planks", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + "craftingToolHardHammer", + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing)); + + addShapedRecipe( + getModItem(Fether.ID, "quartz_sword", 1, 0, missing), + null, + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + null, + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + "craftingToolFile", + Items.stick, + "craftingToolHardHammer"); + + addShapedRecipe( + getModItem(Fether.ID, "quartz_shovel", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + "craftingToolFile", + Items.stick, + "craftingToolHardHammer", + null, + Items.stick, + null); + + addShapedRecipe( + getModItem(Fether.ID, "quartz_pickaxe", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + "craftingToolFile", + Items.stick, + "craftingToolHardHammer", + null, + Items.stick, + null); + + addShapedRecipe( + getModItem(Fether.ID, "quartz_axe", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + "craftingToolHardHammer", + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + Items.stick, + null, + "craftingToolFile", + Items.stick, + null); + + addShapedRecipe( + getModItem(Fether.ID, "quartz_hoe", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + "craftingToolHardHammer", + "craftingToolFile", + Items.stick, + null, + null, + Items.stick, + null); + + addShapedRecipe( + getModItem(Fether.ID, "quartz_helmet", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + "craftingToolHardHammer", + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + null, + null, + null); + + addShapedRecipe( + getModItem(Fether.ID, "quartz_chestplate", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + "craftingToolHardHammer", + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing)); + + addShapedRecipe( + getModItem(Fether.ID, "quartz_leggings", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + "craftingToolHardHammer", + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + null, + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L)); + + addShapedRecipe( + getModItem(Fether.ID, "quartz_boots", 1, 0, missing), + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + null, + getModItem(Fether.ID, "quartz_ingot", 1, 0, missing), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + "craftingToolHardHammer", + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + null, + null, + null); + + addShapelessRecipe( + getModItem(Fether.ID, "glow_flower_seeds", 1, 0, missing), + getModItem(Fether.ID, "glow_flower", 1, 0, missing)); + + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stone_slab, 1, 7)) + .itemOutputs(getModItem(Fether.ID, "quartz_ingot", 2, 0, missing)) + .fluidInputs(Materials.Water.getFluid(5)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV / 2) + .addTo(cutterRecipes); + + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stone_slab, 1, 7)) + .itemOutputs(getModItem(Fether.ID, "quartz_ingot", 2, 0, missing)) + .fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 3)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV / 2).addTo(cutterRecipes); + + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stone_slab, 1, 7)) + .itemOutputs(getModItem(Fether.ID, "quartz_ingot", 2, 0, missing)) + .fluidInputs(Materials.Lubricant.getFluid(1)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV / 2) + .addTo(cutterRecipes); + + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stone_slab, 1, 7)) + .itemOutputs(getModItem(Fether.ID, "quartz_ingot", 2, 0, missing)) + .fluidInputs(Materials.DimensionallyShiftedSuperfluid.getFluid(1)).duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV / 2).addTo(cutterRecipes); + + removeOreDict("listAllmeatraw", getModItem(Fether.ID, "flesh_root", 1)); + } +} diff --git a/src/main/java/com/dreammaster/scripts/ScriptHarvestcraftNether.java b/src/main/java/com/dreammaster/scripts/ScriptHarvestcraftNether.java deleted file mode 100644 index abbb30e74f..0000000000 --- a/src/main/java/com/dreammaster/scripts/ScriptHarvestcraftNether.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.dreammaster.scripts; - -import static com.dreammaster.oredict.OreDictHelper.removeOreDict; -import static gregtech.api.enums.Mods.Minecraft; -import static gregtech.api.enums.Mods.PamsHarvestTheNether; -import static gregtech.api.recipe.RecipeMaps.cutterRecipes; -import static gregtech.api.util.GTModHandler.getModItem; -import static gregtech.api.util.GTRecipeBuilder.SECONDS; - -import java.util.Collections; -import java.util.List; - -import net.minecraftforge.fluids.FluidRegistry; - -import gregtech.api.enums.GTValues; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; -import gregtech.api.util.GTOreDictUnificator; - -public class ScriptHarvestcraftNether implements IScriptLoader { - - @Override - public String getScriptName() { - return "Harvestcraft Nether"; - } - - @Override - public List getDependencies() { - return Collections.singletonList(PamsHarvestTheNether.ID); - } - - @Override - public void loadRecipes() { - addShapelessRecipe( - getModItem(PamsHarvestTheNether.ID, "netherPlanks", 2, 0, missing), - getModItem(PamsHarvestTheNether.ID, "netherLog", 1, 0, missing)); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "netherPlanks", 4, 0, missing), - "craftingToolSaw", - getModItem(PamsHarvestTheNether.ID, "netherLog", 1, 0, missing), - null); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "netherbedItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "bloodleafItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "bloodleafItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "bloodleafItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "netherPlanks", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "netherPlanks", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "netherPlanks", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - "craftingToolHardHammer", - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing)); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "Quartz Sword", 1, 0, missing), - null, - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - null, - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 64, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - "craftingToolFile", - getModItem(Minecraft.ID, "stick", 1, 0, missing), - "craftingToolHardHammer"); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "Quartz Shovel", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 64, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - "craftingToolFile", - getModItem(Minecraft.ID, "stick", 1, 0, missing), - "craftingToolHardHammer", - null, - getModItem(Minecraft.ID, "stick", 1, 0, missing), - null); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "Quartz Pickaxe", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - "craftingToolFile", - getModItem(Minecraft.ID, "stick", 1, 0, missing), - "craftingToolHardHammer", - null, - getModItem(Minecraft.ID, "stick", 1, 0, missing), - null); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "Quartz Axe", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - "craftingToolHardHammer", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(Minecraft.ID, "stick", 1, 0, missing), - null, - "craftingToolFile", - getModItem(Minecraft.ID, "stick", 1, 0, missing), - null); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "Quartz Hoe", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - "craftingToolHardHammer", - "craftingToolFile", - getModItem(Minecraft.ID, "stick", 1, 0, missing), - null, - null, - getModItem(Minecraft.ID, "stick", 1, 0, missing), - null); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "quartzhelmItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - "craftingToolHardHammer", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - null, - null, - null); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "quartzchestItem", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - "craftingToolHardHammer", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing)); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "quartzleggingsItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - "craftingToolHardHammer", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - null, - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L)); - addShapedRecipe( - getModItem(PamsHarvestTheNether.ID, "quartzbootsItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - null, - getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - "craftingToolHardHammer", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - null, - null, - null); - addShapelessRecipe( - getModItem(PamsHarvestTheNether.ID, "glowflowerseedItem", 1, 0, missing), - getModItem(PamsHarvestTheNether.ID, "glowFlower", 1, 0, missing)); - - GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "stone_slab", 1, 7, missing)) - .itemOutputs(getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 2, 0, missing)) - .fluidInputs(FluidRegistry.getFluidStack("water", 5)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV / 2) - .addTo(cutterRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "stone_slab", 1, 7, missing)) - .itemOutputs(getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 2, 0, missing)) - .fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 3)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV / 2).addTo(cutterRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "stone_slab", 1, 7, missing)) - .itemOutputs(getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 2, 0, missing)) - .fluidInputs(FluidRegistry.getFluidStack("lubricant", 1)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV / 2).addTo(cutterRecipes); - GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "stone_slab", 1, 7, missing)) - .itemOutputs(getModItem(PamsHarvestTheNether.ID, "quartzingotItem", 2, 0, missing)) - .fluidInputs(Materials.DimensionallyShiftedSuperfluid.getFluid(1)).duration(2 * SECONDS) - .eut(TierEU.RECIPE_LV / 2).addTo(cutterRecipes); - - removeOreDict("listAllmeatraw", getModItem(PamsHarvestTheNether.ID, "fleshrootItem", 1)); - } -} diff --git a/src/main/java/com/dreammaster/scripts/ScriptLoader.java b/src/main/java/com/dreammaster/scripts/ScriptLoader.java index b4a919bac5..ead6c881d3 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptLoader.java +++ b/src/main/java/com/dreammaster/scripts/ScriptLoader.java @@ -77,7 +77,7 @@ public static void run() { new ScriptGregtechPlusPlus(), new ScriptHardcoreEnderExpansion(), new ScriptHarvestcraft(), - new ScriptHarvestcraftNether(), + new ScriptFether(), new ScriptHoloInventory(), new ScriptIguanaTweaks(), new ScriptIndustrialApiary(), diff --git a/src/main/java/com/dreammaster/thaumcraft/TCHelper.java b/src/main/java/com/dreammaster/thaumcraft/TCHelper.java index da6e6d85bb..7a77112881 100644 --- a/src/main/java/com/dreammaster/thaumcraft/TCHelper.java +++ b/src/main/java/com/dreammaster/thaumcraft/TCHelper.java @@ -254,6 +254,7 @@ public static void removeResearch(final String research) { rcl.research.remove(research); } + @SuppressWarnings("unchecked") public static void removeArcaneRecipe(final ItemStack output) { ThaumcraftApi.getCraftingRecipes().removeIf(recipe -> { if (recipe instanceof IArcaneRecipe arcaneRecipe) { @@ -264,6 +265,7 @@ public static void removeArcaneRecipe(final ItemStack output) { }); } + @SuppressWarnings("unchecked") public static void removeCrucibleRecipe(final ItemStack output) { ThaumcraftApi.getCraftingRecipes().removeIf(recipe -> { if (recipe instanceof CrucibleRecipe crucibleRecipe) { @@ -274,6 +276,7 @@ public static void removeCrucibleRecipe(final ItemStack output) { }); } + @SuppressWarnings("unchecked") public static void removeInfusionRecipe(final ItemStack output) { ThaumcraftApi.getCraftingRecipes().removeIf(recipe -> { if (recipe instanceof InfusionRecipe infusionRecipe) { @@ -284,6 +287,7 @@ public static void removeInfusionRecipe(final ItemStack output) { }); } + @SuppressWarnings("unchecked") public static void removeInfusionEnchantmentRecipe(final int effectID) { ThaumcraftApi.getCraftingRecipes().removeIf(recipe -> { if (recipe instanceof InfusionEnchantmentRecipe infusionEnchantmentRecipe) {