diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration')
5 files changed, 53 insertions, 74 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 1fd4e17b03..6ad68efbfe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT; import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL; import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; @@ -15,9 +15,9 @@ import gregtech.api.enums.SoundResource; import gregtech.api.enums.TierEU; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; -import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ALLOY; @@ -44,22 +44,22 @@ public class GregtechDehydrator { .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 0), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1)) - .itemOutputs(coilT1).duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemOutputs(coilT1).duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 1), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1)) - .itemOutputs(coilT2).duration(8 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes); + .itemOutputs(coilT2).duration(8 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 2), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1)) - .itemOutputs(coilT3).duration(8 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(coilT3).duration(8 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 3), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1)) - .itemOutputs(coilT4).duration(8 * SECONDS).eut(TierEU.RECIPE_EV / 2).addTo(sAssemblerRecipes); + .itemOutputs(coilT4).duration(8 * SECONDS).eut(TierEU.RECIPE_EV / 2).addTo(assemblerRecipes); // Basic GregtechItemList.GT_Dehydrator_MV.set( @@ -69,19 +69,18 @@ public class GregtechDehydrator { "Basic Dehydrator I", 2, new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', OrePrefixes.wireFine.get(Materials.RedAlloy), 'C', CIRCUIT, 'W', OrePrefixes.cableGt04.get(Materials.Copper), 'G', - OrePrefixes.gearGt.get(Materials.Steel) }).getStackForm(1L)); + OrePrefixes.gearGt.get(Materials.Steel) }).setRecipeCatalystPriority(6) + .getStackForm(1L)); GregtechItemList.GT_Dehydrator_HV.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( @@ -90,19 +89,17 @@ public class GregtechDehydrator { "Basic Dehydrator II", 3, new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', OrePrefixes.wireFine.get(Materials.Electrum), 'C', CIRCUIT, 'W', OrePrefixes.cableGt04.get(Materials.Silver), 'G', ALLOY.POTIN.getGear(1) }) - .getStackForm(1L)); + .setRecipeCatalystPriority(5).getStackForm(1L)); // Chemical GregtechItemList.GT_Dehydrator_EV.set( @@ -113,18 +110,16 @@ public class GregtechDehydrator { 4, new String[] { "A hangover is the way your body reacts to dehydration.", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT1, 'C', CIRCUIT, 'W', OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', ALLOY.TUMBAGA.getGear(1) }) - .getStackForm(1L)); + .setRecipeCatalystPriority(4).getStackForm(1L)); GregtechItemList.GT_Dehydrator_IV.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( @@ -134,18 +129,16 @@ public class GregtechDehydrator { 5, new String[] { "A hangover is the way your body reacts to dehydration.", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT2, 'C', CIRCUIT, 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', ALLOY.INCONEL_690.getGear(1) }) - .getStackForm(1L)); + .setRecipeCatalystPriority(3).getStackForm(1L)); GregtechItemList.GT_Dehydrator_LuV.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( @@ -154,18 +147,16 @@ public class GregtechDehydrator { "Chemical Dehydrator III", 6, new String[] { "You could probably make space icecream with this..", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT3, 'C', CIRCUIT, 'W', OrePrefixes.cableGt04.get(Materials.Naquadah), 'G', ALLOY.HASTELLOY_N.getGear(1) }) - .getStackForm(1L)); + .setRecipeCatalystPriority(2).getStackForm(1L)); GregtechItemList.GT_Dehydrator_ZPM.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( @@ -174,18 +165,16 @@ public class GregtechDehydrator { "Chemical Dehydrator IV", 7, new String[] { "You can definitely make space icecream with this..", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, + GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT4, 'C', CIRCUIT, 'W', OrePrefixes.cableGt04.get(Materials.Osmium), 'G', ALLOY.ZERON_100.getGear(1) }) - .getStackForm(1L)); + .setRecipeCatalystPriority(1).getStackForm(1L)); // Advanced GregtechItemList.Controller_Vacuum_Furnace.set( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index 64a161b227..e631ca0445 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -5,9 +5,9 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; -import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -38,7 +38,7 @@ public class GregtechIndustrialMassFabricator { // Generate Scrap->UUA Recipes // Basic UUA1 - GT_Recipe UUA_From_Scrap = new GTPP_Recipe( + GT_Recipe UUA_From_Scrap = new GT_Recipe( false, new ItemStack[] { CI.getNumberedCircuit(9), ItemUtils.getSimpleStack(getScrapPile(), 9) }, new ItemStack[] { GT_Values.NI }, @@ -50,7 +50,7 @@ public class GregtechIndustrialMassFabricator { 32, 0); // Basic UUA2 - GT_Recipe UUA_From_ScrapBoxes = new GTPP_Recipe( + GT_Recipe UUA_From_ScrapBoxes = new GT_Recipe( false, new ItemStack[] { CI.getNumberedCircuit(19), ItemUtils.getSimpleStack(getScrapBox(), 1) }, new ItemStack[] { GT_Values.NI }, @@ -62,11 +62,11 @@ public class GregtechIndustrialMassFabricator { 32, 0); - GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(UUA_From_Scrap); - GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(UUA_From_ScrapBoxes); + GTPPRecipeMaps.multiblockMassFabricatorRecipes.add(UUA_From_Scrap); + GTPPRecipeMaps.multiblockMassFabricatorRecipes.add(UUA_From_ScrapBoxes); // Basic UUM - GT_Recipe generateUUM_LV = new GTPP_Recipe( + GT_Recipe generateUUM_LV = new GT_Recipe( false, new ItemStack[] { CI.getNumberedCircuit(1) }, new ItemStack[] { GT_Values.NI }, @@ -79,7 +79,7 @@ public class GregtechIndustrialMassFabricator { 0); // Basic UUM - GT_Recipe generateUUMFromUUA_LV = new GTPP_Recipe( + GT_Recipe generateUUMFromUUA_LV = new GT_Recipe( false, new ItemStack[] { CI.getNumberedCircuit(2) }, new ItemStack[] { GT_Values.NI }, @@ -92,8 +92,8 @@ public class GregtechIndustrialMassFabricator { 0); // Advanced UUM - GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add( - new GTPP_Recipe( + GTPPRecipeMaps.multiblockMassFabricatorRecipes.add( + new GT_Recipe( false, new ItemStack[] { CI.getNumberedCircuit(3) }, new ItemStack[] { GT_Values.NI }, @@ -106,8 +106,8 @@ public class GregtechIndustrialMassFabricator { 0)); // Advanced UUM - GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add( - new GTPP_Recipe( + GTPPRecipeMaps.multiblockMassFabricatorRecipes.add( + new GT_Recipe( false, new ItemStack[] { CI.getNumberedCircuit(4) }, new ItemStack[] { GT_Values.NI }, @@ -119,11 +119,11 @@ public class GregtechIndustrialMassFabricator { 65536, 0)); - GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUM_LV); - GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_LV); + GTPPRecipeMaps.multiblockMassFabricatorRecipes.add(generateUUM_LV); + GTPPRecipeMaps.multiblockMassFabricatorRecipes.add(generateUUMFromUUA_LV); Logger.INFO( - "Generated " + GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.mRecipeList.size() + "Generated " + GTPPRecipeMaps.multiblockMassFabricatorRecipes.getAllRecipes().size() + " Matter Fabricator recipes."); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java index b16c4bcb34..2e91eb4bb0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -3,8 +3,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gregtech.api.enums.SoundResource; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; -import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_SpargeTower; @@ -32,13 +32,11 @@ public class GregtechLFTR { "Reactor Processing Unit I", 5, new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes, + GTPPRecipeMaps.reactorProcessingUnitRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "REACTOR_PROCESSING_UNIT", null).getStackForm(1L)); @@ -49,13 +47,11 @@ public class GregtechLFTR { "Reactor Processing Unit II", 7, new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes, + GTPPRecipeMaps.reactorProcessingUnitRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "REACTOR_PROCESSING_UNIT", null).getStackForm(1L)); @@ -67,13 +63,11 @@ public class GregtechLFTR { "Cold Trap I", 5, new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes, + GTPPRecipeMaps.coldTrapRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "COLD_TRAP", null).getStackForm(1L)); @@ -84,13 +78,11 @@ public class GregtechLFTR { "Cold Trap II", 7, new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes, + GTPPRecipeMaps.coldTrapRecipes, 2, 9, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "COLD_TRAP", null).getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index 308b721d61..5ae416953f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -13,9 +13,10 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SoundResource; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; -import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; import gtPlusPlus.api.objects.data.Quad; +import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -81,37 +82,34 @@ public class GregtechSimpleWasher { 0, new String[] { "It's like an automatic Cauldron for washing dusts.", "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes, + GTPPRecipeMaps.simpleWasherRecipes, 1, 1, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "SIMPLE_WASHER", - null).getStackForm(1L)); + null).setRecipeCatalystPriority(-11).getStackForm(1L)); for (int i = 0; i < washers.size(); i++) { Quad<GregtechItemList, Integer, String, String> washer = washers.get(i); + int tier = i + 1; washer.getKey().set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( washer.getValue_1(), washer.getValue_2(), washer.getValue_3(), - i + 1, + tier, new String[] { "It's like an automatic Cauldron for washing dusts.", CORE.GT_Tooltip.get() }, - GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes, + GTPPRecipeMaps.simpleWasherRecipes, 1, 1, true, SoundResource.NONE, - false, - false, SpecialEffects.NONE, "SIMPLE_WASHER", - null).getStackForm(1L)); + null).setRecipeCatalystPriority(-tier).getStackForm(1L)); } } } @@ -144,11 +142,11 @@ public class GregtechSimpleWasher { addSimpleWashRecipe(dustPure, dustClean); } - return GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList.size() > mRecipeCount; + return GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes().size() > mRecipeCount; } private static boolean generateDirtyCrushedRecipes() { - int mRecipeCount = GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList.size(); + int mRecipeCount = GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes().size(); // Generate Recipe Map for the Dust Washer. ItemStack crushedClean; ItemStack crushedDirty; @@ -164,12 +162,12 @@ public class GregtechSimpleWasher { addSimpleWashRecipe(crushedDirty, crushedClean); } - return GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.mRecipeList.size() > mRecipeCount; + return GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes().size() > mRecipeCount; } private static void addSimpleWashRecipe(ItemStack aInput, ItemStack aOutput) { if (aInput != null && aOutput != null) { - GTPP_Recipe aRecipe = new GTPP_Recipe( + GT_Recipe aRecipe = new GT_Recipe( false, new ItemStack[] { aInput }, new ItemStack[] { aOutput }, @@ -180,7 +178,7 @@ public class GregtechSimpleWasher { 5, 8, 0); - GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes.addRecipe(aRecipe); + GTPPRecipeMaps.simpleWasherRecipes.addRecipe(aRecipe); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java index e9661befd4..5e4a367ebc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java @@ -2,8 +2,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_SolarTower; @@ -31,7 +31,7 @@ public class GregtechSolarTower { 0).getStackForm(1L)); // NEI recipe - GTPP_Recipe.GTPP_Recipe_Map.sSolarTowerRecipes.addRecipe( + GTPPRecipeMaps.solarTowerRecipes.addRecipe( false, null, null, |