diff options
author | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:56:42 -0800 |
---|---|---|
committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-30 10:56:42 -0800 |
commit | 0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a (patch) | |
tree | 1e2c649f3a6ce3f6b2babd0098a5f4819e9cd0b6 /src/main/java/gregtech/loaders/oreprocessing | |
parent | f8cc82edeb9810c45cba762d733a2c909a302faa (diff) | |
download | GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.gz GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.tar.bz2 GT5-Unofficial-0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a.zip |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
51 files changed, 1967 insertions, 2727 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java index 5767332ee7..bdd1109a93 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java @@ -1,18 +1,20 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import net.minecraft.item.ItemStack; -public class ProcessingAll - implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO ACTUALLY COMPARE ALL THE PROCESSING CLASSES +public class ProcessingAll implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO ACTUALLY COMPARE ALL THE + // PROCESSING CLASSES + public ProcessingAll() { for (OrePrefixes tPrefix : OrePrefixes.values()) tPrefix.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) && (aPrefix.mDefaultStackSize < aStack.getItem().getItemStackLimit(aStack))) aStack.getItem().setMaxStackSize(aPrefix.mDefaultStackSize); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java index a66d17293f..6c1d1896b1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -1,23 +1,25 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.item.ItemStack; public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingArrows() { OrePrefixes.arrowGtWood.add(this); OrePrefixes.arrowGtPlastic.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { ItemStack tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( @@ -57,7 +59,14 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis Enchantment.fireAspect, EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), Materials.Blaze.getMolten(18L), tOutput, null, null, null, 100, 2); + GT_Utility.copyAmount(1L, aStack), + Materials.Blaze.getMolten(18L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); @@ -66,53 +75,48 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis Enchantment.knockback, EnchantmentHelper.getEnchantmentLevel(Enchantment.knockback.effectId, tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), Materials.Rubber.getMolten(18L), tOutput, null, null, null, 100, 2); + GT_Utility.copyAmount(1L, aStack), + Materials.Rubber.getMolten(18L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); GT_Utility.ItemNBT.addEnchantment( tOutput, gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE, - EnchantmentHelper.getEnchantmentLevel( - gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + EnchantmentHelper + .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(25L), tOutput, null, null, null, 100, 2); + GT_Utility.copyAmount(1L, aStack), + Materials.Mercury.getFluid(25L), + tOutput, + null, + null, + null, + 100, + 2); - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aPrefix) { case arrowGtWood: GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.arrowGtWood, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - " A", - " S ", - "F ", - 'S', - OrePrefixes.stick.get(Materials.Wood), - 'F', - OreDictNames.craftingFeather, - 'A', - OrePrefixes.toolHeadArrow.get(aMaterial) - }); + new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', + OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); case arrowGtPlastic: GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.arrowGtPlastic, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - " A", - " S ", - "F ", - 'S', - OrePrefixes.stick.get(Materials.Plastic), - 'F', - OreDictNames.craftingFeather, - 'A', - OrePrefixes.toolHeadArrow.get(aMaterial) - }); + new Object[] { " A", " S ", "F ", 'S', OrePrefixes.stick.get(Materials.Plastic), 'F', + OreDictNames.craftingFeather, 'A', OrePrefixes.toolHeadArrow.get(aMaterial) }); default: break; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java index 35af7d302f..9fdf755c8a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java @@ -1,22 +1,24 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingBeans() { OrePrefixes.beans.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (aOreDictName.equals("beansCocoa")) - GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + if (aOreDictName.equals("beansCocoa")) GT_ModHandler.addPulverisationRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index a4619d2ea2..4043ea02aa 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -2,30 +2,29 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingBlock() { OrePrefixes.block.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aMaterial != Materials.Clay && aMaterial != Materials.Basalt) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_Values.RA.addCutterRecipe( GT_Utility.copyAmount(1L, aStack), - aMaterial == MaterialsBotania.Livingrock - || aMaterial == MaterialsBotania.Livingwood - || aMaterial == MaterialsBotania.Dreamwood - ? GT_Utility.getIntegratedCircuit(3) - : null, + aMaterial == MaterialsBotania.Livingrock || aMaterial == MaterialsBotania.Livingwood + || aMaterial == MaterialsBotania.Dreamwood ? GT_Utility.getIntegratedCircuit(3) : null, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), null, (int) Math.max(aMaterial.getMass() * 10L, 1L), @@ -39,15 +38,21 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack)); - if (tStack1 != null) - GT_ModHandler.removeRecipeDelayed( - tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1); - if (tStack2 != null) - GT_ModHandler.removeRecipeDelayed( - tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2); + if (tStack1 != null) GT_ModHandler + .removeRecipeDelayed(tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1); + if (tStack2 != null) GT_ModHandler + .removeRecipeDelayed(tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2); if (tStack3 != null) { GT_ModHandler.removeRecipeDelayed( - tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3); + tStack3, + tStack3, + tStack3, + tStack3, + tStack3, + tStack3, + tStack3, + tStack3, + tStack3); } if (aMaterial.mStandardMoltenFluid != null) { @@ -66,18 +71,16 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist ConfigCategories.Recipes.storageblockcrafting, OrePrefixes.block.get(aMaterial).toString(), false)) { - if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] {"XXX", "XXX", "XXX", 'X', OrePrefixes.dust.get(aMaterial)}); - if (tStack2 != null) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] {"XXX", "XXX", "XXX", 'X', OrePrefixes.gem.get(aMaterial)}); + if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.dust.get(aMaterial) }); + if (tStack2 != null) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.gem.get(aMaterial) }); if (tStack1 != null) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), - new Object[] {"XXX", "XXX", "XXX", 'X', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.ingot.get(aMaterial) }); } } if (tStack1 != null) tStack1.stackSize = 9; @@ -90,11 +93,11 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist OrePrefixes.block.get(aMaterial).toString(), tStack2 != null)) { if (tStack3 != null) - GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] {OrePrefixes.block.get(aMaterial)}); + GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); if (tStack2 != null) - GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] {OrePrefixes.block.get(aMaterial)}); + GT_ModHandler.addShapelessCraftingRecipe(tStack2, new Object[] { OrePrefixes.block.get(aMaterial) }); if (tStack1 != null) - GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] {OrePrefixes.block.get(aMaterial)}); + GT_ModHandler.addShapelessCraftingRecipe(tStack1, new Object[] { OrePrefixes.block.get(aMaterial) }); } if (!OrePrefixes.block.isIgnored(aMaterial)) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java index a758148e5f..96acfa1f17 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java @@ -1,26 +1,28 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingBolt() { OrePrefixes.bolt.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { - GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(2L, aStack), GT_Proxy.tBits, new Object[] { - "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) - }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(2L, aStack), + GT_Proxy.tBits, + new Object[] { "s ", " X", 'X', OrePrefixes.stick.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index 04e456a189..aa478a5560 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -1,5 +1,9 @@ package gregtech.loaders.oreprocessing; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -9,18 +13,17 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; public class ProcessingCell implements IOreRecipeRegistrator { + public ProcessingCell() { OrePrefixes.cell.add(this); OrePrefixes.cellPlasma.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case cell: if (aMaterial == Materials.Empty) { @@ -44,10 +47,10 @@ public class ProcessingCell implements IOreRecipeRegistrator { tAllAmount = (int) (tAllAmount + tMat2.mAmount); } long tItemAmount = 0L; - long tCapsuleCount = - GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(aStack) * -tAllAmount; - long tDensityMultiplier = - aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L : 1L; + long tCapsuleCount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(aStack) + * -tAllAmount; + long tDensityMultiplier = aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L + : 1L; ArrayList<ItemStack> tList = new ArrayList<>(); for (MaterialStack tMat : aMaterial.mMaterialList) { if (tMat.mAmount > 0L) { @@ -57,8 +60,8 @@ public class ProcessingCell implements IOreRecipeRegistrator { } else { tStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); if (tStack == null) { - tStack = GT_OreDictUnificator.get( - OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); + tStack = GT_OreDictUnificator + .get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); } } if (tItemAmount + tMat.mAmount * 3628800L @@ -68,26 +71,20 @@ public class ProcessingCell implements IOreRecipeRegistrator { tStack.stackSize = ((int) (tStack.stackSize * tDensityMultiplier)); while ((tStack.stackSize > 64) && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCount( - tStack) - * 64L - < 0L - ? tList.size() < 5 - : tList.size() < 6) + + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L < 0L + ? tList.size() < 5 + : tList.size() < 6) && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCount(tStack) - * 64L + + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L <= 64L)) { tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64L; tList.add(GT_Utility.copyAmount(64L, tStack)); tStack.stackSize -= 64; } - int tThisCapsuleCount = - GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - tStack); + int tThisCapsuleCount = GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize(tStack); if (tStack.stackSize > 0 && tCapsuleCount + tThisCapsuleCount <= 64L) { - if (tCapsuleCount + tThisCapsuleCount < 0L - ? tList.size() < 5 + if (tCapsuleCount + tThisCapsuleCount < 0L ? tList.size() < 5 : tList.size() < 6) { tCapsuleCount += tThisCapsuleCount; tList.add(tStack); @@ -110,8 +107,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { tList.size() >= 3 ? tList.get(2) : null, tList.size() >= 4 ? tList.get(3) : null, tList.size() >= 5 ? tList.get(4) : null, - tCapsuleCount >= 0L - ? tList.size() >= 6 ? tList.get(5) : null + tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null : ItemList.Cell_Empty.get(-tCapsuleCount), (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), Math.min(4, tList.size()) * 30); @@ -125,8 +121,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { tList.size() >= 3 ? tList.get(2) : null, tList.size() >= 4 ? tList.get(3) : null, tList.size() >= 5 ? tList.get(4) : null, - tCapsuleCount >= 0L - ? tList.size() >= 6 ? tList.get(5) : null + tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null : tCellBalance < 0 ? ItemList.Cell_Empty.get(-tCellBalance) : null, (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 8L * tItemAmount)), Math.min(4, tList.size()) * 30); @@ -141,8 +136,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { tList.size() >= 3 ? tList.get(2) : null, tList.size() >= 4 ? tList.get(3) : null, tList.size() >= 5 ? tList.get(4) : null, - tCapsuleCount >= 0L - ? tList.size() >= 6 ? tList.get(5) : null + tCapsuleCount >= 0L ? tList.size() >= 6 ? tList.get(5) : null : ItemList.Cell_Empty.get(-tCapsuleCount), (int) Math.max(1L, Math.abs(aMaterial.getMass() * 2L * tItemAmount))); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index 32e7d9b7ac..643d6af903 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -1,20 +1,22 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCircuit() { OrePrefixes.circuit.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals("gregtech")) return; switch (aMaterial.mName) { case "Good": @@ -34,24 +36,17 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi break; case "Basic": GT_ModHandler.removeRecipeByOutputDelayed(aStack); - GT_ModHandler.addCraftingRecipe(aStack, GT_ModHandler.RecipeBits.BUFFERED, new Object[] { - "RIR", - "VBV", - "CCC", - 'R', - ItemList.Circuit_Parts_Resistor.get(1), - 'C', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1), - 'V', - ItemList.Circuit_Parts_Vacuum_Tube.get(1), - 'B', - ItemList.Circuit_Board_Coated_Basic.get(1), - 'I', - ItemList.IC2_Item_Casing_Steel.get(1) - }); + GT_ModHandler.addCraftingRecipe( + aStack, + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "RIR", "VBV", "CCC", 'R', ItemList.Circuit_Parts_Resistor.get(1), 'C', + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.RedAlloy, 1), 'V', + ItemList.Circuit_Parts_Vacuum_Tube.get(1), 'B', + ItemList.Circuit_Board_Coated_Basic.get(1), 'I', + ItemList.IC2_Item_Casing_Steel.get(1) }); GT_ModHandler.addShapelessCraftingRecipe( GT_ModHandler.getIC2Item("electronicCircuit", 1L), - new Object[] {ItemList.Circuit_Integrated.getWildcard(1L)}); + new Object[] { ItemList.Circuit_Integrated.getWildcard(1L) }); break; } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java index 7c17c7ca27..86478eb3d7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java @@ -1,24 +1,28 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; -import net.minecraft.item.ItemStack; public class ProcessingCompressed implements IOreRecipeRegistrator { + public ProcessingCompressed() { OrePrefixes.compressed.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); GregTech_API.registerCover( - aStack, TextureFactory.of(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), null); + aStack, + TextureFactory.of(aMaterial.mIconSet.mTextures[72], aMaterial.mRGBa, false), + null); // GT_RecipeRegistrator.registerUsagesForMaterials(null, false, GT_Utility.copyAmount(1L, aStack)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 48d9708f4a..84fbf9c05d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -2,6 +2,9 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.enums.GT_Values.MOD_ID_DC; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -9,17 +12,16 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrafting() { OrePrefixes.crafting.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aOreDictName) { case "craftingQuartz": GT_Values.RA.addAssemblerRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java index 042580144b..79c5ca9874 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java @@ -1,13 +1,15 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrate() { OrePrefixes.crateGtDust.add(this); OrePrefixes.crateGtIngot.add(this); @@ -16,10 +18,9 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - boolean aSpecialRecipeReq2 = aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { case crateGtDust: @@ -35,11 +36,10 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L), 800, 1); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] {"Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial) }); break; case crateGtIngot: GT_Values.RA.addBoxingRecipe( @@ -54,11 +54,10 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L), 800, 1); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] {"Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial) }); break; case crateGtGem: GT_Values.RA.addBoxingRecipe( @@ -73,11 +72,10 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L), 800, 1); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] {"Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial) }); break; case crateGtPlate: GT_Values.RA.addBoxingRecipe( @@ -92,11 +90,10 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist ItemList.Crate_Empty.get(1L), 800, 1); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), - GT_Proxy.tBits, - new Object[] {"Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), + GT_Proxy.tBits, + new Object[] { "Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial) }); break; default: break; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index ceb7aee979..9062533d93 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -1,27 +1,26 @@ package gregtech.loaders.oreprocessing; +import net.minecraftforge.fluids.FluidRegistry; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraftforge.fluids.FluidRegistry; public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrop() { OrePrefixes.crop.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, - Materials aMaterial, - String aOreDictName, - String aModName, + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, net.minecraft.item.ItemStack aStack) { GT_ModHandler.addCompressionRecipe( - gregtech.api.util.GT_Utility.copyAmount(8L, aStack), ItemList.IC2_PlantballCompressed.get(1L)); + gregtech.api.util.GT_Utility.copyAmount(8L, aStack), + ItemList.IC2_PlantballCompressed.get(1L)); switch (aOreDictName) { case "cropTea": GT_Values.RA.addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.tea"), false); @@ -33,7 +32,10 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr break; case "cropGrape": GT_Values.RA.addBrewingRecipe( - aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.grapejuice"), false); + aStack, + FluidRegistry.WATER, + FluidRegistry.getFluid("potion.grapejuice"), + false); GT_Values.RA.addBrewingRecipe( aStack, GT_ModHandler.getDistilledWater(1L).getFluid(), @@ -42,19 +44,32 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr break; case "cropChilipepper": GT_ModHandler.addPulverisationRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); break; case "cropCoffee": GT_ModHandler.addPulverisationRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); break; case "cropPotato": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Raw_PotatoChips.get(1L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Raw_PotatoChips.get(1L), + 64, + 4); GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Stripes.get(0L), ItemList.Food_Raw_Fries.get(1L), 64, 4); + aStack, + ItemList.Shape_Slicer_Stripes.get(0L), + ItemList.Food_Raw_Fries.get(1L), + 64, + 4); GT_Values.RA.addBrewingRecipe( - aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.potatojuice"), true); + aStack, + FluidRegistry.WATER, + FluidRegistry.getFluid("potion.potatojuice"), + true); GT_Values.RA.addBrewingRecipe( aStack, GT_ModHandler.getDistilledWater(1L).getFluid(), @@ -63,9 +78,16 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr break; case "cropLemon": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Lemon.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Lemon.get(4L), + 64, + 4); GT_Values.RA.addBrewingRecipe( - aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.lemonjuice"), false); + aStack, + FluidRegistry.WATER, + FluidRegistry.getFluid("potion.lemonjuice"), + false); GT_Values.RA.addBrewingRecipe( aStack, GT_ModHandler.getDistilledWater(1L).getFluid(), @@ -79,15 +101,27 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr break; case "cropTomato": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Tomato.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Tomato.get(4L), + 64, + 4); break; case "cropCucumber": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Cucumber.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Cucumber.get(4L), + 64, + 4); break; case "cropOnion": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Onion.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Onion.get(4L), + 64, + 4); break; } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index e9b954f52e..77d20209b8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -1,22 +1,24 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrushedOre() { OrePrefixes.crushedCentrifuged.add(this); OrePrefixes.crushedPurified.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case crushedCentrifuged: GT_Values.RA.addForgeHammerRecipe( @@ -37,7 +39,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR case crushedPurified: GT_ModHandler.addThermalCentrifugeRecipe( GT_Utility.copyAmount(1L, aStack), - new int[] {10000, 1111}, + new int[] { 10000, 1111 }, (int) Math.min(5000L, Math.abs(aMaterial.getMass() * 20L)), GT_OreDictUnificator.get( OrePrefixes.crushedCentrifuged, @@ -71,14 +73,12 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR GT_Values.RA.addSifterRecipe( GT_Utility.copyAmount(1L, aStack), new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), - tGem, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) - }, - new int[] {300, 1200, 4500, 1400, 2800, 3500}, + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), + tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + new int[] { 300, 1200, 4500, 1400, 2800, 3500 }, 800, 16); break; @@ -86,14 +86,12 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR GT_Values.RA.addSifterRecipe( GT_Utility.copyAmount(1L, aStack), new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), - tGem, - GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) - }, - new int[] {100, 400, 1500, 2000, 4000, 5000}, + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), + tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + new int[] { 100, 400, 1500, 2000, 4000, 5000 }, 800, 16); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java index ccd11b5d88..df2284a95c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java @@ -1,22 +1,24 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingCrystallized() { OrePrefixes.crystal.add(this); OrePrefixes.crystalline.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java index cc0b25345c..e9a1b0425c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java @@ -10,6 +10,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingDirty() { OrePrefixes.clump.add(this); OrePrefixes.shard.add(this); @@ -18,11 +19,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist } @Override - public void registerOre( - OrePrefixes aPrefix, - Materials aMaterial, - String aOreDictName, - String aModName, + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, net.minecraft.item.ItemStack aStack) { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), @@ -44,7 +41,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist false); GT_ModHandler.addOreWasherRecipe( GT_Utility.copyAmount(1L, aStack), - new int[] {10000, 1111, 10000}, + new int[] { 10000, 1111, 10000 }, 1000, GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, @@ -57,7 +54,7 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)); GT_ModHandler.addThermalCentrifugeRecipe( GT_Utility.copyAmount(1L, aStack), - new int[] {10000, 1111, 10000}, + new int[] { 10000, 1111, 10000 }, (int) Math.min(5000L, Math.abs(aMaterial.getMass() * 20L)), GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedCentrifuged : OrePrefixes.dust, @@ -69,86 +66,79 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)); - if (aMaterial.contains(SubTag.WASHING_MERCURY)) - GT_Values.RA.addChemicalBathRecipe( + if (aMaterial.contains(SubTag.WASHING_MERCURY)) GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.Mercury.getFluid(1000L), + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), + new int[] { 10000, 7000, 4000 }, + 800, + 8); + if (aMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.Mercury.getFluid(1000L), + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), + new int[] { 10000, 9900, 4000 }, + 800, + 8); + if (aMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.SodiumPersulfate.getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L), + GT_OreDictUnificator.get( + aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, + aMaterial, + 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), + new int[] { 10000, 7000, 4000 }, + 800, + 8); + for (Materials tMaterial : aMaterial.mOreByProducts) { + if (tMaterial.contains(SubTag.WASHING_MERCURY)) GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(1000L), GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, + new int[] { 10000, 7000, 4000 }, 800, 8); - if (aMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) - GT_Values.RA.addChemicalBathRecipe( + if (tMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(1000L), GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 9900, 4000}, + new int[] { 10000, 9900, 4000 }, 800, 8); - if (aMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) - GT_Values.RA.addChemicalBathRecipe( + if (tMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.SodiumPersulfate.getFluid(GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L), GT_OreDictUnificator.get( aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, + new int[] { 10000, 7000, 4000 }, 800, 8); - for (Materials tMaterial : aMaterial.mOreByProducts) { - if (tMaterial.contains(SubTag.WASHING_MERCURY)) - GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Mercury.getFluid(1000L), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, - 800, - 8); - if (tMaterial.contains(SubTag.WASHING_MERCURY_99_PERCENT)) - GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.Mercury.getFluid(1000L), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 9900, 4000}, - 800, - 8); - if (tMaterial.contains(SubTag.WASHING_SODIUMPERSULFATE)) - GT_Values.RA.addChemicalBathRecipe( - GT_Utility.copyAmount(1L, aStack), - Materials.SodiumPersulfate.getFluid( - GT_Mod.gregtechproxy.mDisableOldChemicalRecipes ? 1000L : 100L), - GT_OreDictUnificator.get( - aPrefix == OrePrefixes.crushed ? OrePrefixes.crushedPurified : OrePrefixes.dustPure, - aMaterial, - 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial.mMacerateInto, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), - new int[] {10000, 7000, 4000}, - 800, - 8); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 3d4c13ecaa..75ba5cc4af 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -1,5 +1,10 @@ package gregtech.loaders.oreprocessing; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -11,11 +16,9 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingDust() { OrePrefixes.dust.add(this); OrePrefixes.dustPure.add(this); @@ -26,13 +29,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case dust: - if (aMaterial.mFuelPower > 0) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + if (aMaterial.mFuelPower > 0) GT_Values.RA + .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); if (GT_Utility.getFluidForFilledItem(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), true) == null) GT_Values.RA.addCannerRecipe( @@ -67,8 +69,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null, null, aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) + ? GT_OreDictUnificator + .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) : GT_Utility.copyAmount(1L, tDustStack), null, (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, @@ -87,7 +89,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } // This is so disgustingly bad. if (((OrePrefixes.block.isIgnored(aMaterial)) - || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) + || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Basalt) @@ -107,49 +109,41 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if ((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0)) { long tItemAmount = 0L; long tCapsuleCount = 0L; - long tDensityMultiplier = - aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L : 1L; + long tDensityMultiplier = aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L + : 1L; ArrayList<ItemStack> tList = new ArrayList<>(); - for (MaterialStack tMat : aMaterial.mMaterialList) - if (tMat.mAmount > 0L) { - if (tMat.mMaterial == Materials.Air) { - tDustStack = ItemList.Cell_Air.get(tMat.mAmount / 2L); - } else { - tDustStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); - if (tDustStack == null) - tDustStack = - GT_OreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); - } - if (tItemAmount + tMat.mAmount * 3628800L - <= aStack.getMaxStackSize() * aMaterial.getDensity()) { - tItemAmount += tMat.mAmount * 3628800L; - if (tDustStack != null) { - tDustStack.stackSize = ((int) (tDustStack.stackSize * tDensityMultiplier)); - while ((tDustStack.stackSize > 64) - && (tList.size() < 6) - && (tCapsuleCount - + GT_ModHandler.getCapsuleCellContainerCount(tDustStack) - * 64 - <= 64L)) { - tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64; - tList.add(GT_Utility.copyAmount(64L, tDustStack)); - tDustStack.stackSize -= 64; - } - if ((tDustStack.stackSize > 0) - && (tList.size() < 6) - && (tCapsuleCount - + GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize( - tDustStack) - <= 64L)) { - tCapsuleCount += - GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - tDustStack); - tList.add(tDustStack); - } + for (MaterialStack tMat : aMaterial.mMaterialList) if (tMat.mAmount > 0L) { + if (tMat.mMaterial == Materials.Air) { + tDustStack = ItemList.Cell_Air.get(tMat.mAmount / 2L); + } else { + tDustStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); + if (tDustStack == null) + tDustStack = GT_OreDictUnificator.get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); + } + if (tItemAmount + tMat.mAmount * 3628800L + <= aStack.getMaxStackSize() * aMaterial.getDensity()) { + tItemAmount += tMat.mAmount * 3628800L; + if (tDustStack != null) { + tDustStack.stackSize = ((int) (tDustStack.stackSize * tDensityMultiplier)); + while ((tDustStack.stackSize > 64) && (tList.size() < 6) + && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64 + <= 64L)) { + tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tDustStack) * 64; + tList.add(GT_Utility.copyAmount(64L, tDustStack)); + tDustStack.stackSize -= 64; + } + if ((tDustStack.stackSize > 0) && (tList.size() < 6) + && (tCapsuleCount + + GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack) + <= 64L)) { + tCapsuleCount += GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack); + tList.add(tDustStack); } } } + } tItemAmount = (tItemAmount * tDensityMultiplier % aMaterial.getDensity() > 0L ? 1 : 0) + tItemAmount * tDensityMultiplier / aMaterial.getDensity(); if (tList.size() > 0) { @@ -160,27 +154,26 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && ((tFluid = GT_Utility.getFluidForFilledItem((ItemStack) tList.get(i), true)) != null)) { tFluid.amount *= tList.get(i).stackSize; - tCapsuleCount -= GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - (ItemStack) tList.get(i)); + tCapsuleCount -= GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize((ItemStack) tList.get(i)); tList.remove(i); break; } } - if ((aMaterial.mExtraData & 0x1) != 0) - GT_Values.RA.addElectrolyzerRecipe( - GT_Utility.copyAmount(tItemAmount, aStack), - tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, - null, - tFluid, - tList.size() < 1 ? null : (ItemStack) tList.get(0), - tList.size() < 2 ? null : (ItemStack) tList.get(1), - tList.size() < 3 ? null : (ItemStack) tList.get(2), - tList.size() < 4 ? null : (ItemStack) tList.get(3), - tList.size() < 5 ? null : (ItemStack) tList.get(4), - tList.size() < 6 ? null : (ItemStack) tList.get(5), - null, - (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), - Math.min(4, tList.size()) * 30); + if ((aMaterial.mExtraData & 0x1) != 0) GT_Values.RA.addElectrolyzerRecipe( + GT_Utility.copyAmount(tItemAmount, aStack), + tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, + null, + tFluid, + tList.size() < 1 ? null : (ItemStack) tList.get(0), + tList.size() < 2 ? null : (ItemStack) tList.get(1), + tList.size() < 3 ? null : (ItemStack) tList.get(2), + tList.size() < 4 ? null : (ItemStack) tList.get(3), + tList.size() < 5 ? null : (ItemStack) tList.get(4), + tList.size() < 6 ? null : (ItemStack) tList.get(5), + null, + (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), + Math.min(4, tList.size()) * 30); if ((aMaterial.mExtraData & 0x2) != 0) { GT_Values.RA.addCentrifugeRecipe( GT_Utility.copyAmount(tItemAmount, aStack), @@ -234,7 +227,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr break; case "Glass": GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), new ItemStack(net.minecraft.init.Blocks.glass)); + GT_Utility.copyAmount(1L, aStack), + new ItemStack(net.minecraft.init.Blocks.glass)); break; case "NetherQuartz": case "Quartz": @@ -242,7 +236,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr if (gregtech.api.GregTech_API.sRecipeFile.get( gregtech.api.enums.ConfigCategories.Recipes.disabledrecipes, "QuartzDustSmeltingIntoAESilicon", - true)) GT_ModHandler.removeFurnaceSmelting(aStack); + true)) + GT_ModHandler.removeFurnaceSmelting(aStack); break; case "MeatRaw": GT_ModHandler.addSmeltingRecipe( @@ -254,11 +249,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr case "Oilsands": GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( true, - new ItemStack[] {GT_Utility.copyAmount(1L, aStack)}, + new ItemStack[] { GT_Utility.copyAmount(1L, aStack) }, null, null, null, - new FluidStack[] {Materials.OilHeavy.getFluid(1000)}, + new FluidStack[] { Materials.OilHeavy.getFluid(1000) }, 660, 8, 0); @@ -324,7 +319,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Gold, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 1L), - new int[] {10000, 4000, 2000}, + new int[] { 10000, 4000, 2000 }, 400, 24); if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_IRON)) @@ -333,7 +328,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L), - new int[] {10000, 4000, 2000}, + new int[] { 10000, 4000, 2000 }, 400, 24); if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM)) { @@ -342,7 +337,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neodymium, 1L), - new int[] {10000, 4000, 2000}, + new int[] { 10000, 4000, 2000 }, 400, 24); } @@ -474,7 +469,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null, null, null, - new int[] {10000, 1111}, + new int[] { 10000, 1111 }, (int) Math.max(1L, aMaterial.getMass() * 8L), 5); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java index 573081b6cc..42b5571b2b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java @@ -1,5 +1,11 @@ package gregtech.loaders.oreprocessing; +import java.util.Locale; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; + import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -8,19 +14,16 @@ import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import java.util.Locale; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; public class ProcessingDye implements IOreRecipeRegistrator { + public ProcessingDye() { OrePrefixes.dye.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { Dyes aDye = Dyes.get(aOreDictName); if ((aDye.mIndex >= 0) && (aDye.mIndex < 16) && (GT_Utility.getContainerItem(aStack, true) == null)) { GT_ModHandler.addAlloySmelterRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java index 046bcf5cda..941191132d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; @@ -7,25 +9,25 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingFineWire implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingFineWire() { OrePrefixes.wireFine.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { GT_RecipeRegistrator.registerWiremillRecipes(aMaterial, 100, 4); } - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { - GT_ModHandler.addCraftingRecipe(GT_Utility.copyAmount(1L, aStack), GT_Proxy.tBits, new Object[] { - "Xx", 'X', OrePrefixes.foil.get(aMaterial) - }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_Proxy.tBits, + new Object[] { "Xx", 'X', OrePrefixes.foil.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java index ae25bcee98..31f7051c3d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFoil.java @@ -2,6 +2,8 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -10,22 +12,24 @@ import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingFoil implements IOreRecipeRegistrator { + public ProcessingFoil() { OrePrefixes.foil.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(1L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L)), GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 4L), (int) Math.max(aMaterial.getMass(), 1L), calculateRecipeEU(aMaterial, 24)); GregTech_API.registerCover( - aStack, TextureFactory.of(aMaterial.mIconSet.mTextures[70], aMaterial.mRGBa, false), null); + aStack, + TextureFactory.of(aMaterial.mIconSet.mTextures[70], aMaterial.mRGBa, false), + null); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index 905bb58fe7..bfd85af1a4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,26 +9,30 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingFood() { OrePrefixes.food.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aOreDictName) { case "foodCheese": GT_Values.RA.addSlicerRecipe( - aStack, ItemList.Shape_Slicer_Flat.get(0L), ItemList.Food_Sliced_Cheese.get(4L), 64, 4); + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Cheese.get(4L), + 64, + 4); GT_OreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L)); break; case "foodDough": GT_ModHandler.removeFurnaceSmelting(aStack); - GT_Values.RA.addBenderRecipe( - GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4); + GT_Values.RA + .addBenderRecipe(GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4); GT_Values.RA.addMixerRecipe( aStack, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java index 606d3f0245..c1e767b9b5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java @@ -2,23 +2,25 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingGear() { OrePrefixes.gearGt.add(this); OrePrefixes.gearGtSmall.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case gearGt: GT_ModHandler.removeRecipeByOutputDelayed(aStack); @@ -31,52 +33,30 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr 128, calculateRecipeEU(aMaterial, 8)); } - if (aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { case "Wood": GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "SPS", - "PsP", - "SPS", - 'P', - OrePrefixes.plank.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial) - }); + new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial) }); break; case "Stone": GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "SPS", - "PfP", - "SPS", - 'P', - OrePrefixes.stoneSmooth, - 'S', - new ItemStack(Blocks.stone_button, 1, 32767) - }); + new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S', + new ItemStack(Blocks.stone_button, 1, 32767) }); break; default: if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "SPS", - "PwP", - "SPS", - 'P', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial) - }); + new Object[] { "SPS", "PwP", "SPS", 'P', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial) }); } } } @@ -91,36 +71,28 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr 16, calculateRecipeEU(aMaterial, 8)); } - if (aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { case "Wood": GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"P ", " s", 'P', OrePrefixes.plank.get(aMaterial)}); + new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) }); break; case "Stone": GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"P ", " f", 'P', OrePrefixes.stoneSmooth}); + new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth }); break; default: if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - " S ", - "hPx", - " S ", - 'S', - OrePrefixes.stick.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial) - }); + new Object[] { " S ", "hPx", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 929ad579ad..0a3315a259 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -2,17 +2,19 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -public class ProcessingGem - implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH GEM??? generators +public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH GEM??? + // generators + public ProcessingGem() { OrePrefixes.gem.add(this); OrePrefixes.gemChipped.add(this); @@ -22,8 +24,8 @@ public class ProcessingGem } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { long aMaterialMass = aMaterial.getMass(); boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); @@ -36,7 +38,10 @@ public class ProcessingGem case gem: if (aFuelPower) { GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower * 2, aMaterial.mFuelType); + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower * 2, + aMaterial.mFuelType); } if (!OrePrefixes.block.isIgnored(aMaterial)) { GT_ModHandler.addCompressionRecipe( @@ -50,7 +55,10 @@ public class ProcessingGem } if (aNoSmashing) { GT_Values.RA.addForgeHammerRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), 64, 16); + aStack, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), + 64, + 16); } else { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), @@ -103,22 +111,20 @@ public class ProcessingGem GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"h", "X", 'X', OrePrefixes.gemFlawless.get(aMaterial)}); + new Object[] { "h", "X", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); GT_Values.RA.addImplosionRecipe( GT_Utility.copyAmount(3L, aStack), 8, GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2)); - if (aMaterial.contains(SubTag.SMELTING_TO_GEM)) - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_Proxy.tBits, - new Object[] {"XXX", "XXX", "XXX", 'X', OrePrefixes.nugget.get(aMaterial)}); - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gem.get(aMaterial)}); + if (aMaterial.contains(SubTag.SMELTING_TO_GEM)) GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_Proxy.tBits, + new Object[] { "XXX", "XXX", "XXX", 'X', OrePrefixes.nugget.get(aMaterial) }); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gem.get(aMaterial) }); } } // GT_RecipeRegistrator.registerUsagesForMaterials(OrePrefixes.plate.get(aMaterial).toString(), @@ -153,8 +159,9 @@ public class ProcessingGem 2000, 30); } - for (ItemStack is : OreDictionary.getOres( - "craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver Recipe adder + for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -165,9 +172,11 @@ public class ProcessingGem } break; case gemChipped: - if (aFuelPower) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower / 2, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower / 2, + aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), @@ -184,16 +193,16 @@ public class ProcessingGem GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"h", "X", 'X', OrePrefixes.gemFlawed.get(aMaterial)}); - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gemChipped.get(aMaterial)}); + new Object[] { "h", "X", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemChipped.get(aMaterial) }); } } - for (ItemStack is : OreDictionary.getOres( - "craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver Recipe adder + for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -204,24 +213,27 @@ public class ProcessingGem } break; case gemExquisite: - if (aFuelPower) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower * 8, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower * 8, + aMaterial.mFuelType); if (!aNoWorking) { if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gemExquisite.get(aMaterial)}); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 4L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); } GT_Values.RA.addForgeHammerRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), 64, 16); + aStack, + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), + 64, + 16); break; case gemFlawed: - if (aFuelPower) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA + .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), @@ -238,18 +250,21 @@ public class ProcessingGem GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"h", "X", 'X', OrePrefixes.gem.get(aMaterial)}); - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gemFlawed.get(aMaterial)}); + new Object[] { "h", "X", 'X', OrePrefixes.gem.get(aMaterial) }); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemFlawed.get(aMaterial) }); } } GT_Values.RA.addForgeHammerRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), 64, 16); - for (ItemStack is : OreDictionary.getOres( - "craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver Recipe adder + aStack, + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, 2L), + 64, + 16); + for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -260,15 +275,18 @@ public class ProcessingGem } break; case gemFlawless: - if (aFuelPower) - GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower * 4, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower * 4, + aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), GT_OreDictUnificator.getDust( - aMaterial, aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount), + aMaterial, + aPrefix.mMaterialAmount - OrePrefixes.stickLong.mMaterialAmount), (int) Math.max(aMaterialMass * 5L, 1L), 16); if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) { @@ -280,18 +298,18 @@ public class ProcessingGem GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"h", "X", 'X', OrePrefixes.gemExquisite.get(aMaterial)}); - if (aSpecialRecipeReq) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), - GT_Proxy.tBits, - new Object[] {"X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial)}); + new Object[] { "h", "X", 'X', OrePrefixes.gemExquisite.get(aMaterial) }); + if (aSpecialRecipeReq) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), + GT_Proxy.tBits, + new Object[] { "X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); } } - GT_Values.RA.addForgeHammerRecipe( - aStack, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), 64, 16); - for (ItemStack is : OreDictionary.getOres( - "craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver Recipe adder + GT_Values.RA + .addForgeHammerRecipe(aStack, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), 64, 16); + for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index aa8964f9be..bc2534204a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -2,6 +2,8 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; @@ -9,9 +11,9 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingIngot() { OrePrefixes.ingot.add(this); OrePrefixes.ingotDouble.add(this); @@ -22,20 +24,22 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); boolean aNoSmelting = aMaterial.contains(SubTag.NO_SMELTING); long aMaterialMass = aMaterial.getMass(); - boolean aSpecialRecipeReq = aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + boolean aSpecialRecipeReq = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_SMASHING); switch (aPrefix) { case ingot: if (aMaterial.mFuelPower > 0) { GT_Values.RA.addFuel( - GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower, + aMaterial.mFuelType); } if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { @@ -48,11 +52,16 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator.registerReverseMacerating( - aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); + GT_RecipeRegistrator + .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { GT_RecipeRegistrator.registerReverseArcSmelting( - GT_Utility.copyAmount(1L, aStack), aMaterial, aPrefix.mMaterialAmount, null, null, null); + GT_Utility.copyAmount(1L, aStack), + aMaterial, + aPrefix.mMaterialAmount, + null, + null, + null); } ItemStack tStack; if ((null != (tStack = GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))) @@ -60,16 +69,14 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.removeFurnaceSmelting(tStack); } - if (aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { - if (!aMaterial.contains(SubTag.SMELTING_TO_GEM)) - if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) - && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {ToolDictNames.craftingToolMortar, OrePrefixes.ingot.get(aMaterial)}); + if (!aMaterial.contains(SubTag.SMELTING_TO_GEM)) if ((aMaterial.contains(SubTag.MORTAR_GRINDABLE)) + && (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, aMaterial.mName, true))) + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.ingot.get(aMaterial) }); } if (!aNoSmashing) { @@ -134,13 +141,12 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Enable crafting with hammer if tier is < IV. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile + .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "I", "I", "h", 'I', OrePrefixes.ingot.get(aMaterial) }); } } } @@ -158,21 +164,13 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist (int) Math.max(aMaterialMass * 3L, 1L), calculateRecipeEU(aMaterial, 96)); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile + .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "I", - "B", - "h", - 'I', - OrePrefixes.ingotDouble.get(aMaterial), - 'B', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotDouble.get(aMaterial), 'B', + OrePrefixes.ingot.get(aMaterial) }); } } } @@ -187,21 +185,13 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // If tier < IV add manual crafting. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile + .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "I", - "B", - "h", - 'I', - OrePrefixes.ingotTriple.get(aMaterial), - 'B', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotTriple.get(aMaterial), 'B', + OrePrefixes.ingot.get(aMaterial) }); } } } @@ -215,21 +205,13 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist calculateRecipeEU(aMaterial, 96)); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq - && GregTech_API.sRecipeFile.get( - ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile + .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "I", - "B", - "h", - 'I', - OrePrefixes.ingotQuadruple.get(aMaterial), - 'B', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "I", "B", "h", 'I', OrePrefixes.ingotQuadruple.get(aMaterial), 'B', + OrePrefixes.ingot.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java index 5ed2c203aa..46bcc170f1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java @@ -1,21 +1,22 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class ProcessingItem implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingItem() { OrePrefixes.item.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (GT_OreDictUnificator.getItemData(aStack) == null - && !aOreDictName.equals("itemCertusQuartz") + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + if (GT_OreDictUnificator.getItemData(aStack) == null && !aOreDictName.equals("itemCertusQuartz") && !aOreDictName.equals("itemNetherQuartz")) { switch (aOreDictName) { case "itemSilicon": diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index c1771c4cee..6e3a8eac00 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -8,16 +10,16 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingLens() { OrePrefixes.lens.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aMaterial.mName) { case "Diamond": case "Glass": @@ -54,8 +56,8 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), 2400, 30); - final ITexture lensCoverTexture = - TextureFactory.of(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false); + final ITexture lensCoverTexture = TextureFactory + .of(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false); GregTech_API.registerCover( aStack, TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index 01d9fd63df..43b4e8b98f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -1,22 +1,24 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingLog() { OrePrefixes.log.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.equals("logRubber")) { GT_Values.RA.addCentrifugeRecipe( GT_Utility.copyAmount(1L, aStack), @@ -29,7 +31,7 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), GT_Values.NI, GT_Values.NI, - new int[] {5000, 3750, 2500, 2500}, + new int[] { 5000, 3750, 2500, 2500 }, 200, 20); GT_ModHandler.addSawmillRecipe( @@ -72,7 +74,7 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"sLf", 'L', GT_Utility.copyAmount(1L, aStack)}); + new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) }); GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 4L), @@ -110,8 +112,8 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } } @@ -120,8 +122,8 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } } @@ -153,17 +155,20 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tPlanks, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); GT_ModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, - tStack), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"s", "L", 'L', new ItemStack(aStack.getItem(), 1, i)}); + GT_ModHandler + .addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize + : tStack.stackSize * 5 / 4, + tStack), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount( - tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), + tStack), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {new ItemStack(aStack.getItem(), 1, i)}); + new Object[] { new ItemStack(aStack.getItem(), 1, i) }); } } } else { @@ -171,8 +176,8 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } } @@ -200,15 +205,17 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tPlanks, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, - tStack), - new Object[] {"s", "L", 'L', GT_Utility.copyAmount(1L, aStack)}); + GT_ModHandler + .addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize + : tStack.stackSize * 5 / 4, + tStack), + new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount( - tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), - new Object[] {GT_Utility.copyAmount(1L, aStack)}); + GT_Utility + .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + new Object[] { GT_Utility.copyAmount(1L, aStack) }); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index 1a8e5011f1..d62da2e857 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -2,26 +2,27 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingNugget() { OrePrefixes.nugget.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addAlloySmelterRecipe( GT_Utility.copyAmount(9L, aStack), - aMaterial.contains(SubTag.SMELTING_TO_GEM) - ? ItemList.Shape_Mold_Ball.get(0L) + aMaterial.contains(SubTag.SMELTING_TO_GEM) ? ItemList.Shape_Mold_Ball.get(0L) : ItemList.Shape_Mold_Ingot.get(0L), GT_OreDictUnificator.get( aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, @@ -41,8 +42,8 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator.registerReverseMacerating( - aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); + GT_RecipeRegistrator + .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); if (!aMaterial.contains(SubTag.NO_SMELTING)) { GT_Values.RA.addAlloySmelterRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), @@ -54,7 +55,7 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 9L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"sI ", 'I', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "sI ", 'I', OrePrefixes.ingot.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 7764ded2db..0bc88296da 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -1,5 +1,9 @@ package gregtech.loaders.oreprocessing; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -8,26 +12,24 @@ import gregtech.api.enums.SubTag; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistrator { + private ArrayList<Materials> mAlreadyListedOres = new ArrayList(1000); public ProcessingOre() { for (OrePrefixes tPrefix : OrePrefixes.values()) - if ((tPrefix.name().startsWith("ore")) - && (tPrefix != OrePrefixes.orePoor) + if ((tPrefix.name().startsWith("ore")) && (tPrefix != OrePrefixes.orePoor) && (tPrefix != OrePrefixes.oreSmall) && (tPrefix != OrePrefixes.oreRich) - && (tPrefix != OrePrefixes.oreNormal)) tPrefix.add(this); + && (tPrefix != OrePrefixes.oreNormal)) + tPrefix.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - boolean tIsRich = (aPrefix == OrePrefixes.oreNetherrack) - || (aPrefix == OrePrefixes.oreNether) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + boolean tIsRich = (aPrefix == OrePrefixes.oreNetherrack) || (aPrefix == OrePrefixes.oreNether) || (aPrefix == OrePrefixes.oreEndstone) || (aPrefix == OrePrefixes.oreEnd) || (aPrefix == OrePrefixes.oreRich) @@ -45,7 +47,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, null, - new int[] {tIsRich ? 2000 : 4000}, + new int[] { tIsRich ? 2000 : 4000 }, tIsRich ? 600 : 300, 30); } else { @@ -54,20 +56,22 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra aMaterial, GT_Utility.copyAmount(1L, aStack), Math.max( - 1, - gregtech.api.GregTech_API.sOPStuff.get( - gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier, - aMaterial.toString(), - 1)) + 1, + gregtech.api.GregTech_API.sOPStuff.get( + gregtech.api.enums.ConfigCategories.Materials.oreprocessingoutputmultiplier, + aMaterial.toString(), + 1)) * (tIsRich ? 2 : 1)); } } - private boolean registerStandardOreRecipes( - OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack, int aMultiplier) { + private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack, + int aMultiplier) { if ((aOreStack == null) || (aMaterial == null)) return false; GT_ModHandler.addValuableOre( - GT_Utility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue); + GT_Utility.getBlockFromStack(aOreStack), + aOreStack.getItemDamage(), + aMaterial.mOreValue); Materials tMaterial = aMaterial.mOreReplacement; Materials tPrimaryByMaterial = null; aMultiplier = Math.max(1, aMultiplier); @@ -76,28 +80,28 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); - ItemStack tSmeltInto = tIngot == null - ? null - : aMaterial.contains(SubTag.SMELTING_TO_GEM) - ? GT_OreDictUnificator.get( - OrePrefixes.gem, - tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( - OrePrefixes.crystal, + ItemStack tSmeltInto = tIngot + == null ? null + : aMaterial.contains(SubTag.SMELTING_TO_GEM) + ? GT_OreDictUnificator.get( + OrePrefixes.gem, tMaterial.mDirectSmelting, GT_OreDictUnificator.get( - OrePrefixes.gem, - tMaterial, - GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), + OrePrefixes.crystal, + tMaterial.mDirectSmelting, + GT_OreDictUnificator.get( + OrePrefixes.gem, + tMaterial, + GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), + 1L), 1L), - 1L), - 1L) - : tIngot; + 1L) + : tIngot; ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); - ItemStack tCrushed = - GT_OreDictUnificator.get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier * aMultiplier); + ItemStack tCrushed = GT_OreDictUnificator + .get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier * aMultiplier); ItemStack tPrimaryByProduct = null; if (tCrushed == null) { @@ -116,20 +120,18 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra if (tPrimaryByProduct == null) { tPrimaryByMaterial = tMat; tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) - GT_OreDictUnificator.get( - OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) - GT_OreDictUnificator.get( - OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } if ((!tByProductStacks.isEmpty()) && (!this.mAlreadyListedOres.contains(aMaterial))) { this.mAlreadyListedOres.add(aMaterial); gregtech.api.util.GT_Recipe.GT_Recipe_Map.sByProductList.addFakeRecipe( false, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ore, aMaterial, aOreStack, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ore, aMaterial, aOreStack, 1L) }, (ItemStack[]) tByProductStacks.toArray(new ItemStack[0]), null, null, @@ -149,7 +151,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.removeFurnaceSmelting(aOreStack); } else { tHasSmelting = GT_ModHandler.addSmeltingRecipe( - aOreStack, GT_Utility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); + aOreStack, + GT_Utility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); } if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_TRIPLE)) { @@ -160,8 +163,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -171,8 +174,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -185,8 +188,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -196,8 +199,8 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag.get( - 1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag + .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -216,7 +219,10 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra if (tCrushed != null) { GT_Values.RA.addForgeHammerRecipe( - aOreStack, GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed), 16, 10); + aOreStack, + GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed), + 16, + 10); GT_ModHandler.addPulverisationRecipe( aOreStack, GT_Utility.mul(2L, tCrushed), @@ -235,8 +241,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra tPrimaryByMaterial, GT_Utility.copyAmount(1L, tPrimaryByProduct), 1L), - tPrimaryByProduct == null - ? 0 + tPrimaryByProduct == null ? 0 : tPrimaryByProduct.stackSize * 10 * aMultiplier * aMaterial.mByProductMultiplier, GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial), 50, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java index c6be18cd1f..11c7fb0a3c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java @@ -1,14 +1,16 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingOrePoor() { OrePrefixes.orePoor.add(this); OrePrefixes.oreSmall.add(this); @@ -17,8 +19,8 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { int aMultiplier = 1; switch (aPrefix) { case oreSmall: @@ -52,10 +54,9 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial), 100, true); - if (aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) - GT_ModHandler.addSmeltingRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier)); + if (aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) GT_ModHandler.addSmeltingRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier)); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index ce1bedac21..55f1e6265a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -1,31 +1,27 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipeRegistrator { - private final OrePrefixes[] mSmeltingPrefixes = { - OrePrefixes.crushed, - OrePrefixes.crushedPurified, - OrePrefixes.crushedCentrifuged, - OrePrefixes.dust, - OrePrefixes.dustImpure, - OrePrefixes.dustPure, - OrePrefixes.dustRefined - }; + + private final OrePrefixes[] mSmeltingPrefixes = { OrePrefixes.crushed, OrePrefixes.crushedPurified, + OrePrefixes.crushedCentrifuged, OrePrefixes.dust, OrePrefixes.dustImpure, OrePrefixes.dustPure, + OrePrefixes.dustRefined }; public ProcessingOreSmelting() { for (OrePrefixes tPrefix : this.mSmeltingPrefixes) tPrefix.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_ModHandler.removeFurnaceSmelting(aStack); if (!aMaterial.contains(SubTag.NO_SMELTING)) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { @@ -36,13 +32,11 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe ItemList.Circuit_Integrated.getWithDamage(0L, 1L), null, null, - aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - 1L) - : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + aMaterial, + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), null, (int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp, 120, @@ -162,11 +156,10 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe break; } ItemStack tStack = GT_OreDictUnificator.get(outputPrefix, aMaterial.mDirectSmelting, outputSize); - if (tStack == null) - tStack = GT_OreDictUnificator.get( - aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, - aMaterial.mDirectSmelting, - 1L); + if (tStack == null) tStack = GT_OreDictUnificator.get( + aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, + aMaterial.mDirectSmelting, + 1L); if ((tStack == null) && (!aMaterial.contains(SubTag.SMELTING_TO_GEM))) tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); GT_ModHandler.addSmeltingRecipe(aStack, tStack); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java index 62b623a8b1..45ecc36230 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java @@ -3,13 +3,15 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.enums.GT_Values.RA; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingPipe() { OrePrefixes.pipeHuge.add(this); OrePrefixes.pipeLarge.add(this); @@ -26,8 +28,8 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { switch (aPrefix) { case pipeHuge: case pipeLarge: @@ -39,71 +41,44 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 8L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "PPP", "h w", "PPP", 'P', OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 6L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PWP", - "P P", - "PHP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench - }); + new Object[] { "PWP", "P P", "PHP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 2L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PPP", - "W H", - "PPP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench - }); + new Object[] { "PPP", "W H", "PPP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PHP", - "P P", - "PWP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'H', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSoftHammer - : ToolDictNames.craftingToolHardHammer, - 'W', - aMaterial.contains(SubTag.WOOD) - ? ToolDictNames.craftingToolSaw - : ToolDictNames.craftingToolWrench - }); + new Object[] { "PHP", "P P", "PWP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'H', + aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSoftHammer + : ToolDictNames.craftingToolHardHammer, + 'W', aMaterial.contains(SubTag.WOOD) ? ToolDictNames.craftingToolSaw + : ToolDictNames.craftingToolWrench }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial)}); + new Object[] { "DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial) }); } break; case pipeRestrictiveHuge: @@ -127,9 +102,8 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "MM ", "MM ", " ", 'M', GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) - }); + new Object[] { "MM ", "MM ", " ", 'M', + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) }); } RA.addAssemblerRecipe( @@ -145,14 +119,8 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount(1, aStack), GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PPP", - "PPP", - "PPP", - 'P', - GT_OreDictUnificator.get( - aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) - }); + new Object[] { "PPP", "PPP", "PPP", 'P', GT_OreDictUnificator + .get(aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) }); } RA.addAssemblerRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java index 56b30c5486..921491237a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlank.java @@ -1,5 +1,9 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,18 +11,16 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingPlank() { OrePrefixes.plank.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.startsWith("plankWood")) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), @@ -120,7 +122,7 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"sP", 'P', tStack}); + new Object[] { "sP", 'P', tStack }); } if ((tStack == null) && (i >= 16)) break; } @@ -139,7 +141,7 @@ public class ProcessingPlank implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount(tOutput.stackSize / 3, tOutput), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"sP", 'P', aStack}); + new Object[] { "sP", 'P', aStack }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 7be8375605..73410bb80b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -10,6 +10,11 @@ import static gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLIS import static gregtech.api.util.GT_Utility.calculateRecipeEU; import static gregtech.common.GT_Proxy.tBits; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.render.TextureFactory; @@ -17,12 +22,9 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_RecipeRegistrator; import gregtech.api.util.GT_Utility; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingPlate() { OrePrefixes.plate.add(this); OrePrefixes.plateDouble.add(this); @@ -45,8 +47,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist * @param aStack always != null, the {@link ItemStack} to register */ @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { final boolean aNoSmashing = aMaterial.contains(SubTag.NO_SMASHING); final boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); @@ -112,14 +114,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, 2L), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] {"hX", 'X', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "hX", 'X', OrePrefixes.plate.get(aMaterial) }); if (aMaterial == Materials.Paper) { GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount(GregTech_API.sRecipeFile.get(harderrecipes, aStack, true) ? 2L : 3L, aStack), BUFFERED, - new Object[] {"XXX", 'X', new ItemStack(Items.reeds, 1, W)}); + new Object[] { "XXX", 'X', new ItemStack(Items.reeds, 1, W) }); } if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial) { @@ -131,49 +133,30 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "h", // craftingToolHardHammer - "X", - "X", - 'X', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "h", // craftingToolHardHammer + "X", "X", 'X', OrePrefixes.ingot.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false GT_ModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "H", // craftingToolForgeHammer - "X", - 'H', - ToolDictNames.craftingToolForgeHammer, - 'X', - OrePrefixes.ingot.get(aMaterial) - }); + new Object[] { "H", // craftingToolForgeHammer + "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', + OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "h", // craftingToolHardHammer - "X", - 'X', - OrePrefixes.gem.get(aMaterial) - }); + new Object[] { "h", // craftingToolHardHammer + "X", 'X', OrePrefixes.gem.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false GT_ModHandler.addCraftingRecipe( aMaterial.getPlates(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "H", // craftingToolForgeHammer - "X", - 'H', - ToolDictNames.craftingToolForgeHammer, - 'X', - OrePrefixes.gem.get(aMaterial) - }); + new Object[] { "H", // craftingToolForgeHammer + "X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', + OrePrefixes.gem.get(aMaterial) }); } } @@ -184,14 +167,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addShapelessCraftingRecipe( aMaterial.getDust(1), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] {ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial)}); + new Object[] { ToolDictNames.craftingToolMortar, OrePrefixes.plate.get(aMaterial) }); } } } } - private void registerPlateDouble( - final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, final long aMaterialMass) { + private void registerPlateDouble(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -214,24 +197,19 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - aPlateStack, - 'B', - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', aPlateStack, 'B', aPlateStack }); } // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false - // GT_ModHandler.addShapelessCraftingRecipe( - // GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new + // GT_ModHandler.addShapelessCraftingRecipe( + // GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new // Object[] { - // gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, + // gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, // aPlateStack - // }); + // }); } RA.addBenderRecipe( @@ -252,8 +230,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } } - private void registerPlateTriple( - final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, final long aMaterialMass) { + private void registerPlateTriple(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -277,23 +255,16 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist Object aPlateStack = OrePrefixes.plate.get(aMaterial); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - OrePrefixes.plateDouble.get(aMaterial), - 'B', - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateDouble.get(aMaterial), 'B', aPlateStack }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, - aPlateStack, - aPlateStack, - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, + aPlateStack, aPlateStack }); } } @@ -321,23 +292,18 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)); } - private void registerPlateQuadruple( - final Materials aMaterial, - final ItemStack aStack, - final boolean aNoSmashing, - final long aMaterialMass, - final boolean aNoWorking) { + private void registerPlateQuadruple(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass, final boolean aNoWorking) { registerCover(aMaterial, aStack); GT_ModHandler.removeRecipeByOutputDelayed(aStack); - if (!aNoWorking) - RA.addCNCRecipe( - GT_Utility.copyAmount(1L, aStack), - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - (int) Math.max(aMaterialMass * 2L, 1L), - 30); + if (!aNoWorking) RA.addCNCRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + (int) Math.max(aMaterialMass * 2L, 1L), + 30); if (!aNoSmashing) { @@ -350,24 +316,16 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist Object aPlateStack = OrePrefixes.plate.get(aMaterial); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - OrePrefixes.plateTriple.get(aMaterial), - 'B', - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateTriple.get(aMaterial), 'B', aPlateStack }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, - aPlateStack, - aPlateStack, - aPlateStack, - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { gregtech.api.enums.ToolDictNames.craftingToolForgeHammer, aPlateStack, + aPlateStack, aPlateStack, aPlateStack }); } } @@ -389,8 +347,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } } - private void registerPlateQuintuple( - final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, final long aMaterialMass) { + private void registerPlateQuintuple(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -407,25 +365,16 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist Object aPlateStack = OrePrefixes.plate.get(aMaterial); GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - "I", - "B", - "h", // craftingToolHardHammer - 'I', - OrePrefixes.plateQuadruple.get(aMaterial), - 'B', - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { "I", "B", "h", // craftingToolHardHammer + 'I', OrePrefixes.plateQuadruple.get(aMaterial), 'B', aPlateStack }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(1L, aStack), DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, new Object[] { - ToolDictNames.craftingToolForgeHammer, - aPlateStack, - aPlateStack, - aPlateStack, - aPlateStack, - aPlateStack - }); + GT_Utility.copyAmount(1L, aStack), + DO_NOT_CHECK_FOR_COLLISIONS | BUFFERED, + new Object[] { ToolDictNames.craftingToolForgeHammer, aPlateStack, aPlateStack, aPlateStack, + aPlateStack, aPlateStack }); } } @@ -447,8 +396,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } } - private void registerPlateDense( - final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, final long aMaterialMass) { + private void registerPlateDense(final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing, + final long aMaterialMass) { registerCover(aMaterial, aStack); @@ -464,8 +413,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist } } - private void registerItemCasing( - final OrePrefixes aPrefix, final Materials aMaterial, final ItemStack aStack, final boolean aNoSmashing) { + private void registerItemCasing(final OrePrefixes aPrefix, final Materials aMaterial, final ItemStack aStack, + final boolean aNoSmashing) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); @@ -479,8 +428,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist calculateRecipeEU(aMaterial, 8)); } - if (aMaterial.mUnificatable - && aMaterial.mMaterialInto == aMaterial + if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial && !aNoSmashing && GregTech_API.sRecipeFile.get(ConfigCategories.Tools.hammerplating, aMaterial.toString(), true)) { @@ -488,15 +436,14 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] {"h X", 'X', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "h X", 'X', OrePrefixes.plate.get(aMaterial) }); // Only added if IC2 Forge Hammer is enabled in Recipes.cfg: B:ic2forgehammer_true=false GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 1L), tBits, // DO_NOT_CHECK_FOR_COLLISIONS|BUFFERED|ONLY_ADD_IF_RESULT_IS_NOT_NULL|NOT_REMOVABLE - new Object[] { - "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', OrePrefixes.plate.get(aMaterial) - }); + new Object[] { "H X", 'H', ToolDictNames.craftingToolForgeHammer, 'X', + OrePrefixes.plate.get(aMaterial) }); } } @@ -589,8 +536,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist // Get ItemStack of Block matching Materials ItemStack tStack = NI; // Try different prefixes to use same smooth stones as older GT5U - for (OrePrefixes orePrefix : - new OrePrefixes[] {OrePrefixes.block, OrePrefixes.block_, OrePrefixes.stoneSmooth, OrePrefixes.stone}) { + for (OrePrefixes orePrefix : new OrePrefixes[] { OrePrefixes.block, OrePrefixes.block_, OrePrefixes.stoneSmooth, + OrePrefixes.stone }) { if ((tStack = GT_OreDictUnificator.get(orePrefix, aMaterial, 1)) != NI) break; } @@ -598,14 +545,10 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GregTech_API.registerCover( aStack, // If there is an ItemStack of Block for Materials - tStack == NI - ? - // Use Materials mRGBa dyed blocs/materialicons/MATERIALSET/block1 icons - TextureFactory.builder() - .addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1]) - .setRGBA(aMaterial.mRGBa) - .stdOrient() - .build() + tStack == NI ? + // Use Materials mRGBa dyed blocs/materialicons/MATERIALSET/block1 icons + TextureFactory.builder().addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1]) + .setRGBA(aMaterial.mRGBa).stdOrient().build() : // or copy Block texture TextureFactory.of(Block.getBlockFromItem(tStack.getItem()), tStack.getItemDamage()), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java index dfda2cd0f3..25c2810a94 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java @@ -1,14 +1,16 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingPure() { OrePrefixes.crushedPurified.add(this); OrePrefixes.cleanGravel.add(this); @@ -16,8 +18,8 @@ public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistr } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dustPure, aMaterial.mMacerateInto, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java index 69957bd909..3f06f0676d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRecycling.java @@ -1,14 +1,16 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingRecycling() { for (OrePrefixes tPrefix : OrePrefixes.values()) if ((tPrefix.mIsMaterialBased) && (tPrefix.mMaterialAmount > 0L) && (tPrefix.mIsContainer)) @@ -16,10 +18,9 @@ public class ProcessingRecycling implements gregtech.api.interfaces.IOreRecipeRe } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if ((aMaterial != Materials.Empty) - && (GT_Utility.getFluidForFilledItem(aStack, true) == null) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + if ((aMaterial != Materials.Empty) && (GT_Utility.getFluidForFilledItem(aStack, true) == null) && !aMaterial.contains(SubTag.SMELTING_TO_FLUID)) GT_Values.RA.addCannerRecipe( aStack, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java index f150c073fa..6f05d874e0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java @@ -2,23 +2,24 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingRotor() { OrePrefixes.rotor.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { ItemStack tPlate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L); ItemStack tRing = GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L); @@ -27,37 +28,30 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), GT_Proxy.tBits, new Object[] { - "PhP", - "SRf", - "PdP", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plate.get(aMaterial), - 'R', - OrePrefixes.ring.get(aMaterial), - 'S', - OrePrefixes.screw.get(aMaterial) - }); + GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PhP", "SRf", "PdP", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plate.get(aMaterial), + 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)}, + new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, Materials.Tin.getMolten(32), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), (int) Math.max(aMaterial.getMass(), 1L), calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)}, + new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, Materials.Lead.getMolten(48), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), (int) Math.max(aMaterial.getMass(), 1L), calculateRecipeEU(aMaterial, 24)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4)}, + new ItemStack[] { tPlate.copy(), tRing.copy(), GT_Utility.getIntegratedCircuit(4) }, Materials.SolderingAlloy.getMolten(16), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), (int) Math.max(aMaterial.getMass(), 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java index c621450e80..fd9ab7dbad 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import appeng.core.Api; import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; @@ -10,16 +12,16 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingRound() { OrePrefixes.round.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial, 1L), @@ -31,17 +33,15 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"fX", "Xh", 'X', OrePrefixes.nugget.get(aMaterial)}); + new Object[] { "fX", "Xh", 'X', OrePrefixes.nugget.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 4L), GT_Proxy.tBits, - new Object[] {"fXh", 'X', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "fXh", 'X', OrePrefixes.ingot.get(aMaterial) }); } } if (GT_Mod.gregtechproxy.mAE2Integration) { - Api.INSTANCE - .registries() - .matterCannon() + Api.INSTANCE.registries().matterCannon() .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass()); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java index 53887e2788..2e91eef9f5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSand.java @@ -1,21 +1,23 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingSand implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingSand() { OrePrefixes.sand.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.equals("sandOil")) { GT_Values.RA.addCentrifugeRecipe( GT_Utility.copyAmount(2L, aStack), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java index 4e65e501b3..5ce42c6f45 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSaplings.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -7,20 +9,20 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingSaplings implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingSaplings() { OrePrefixes.treeSapling.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addPulveriserRecipe( GT_Utility.copyAmount(1L, aStack), - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)}, - new int[] {10000}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L) }, + new int[] { 10000 }, 100, 2); GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(8L, aStack), ItemList.IC2_Plantball.get(1L)); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java index 4682394199..65564437e4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingScrew.java @@ -2,21 +2,23 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingScrew() { OrePrefixes.screw.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), @@ -29,7 +31,7 @@ public class ProcessingScrew implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial)}); + new Object[] { "fX", "X ", 'X', OrePrefixes.bolt.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index b131b9273c..3afc8201c6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -2,24 +2,26 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingShaping() { OrePrefixes.ingot.add(this); OrePrefixes.dust.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (((aMaterial == Materials.Glass) || (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null)) && (!aMaterial.contains(SubTag.NO_SMELTING))) { long aMaterialMass = aMaterial.getMass(); @@ -207,20 +209,18 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi calculateRecipeEU(aMaterial, 2 * tVoltageMultiplier)); } } - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Wire.get(0L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); - if (tAmount * 8 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Bolt.get(0L), - GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8), - (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), - calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Wire.get(0L), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial.mSmeltInto, tAmount * 2), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); + if (tAmount * 8 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Bolt.get(0L), + GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial.mSmeltInto, tAmount * 8), + (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), + calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); if (tAmount * 4 <= 64) { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), @@ -228,8 +228,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial.mSmeltInto, tAmount * 4), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 6 * tVoltageMultiplier)); - if ((aMaterial.mUnificatable) - && (aMaterial.mMaterialInto == aMaterial) + if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_SMASHING)) // If material tier < IV then add manual recipe. @@ -237,7 +236,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"h ", "fX", 'X', OrePrefixes.stick.get(aMaterial)}); + new Object[] { "h ", "fX", 'X', OrePrefixes.stick.get(aMaterial) }); } } @@ -349,20 +348,18 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Cell_Empty.get(tAmount), tAmount * 128, 30); - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingadviron", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingadviron", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingadviron", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingadviron", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Iron": case "WroughtIron": @@ -372,27 +369,24 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("fuelRod", tAmount), tAmount * 128, 30); - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingiron", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingiron", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); - if (tAmount * 31 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(31L, aStack), - ItemList.Shape_Mold_Anvil.get(0L), - new ItemStack(Blocks.anvil, 1, 0), - tAmount * 512, - 4 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingiron", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingiron", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); + if (tAmount * 31 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(31L, aStack), + ItemList.Shape_Mold_Anvil.get(0L), + new ItemStack(Blocks.anvil, 1, 0), + tAmount * 512, + 4 * tVoltageMultiplier); break; case "Tin": GT_Values.RA.addExtruderRecipe( @@ -401,85 +395,75 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi ItemList.Cell_Empty.get(tAmount), tAmount * 128, 30); - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingtin", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingtin", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingtin", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingtin", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Lead": - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casinglead", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casinglead", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casinglead", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casinglead", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Copper": case "AnnealedCopper": - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingcopper", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingcopper", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingcopper", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingcopper", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Bronze": - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casingbronze", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casingbronze", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casingbronze", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casingbronze", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Gold": - if (tAmount * 2 <= 64) - GT_Values.RA.addExtruderRecipe( - GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Casing.get(0L), - GT_ModHandler.getIC2Item("casinggold", tAmount * 2), - tAmount * 32, - 3 * tVoltageMultiplier); - if (tAmount * 2 <= 64) - GT_Values.RA.addAlloySmelterRecipe( - GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Mold_Casing.get(0L), - GT_ModHandler.getIC2Item("casinggold", tAmount * 3), - tAmount * 128, - 1 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Shape_Extruder_Casing.get(0L), + GT_ModHandler.getIC2Item("casinggold", tAmount * 2), + tAmount * 32, + 3 * tVoltageMultiplier); + if (tAmount * 2 <= 64) GT_Values.RA.addAlloySmelterRecipe( + GT_Utility.copyAmount(2L, aStack), + ItemList.Shape_Mold_Casing.get(0L), + GT_ModHandler.getIC2Item("casinggold", tAmount * 3), + tAmount * 128, + 1 * tVoltageMultiplier); break; case "Polytetrafluoroethylene": // Recipe for cells from PTFE, why is it here? GT_Values.RA.addExtruderRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java index 29a990aedc..1b7440b2af 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java @@ -2,22 +2,24 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.enums.GT_Values.MOD_ID_RC; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingSlab implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingSlab() { OrePrefixes.slab.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.startsWith("slabWood")) { if (Loader.isModLoaded(MOD_ID_RC)) { GT_Values.RA.addChemicalBathRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java index 69d7366c83..3e7470b5f7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStick.java @@ -2,31 +2,32 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingStick() { OrePrefixes.stick.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 1L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {" s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial)}); + new Object[] { " s ", "fPx", 'P', OrePrefixes.stick.get(aMaterial) }); } if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_WORKING)) { GT_Values.RA.addLatheRecipe( - aMaterial.contains(SubTag.CRYSTAL) - ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) + aMaterial.contains(SubTag.CRYSTAL) ? GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, aMaterial.mMacerateInto, 2L), @@ -43,11 +44,11 @@ public class ProcessingStick implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"s", "X", 'X', OrePrefixes.stickLong.get(aMaterial)}); + new Object[] { "s", "X", 'X', OrePrefixes.stickLong.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"f ", " X", 'X', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "f ", " X", 'X', OrePrefixes.ingot.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java index 0558310751..e586922891 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStickLong.java @@ -2,26 +2,28 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import net.minecraft.item.ItemStack; public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingStickLong() { OrePrefixes.stickLong.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.spring, aMaterial, 1L), GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {" s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial)}); + new Object[] { " s ", "fSx", " S ", 'S', OrePrefixes.stickLong.get(aMaterial) }); } if (!aMaterial.contains(SubTag.NO_WORKING)) { GT_Values.RA.addCutterRecipe( @@ -35,11 +37,11 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial)}); + new Object[] { "sf", "G ", 'G', OrePrefixes.gemFlawless.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 2L), GT_Proxy.tBits, - new Object[] {"sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial)}); + new Object[] { "sf", "G ", 'G', OrePrefixes.gemExquisite.get(aMaterial) }); } } } @@ -54,7 +56,7 @@ public class ProcessingStickLong implements gregtech.api.interfaces.IOreRecipeRe GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"ShS", 'S', OrePrefixes.stick.get(aMaterial)}); + new Object[] { "ShS", 'S', OrePrefixes.stick.get(aMaterial) }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index fcd604ef3b..72239056cd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -1,5 +1,10 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -8,19 +13,16 @@ import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingStone implements IOreRecipeRegistrator { + public ProcessingStone() { OrePrefixes.stone.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { Block aBlock = GT_Utility.getBlockFromStack(aStack); switch (aMaterial.mName) { case "NULL": @@ -34,7 +36,11 @@ public class ProcessingStone implements IOreRecipeRegistrator { break; case "Sand": GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), new ItemStack(Blocks.sand, 1, 0), null, 10, false); + GT_Utility.copyAmount(1L, aStack), + new ItemStack(Blocks.sand, 1, 0), + null, + 10, + false); break; case "Endstone": GT_ModHandler.addPulverisationRecipe( @@ -87,7 +93,8 @@ public class ProcessingStone implements IOreRecipeRegistrator { 100, 30); GT_ModHandler.addPulverisationRecipe( - GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)); + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)); break; case "Rhyolite": GT_ModHandler.addPulverisationRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java index 4e78aaf72f..fad83fe171 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneCobble.java @@ -1,23 +1,25 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ProcessingStoneCobble implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingStoneCobble() { OrePrefixes.stoneCobble.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { GT_Values.RA.addAssemblerRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java index 539e0513e0..1bab13c5b5 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStoneVarious.java @@ -1,13 +1,15 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Utility; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingStoneVarious implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingStoneVarious() { OrePrefixes.stone.add(this); OrePrefixes.stoneCobble.add(this); @@ -20,12 +22,8 @@ public class ProcessingStoneVarious implements gregtech.api.interfaces.IOreRecip } @Override - public void registerOre( - OrePrefixes aPrefix, - gregtech.api.enums.Materials aMaterial, - String aOreDictName, - String aModName, - ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, gregtech.api.enums.Materials aMaterial, String aOreDictName, + String aModName, ItemStack aStack) { if (aPrefix == OrePrefixes.stoneSmooth) { GT_Values.RA.addAssemblerRecipe( GT_Utility.copyAmount(1L, aStack), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index 25ebbe793c..31260c1308 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -2,16 +2,18 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; import gregtech.common.items.GT_MetaGenerated_Tool_01; -import net.minecraft.item.ItemStack; -public class ProcessingToolHead - implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH OLD TOOL HEAD??? generator +public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH OLD TOOL + // HEAD??? generator + public ProcessingToolHead() { OrePrefixes.toolHeadArrow.add(this); OrePrefixes.toolHeadAxe.add(this); @@ -33,13 +35,11 @@ public class ProcessingToolHead } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - boolean aSpecialRecipeReq1 = aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { + boolean aSpecialRecipeReq1 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_SMASHING); - boolean aSpecialRecipeReq2 = aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { @@ -57,858 +57,489 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"Xf", 'X', OrePrefixes.gemChipped.get(aMaterial)}); + new Object[] { "Xf", 'X', OrePrefixes.gemChipped.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.toolHeadArrow, aMaterial, 3L), GT_Proxy.tBits, - new Object[] { - (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", - 'P', - OrePrefixes.plate.get(aMaterial) - }); + new Object[] { (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", 'P', + OrePrefixes.plate.get(aMaterial) }); } break; case toolHeadAxe: GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.AXE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.AXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(2) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(2) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.AXE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.AXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, 120); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PIh", - "P ", - "f ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GG ", "G ", "f ", 'G', OrePrefixes.gem.get(aMaterial)}); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PIh", "P ", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GG ", "G ", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); break; case toolHeadBuzzSaw: GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 100000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 75000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 50000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.BUZZSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.BUZZSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1600000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.BUZZSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1200000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.BUZZSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {800000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PBM", - "dXG", - "SGP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "PBM", "dXG", "SGP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial) }); break; case toolHeadChainsaw: GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 100000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 75000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, aMaterial, Materials.Steel, new long[] { - 50000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.CHAINSAW_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.CHAINSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1600000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.CHAINSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1200000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.CHAINSAW_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {800000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "SRS", - "XhX", - "SRS", - 'X', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.plate.get(Materials.Steel), - 'R', - OrePrefixes.ring.get(Materials.Steel) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadChainsaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SRS", "XhX", "SRS", 'X', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel) }); break; case toolHeadDrill: GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, 1, aMaterial, Materials.Steel, new long[] { - 100_000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100_000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, 1, aMaterial, Materials.Steel, new long[] { - 75_000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75_000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, 1, aMaterial, Materials.Steel, new long[] { - 50_000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50_000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400_000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400_000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300_000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300_000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200_000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200_000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1_600_000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1_600_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1_200_000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1_200_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 800_000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.JACKHAMMER, 1, aMaterial, Materials.StainlessSteel, - new long[] {1_600_000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1_600_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "PRP", - "MPB", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Piston_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'R', - OrePrefixes.spring.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Piston_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'R', + OrePrefixes.spring.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.JACKHAMMER, 1, aMaterial, Materials.StainlessSteel, - new long[] {1_200_000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1_200_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "PRP", - "MPB", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Piston_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'R', - OrePrefixes.spring.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Piston_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'R', + OrePrefixes.spring.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.JACKHAMMER, 1, aMaterial, Materials.StainlessSteel, - new long[] {800_000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 800_000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "PRP", - "MPB", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Piston_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'R', - OrePrefixes.spring.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); + new Object[] { "SXd", "PRP", "MPB", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Piston_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'R', + OrePrefixes.spring.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); if (aSpecialRecipeReq2) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.toolHeadDrill, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "XSX", - "XSX", - "ShS", - 'X', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.plate.get(Materials.Steel) - }); + new Object[] { "XSX", "XSX", "ShS", 'X', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.plate.get(Materials.Steel) }); if (aMaterial.getMolten(1) != null) { GT_Values.RA.addFluidSolidifierRecipe( ItemList.Shape_Mold_ToolHeadDrill.get(0), @@ -931,8 +562,12 @@ public class ProcessingToolHead if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.FILE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -946,28 +581,23 @@ public class ProcessingToolHead GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "P", - "P", - "S", - 'P', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) - }); + new Object[] { "P", "P", "S", 'P', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } } } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(15) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(15) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.FILE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); @@ -976,75 +606,71 @@ public class ProcessingToolHead if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HOE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.HOE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(16) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(16) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HOE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.HOE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PIh", - "f ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial)}); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PIh", "f ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); break; case toolHeadPickaxe: if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PICKAXE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.PICKAXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PII", - "f h", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PII", "f h", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(5) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(5) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PICKAXE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.PICKAXE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, 120); @@ -1054,31 +680,35 @@ public class ProcessingToolHead GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLOW, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.PLOW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial)}); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PP", "PP", "hf", 'P', OrePrefixes.plate.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(6) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(6) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLOW, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.PLOW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); @@ -1088,38 +718,36 @@ public class ProcessingToolHead GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.SAW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PP ", - "fh ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PP ", "fh ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GGf", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GGf", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(7) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(7) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SAW, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); @@ -1129,38 +757,36 @@ public class ProcessingToolHead GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SENSE, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.SENSE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "PPI", - "hf ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "PPI", "hf ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(8) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(8) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SENSE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SENSE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); @@ -1168,583 +794,371 @@ public class ProcessingToolHead case toolHeadShovel: GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SHOVEL, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.SHOVEL, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(9) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(9) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SHOVEL, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SHOVEL, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, 120); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) - }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"fG", 'G', OrePrefixes.gem.get(aMaterial)}); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fG", 'G', OrePrefixes.gem.get(aMaterial) }); break; case toolHeadSword: if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SWORD, 1, aMaterial, aMaterial.mHandleMaterial, null), - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + GT_MetaGenerated_Tool_01.SWORD, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - " P ", - "fPh", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { " P ", "fPh", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); - if (!aNoWorking) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {" G", "fG", 'G', OrePrefixes.gem.get(aMaterial)}); + if (!aNoWorking) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { " G", "fG", 'G', OrePrefixes.gem.get(aMaterial) }); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(10) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(10) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SWORD, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SWORD, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, calculateRecipeEU(aMaterial, 120)); break; case toolHeadUniversalSpade: GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, aMaterial, aMaterial, null), - new Object[] { - aOreDictName, - OrePrefixes.stick.get(aMaterial), - OrePrefixes.screw.get(aMaterial), - ToolDictNames.craftingToolScrewdriver - }); + GT_MetaGenerated_Tool_01.UNIVERSALSPADE, + 1, + aMaterial, + aMaterial, + null), + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial), OrePrefixes.screw.get(aMaterial), + ToolDictNames.craftingToolScrewdriver }); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(11) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(11) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.UNIVERSALSPADE, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), 200, 120); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] {"fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial)}); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial) }); break; case toolHeadWrench: GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, 1, aMaterial, Materials.Steel, new long[] { - 100000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, 1, aMaterial, Materials.Steel, new long[] { - 75000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, 1, aMaterial, Materials.Steel, new long[] { - 50000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_LV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_MV.get(1L), + 'S', OrePrefixes.screw.get(Materials.Aluminium), 'P', + OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1600000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 1200000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, 1, aMaterial, Materials.StainlessSteel, new long[] { - 800000L, 512L, 3L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.WRENCH_HV, + 1, + aMaterial, + Materials.StainlessSteel, + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SXd", - "GMG", - "PBP", - 'X', - aOreDictName, - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); + new Object[] { "SXd", "GMG", "PBP", 'X', aOreDictName, 'M', ItemList.Electric_Motor_HV.get(1L), + 'S', OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, 1, aMaterial, Materials.Steel, new long[] { - 100000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 100000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, 1, aMaterial, Materials.Steel, new long[] { - 75000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 75000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Cadmium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, 1, aMaterial, Materials.Steel, new long[] { - 50000L, 32L, 1L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + 1, + aMaterial, + Materials.Steel, + new long[] { 50000L, 32L, 1L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_LV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Steel), - 'P', - OrePrefixes.plate.get(Materials.Steel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', - ItemList.Battery_RE_LV_Sodium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_LV.get(1L), 'S', OrePrefixes.screw.get(Materials.Steel), 'P', + OrePrefixes.plate.get(Materials.Steel), 'G', + OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', + ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 400000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 400000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), + 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 300000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 300000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Cadmium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), + 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, 1, aMaterial, Materials.Aluminium, new long[] { - 200000L, 128L, 2L, -1L - }), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + 1, + aMaterial, + Materials.Aluminium, + new long[] { 200000L, 128L, 2L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_MV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.Aluminium), - 'P', - OrePrefixes.plate.get(Materials.Aluminium), - 'G', - OrePrefixes.gearGtSmall.get(Materials.Aluminium), - 'B', - ItemList.Battery_RE_MV_Sodium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_MV.get(1L), 'S', OrePrefixes.screw.get(Materials.Aluminium), + 'P', OrePrefixes.plate.get(Materials.Aluminium), 'G', + OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', + ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1600000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1600000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {1200000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 1200000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Cadmium.get(1L) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, 1, aMaterial, Materials.StainlessSteel, - new long[] {800000L, 512L, 3L, -1L}), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + new long[] { 800000L, 512L, 3L, -1L }), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PdX", - "MGS", - "GBP", - 'X', - OrePrefixes.stickLong.get(aMaterial), - 'M', - ItemList.Electric_Motor_HV.get(1L), - 'S', - OrePrefixes.screw.get(Materials.StainlessSteel), - 'P', - OrePrefixes.plate.get(Materials.StainlessSteel), - 'G', - OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), - 'B', - ItemList.Battery_RE_HV_Sodium.get(1L) - }); - if (aSpecialRecipeReq2) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "hXW", - "XRX", - "WXd", - 'X', - OrePrefixes.plate.get(aMaterial), - 'S', - OrePrefixes.plate.get(Materials.Steel), - 'R', - OrePrefixes.ring.get(Materials.Steel), - 'W', - OrePrefixes.screw.get(Materials.Steel) - }); + new Object[] { "PdX", "MGS", "GBP", 'X', OrePrefixes.stickLong.get(aMaterial), 'M', + ItemList.Electric_Motor_HV.get(1L), 'S', + OrePrefixes.screw.get(Materials.StainlessSteel), 'P', + OrePrefixes.plate.get(Materials.StainlessSteel), 'G', + OrePrefixes.gearGtSmall.get(Materials.StainlessSteel), 'B', + ItemList.Battery_RE_HV_Sodium.get(1L) }); + if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadWrench, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "hXW", "XRX", "WXd", 'X', OrePrefixes.plate.get(aMaterial), 'S', + OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel), 'W', + OrePrefixes.screw.get(Materials.Steel) }); break; case toolHeadHammer: case toolHeadMallet: GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), - GT_Utility.getIntegratedCircuit(14) - }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(14) }, GT_Values.NF, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) @@ -1767,7 +1181,7 @@ public class ProcessingToolHead aMaterial.mHandleMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial)}); + new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) @@ -1778,17 +1192,10 @@ public class ProcessingToolHead aMaterial.mHandleMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "XX ", - "XXS", - "XX ", - 'X', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(Materials.Wood) - : OrePrefixes.ingot.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) - }); + new Object[] { "XX ", "XXS", "XX ", 'X', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) + : OrePrefixes.ingot.get(aMaterial), + 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( (aMaterial.contains(SubTag.BOUNCY)) || (aMaterial.contains(SubTag.WOOD)) @@ -1799,32 +1206,16 @@ public class ProcessingToolHead aMaterial.mHandleMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "XX ", - "XXS", - "XX ", - 'X', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(Materials.Wood) - : OrePrefixes.gem.get(aMaterial), - 'S', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) - }); + new Object[] { "XX ", "XXS", "XX ", 'X', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(Materials.Wood) + : OrePrefixes.gem.get(aMaterial), + 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } - if (aPrefix == OrePrefixes.toolHeadHammer) - if (aSpecialRecipeReq1) - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { - "II ", - "IIh", - "II ", - 'P', - OrePrefixes.plate.get(aMaterial), - 'I', - OrePrefixes.ingot.get(aMaterial) - }); + if (aPrefix == OrePrefixes.toolHeadHammer) if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "II ", "IIh", "II ", 'P', OrePrefixes.plate.get(aMaterial), 'I', + OrePrefixes.ingot.get(aMaterial) }); break; case turbineBlade: GT_Values.RA.addAssemblerRecipe( @@ -1857,19 +1248,10 @@ public class ProcessingToolHead GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), GT_Proxy.tBits, - new Object[] { - "fPd", - "SPS", - " P ", - 'P', - aMaterial == Materials.Wood - ? OrePrefixes.plank.get(aMaterial) - : OrePrefixes.plateDouble.get(aMaterial), - 'R', - OrePrefixes.ring.get(aMaterial), - 'S', - OrePrefixes.screw.get(aMaterial) - }); + new Object[] { "fPd", "SPS", " P ", 'P', + aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) + : OrePrefixes.plateDouble.get(aMaterial), + 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial) }); } GT_Values.RA.addFormingPressRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java index d50fa96967..59a9e6a479 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java @@ -1,206 +1,132 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.common.items.GT_MetaGenerated_Tool_01; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingToolOther() { OrePrefixes.toolHeadHammer.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { if (aMaterial != Materials.Rubber) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLUNGER, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.PLUNGER, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "xRR", - " SR", - "S f", - 'S', - OrePrefixes.stick.get(aMaterial), - 'R', - OrePrefixes.plate.get(Materials.AnyRubber) - }); + new Object[] { "xRR", " SR", "S f", 'S', OrePrefixes.stick.get(aMaterial), 'R', + OrePrefixes.plate.get(Materials.AnyRubber) }); } - if ((!aMaterial.contains(SubTag.WOOD)) - && (!aMaterial.contains(SubTag.BOUNCY)) + if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial)}); + new Object[] { "IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CROWBAR, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] {"hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue}); + new Object[] { "hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, aMaterial, aMaterial.mHandleMaterial, null), + GT_MetaGenerated_Tool_01.SCREWDRIVER, + 1, + aMaterial, + aMaterial.mHandleMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - " fS", - " Sh", - "W ", - 'S', - OrePrefixes.stick.get(aMaterial), - 'W', - OrePrefixes.stick.get(aMaterial.mHandleMaterial) - }); + new Object[] { " fS", " Sh", "W ", 'S', OrePrefixes.stick.get(aMaterial), 'W', + OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PfP", - "hPd", - "STS", - 'S', - OrePrefixes.stick.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial), - 'T', - OrePrefixes.screw.get(aMaterial) - }); + new Object[] { "PfP", "hPd", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCOOP, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.SCOOP, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "SWS", - "SSS", - "xSh", - 'S', - OrePrefixes.stick.get(aMaterial), - 'W', - new ItemStack(Blocks.wool, 1, 32767) - }); + new Object[] { "SWS", "SSS", "xSh", 'S', OrePrefixes.stick.get(aMaterial), 'W', + new ItemStack(Blocks.wool, 1, 32767) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BRANCHCUTTER, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.BRANCHCUTTER, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PfP", - "PdP", - "STS", - 'S', - OrePrefixes.stick.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial), - 'T', - OrePrefixes.screw.get(aMaterial) - }); + new Object[] { "PfP", "PdP", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.KNIFE, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.KNIFE, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) - }); + new Object[] { "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, + 1, + aMaterial, + aMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "PPf", - "PP ", - "Sh ", - 'S', - OrePrefixes.stick.get(aMaterial), - 'P', - OrePrefixes.plate.get(aMaterial) - }); + new Object[] { "PPf", "PP ", "Sh ", 'S', OrePrefixes.stick.get(aMaterial), 'P', + OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, aMaterial, Materials.Rubber, new long[] { - 100000L, 32L, 1L, -1L - }), + GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, + 1, + aMaterial, + Materials.Rubber, + new long[] { 100000L, 32L, 1L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "LBf", - "Sd ", - "P ", - 'B', - OrePrefixes.bolt.get(aMaterial), - 'P', - OrePrefixes.plate.get(Materials.AnyRubber), - 'S', - OrePrefixes.stick.get(Materials.Iron), - 'L', - ItemList.Battery_RE_LV_Lithium.get(1L) - }); + new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', + OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Iron), + 'L', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_MV, 1, aMaterial, Materials.Rubber, new long[] { - 400000L, 128L, 2L, -1L - }), + GT_MetaGenerated_Tool_01.SOLDERING_IRON_MV, + 1, + aMaterial, + Materials.Rubber, + new long[] { 400000L, 128L, 2L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "LBf", - "Sd ", - "P ", - 'B', - OrePrefixes.bolt.get(aMaterial), - 'P', - OrePrefixes.plate.get(Materials.AnyRubber), - 'S', - OrePrefixes.stick.get(Materials.Steel), - 'L', - ItemList.Battery_RE_MV_Lithium.get(1L) - }); + new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', + OrePrefixes.plate.get(Materials.AnyRubber), 'S', OrePrefixes.stick.get(Materials.Steel), + 'L', ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SOLDERING_IRON_HV, 1, aMaterial, Materials.AnySyntheticRubber, - new long[] {1600000L, 512L, 3L, -1L}), + new long[] { 1600000L, 512L, 3L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "LBf", - "Sd ", - "P ", - 'B', - OrePrefixes.bolt.get(aMaterial), - 'P', - OrePrefixes.plate.get(Materials.AnySyntheticRubber), - 'S', - OrePrefixes.stick.get(Materials.StainlessSteel), - 'L', - ItemList.Battery_RE_HV_Lithium.get(1L) - }); + new Object[] { "LBf", "Sd ", "P ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', + OrePrefixes.plate.get(Materials.AnySyntheticRubber), 'S', + OrePrefixes.stick.get(Materials.StainlessSteel), 'L', + ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( (GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.POCKET_MULTITOOL, 1, aMaterial, aMaterial, null)), + GT_MetaGenerated_Tool_01.POCKET_MULTITOOL, + 1, + aMaterial, + aMaterial, + null)), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "ABC", - "DEF", - "CFG", - 'A', - OrePrefixes.stickLong.get(aMaterial), - 'B', - OrePrefixes.toolHeadSaw.get(aMaterial), - 'C', - OrePrefixes.ring.get(aMaterial), - 'D', - OrePrefixes.toolHeadFile.get(aMaterial), - 'E', - OrePrefixes.plate.get(aMaterial), - 'F', - OrePrefixes.toolHeadSword.get(aMaterial), - 'G', - Dyes.dyeBlue - }); + new Object[] { "ABC", "DEF", "CFG", 'A', OrePrefixes.stickLong.get(aMaterial), 'B', + OrePrefixes.toolHeadSaw.get(aMaterial), 'C', OrePrefixes.ring.get(aMaterial), 'D', + OrePrefixes.toolHeadFile.get(aMaterial), 'E', OrePrefixes.plate.get(aMaterial), 'F', + OrePrefixes.toolHeadSword.get(aMaterial), 'G', Dyes.dyeBlue }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java index 217781f61a..1d0fa1c3bb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java @@ -1,30 +1,33 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IOreRecipeRegistrator; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingTransforming implements IOreRecipeRegistrator { + public ProcessingTransforming() { for (OrePrefixes tPrefix : OrePrefixes.values()) if (((tPrefix.mMaterialAmount > 0L) && (!tPrefix.mIsContainer) && (!tPrefix.mIsEnchantable)) - || (tPrefix == OrePrefixes.plank)) tPrefix.add(this); + || (tPrefix == OrePrefixes.plank)) + tPrefix.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aPrefix == OrePrefixes.plank) aPrefix = OrePrefixes.plate; switch (aMaterial.mName) { case "Wood": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.SeedOil.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)), + Materials.SeedOil + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)), GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), GT_Values.NI, GT_Values.NI, @@ -33,8 +36,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { 8); GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.SeedOilLin.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), + Materials.SeedOilLin + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), GT_Values.NI, GT_Values.NI, @@ -43,8 +46,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { 8); GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.SeedOilHemp.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), + Materials.SeedOilHemp + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), GT_Values.NI, GT_Values.NI, @@ -55,8 +58,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Iron": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)), + Materials.FierySteel + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)), GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), GT_Values.NI, GT_Values.NI, @@ -72,8 +75,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "WroughtIron": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)), + Materials.FierySteel + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)), GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), GT_Values.NI, GT_Values.NI, @@ -89,8 +92,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Steel": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel.getFluid( - GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)), + Materials.FierySteel + .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)), GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), GT_Values.NI, GT_Values.NI, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java index 315e8a7549..6b6580885e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWax.java @@ -1,19 +1,21 @@ package gregtech.loaders.oreprocessing; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; public class ProcessingWax implements gregtech.api.interfaces.IOreRecipeRegistrator { + public ProcessingWax() { OrePrefixes.wax.add(this); } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (aOreDictName.equals("waxMagical")) GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aStack), null, 6, 5); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index ae1b476b94..9b136ad29b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -2,6 +2,10 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; + import appeng.api.config.TunnelType; import appeng.core.Api; import cpw.mods.fml.common.Optional; @@ -12,14 +16,12 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistrator { - private Materials[] dielectrics = {Materials.PolyvinylChloride, Materials.Polydimethylsiloxane}; - private Materials[] rubbers = {Materials.Rubber, Materials.StyreneButadieneRubber, Materials.Silicone}; - private Materials[] syntheticRubbers = {Materials.StyreneButadieneRubber, Materials.Silicone}; + private Materials[] dielectrics = { Materials.PolyvinylChloride, Materials.Polydimethylsiloxane }; + private Materials[] rubbers = { Materials.Rubber, Materials.StyreneButadieneRubber, Materials.Silicone }; + private Materials[] syntheticRubbers = { Materials.StyreneButadieneRubber, Materials.Silicone }; private static Object tt; @@ -33,8 +35,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } @Override - public void registerOre( - OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + ItemStack aStack) { if (GT_Mod.gregtechproxy.mAE2Integration) { if (tt == TunnelType.ME) { try { @@ -64,14 +66,13 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr 200, calculateRecipeEU(aMaterial, 8)); } - if (aMaterial.mUnificatable - && (aMaterial.mMaterialInto == aMaterial) + if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), GT_Proxy.tBits, - new Object[] {"Xx", 'X', OrePrefixes.plate.get(aMaterial)}); + new Object[] { "Xx", 'X', OrePrefixes.plate.get(aMaterial) }); } } GT_Values.RA.addAssemblerRecipe( @@ -110,10 +111,11 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt02; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), new Object[] {aOreDictName}); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); } break; case wireGt04: @@ -121,16 +123,15 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt04; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), new Object[] {aOreDictName}); - GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] { - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial) - }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 4L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial) }); } break; case wireGt08: @@ -138,20 +139,17 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr correspondingCable = OrePrefixes.cableGt08; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), new Object[] {aOreDictName}); - GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, aStack), new Object[] { - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial), - OrePrefixes.wireGt01.get(aMaterial) - }); + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 8L), + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial), + OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_Utility.copyAmount(1L, aStack), + new Object[] { OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } break; case wireGt12: @@ -160,10 +158,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 12L), - new Object[] {aOreDictName}); + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } break; case wireGt16: @@ -173,13 +171,13 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addShapelessCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 16L), - new Object[] {aOreDictName}); + new Object[] { aOreDictName }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt08.get(aMaterial) }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount(1L, aStack), - new Object[] {OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)}); + new Object[] { OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); if (GT_Mod.gregtechproxy.mAE2Integration) { AE2addNewAttunement(aStack); @@ -187,8 +185,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } break; default: - GT_Log.err.println("OrePrefix " + aPrefix.name() + " cannot be registered as a cable for Material " - + aMaterial.mName); + GT_Log.err.println( + "OrePrefix " + aPrefix.name() + + " cannot be registered as a cable for Material " + + aMaterial.mName); return; } @@ -207,7 +207,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr craftingListRubber.add(OrePrefixes.plate.get(Materials.Rubber)); } GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), craftingListRubber.toArray()); + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + craftingListRubber.toArray()); GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Rubber), costMultiplier), @@ -272,13 +273,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)}, + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {aStack, dielectric.getDustSmall(costMultiplier)}, + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, @@ -310,13 +312,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier)}, + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, 8); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {aStack, dielectric.getDustSmall(costMultiplier)}, + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, @@ -350,15 +353,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier) - }, + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {aStack, dielectric.getDustSmall(costMultiplier)}, + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, @@ -367,66 +369,60 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } } else { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - aStack, - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), - GT_Utility.getIntegratedCircuit(24) - }, + new ItemStack[] { aStack, + GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), + GT_Utility.getIntegratedCircuit(24) }, Materials.Silicone.getMolten(costMultiplier * 72), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - aStack, - GT_OreDictUnificator.get( - OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier), - GT_Utility.getIntegratedCircuit(24) - }, + new ItemStack[] { aStack, + GT_OreDictUnificator + .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier), + GT_Utility.getIntegratedCircuit(24) }, Materials.Silicone.getMolten(costMultiplier * 72), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, calculateRecipeEU(aMaterial, 8)); for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier), + GT_OreDictUnificator + .get(OrePrefixes.foil, aMaterial, costMultiplier * 4) }, + syntheticRubber.getMolten(costMultiplier * 144), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), + 400, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4) - }, + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.PolyphenyleneSulfide, + costMultiplier * 4) }, syntheticRubber.getMolten(costMultiplier * 144), GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, calculateRecipeEU(aMaterial, 8)); + GT_Values.RA + .addAssemblerRecipe( + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), + GT_OreDictUnificator + .get(OrePrefixes.foil, aMaterial, costMultiplier) }, + syntheticRubber.getMolten(costMultiplier * 36), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier), - GT_OreDictUnificator.get( - OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier * 4) - }, - syntheticRubber.getMolten(costMultiplier * 144), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), - 400, - calculateRecipeEU(aMaterial, 8)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - aStack, - dielectric.getDustSmall(costMultiplier), - GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier) - }, - syntheticRubber.getMolten(costMultiplier * 36), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - aStack, - dielectric.getDustSmall(costMultiplier), - GT_OreDictUnificator.get( - OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier) - }, + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.PolyphenyleneSulfide, + costMultiplier) }, syntheticRubber.getMolten(costMultiplier * 36), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), 100, @@ -466,9 +462,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr @Optional.Method(modid = "appliedenergistics2") private void AE2AddNetAttunementCable(ItemStack aStack, OrePrefixes correspondingCable, Materials aMaterial) { Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt); - Api.INSTANCE - .registries() - .p2pTunnel() + Api.INSTANCE.registries().p2pTunnel() .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt); } // end region |