diff --git a/src/main/java/gregapi/api/example/Example_Mod.java b/src/main/java/gregapi/api/example/Example_Mod.java index 5427b3431..8fe2e42f9 100644 --- a/src/main/java/gregapi/api/example/Example_Mod.java +++ b/src/main/java/gregapi/api/example/Example_Mod.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -167,7 +167,7 @@ public void onModInit2(cpw.mods.fml.common.event.FMLInitializationEvent aEvent) tExampleRegistry.add("Oven ("+tExamplium.getLocal()+")", "Example Mod", 1, 0, gregapi.tileentity.machines.MultiTileEntityBasicMachine.class, tExamplium.mToolQuality, 16, tMachineBlock, gregapi.util.UT.NBT.make(gregapi.data.CS.NBT_MATERIAL, tExamplium, gregapi.data.CS.NBT_HARDNESS, 6.0F, gregapi.data.CS.NBT_RESISTANCE, 6.0F, gregapi.data.CS.NBT_COLOR, gregapi.util.UT.Code.getRGBInt(tExamplium.fRGBaSolid), gregapi.data.CS.NBT_INPUT, 128, gregapi.data.CS.NBT_TEXTURE, "oven", gregapi.data.CS.NBT_GUI, MOD_ID+":textures/gui/machines/Oven", gregapi.data.CS.NBT_ENERGY_ACCEPTED, gregapi.data.TD.Energy.HU, gregapi.data.CS.NBT_RECIPEMAP, gregapi.data.RM.Furnace, gregapi.data.CS.NBT_EFFICIENCY, 10000, gregapi.data.CS.NBT_INV_SIDE_IN, gregapi.data.CS.SBIT_L, gregapi.data.CS.NBT_INV_SIDE_AUTO_IN, gregapi.data.CS.SIDE_LEFT, gregapi.data.CS.NBT_INV_SIDE_OUT, gregapi.data.CS.SBIT_R, gregapi.data.CS.NBT_INV_SIDE_AUTO_OUT, gregapi.data.CS.SIDE_RIGHT, gregapi.data.CS.NBT_ENERGY_ACCEPTED_SIDES, gregapi.data.CS.SBIT_D), "wMh", "BCB", 'M', gregapi.data.OP.casingMachine.dat(tExamplium), 'B', gregapi.util.ST.make(net.minecraft.init.Blocks.brick_block, 1, gregapi.data.CS.W), 'C', gregapi.data.OP.plateDouble.dat(gregapi.data.ANY.Cu)); // The above just makes a vanilla Furnace that is made of Examplium, you cannot obtain the Examplium right now. For that you will need your own Recipe Handler. - gregapi.recipes.Recipe.RecipeMap tRecipeMap = new gregapi.recipes.Recipe.RecipeMap(null, "example.recipe.exampliumfurnace", "Examplium Furnace", null, 0, 1, MOD_ID+":textures/gui/machines/ExampliumFurnace",/*IN-OUT-MIN-ITEM=*/ 1, 1, 1,/*IN-OUT-MIN-FLUID=*/ 0, 0, 0,/*MIN*/ 0,/*AMP=*/ 1, "", 1, "", true, true, true, true, false, true, true); + gregapi.recipes.Recipe.RecipeMap tRecipeMap = new gregapi.recipes.Recipe.RecipeMap(null, "example.recipe.exampliumfurnace", "Examplium Furnace", null, 0, 1, MOD_ID+":textures/gui/machines/ExampliumFurnace",/*IN-OUT-MIN-ITEM=*/ 1, 1, 1,/*IN-OUT-MIN-FLUID=*/ 0, 0, 0,/*MIN*/ 0,/*AMP=*/ 1, "", 1, "", false, true, true, true, true, false, true, true); // This Recipe will turn an Iron Ingot into an Examplium Ingot at 64 Units per Tick for 128 Ticks. tRecipeMap.addRecipe1(true, 64, 128, gregapi.util.OM.ingot(gregapi.data.MT.Fe ), gregapi.util.OM.ingot(tExamplium)); // This Recipe will turn a Wrought Iron Ingot into an Examplium Ingot at 64 Units per Tick for 96 Ticks. So a slightly cheaper variant diff --git a/src/main/java/gregapi/item/ItemFluidDisplay.java b/src/main/java/gregapi/item/ItemFluidDisplay.java index 2d7d68e53..141db9c25 100644 --- a/src/main/java/gregapi/item/ItemFluidDisplay.java +++ b/src/main/java/gregapi/item/ItemFluidDisplay.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -25,7 +25,10 @@ import gregapi.GT_API; import gregapi.api.Abstract_Mod; import gregapi.config.ConfigCategories; -import gregapi.data.*; +import gregapi.data.FL; +import gregapi.data.LH; +import gregapi.data.MD; +import gregapi.data.OP; import gregapi.fluid.FluidGT; import gregapi.oredict.OreDictMaterial; import gregapi.oredict.OreDictMaterialStack; @@ -165,52 +168,17 @@ public void addInformation(ItemStack aStack, EntityPlayer aPlayer, @SuppressWarn aList.add(LH.Chat.ORANGE + "Industrial Use ONLY!"); aList.add(LH.Chat.RED + "Not Flammable!"); } else { - Collection - tRecipes = FM.Burn.mRecipeFluidMap.get(aName); - if (tRecipes != null && !tRecipes.isEmpty()) { - long tFuelValue = 0; - for (Recipe tRecipe : tRecipes) if (tRecipe.mEnabled && tRecipe.mFluidInputs[0] != null) tFuelValue = Math.max(tFuelValue, (tRecipe.getAbsoluteTotalPower() * U) / tRecipe.mFluidInputs[0].amount); - if (tFuelValue > 0) { - if (tAmount > 1) { - aList.add(LH.Chat.RED + "Burning: " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L; " + LH.Chat.WHITE + UT.Code.makeString((tFuelValue * tAmount) / U) + LH.Chat.YELLOW + " GU total"); - } else { - aList.add(LH.Chat.RED + "Burning: " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L "); - } - } - } - tRecipes = FM.Engine.mRecipeFluidMap.get(aName); - if (tRecipes != null && !tRecipes.isEmpty()) { - long tFuelValue = 0; - for (Recipe tRecipe : tRecipes) if (tRecipe.mEnabled && tRecipe.mFluidInputs[0] != null) tFuelValue = Math.max(tFuelValue, (tRecipe.getAbsoluteTotalPower() * U) / tRecipe.mFluidInputs[0].amount); - if (tFuelValue > 0) { - if (tAmount > 1) { - aList.add(LH.Chat.RED + "Engine: " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L; " + LH.Chat.WHITE + UT.Code.makeString((tFuelValue * tAmount) / U) + LH.Chat.YELLOW + " GU total"); - } else { - aList.add(LH.Chat.RED + "Engine: " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L "); - } - } - } - tRecipes = FM.Gas.mRecipeFluidMap.get(aName); - if (tRecipes != null && !tRecipes.isEmpty()) { - long tFuelValue = 0; - for (Recipe tRecipe : tRecipes) if (tRecipe.mEnabled && tRecipe.mFluidInputs[0] != null) tFuelValue = Math.max(tFuelValue, (tRecipe.getAbsoluteTotalPower() * U) / tRecipe.mFluidInputs[0].amount); - if (tFuelValue > 0) { - if (tAmount > 1) { - aList.add(LH.Chat.RED + "Turbine: " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L; " + LH.Chat.WHITE + UT.Code.makeString((tFuelValue * tAmount) / U) + LH.Chat.YELLOW + " GU total"); - } else { - aList.add(LH.Chat.RED + "Turbine: " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L "); - } - } - } - tRecipes = FM.Hot.mRecipeFluidMap.get(aName); - if (tRecipes != null && !tRecipes.isEmpty()) { - long tFuelValue = 0; - for (Recipe tRecipe : tRecipes) if (tRecipe.mEnabled && tRecipe.mFluidInputs[0] != null) tFuelValue = Math.max(tFuelValue, (tRecipe.getAbsoluteTotalPower() * U) / tRecipe.mFluidInputs[0].amount); - if (tFuelValue > 0) { - if (tAmount > 1) { - aList.add(LH.Chat.RED + "Heat Exchanger: " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L; " + LH.Chat.WHITE + UT.Code.makeString((tFuelValue * tAmount) / U) + LH.Chat.YELLOW + " GU total"); - } else { - aList.add(LH.Chat.RED + "Heat Exchanger: " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L "); + for (Recipe.RecipeMap tMap : Recipe.RecipeMap.FUEL_MAP_LIST) { + Collection tRecipes = tMap.mRecipeFluidMap.get(aName); + if (tRecipes != null && !tRecipes.isEmpty()) { + long tFuelValue = 0; + for (Recipe tRecipe : tRecipes) if (tRecipe.mEnabled && tRecipe.mFluidInputs[0] != null) tFuelValue = Math.max(tFuelValue, (tRecipe.getAbsoluteTotalPower() * U) / tRecipe.mFluidInputs[0].amount); + if (tFuelValue > 0) { + if (tAmount > 1) { + aList.add(LH.Chat.RED + LH.get(tMap.mNameInternal) + ": " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L; " + LH.Chat.WHITE + UT.Code.makeString((tFuelValue * tAmount) / U) + LH.Chat.YELLOW + " GU total"); + } else { + aList.add(LH.Chat.RED + LH.get(tMap.mNameInternal) + ": " + LH.Chat.WHITE + UT.Code.makeString(tFuelValue / U) + LH.Chat.YELLOW + " GU/L "); + } } } } diff --git a/src/main/java/gregapi/recipes/Recipe.java b/src/main/java/gregapi/recipes/Recipe.java index a94957e17..1e3d4c473 100644 --- a/src/main/java/gregapi/recipes/Recipe.java +++ b/src/main/java/gregapi/recipes/Recipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -51,6 +51,8 @@ public static class RecipeMap implements Runnable { public static final Map RECIPE_MAPS = new HashMap<>(); /** List of Recipe Maps in order of their creation. */ public static final List RECIPE_MAP_LIST = new ArrayList<>(); + /** List of Fuel specific Maps in order of their creation. */ + public static final List FUEL_MAP_LIST = new ArrayList<>(); /** List of Recipe Map Handlers. They will dynamically add regular Recipes when needed. */ public final List mRecipeMapHandlers = new ArrayListNoNulls<>(); @@ -99,8 +101,9 @@ public static class RecipeMap implements Runnable { * @param aNEISpecialValueMultiplier the Value the Special Value is getting Multiplied with before displaying * @param aNEISpecialValuePost the String after the Special Value. Usually for a Unit or something. * @param aNEIAllowed if NEI is allowed to display this Recipe Handler in general. + * @param aFuelMap if NEI is allowed to display this Recipe Handler in general. */ - public RecipeMap(Collection aRecipeList, String aNameInternal, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { + public RecipeMap(Collection aRecipeList, String aNameInternal, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aFuelMap, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { mNEIAllowed = aNEIAllowed; mShowVoltageAmperageInNEI = aShowVoltageAmperageInNEI; mNeedsOutputs = aNeedsOutputs; @@ -136,6 +139,7 @@ public RecipeMap(Collection aRecipeList, String aNameInternal, String aN if (RECIPE_MAPS.containsKey(mNameInternal)) throw new IllegalArgumentException("Recipe Map Name already exists: " + mNameInternal); RECIPE_MAPS.put(mNameInternal, this); RECIPE_MAP_LIST.add(this); + if (aFuelMap) FUEL_MAP_LIST.add(this); if (aConfigAllowed) if (GAPI.mBeforePreInit != null) GAPI.mBeforePreInit.add(this); else run(); } @@ -147,6 +151,7 @@ public RecipeMap() { @Override public String toString() {return mNameInternal;} @Override public void run() {mConfigFile = new Config(DirectoriesGT.CONFIG_RECIPES, mNameLocalUnderscored+".cfg");} + @Deprecated public RecipeMap(Collection aRecipeList, String aNameInternal, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) {this(aRecipeList, aNameInternal, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut);} @Deprecated public RecipeMap(Collection aRecipeList, String aNameInternal, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower) {this(aRecipeList, aNameInternal, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, T, T);} @Deprecated public RecipeMap(Collection aRecipeList, String aNameInternal, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs) {this(aRecipeList, aNameInternal, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, F);} @Deprecated public RecipeMap(Collection aRecipeList, String aNameInternal, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs) {this(aRecipeList, aNameInternal, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, 0, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs);} diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapAssembler.java b/src/main/java/gregapi/recipes/maps/RecipeMapAssembler.java index a7920b7c6..33ca7fe06 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapAssembler.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapAssembler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2020 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,10 +19,6 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; - import gregapi.data.IL; import gregapi.random.IHasWorldAndCoords; import gregapi.recipes.Recipe; @@ -31,12 +27,16 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; + +import static gregapi.data.CS.*; + /** * @author Gregorius Techneticies */ public class RecipeMapAssembler extends RecipeMap { public RecipeMapAssembler(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapAutocrafting.java b/src/main/java/gregapi/recipes/maps/RecipeMapAutocrafting.java index fa4e56a04..1259e112b 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapAutocrafting.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapAutocrafting.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -56,7 +56,7 @@ */ public class RecipeMapAutocrafting extends RecipeMap { public RecipeMapAutocrafting(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } public static final List ALLOWED_RECIPES = new ArrayListNoNulls<>(); diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapBath.java b/src/main/java/gregapi/recipes/maps/RecipeMapBath.java index d617a1b54..e7827a3ff 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapBath.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapBath.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -51,7 +51,7 @@ public class RecipeMapBath extends RecipeMap { public static FL[] OILS = {FL.Oil_Seed, FL.Oil_Lin, FL.Oil_Hemp, FL.Oil_Nut, FL.Oil_Olive, FL.Oil_Sunflower, FL.Oil_Creosote}; public RecipeMapBath(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapBumblelyzer.java b/src/main/java/gregapi/recipes/maps/RecipeMapBumblelyzer.java index d78ecb01a..0886deff8 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapBumblelyzer.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapBumblelyzer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,13 +19,9 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; -import gregapi.data.CS.FluidsGT; +import gregapi.data.CS.*; import gregapi.data.FL; import gregapi.data.IL; import gregapi.data.MT; @@ -39,12 +35,16 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; + +import static gregapi.data.CS.*; + /** * @author Gregorius Techneticies */ public class RecipeMapBumblelyzer extends RecipeMap { public RecipeMapBumblelyzer(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapChisel.java b/src/main/java/gregapi/recipes/maps/RecipeMapChisel.java index 87d94cb48..be7f425ec 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapChisel.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapChisel.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,11 +19,6 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; -import java.util.List; - import gregapi.data.OP; import gregapi.data.TD; import gregapi.oredict.OreDictItemData; @@ -36,12 +31,17 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; +import java.util.List; + +import static gregapi.data.CS.*; + /** * @author Gregorius Techneticies */ public class RecipeMapChisel extends RecipeMap { public RecipeMapChisel(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapCrucible.java b/src/main/java/gregapi/recipes/maps/RecipeMapCrucible.java index ad6faf927..085a9844c 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapCrucible.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapCrucible.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapCutter.java b/src/main/java/gregapi/recipes/maps/RecipeMapCutter.java index 0c219b232..696646aa1 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapCutter.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapCutter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2020 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,17 +19,19 @@ package gregapi.recipes.maps; -import java.util.Collection; - import gregapi.recipes.Recipe; import gregapi.recipes.Recipe.RecipeMap; +import java.util.Collection; + +import static gregapi.data.CS.F; + /** * @author Gregorius Techneticies */ public class RecipeMapCutter extends RecipeMap { public RecipeMapCutter(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } /* @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapFluidCanner.java b/src/main/java/gregapi/recipes/maps/RecipeMapFluidCanner.java index 1967d0044..437030eb4 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapFluidCanner.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapFluidCanner.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -41,7 +41,7 @@ */ public class RecipeMapFluidCanner extends RecipeMap { public RecipeMapFluidCanner(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); mMaxFluidInputSize = mMaxFluidOutputSize = 128000; } diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapFormingPress.java b/src/main/java/gregapi/recipes/maps/RecipeMapFormingPress.java index 044f14fc9..9a12602d9 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapFormingPress.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapFormingPress.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2020 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,10 +19,6 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; - import gregapi.data.IL; import gregapi.random.IHasWorldAndCoords; import gregapi.recipes.Recipe; @@ -33,12 +29,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; + +import static gregapi.data.CS.*; + /** * @author Gregorius Techneticies */ public class RecipeMapFormingPress extends RecipeMap { public RecipeMapFormingPress(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapFuel.java b/src/main/java/gregapi/recipes/maps/RecipeMapFuel.java index 6e56218ff..34b7a8c99 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapFuel.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapFuel.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2020 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,10 +19,6 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; - import gregapi.data.FL; import gregapi.recipes.Recipe; import gregapi.recipes.Recipe.RecipeMap; @@ -30,12 +26,16 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; + +import static gregapi.data.CS.T; + /** * @author Gregorius Techneticies */ public class RecipeMapFuel extends RecipeMap { public RecipeMapFuel(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, T, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } public Recipe addFuel(ItemStack aInput, ItemStack aOutput, long aFuelValueInEU) { diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapFurnace.java b/src/main/java/gregapi/recipes/maps/RecipeMapFurnace.java index 0858b3f11..eae17b7c0 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapFurnace.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapFurnace.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapFurnaceFuel.java b/src/main/java/gregapi/recipes/maps/RecipeMapFurnaceFuel.java index 434557010..81e14db86 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapFurnaceFuel.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapFurnaceFuel.java @@ -42,7 +42,7 @@ */ public class RecipeMapFurnaceFuel extends RecipeMap { public RecipeMapFurnaceFuel(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal + " (1 Smelt = 5000 GU)", aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal + " (1 Smelt = 5000 GU)", aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapHammer.java b/src/main/java/gregapi/recipes/maps/RecipeMapHammer.java index ebae5d879..e812e4495 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapHammer.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapHammer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapMicrowave.java b/src/main/java/gregapi/recipes/maps/RecipeMapMicrowave.java index 237615c2e..dfd4b9249 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapMicrowave.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapMicrowave.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapNonGTRecipes.java b/src/main/java/gregapi/recipes/maps/RecipeMapNonGTRecipes.java index c3e5eb900..a16c4ccd8 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapNonGTRecipes.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapNonGTRecipes.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2020 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,10 +19,6 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; - import gregapi.random.IHasWorldAndCoords; import gregapi.recipes.Recipe; import gregapi.recipes.Recipe.RecipeMap; @@ -30,12 +26,16 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; + +import static gregapi.data.CS.F; + /** * @author Gregorius Techneticies */ public abstract class RecipeMapNonGTRecipes extends RecipeMap { public RecipeMapNonGTRecipes(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override public boolean containsInput(ItemStack aStack, IHasWorldAndCoords aTileEntity, ItemStack aSpecialSlot) {return F;} diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapPlantalyzer.java b/src/main/java/gregapi/recipes/maps/RecipeMapPlantalyzer.java index 5242abf69..d78927557 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapPlantalyzer.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapPlantalyzer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,10 +19,6 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import gregapi.data.IL; @@ -35,12 +31,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; + +import static gregapi.data.CS.*; + /** * @author Gregorius Techneticies */ public class RecipeMapPlantalyzer extends RecipeMap { public RecipeMapPlantalyzer(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapPrinter.java b/src/main/java/gregapi/recipes/maps/RecipeMapPrinter.java index 64eee0509..ff7a42f28 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapPrinter.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapPrinter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -48,7 +48,7 @@ */ public class RecipeMapPrinter extends RecipeMap { public RecipeMapPrinter(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapReplicator.java b/src/main/java/gregapi/recipes/maps/RecipeMapReplicator.java index 49c312670..bc65b22f8 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapReplicator.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapReplicator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -46,7 +46,7 @@ */ public class RecipeMapReplicator extends RecipeMap { public RecipeMapReplicator(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); mMaxFluidInputSize = 2000; } diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapScannerMolecular.java b/src/main/java/gregapi/recipes/maps/RecipeMapScannerMolecular.java index defbabec1..5b2017e31 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapScannerMolecular.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapScannerMolecular.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,10 +19,6 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; - import gregapi.data.TD; import gregapi.oredict.OreDictItemData; import gregapi.random.IHasWorldAndCoords; @@ -34,12 +30,16 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; + +import static gregapi.data.CS.*; + /** * @author Gregorius Techneticies */ public class RecipeMapScannerMolecular extends RecipeMap { public RecipeMapScannerMolecular(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapScannerVisuals.java b/src/main/java/gregapi/recipes/maps/RecipeMapScannerVisuals.java index 6790939b8..ad43840f0 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapScannerVisuals.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapScannerVisuals.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -45,7 +45,7 @@ */ public class RecipeMapScannerVisuals extends RecipeMap { public RecipeMapScannerVisuals(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); mMappings.put(Items.flint_and_steel , W, ST.make(Blocks.fire, 1, 0)); mMappings.put(Items.reeds , W, ST.make(Blocks.reeds, 1, 0)); mMappings.put(Items.snowball , W, ST.make(Blocks.snow, 1, 0)); diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapShredder.java b/src/main/java/gregapi/recipes/maps/RecipeMapShredder.java index bdbd54dff..d1d3dde4a 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapShredder.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapShredder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapSpecialSingleInput.java b/src/main/java/gregapi/recipes/maps/RecipeMapSpecialSingleInput.java index f31c57a69..419b2ccdc 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapSpecialSingleInput.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapSpecialSingleInput.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2021 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,23 +19,24 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; -import java.util.List; - import gregapi.random.IHasWorldAndCoords; import gregapi.recipes.Recipe; import gregapi.recipes.Recipe.RecipeMap; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; +import java.util.List; + +import static gregapi.data.CS.F; +import static gregapi.data.CS.GAPI_POST; + /** * @author Gregorius Techneticies */ public abstract class RecipeMapSpecialSingleInput extends RecipeMap { public RecipeMapSpecialSingleInput(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override diff --git a/src/main/java/gregapi/recipes/maps/RecipeMapUnboxinator.java b/src/main/java/gregapi/recipes/maps/RecipeMapUnboxinator.java index 8a44e1ee7..bbc9f029e 100644 --- a/src/main/java/gregapi/recipes/maps/RecipeMapUnboxinator.java +++ b/src/main/java/gregapi/recipes/maps/RecipeMapUnboxinator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2020 GregTech-6 Team + * Copyright (c) 2024 GregTech-6 Team * * This file is part of GregTech. * @@ -19,10 +19,6 @@ package gregapi.recipes.maps; -import static gregapi.data.CS.*; - -import java.util.Collection; - import gregapi.data.IL; import gregapi.random.IHasWorldAndCoords; import gregapi.recipes.Recipe; @@ -32,12 +28,16 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import java.util.Collection; + +import static gregapi.data.CS.*; + /** * @author Gregorius Techneticies */ public class RecipeMapUnboxinator extends RecipeMap { public RecipeMapUnboxinator(Collection aRecipeList, String aUnlocalizedName, String aNameLocal, String aNameNEI, long aProgressBarDirection, long aProgressBarAmount, String aNEIGUIPath, long aInputItemsCount, long aOutputItemsCount, long aMinimalInputItems, long aInputFluidCount, long aOutputFluidCount, long aMinimalInputFluids, long aMinimalInputs, long aPower, String aNEISpecialValuePre, long aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed, boolean aConfigAllowed, boolean aNeedsOutputs, boolean aCombinePower, boolean aUseBucketSizeIn, boolean aUseBucketSizeOut) { - super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); + super(aRecipeList, aUnlocalizedName, aNameLocal, aNameNEI, aProgressBarDirection, aProgressBarAmount, aNEIGUIPath, aInputItemsCount, aOutputItemsCount, aMinimalInputItems, aInputFluidCount, aOutputFluidCount, aMinimalInputFluids, aMinimalInputs, aPower, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, F, aShowVoltageAmperageInNEI, aNEIAllowed, aConfigAllowed, aNeedsOutputs, aCombinePower, aUseBucketSizeIn, aUseBucketSizeOut); } @Override