diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
12 files changed, 282 insertions, 279 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java index 3ab2c613a2..3dd3c88dc4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java @@ -11,6 +11,6 @@ public class Gregtech_Blocks { //Casing Blocks ModBlocks.blockCasingsMisc = new GregtechMetaCasingBlocks(); ModBlocks.blockCasings2Misc = new GregtechMetaCasingBlocks2(); - + } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java index 7928907db1..190cf416f3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java @@ -12,78 +12,79 @@ import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; import net.minecraft.item.ItemStack; public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrator, Runnable { - public ProcessingToolHeadChoocher() { - GregtechOrePrefixes.toolSkookumChoocher.add(this); - } + public ProcessingToolHeadChoocher() { + GregtechOrePrefixes.toolSkookumChoocher.add(this); + } - @Override - public void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { - if (aMaterial != Materials.Rubber) - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) { - GT_ModHandler.addCraftingRecipe(MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(16, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"IhI", "III", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial)}); - } - } - } + @Override + public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) { + if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { + if (aMaterial != Materials.Rubber) { + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) { + GT_ModHandler.addCraftingRecipe(MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(16, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"IhI", "III", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial)}); + } + } + } + } @Override - public void registerOre(GregtechOrePrefixes aPrefix, - GT_Materials aMaterial, String aOreDictName, String aModName, - ItemStack aStack) { + public void registerOre(final GregtechOrePrefixes aPrefix, + final GT_Materials aMaterial, final String aOreDictName, final String aModName, + final ItemStack aStack) { // TODO Auto-generated method stub - + } - + public void materialsLoops(){ - Materials[] i = Materials.values(); - int size = i.length; + final Materials[] i = Materials.values(); + final int size = i.length; Utils.LOG_WARNING("Materials to attempt tool gen. with: "+size); int used = 0; Materials aMaterial = null; for (int r=0;r<size;r++){ - aMaterial = i[r]; - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))&& (!aMaterial.contains(SubTag.TRANSPARENT))&& (!aMaterial.contains(SubTag.FLAMMABLE))&& (!aMaterial.contains(SubTag.MAGICAL))&& (!aMaterial.contains(SubTag.NO_SMELTING))) { - Utils.LOG_WARNING("Found "+aMaterial.name()+" as a valid Skookum Choocher Material."); - //Input 1 - ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); - ItemStack ingot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L); - ItemStack screw = GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L); - ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L); - ItemStack hammerhead = GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L); - - if (null != plate && null != ingot && null != hammerhead && null != longrod && null != screw){ - RecipeUtils.recipeBuilder( - hammerhead, ToolDictNames.craftingToolScrewdriver.name(), plate, - ingot, plate, plate, - longrod, screw, null, - MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER, 1, aMaterial, null, null)); - used++; - } - else { - Utils.LOG_WARNING(""+aMaterial.name()+" could not be used for all input compoenents. [3x"+aMaterial.name()+" plates, 2x"+aMaterial.name()+" ingots, 1x"+aMaterial.name()+" Hard Hammer Head."); - } - //GT_ModHandler.addCraftingRecipe(, GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); - } - else { - Utils.LOG_WARNING(""+aMaterial.name()+" was not a valid Skookum Choocher Material."); + aMaterial = i[r]; + if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))&& (!aMaterial.contains(SubTag.TRANSPARENT))&& (!aMaterial.contains(SubTag.FLAMMABLE))&& (!aMaterial.contains(SubTag.MAGICAL))&& (!aMaterial.contains(SubTag.NO_SMELTING))) { + Utils.LOG_WARNING("Found "+aMaterial.name()+" as a valid Skookum Choocher Material."); + //Input 1 + final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); + final ItemStack ingot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L); + final ItemStack screw = GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L); + final ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L); + final ItemStack hammerhead = GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L); + + if ((null != plate) && (null != ingot) && (null != hammerhead) && (null != longrod) && (null != screw)){ + RecipeUtils.recipeBuilder( + hammerhead, ToolDictNames.craftingToolScrewdriver.name(), plate, + ingot, plate, plate, + longrod, screw, null, + MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER, 1, aMaterial, null, null)); + used++; + } + else { + Utils.LOG_WARNING(""+aMaterial.name()+" could not be used for all input compoenents. [3x"+aMaterial.name()+" plates, 2x"+aMaterial.name()+" ingots, 1x"+aMaterial.name()+" Hard Hammer Head."); + } + //GT_ModHandler.addCraftingRecipe(, GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); + } + else { + Utils.LOG_WARNING(""+aMaterial.name()+" was not a valid Skookum Choocher Material."); } - } + } else { - Utils.LOG_WARNING(""+aMaterial.name()+" was not a valid Skookum Choocher Material."); + Utils.LOG_WARNING(""+aMaterial.name()+" was not a valid Skookum Choocher Material."); } - - + + } - + Utils.LOG_INFO("Materials used for tool gen: "+used); } @Override public void run() { Utils.LOG_INFO("Generating Skookum Choochers of all GT Materials."); - materialsLoops(); + this.materialsLoops(); } - - + + }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java index 41e0511ace..845fb6db68 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java @@ -3,8 +3,8 @@ package gtPlusPlus.xmod.gregtech.loaders; import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures.ItemIcons.CustomIcon; public class Processing_Textures_Items { - + public static final CustomIcon itemSkookumChoocher = new CustomIcon("iconsets/SKOOKUMCHOOCHER"); - + } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java index d2bee058e1..f43aae74b6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java @@ -7,36 +7,36 @@ import gtPlusPlus.core.material.Material; public class RecipeGen_AlloySmelter implements Runnable{ final Material toGenerate; - + public RecipeGen_AlloySmelter(final Material M){ this.toGenerate = M; } - + @Override public void run() { - generateRecipes(toGenerate); + generateRecipes(this.toGenerate); } - + public static void generateRecipes(final Material material){ final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; - + //Nuggets GT_Values.RA.addAlloySmelterRecipe( material.getIngot(1), ItemList.Shape_Mold_Nugget.get(1), material.getNugget(9), (int) Math.max(material.getMass() * 2L, 1L), - 2 * tVoltageMultiplier); - + 2 * tVoltageMultiplier); + //Gears GT_Values.RA.addAlloySmelterRecipe( material.getIngot(8), ItemList.Shape_Mold_Gear.get(1), material.getGear(1), (int) Math.max(material.getMass() * 2L, 1L), - 2 * tVoltageMultiplier); - - } - + 2 * tVoltageMultiplier); + + } + } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java index dc22912f0a..6279a28d5c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java @@ -9,37 +9,37 @@ import net.minecraft.item.ItemStack; public class RecipeGen_Assembler implements Runnable{ final Material toGenerate; - + public RecipeGen_Assembler(final Material M){ this.toGenerate = M; } - + @Override public void run() { - generateRecipes(toGenerate); + generateRecipes(this.toGenerate); } - + public static void generateRecipes(final Material material){ - + //Frame Box GT_Values.RA.addAssemblerRecipe( material.getRod(4), ItemUtils.getGregtechCircuit(4), - material.getBlock(1), + material.getFrameBox(1), 60, - 8); - + 8); + //Rotor addAssemblerRecipe( material.getPlate(4), material.getRing(1), material.getRotor(1), 240, - 24); - + 24); + } - - private static void addAssemblerRecipe(ItemStack input1, ItemStack input2, ItemStack output1, int seconds, int euCost){ + + private static void addAssemblerRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1, final int seconds, final int euCost){ GT_Values.RA.addAssemblerRecipe( input1, input2, @@ -61,8 +61,8 @@ public class RecipeGen_Assembler implements Runnable{ output1, seconds, euCost); - } - - + } + + } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index c84989e950..efc5c10551 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.loaders; +import java.util.ArrayList; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gtPlusPlus.core.lib.CORE; @@ -8,39 +10,36 @@ import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; - -import java.util.ArrayList; - import net.minecraft.item.ItemStack; public class RecipeGen_BlastSmelter implements Runnable{ final Material toGenerate; - + public RecipeGen_BlastSmelter(final Material M){ this.toGenerate = M; } - + @Override public void run() { - generateARecipe(toGenerate); + generateARecipe(this.toGenerate); } public static void generateARecipe(final Material M){ - //Add a Blast Smelting Recipe, Let's go! + //Add a Blast Smelting Recipe, Let's go! ItemStack tStack; if (null != (tStack = M.getDust(1))) { - - Material[] badMaterials = { - FLUORIDES.THORIUM_HEXAFLUORIDE, - FLUORIDES.THORIUM_TETRAFLUORIDE, - ALLOY.BLOODSTEEL, - //ALLOY.BEDROCKIUM, - NUCLIDE.LiFBeF2ThF4UF4, - NUCLIDE.LiFBeF2ZrF4U235 + + final Material[] badMaterials = { + FLUORIDES.THORIUM_HEXAFLUORIDE, + FLUORIDES.THORIUM_TETRAFLUORIDE, + ALLOY.BLOODSTEEL, + //ALLOY.BEDROCKIUM, + NUCLIDE.LiFBeF2ThF4UF4, + NUCLIDE.LiFBeF2ZrF4U235 }; - for (Material R : badMaterials){ + for (final Material R : badMaterials){ if (M == R){ return; } @@ -48,12 +47,12 @@ public class RecipeGen_BlastSmelter implements Runnable{ //Prepare some Variables ItemStack[] components; - ArrayList<MaterialStack> tMaterial = new ArrayList<MaterialStack>(); + ArrayList<MaterialStack> tMaterial = new ArrayList<>(); short counter=0; int inputStackCount=0; int fluidAmount=0; - boolean doTest = true; - tMaterial = M.getComposites(); + final boolean doTest = true; + tMaterial = M.getComposites(); //This Bad boy here is what dictates unique recipes. Fuck life, right? ItemStack circuitGT = ItemUtils.getGregtechCircuit(0); @@ -65,36 +64,38 @@ public class RecipeGen_BlastSmelter implements Runnable{ duration = (int) Math.max(M.getMass() / 50L, 1L) * M.getMeltingPointK(); } else { - duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; + duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; } int mMaterialListSize=0; if (M.getComposites() != null){ - for (gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()){ - if (ternkfsdf != null) - mMaterialListSize++; + for (final gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()){ + if (ternkfsdf != null) { + mMaterialListSize++; + } } } else { - mMaterialListSize = 1; - } + mMaterialListSize = 1; + } Utils.LOG_WARNING("Size: "+mMaterialListSize); - //Make a simple one Material Materialstack[] and log it for validity. + //Make a simple one Material Materialstack[] and log it for validity. circuitGT = ItemUtils.getGregtechCircuit(1); - ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, tStack}; + final ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, tStack}; inputStackCount = 1; fluidAmount = 144*inputStackCount; Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+". Gives "+fluidAmount+"L of molten metal."); for (int das=0;das<tItemStackTest.length;das++){ - if (tItemStackTest[das] != null) + if (tItemStackTest[das] != null) { Utils.LOG_WARNING("tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize); + } } - - boolean hasMoreInputThanACircuit = (tItemStackTest.length > 1); + + final boolean hasMoreInputThanACircuit = (tItemStackTest.length > 1); //Generate Recipes for all singular materials that can be made molten. if (hasMoreInputThanACircuit){ @@ -130,12 +131,12 @@ public class RecipeGen_BlastSmelter implements Runnable{ if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration/2, 60)){ Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); } - ItemStack tempitem = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1); + final ItemStack tempitem = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1); if (tempitem != null){ if (GT_Values.RA.addFluidExtractionRecipe(tempitem, null, M.getFluid(16), 100, duration/2/9, 60)){ Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); } - } + } if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/2/4, 60)){ Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); } @@ -143,11 +144,11 @@ public class RecipeGen_BlastSmelter implements Runnable{ Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe."); } } - } + } else { Utils.LOG_WARNING("Failed."); - } - } + } + } if (tMaterial != null){ //Reset the Variables for compounds if last recipe was a success. @@ -158,21 +159,21 @@ public class RecipeGen_BlastSmelter implements Runnable{ //If this Material has some kind of compound list, proceed if (mMaterialListSize > 1){ - gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize]; + final gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize]; circuitGT = ItemUtils.getGregtechCircuit(mMaterialListSize); //Just double checking if (tempStack.length > 1){ //Builds me a MaterialStack[] from the MaterialList of M. int ooo=0; - for (gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()){ + for (final gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()){ if (xMaterial != null){ if (xMaterial.getStackMaterial() != null){ Utils.LOG_WARNING("FOUND: "+xMaterial.getStackMaterial().getLocalizedName()); - Utils.LOG_WARNING("ADDING: "+xMaterial.getStackMaterial().getLocalizedName()); - } - tempStack[ooo] = xMaterial; - } + Utils.LOG_WARNING("ADDING: "+xMaterial.getStackMaterial().getLocalizedName()); + } + tempStack[ooo] = xMaterial; + } ooo++; } @@ -181,25 +182,25 @@ public class RecipeGen_BlastSmelter implements Runnable{ inputStackCount=0; for (int irc=0;irc<M.getComposites().size();irc++){ if (M.getComposites().get(irc) != null){ - int r = (int) M.vSmallestRatio[irc]; + final int r = (int) M.vSmallestRatio[irc]; inputStackCount = inputStackCount+r; components[irc] = M.getComposites().get(irc).getDustStack(r); - } + } } //Adds a circuit - if (mMaterialListSize < 9 && mMaterialListSize != 0){ - ItemStack[] components_NoCircuit = components; + if ((mMaterialListSize < 9) && (mMaterialListSize != 0)){ + final ItemStack[] components_NoCircuit = components; //Builds me an ItemStack[] of the materials. - With a circuit components = new ItemStack[components_NoCircuit.length+1]; - for (int fr=0;fr<components.length;fr++){ + for (int fr=0;fr<components.length;fr++){ if (fr==0){ components[0] = circuitGT; } else { components[fr] = components_NoCircuit[fr-1]; - } + } } Utils.LOG_WARNING("Should have added a circuit. mMaterialListSize: "+mMaterialListSize+" | circuit: "+components[0].getDisplayName()); } @@ -213,8 +214,9 @@ public class RecipeGen_BlastSmelter implements Runnable{ Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal."); Utils.LOG_WARNING("tMaterial.length: "+components.length+"."); for (int das=0;das<components.length;das++){ - if (components[das] != null) + if (components[das] != null) { Utils.LOG_WARNING("tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize); + } } //Adds Recipe @@ -229,10 +231,10 @@ public class RecipeGen_BlastSmelter implements Runnable{ else { if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 240)){ Utils.LOG_WARNING("Success."); - } + } else { Utils.LOG_WARNING("Failed."); - } + } } } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java index e5262ac645..38f4f5c808 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java @@ -6,8 +6,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; -import gtPlusPlus.core.util.materials.MaterialUtils; -import gtPlusPlus.core.util.math.MathUtils; import net.minecraft.item.ItemStack; public class RecipeGen_BlastSmelterGT implements Runnable{ @@ -18,17 +16,17 @@ public class RecipeGen_BlastSmelterGT implements Runnable{ @Override public void run() { - generateRecipes(); + generateRecipes(); } public static void generateRecipes(){ - Materials[] GregMaterials = Materials.values(); + final Materials[] GregMaterials = Materials.values(); - GT: for (Materials M : GregMaterials){ + GT: for (final Materials M : GregMaterials){ if (!M.equals(Materials._NULL)){ - //Add a Blast Smelting Recipe, Let's go! + //Add a Blast Smelting Recipe, Let's go! ItemStack tStack; if ((null != (tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, M.mSmeltInto, 1L))) && (!M.contains(SubTag.NO_SMELTING) && (M.contains(SubTag.METAL)))) { @@ -50,25 +48,26 @@ public class RecipeGen_BlastSmelterGT implements Runnable{ duration = (int) Math.max(M.getMass() / 50L, 1L) * M.mBlastFurnaceTemp; } else { - duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; + duration = (int) Math.max(M.getMass() / 50L, 1L) * 150; } - + //Sets the materials 'tier'. Will probably replace this logic. - int x = M.mMeltingPoint; - int vVoltageMultiplier = (x <= 800 ? 8 : (x <= 1600 ? 16 : (x <= 2800 ? 32 : (x <= 3600 ? 64 : (x <= 4200 ? 128 : (x <= 5400 ? 256 : (x <= 7200 ? 512 : 1024))))))); + final int x = M.mMeltingPoint; + final int vVoltageMultiplier = (x <= 800 ? 8 : (x <= 1600 ? 16 : (x <= 2800 ? 32 : (x <= 3600 ? 64 : (x <= 4200 ? 128 : (x <= 5400 ? 256 : (x <= 7200 ? 512 : 1024))))))); //Make a simple one Material Materialstack[] and log it for validity. - tMaterial = new MaterialStack[]{new MaterialStack(M, 1)}; + tMaterial = new MaterialStack[]{new MaterialStack(M, 1)}; circuitGT = ItemUtils.getGregtechCircuit(1); - ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, ItemUtils.getGregtechDust(M, 1)}; + final ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, ItemUtils.getGregtechDust(M, 1)}; inputStackCount = 1; fluidAmount = 144*inputStackCount; Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M+". Gives "+fluidAmount+"L of molten metal."); Utils.LOG_WARNING("tMaterial.length: "+tMaterial.length+"."); for (int das=0;das<tItemStackTest.length;das++){ - if (tItemStackTest[das] != null) + if (tItemStackTest[das] != null) { Utils.LOG_WARNING("tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize); + } } //Generate Recipes for all singular materials that can be made molten. @@ -76,15 +75,15 @@ public class RecipeGen_BlastSmelterGT implements Runnable{ doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration, 8*vVoltageMultiplier); } else { - doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration/2, 4*vVoltageMultiplier); + doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration/2, 4*vVoltageMultiplier); } - - for (MaterialStack xMaterial : M.mMaterialList){ - if (xMaterial.mMaterial == Materials.Magic || xMaterial.mMaterial == Materials.Metal){ - continue GT; + + for (final MaterialStack xMaterial : M.mMaterialList){ + if ((xMaterial.mMaterial == Materials.Magic) || (xMaterial.mMaterial == Materials.Metal)){ + continue GT; } if (null == GT_OreDictUnificator.get(OrePrefixes.dust, xMaterial, 1L)){ - continue GT; + continue GT; } } @@ -95,20 +94,20 @@ public class RecipeGen_BlastSmelterGT implements Runnable{ int mMaterialListSize=0; - for (MaterialStack ternkfsdf:M.mMaterialList){ + for (final MaterialStack ternkfsdf:M.mMaterialList){ mMaterialListSize++; } Utils.LOG_WARNING("Size: "+mMaterialListSize); //If this Material has some kind of compound list, proceed if (mMaterialListSize > 1){ - MaterialStack[] tempStack = new MaterialStack[mMaterialListSize]; + final MaterialStack[] tempStack = new MaterialStack[mMaterialListSize]; circuitGT = ItemUtils.getGregtechCircuit(mMaterialListSize); //Just double checking if (tempStack.length > 1){ //Builds me a MaterialStack[] from the MaterialList of M. int ooo=0; - for (MaterialStack xMaterial : M.mMaterialList){ + for (final MaterialStack xMaterial : M.mMaterialList){ Utils.LOG_WARNING("FOUND: "+xMaterial.mMaterial); Utils.LOG_WARNING("ADDING: "+xMaterial.mMaterial); tempStack[ooo] = M.mMaterialList.get(ooo); @@ -117,31 +116,31 @@ public class RecipeGen_BlastSmelterGT implements Runnable{ //Builds me an ItemStack[] of the materials. - Without a circuit - this gets a good count for the 144L fluid multiplier components = new ItemStack[tempStack.length]; - for (MaterialStack aOutputPart : tempStack){ + for (final MaterialStack aOutputPart : tempStack){ if (aOutputPart != null){ Utils.LOG_WARNING("Finding dust: "+aOutputPart.mMaterial); - ItemStack rStack = ItemUtils.getGregtechDust(aOutputPart.mMaterial, (int) aOutputPart.mAmount); + final ItemStack rStack = ItemUtils.getGregtechDust(aOutputPart.mMaterial, (int) aOutputPart.mAmount); if (rStack != null){ Utils.LOG_WARNING("Found dust: "+aOutputPart.mMaterial); components[counter] = rStack; inputStackCount = inputStackCount+rStack.stackSize; } - } - counter++; + } + counter++; } - if (mMaterialListSize > 0 && mMaterialListSize < 9){ - ItemStack[] components_NoCircuit = components; + if ((mMaterialListSize > 0) && (mMaterialListSize < 9)){ + final ItemStack[] components_NoCircuit = components; //Builds me an ItemStack[] of the materials. - With a circuit components = new ItemStack[components_NoCircuit.length+1]; - for (int fr=0;fr<components.length;fr++){ + for (int fr=0;fr<components.length;fr++){ if (fr==0){ components[0] = circuitGT; } else { components[fr] = components_NoCircuit[fr-1]; - } + } } } @@ -159,22 +158,23 @@ public class RecipeGen_BlastSmelterGT implements Runnable{ Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal."); Utils.LOG_WARNING("tMaterial.length: "+components.length+"."); for (int das=0;das<components.length;das++){ - if (components[das] != null) + if (components[das] != null) { Utils.LOG_WARNING("tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize); + } } - + CORE.RA.addBlastSmelterRecipe( components, M.getMolten(fluidAmount), 100, (int) Math.max(M.getMass() * 2L * 1, 1), 8 * vVoltageMultiplier); // EU Cost - + /*if (M.mBlastFurnaceRequired) { - CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 500); + CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 500); } else { - CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 240); + CORE.RA.addBlastSmelterRecipe(components, M.getMolten(fluidAmount), 100, duration, 240); }*/ } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index 4a2f91647e..6c93ef58a7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -2,10 +2,10 @@ package gtPlusPlus.xmod.gregtech.loaders; import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.core.material.*; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.fluid.FluidUtils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import net.minecraft.item.ItemStack; @@ -21,14 +21,14 @@ public class RecipeGen_DustGeneration implements Runnable{ @Override public void run() { - generateRecipes(toGenerate); + generateRecipes(this.toGenerate); } public static void generateRecipes(final Material material){ generateRecipes(material, false); } - public static void generateRecipes(final Material material, boolean disableOptional){ + public static void generateRecipes(final Material material, final boolean disableOptional){ final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; Utils.LOG_WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO @@ -42,7 +42,7 @@ public class RecipeGen_DustGeneration implements Runnable{ Utils.LOG_WARNING("Ring Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Ring Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Ring Recipe: "+material.getLocalizedName()+" - Failed"); } @@ -54,66 +54,68 @@ public class RecipeGen_DustGeneration implements Runnable{ final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); if (RecipeUtils.recipeBuilder( - tinyDust, tinyDust, tinyDust, - tinyDust, tinyDust, tinyDust, + tinyDust, tinyDust, tinyDust, + tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, normalDust)){ Utils.LOG_WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); } if (RecipeUtils.recipeBuilder( - normalDust, null, null, - null, null, null, + normalDust, null, null, + null, null, null, null, null, null, material.getTinyDust(9))){ Utils.LOG_WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed"); } if (RecipeUtils.recipeBuilder( - smallDust, smallDust, null, - smallDust, smallDust, null, + smallDust, smallDust, null, + smallDust, smallDust, null, null, null, null, normalDust)){ Utils.LOG_WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); } if (RecipeUtils.recipeBuilder( - null, normalDust, null, - null, null, null, + null, normalDust, null, + null, null, null, null, null, null, material.getSmallDust(4))){ Utils.LOG_WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); } //Macerate blocks back to dusts. - ItemStack materialBlock = material.getBlock(1); - ItemStack materialFrameBox = material.getFrameBox(1); + final ItemStack materialBlock = material.getBlock(1); + final ItemStack materialFrameBox = material.getFrameBox(1); - if (materialBlock != null) + if (materialBlock != null) { GT_ModHandler.addPulverisationRecipe(materialBlock, material.getDust(9)); + } - if (materialFrameBox != null) + if (materialFrameBox != null) { GT_ModHandler.addPulverisationRecipe(materialFrameBox, material.getDust(2)); + } //Is this a composite? - if (inputStacks != null && !disableOptional){ + if ((inputStacks != null) && !disableOptional){ //Is this a composite? Utils.LOG_INFO("mixer length: "+inputStacks.length); - if (inputStacks.length != 0 && inputStacks.length <= 4){ + if ((inputStacks.length != 0) && (inputStacks.length <= 4)){ //Log Input items Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks)); final long[] inputStackSize = material.vSmallestRatio; @@ -122,12 +124,12 @@ public class RecipeGen_DustGeneration implements Runnable{ if (inputStackSize != null){ //set stack sizes on an input ItemStack[] for (short x=0;x<inputStacks.length;x++){ - if (inputStacks[x] != null && inputStackSize[x] != 0){ - inputStacks[x].stackSize = (int) inputStackSize[x]; + if ((inputStacks[x] != null) && (inputStackSize[x] != 0)){ + inputStacks[x].stackSize = (int) inputStackSize[x]; } } //Relog input values, with stack sizes - Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks)); + Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks)); //Get us four ItemStacks to input into the mixer ItemStack input1, input2, input3, input4; @@ -140,13 +142,13 @@ public class RecipeGen_DustGeneration implements Runnable{ FluidStack oxygen = GT_Values.NF; if (material.getComposites() != null){ - for (MaterialStack x : material.getComposites()){ + for (final MaterialStack x : material.getComposites()){ if (!material.getComposites().isEmpty()){ if (x != null){ if (x.getStackMaterial() != null){ if (x.getStackMaterial().getDust(1) == null){ if (x.getStackMaterial().getState() == MaterialState.GAS){ - oxygen = x.getStackMaterial().getFluid(1000); + oxygen = x.getStackMaterial().getFluid(1000); } } } @@ -168,7 +170,7 @@ public class RecipeGen_DustGeneration implements Runnable{ Utils.LOG_INFO("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_INFO("Dust Mixer Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_INFO("Dust Mixer Recipe: "+material.getLocalizedName()+" - Failed"); } } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java index caaf0f9b47..d0670e2d7e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java @@ -17,7 +17,7 @@ public class RecipeGen_Extruder implements Runnable{ @Override public void run() { - generateRecipes(toGenerate); + generateRecipes(this.toGenerate); } public static void generateRecipes(final Material material){ @@ -47,7 +47,7 @@ public class RecipeGen_Extruder implements Runnable{ Utils.LOG_WARNING("Extruder Ingot Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Extruder Ingot Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Extruder Ingot Recipe: "+material.getLocalizedName()+" - Failed"); } //Block Recipe @@ -60,7 +60,7 @@ public class RecipeGen_Extruder implements Runnable{ Utils.LOG_WARNING("Extruder Block Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Extruder Block Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Extruder Block Recipe: "+material.getLocalizedName()+" - Failed"); } //Plate Recipe @@ -72,7 +72,7 @@ public class RecipeGen_Extruder implements Runnable{ Utils.LOG_WARNING("Extruder Plate Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Extruder Plate Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Extruder Plate Recipe: "+material.getLocalizedName()+" - Failed"); } //Ring Recipe @@ -86,7 +86,7 @@ public class RecipeGen_Extruder implements Runnable{ Utils.LOG_WARNING("Extruder Ring Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Extruder Ring Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Extruder Ring Recipe: "+material.getLocalizedName()+" - Failed"); } } @@ -102,7 +102,7 @@ public class RecipeGen_Extruder implements Runnable{ Utils.LOG_WARNING("Extruder Gear Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Extruder Gear Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Extruder Gear Recipe: "+material.getLocalizedName()+" - Failed"); } } @@ -117,29 +117,29 @@ public class RecipeGen_Extruder implements Runnable{ Utils.LOG_WARNING("Extruder Rod Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Extruder Rod Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Extruder Rod Recipe: "+material.getLocalizedName()+" - Failed"); } //Bolt Recipe if (!material.isRadioactive){ if (addExtruderRecipe( - itemIngot, - shape_Bolt, + itemIngot, + shape_Bolt, material.getBolt(8), (int) Math.max(material.getMass() * 2L * 1, 1), 6 * material.vVoltageMultiplier)){ Utils.LOG_WARNING("Extruder Bolt Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Extruder Bolt Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Extruder Bolt Recipe: "+material.getLocalizedName()+" - Failed"); } } - } + } - public static boolean addExtruderRecipe(ItemStack aInput, ItemStack aShape, ItemStack aOutput, int aDuration, int aEUt) { + public static boolean addExtruderRecipe(final ItemStack aInput, final ItemStack aShape, final ItemStack aOutput, int aDuration, final int aEUt) { if ((aInput == null) || (aShape == null) || (aOutput == null)) { return false; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java index eac2cba20f..f4f8752421 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java @@ -15,14 +15,14 @@ public class RecipeGen_Fluids implements Runnable{ @Override public void run() { - generateRecipes(toGenerate); + generateRecipes(this.toGenerate); } public static void generateRecipes(final Material material){ generateRecipes(material, false); } - public static void generateRecipes(final Material material, boolean disableOptional){ + public static void generateRecipes(final Material material, final boolean disableOptional){ //Melting Shapes to fluid if (!material.getFluid(1).getUnlocalizedName().toLowerCase().contains("plasma")){ @@ -37,8 +37,8 @@ public class RecipeGen_Fluids implements Runnable{ Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); - } + Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + } //Ingot if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(1), //Input @@ -51,7 +51,7 @@ public class RecipeGen_Fluids implements Runnable{ Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed"); } //Plate @@ -65,8 +65,8 @@ public class RecipeGen_Fluids implements Runnable{ Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed"); - } + Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed"); + } //Double Plate if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), //Input @@ -79,7 +79,7 @@ public class RecipeGen_Fluids implements Runnable{ Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed"); } //Nugget @@ -93,7 +93,7 @@ public class RecipeGen_Fluids implements Runnable{ Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed"); } //Block @@ -107,7 +107,7 @@ public class RecipeGen_Fluids implements Runnable{ Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed"); } @@ -120,72 +120,72 @@ public class RecipeGen_Fluids implements Runnable{ //Ingot if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Ingot.get(0), //Item Shape + ItemList.Shape_Mold_Ingot.get(0), //Item Shape material.getFluid(144), //Fluid Input - material.getIngot(1), //output + material.getIngot(1), //output 32, //Duration 8 //Eu Tick )){ Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Failed"); - } + Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Failed"); + } //Plate if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Plate.get(1), //Item Shape + ItemList.Shape_Mold_Plate.get(1), //Item Shape material.getFluid(144), //Fluid Input - material.getPlate(1), //output + material.getPlate(1), //output 32, //Duration 8 //Eu Tick )){ Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Failed"); } //Nugget if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Nugget.get(0), //Item Shape + ItemList.Shape_Mold_Nugget.get(0), //Item Shape material.getFluid(16), //Fluid Input - material.getNugget(1), //output + material.getNugget(1), //output 16, //Duration 4 //Eu Tick )){ Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Failed"); } //Gears if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Gear.get(0), //Item Shape + ItemList.Shape_Mold_Gear.get(0), //Item Shape material.getFluid(576), //Fluid Input - material.getGear(1), //output + material.getGear(1), //output 128, //Duration 8 //Eu Tick )){ Utils.LOG_WARNING("576l fluid molder for 1 gear Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("576l fluid molder for 1 gear Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("576l fluid molder for 1 gear Recipe: "+material.getLocalizedName()+" - Failed"); } //Blocks if (GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Block.get(0), //Item Shape + ItemList.Shape_Mold_Block.get(0), //Item Shape material.getFluid(144*9), //Fluid Input - material.getBlock(1), //output + material.getBlock(1), //output 288, //Duration 16 //Eu Tick )){ Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Failed"); } } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java index c48a41b496..fe9d322fde 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java @@ -11,16 +11,16 @@ import net.minecraft.item.ItemStack; public class RecipeGen_Plates implements Runnable{ final Material toGenerate; - + public RecipeGen_Plates(final Material M){ this.toGenerate = M; } - + @Override public void run() { - generateRecipes(toGenerate); + generateRecipes(this.toGenerate); } - + public static void generateRecipes(final Material material){ final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15; @@ -32,7 +32,7 @@ public class RecipeGen_Plates implements Runnable{ final ItemStack plate_Double = material.getPlateDouble(1); Utils.LOG_WARNING("Generating Plate recipes for "+material.getLocalizedName()); - + //Forge Hammer if (addForgeHammerRecipe( ingotStackTwo, @@ -42,7 +42,7 @@ public class RecipeGen_Plates implements Runnable{ Utils.LOG_WARNING("Forge Hammer Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Forge Hammer Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Forge Hammer Recipe: "+material.getLocalizedName()+" - Failed"); } //Bender if (addBenderRecipe( @@ -53,7 +53,7 @@ public class RecipeGen_Plates implements Runnable{ Utils.LOG_WARNING("Bender Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Bender Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Bender Recipe: "+material.getLocalizedName()+" - Failed"); } //Alloy Smelter if (GT_Values.RA.addAlloySmelterRecipe( @@ -65,7 +65,7 @@ public class RecipeGen_Plates implements Runnable{ Utils.LOG_WARNING("Alloy Smelter Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Alloy Smelter Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Alloy Smelter Recipe: "+material.getLocalizedName()+" - Failed"); } @@ -78,7 +78,7 @@ public class RecipeGen_Plates implements Runnable{ Utils.LOG_WARNING("Bender Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Bender Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Bender Recipe: "+material.getLocalizedName()+" - Failed"); } if (addBenderRecipe( plate_SingleTwo, @@ -88,11 +88,11 @@ public class RecipeGen_Plates implements Runnable{ Utils.LOG_WARNING("Bender Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Bender Recipe: "+material.getLocalizedName()+" - Failed"); - } + Utils.LOG_WARNING("Bender Recipe: "+material.getLocalizedName()+" - Failed"); + } } - public static boolean addBenderRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt) { + public static boolean addBenderRecipe(final ItemStack aInput1, final ItemStack aOutput1, int aDuration, final int aEUt) { if ((aInput1 == null) || (aOutput1 == null)) { return false; } @@ -103,7 +103,7 @@ public class RecipeGen_Plates implements Runnable{ return true; } - public static boolean addExtruderRecipe(ItemStack aInput, ItemStack aShape, ItemStack aOutput, int aDuration, int aEUt) { + public static boolean addExtruderRecipe(final ItemStack aInput, final ItemStack aShape, final ItemStack aOutput, int aDuration, final int aEUt) { if ((aInput == null) || (aShape == null) || (aOutput == null)) { return false; } @@ -114,7 +114,7 @@ public class RecipeGen_Plates implements Runnable{ return true; } - public static boolean addForgeHammerRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt) { + public static boolean addForgeHammerRecipe(final ItemStack aInput1, final ItemStack aOutput1, final int aDuration, final int aEUt) { if ((aInput1 == null) || (aOutput1 == null)) { return false; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java index e26f630604..6c25b697a2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java @@ -1,11 +1,9 @@ package gtPlusPlus.xmod.gregtech.loaders; import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; import net.minecraft.item.ItemStack; @@ -19,7 +17,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ @Override public void run() { - generateRecipes(toGenerate); + generateRecipes(this.toGenerate); } public static void generateRecipes(final Material material){ @@ -32,32 +30,32 @@ public class RecipeGen_ShapedCrafting implements Runnable{ material.getPlate(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"h", "B", "I", - Character.valueOf('I'), - material.getIngot(1), - Character.valueOf('B'), - material.getIngot(1)}); + Character.valueOf('I'), + material.getIngot(1), + Character.valueOf('B'), + material.getIngot(1)}); GT_ModHandler.addShapelessCraftingRecipe( material.getPlate(1), new Object[]{gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, - material.getIngot(1), - material.getIngot(1)}); + material.getIngot(1), + material.getIngot(1)}); //Double Plate Shaped/Shapeless GT_ModHandler.addCraftingRecipe( material.getPlateDouble(1), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"I", "B", "h", - Character.valueOf('I'), - material.getPlate(1), - Character.valueOf('B'), - material.getPlate(1)}); + Character.valueOf('I'), + material.getPlate(1), + Character.valueOf('B'), + material.getPlate(1)}); GT_ModHandler.addShapelessCraftingRecipe( material.getPlateDouble(1), new Object[]{gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, - material.getPlate(1), - material.getPlate(1)}); + material.getPlate(1), + material.getPlate(1)}); //Ring Recipe if (!material.isRadioactive){ @@ -70,7 +68,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("GT:NH Ring Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("GT:NH Ring Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("GT:NH Ring Recipe: "+material.getLocalizedName()+" - Failed"); } } else { @@ -82,9 +80,9 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Ring Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Ring Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Ring Recipe: "+material.getLocalizedName()+" - Failed"); } - } + } } @@ -99,13 +97,13 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Framebox Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Framebox Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Framebox Recipe: "+material.getLocalizedName()+" - Failed"); } } /*final int tVoltageMultiplier = material.getMeltingPointK() >= 1600 ? 60 : 15; - + //Add a shapeless recipe for each dust this way - Compat mode. ItemStack[] inputStacks = material.getMaterialComposites(); @@ -119,18 +117,18 @@ public class RecipeGen_ShapedCrafting implements Runnable{ if (inputStacks[x] != null && inputStackSize[x] != 0) inputStacks[x].stackSize = (int) inputStackSize[x]; } - Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks)); + Utils.LOG_WARNING(ItemUtils.getArrayStackNames(inputStacks)); if (RecipeUtils.buildShapelessRecipe( - outputStacks, + outputStacks, inputStacks )){ Utils.LOG_WARNING("Shapeless Crafting Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Shapeless Crafting Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Shapeless Crafting Recipe: "+material.getLocalizedName()+" - Failed"); } } - } */ + } */ //Shaped Recipe - Bolts @@ -143,7 +141,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Bolt Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Bolt Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Bolt Recipe: "+material.getLocalizedName()+" - Failed"); } } @@ -157,7 +155,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Rod Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Rod Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Rod Recipe: "+material.getLocalizedName()+" - Failed"); } @@ -170,7 +168,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Rod Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Rod Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Rod Recipe: "+material.getLocalizedName()+" - Failed"); } //Two small to long rod @@ -182,7 +180,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Long Rod Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Long Rod Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Long Rod Recipe: "+material.getLocalizedName()+" - Failed"); } //Rotor Recipe @@ -195,7 +193,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Rotor Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Rotor Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Rotor Recipe: "+material.getLocalizedName()+" - Failed"); } } @@ -209,7 +207,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Gear Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Gear Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Gear Recipe: "+material.getLocalizedName()+" - Failed"); } } @@ -223,7 +221,7 @@ public class RecipeGen_ShapedCrafting implements Runnable{ Utils.LOG_WARNING("Screw Recipe: "+material.getLocalizedName()+" - Success"); } else { - Utils.LOG_WARNING("Screw Recipe: "+material.getLocalizedName()+" - Failed"); + Utils.LOG_WARNING("Screw Recipe: "+material.getLocalizedName()+" - Failed"); } } } |