From 6f31720697bcc351421a4d86ba3bf749375dd12c Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 27 Aug 2022 10:19:57 +0100 Subject: Update buildscript & apply spotless (#1306) * Update dependencies * Update buildscript, apply spotless --- .../loaders/oreprocessing/ProcessingAll.java | 9 +- .../loaders/oreprocessing/ProcessingArrows.java | 101 +- .../loaders/oreprocessing/ProcessingBeans.java | 6 +- .../loaders/oreprocessing/ProcessingBlock.java | 77 +- .../loaders/oreprocessing/ProcessingBolt.java | 11 +- .../loaders/oreprocessing/ProcessingCell.java | 129 +- .../loaders/oreprocessing/ProcessingCircuit.java | 31 +- .../oreprocessing/ProcessingCompressed.java | 8 +- .../loaders/oreprocessing/ProcessingCrafting.java | 408 ++++- .../loaders/oreprocessing/ProcessingCrate.java | 91 +- .../loaders/oreprocessing/ProcessingCrop.java | 73 +- .../oreprocessing/ProcessingCrushedOre.java | 112 +- .../oreprocessing/ProcessingCrystallized.java | 16 +- .../loaders/oreprocessing/ProcessingDirty.java | 134 +- .../loaders/oreprocessing/ProcessingDust.java | 431 ++++- .../loaders/oreprocessing/ProcessingDye.java | 56 +- .../loaders/oreprocessing/ProcessingFineWire.java | 27 +- .../loaders/oreprocessing/ProcessingFoil.java | 12 +- .../loaders/oreprocessing/ProcessingFood.java | 63 +- .../loaders/oreprocessing/ProcessingGear.java | 91 +- .../loaders/oreprocessing/ProcessingGem.java | 267 ++- .../loaders/oreprocessing/ProcessingIngot.java | 186 +- .../loaders/oreprocessing/ProcessingItem.java | 14 +- .../loaders/oreprocessing/ProcessingLens.java | 38 +- .../loaders/oreprocessing/ProcessingLog.java | 293 +++- .../loaders/oreprocessing/ProcessingNugget.java | 41 +- .../loaders/oreprocessing/ProcessingOre.java | 197 ++- .../loaders/oreprocessing/ProcessingOrePoor.java | 29 +- .../oreprocessing/ProcessingOreSmelting.java | 132 +- .../loaders/oreprocessing/ProcessingPipe.java | 133 +- .../loaders/oreprocessing/ProcessingPlank.java | 130 +- .../loaders/oreprocessing/ProcessingPlate.java | 382 ++-- .../loaders/oreprocessing/ProcessingPure.java | 23 +- .../loaders/oreprocessing/ProcessingRecycling.java | 15 +- .../loaders/oreprocessing/ProcessingRotor.java | 59 +- .../loaders/oreprocessing/ProcessingRound.java | 25 +- .../loaders/oreprocessing/ProcessingSand.java | 25 +- .../loaders/oreprocessing/ProcessingSaplings.java | 17 +- .../loaders/oreprocessing/ProcessingScrew.java | 15 +- .../loaders/oreprocessing/ProcessingShaping.java | 448 ++++- .../loaders/oreprocessing/ProcessingSlab.java | 18 +- .../loaders/oreprocessing/ProcessingStick.java | 54 +- .../loaders/oreprocessing/ProcessingStickLong.java | 36 +- .../loaders/oreprocessing/ProcessingStone.java | 178 +- .../oreprocessing/ProcessingStoneCobble.java | 32 +- .../oreprocessing/ProcessingStoneVarious.java | 21 +- .../loaders/oreprocessing/ProcessingToolHead.java | 1845 ++++++++++++++++++-- .../loaders/oreprocessing/ProcessingToolOther.java | 177 +- .../oreprocessing/ProcessingTransforming.java | 103 +- .../loaders/oreprocessing/ProcessingWax.java | 6 +- .../loaders/oreprocessing/ProcessingWire.java | 424 ++++- 51 files changed, 6092 insertions(+), 1157 deletions(-) (limited to 'src/main/java/gregtech/loaders/oreprocessing') diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java index 2c4948ce36..5767332ee7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java @@ -4,14 +4,17 @@ 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) { - if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) && (aPrefix.mDefaultStackSize < aStack.getItem().getItemStackLimit(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 4ed4d7efa9..a66d17293f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -16,48 +16,105 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis } @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(tOutput, Enchantment.smite, EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3); - GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, aStack), Materials.HolyWater.getFluid(25L), tOutput, null, null, null, 100, 2); + GT_Utility.ItemNBT.addEnchantment( + tOutput, + Enchantment.smite, + EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId, tOutput) + 3); + GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.HolyWater.getFluid(25L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); - GT_Utility.ItemNBT.addEnchantment(tOutput, Enchantment.fireAspect, EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3); - GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, aStack), Materials.FierySteel.getFluid(25L), tOutput, null, null, null, 100, 2); + GT_Utility.ItemNBT.addEnchantment( + tOutput, + Enchantment.fireAspect, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, tOutput) + 3); + GT_Values.RA.addChemicalBathRecipe( + GT_Utility.copyAmount(1L, aStack), + Materials.FierySteel.getFluid(25L), + tOutput, + null, + null, + null, + 100, + 2); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); - GT_Utility.ItemNBT.addEnchantment(tOutput, 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.ItemNBT.addEnchantment( + tOutput, + 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); tOutput = GT_Utility.copyAmount(1L, aStack); GT_Utility.updateItemStack(tOutput); - GT_Utility.ItemNBT.addEnchantment(tOutput, 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.ItemNBT.addEnchantment( + tOutput, + 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); 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) + 1); - GT_Values.RA.addChemicalBathRecipe(GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(25L), tOutput, null, null, null, 100, 2); + GT_Utility.ItemNBT.addEnchantment( + tOutput, + gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE, + 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); - if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { + 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)} - ); + 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) + }); 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)} - ); - default: - break; + 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) + }); + default: + break; } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java index e292831b05..35af7d302f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java @@ -13,8 +13,10 @@ public class ProcessingBeans 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) { if (aOreDictName.equals("beansCocoa")) - GT_ModHandler.addPulverisationRecipe(GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); + 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 e9f66415df..aab525bded 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -13,9 +13,15 @@ public class ProcessingBlock 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) { if (aMaterial != Materials.Clay) { - GT_Values.RA.addCutterRecipe(GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), null, (int) Math.max(aMaterial.getMass() * 10L, 1L), 30); + GT_Values.RA.addCutterRecipe( + GT_Utility.copyAmount(1L, aStack), + GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 9L), + null, + (int) Math.max(aMaterial.getMass() * 10L, 1L), + 30); } ItemStack tStack1 = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L); @@ -25,52 +31,77 @@ 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); + 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); + 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); + GT_ModHandler.removeRecipeDelayed( + tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3, tStack3); } if (aMaterial.mStandardMoltenFluid != null) { if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { - GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Block.get(0L), aMaterial.getMolten(1296L), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), 288, 8); + GT_Values.RA.addFluidSolidifierRecipe( + ItemList.Shape_Mold_Block.get(0L), + aMaterial.getMolten(1296L), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + 288, + 8); } } - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.storageblockcrafting, OrePrefixes.block.get(aMaterial).toString(), false)) { + if (GregTech_API.sRecipeFile.get( + 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)}); + 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)}); + 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)}); + GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), + new Object[] {"XXX", "XXX", "XXX", 'X', OrePrefixes.ingot.get(aMaterial)}); } } - if (tStack1 != null) - tStack1.stackSize = 9; - if (tStack2 != null) - tStack2.stackSize = 9; - if (tStack3 != null) - tStack3.stackSize = 9; + if (tStack1 != null) tStack1.stackSize = 9; + if (tStack2 != null) tStack2.stackSize = 9; + if (tStack3 != null) tStack3.stackSize = 9; GT_Values.RA.addForgeHammerRecipe(aStack, tStack2, 100, 24); - if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.storageblockdecrafting, OrePrefixes.block.get(aMaterial).toString(), tStack2 != null)) { + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.storageblockdecrafting, + 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)) - GT_ModHandler.addCompressionRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); + GT_ModHandler.addCompressionRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 9L), + GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)); switch (aMaterial.mName) { case "Mercury": - System.err.println("'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); + System.err.println( + "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); break; case "Iron": case "WroughtIron": case "Steel": - GT_Values.RA.addAssemblerRecipe(ItemList.IC2_Compressed_Coal_Ball.get(8L), GT_Utility.copyAmount(1L, aStack), ItemList.IC2_Compressed_Coal_Chunk.get(1L), 400, 4); + GT_Values.RA.addAssemblerRecipe( + ItemList.IC2_Compressed_Coal_Ball.get(8L), + GT_Utility.copyAmount(1L, aStack), + ItemList.IC2_Compressed_Coal_Chunk.get(1L), + 400, + 4); break; } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java index 406be61b82..17ba07917f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java @@ -14,9 +14,14 @@ public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistr } @Override - public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - 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)}); + public void registerOre( + OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { + 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) + }); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index f9a92a672e..387968e240 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -9,10 +9,9 @@ import gregtech.api.objects.MaterialStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import net.minecraft.item.ItemStack; - import java.util.ArrayList; import java.util.Iterator; +import net.minecraft.item.ItemStack; public class ProcessingCell implements IOreRecipeRegistrator { public ProcessingCell() { @@ -21,7 +20,8 @@ public class ProcessingCell implements IOreRecipeRegistrator { } @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) { @@ -31,17 +31,27 @@ public class ProcessingCell implements IOreRecipeRegistrator { } } else { if (aMaterial.mFuelPower > 0) { - GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aStack), GT_Utility.getFluidForFilledItem(aStack, true) == null ? GT_Utility.getContainerItem(aStack, true) : null, aMaterial.mFuelPower, aMaterial.mFuelType); + GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getFluidForFilledItem(aStack, true) == null + ? GT_Utility.getContainerItem(aStack, true) + : null, + aMaterial.mFuelPower, + aMaterial.mFuelType); } if ((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0)) { int tAllAmount = 0; MaterialStack tMat2; - for (Iterator i$ = aMaterial.mMaterialList.iterator(); i$.hasNext(); tAllAmount = (int) (tAllAmount + tMat2.mAmount)) { + for (Iterator i$ = aMaterial.mMaterialList.iterator(); + i$.hasNext(); + tAllAmount = (int) (tAllAmount + tMat2.mAmount)) { tMat2 = (MaterialStack) i$.next(); } 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 tList = new ArrayList(); for (MaterialStack tMat : aMaterial.mMaterialList) { if (tMat.mAmount > 0L) { @@ -51,21 +61,48 @@ 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 <= aStack.getMaxStackSize() * aMaterial.getDensity()) { + if (tItemAmount + tMat.mAmount * 3628800L + <= aStack.getMaxStackSize() * aMaterial.getDensity()) { tItemAmount += tMat.mAmount * 3628800L; if (tStack != null) { tStack.stackSize = ((int) (tStack.stackSize * tDensityMultiplier)); - while ((tStack.stackSize > 64) && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64 < 0L ? tList.size() < 5 : tList.size() < 6) && (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64 <= 64L)) { + while ((tStack.stackSize > 64) + && (tCapsuleCount + + GT_ModHandler.getCapsuleCellContainerCount( + tStack) + * 64 + < 0L + ? tList.size() < 5 + : tList.size() < 6) + && (tCapsuleCount + + GT_ModHandler.getCapsuleCellContainerCount(tStack) + * 64 + <= 64L)) { tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCount(tStack) * 64; tList.add(GT_Utility.copyAmount(64L, tStack)); tStack.stackSize -= 64; } - if ((tStack.stackSize > 0) && tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(tStack) <= 64L) { - if (tCapsuleCount + GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(tStack) < 0L ? tList.size() < 5 : tList.size() < 6) { - tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(tStack); + if ((tStack.stackSize > 0) + && tCapsuleCount + + GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize( + tStack) + <= 64L) { + if (tCapsuleCount + + GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize( + tStack) + < 0L + ? tList.size() < 5 + : tList.size() < 6) { + tCapsuleCount += + GT_ModHandler + .getCapsuleCellContainerCountMultipliedWithStackSize( + tStack); tList.add(tStack); } } @@ -73,18 +110,59 @@ public class ProcessingCell implements IOreRecipeRegistrator { } } } - tItemAmount = (tItemAmount * tDensityMultiplier % aMaterial.getDensity() > 0L ? 1 : 0) + tItemAmount * tDensityMultiplier / aMaterial.getDensity(); + tItemAmount = (tItemAmount * tDensityMultiplier % aMaterial.getDensity() > 0L ? 1 : 0) + + tItemAmount * tDensityMultiplier / aMaterial.getDensity(); if (tList.size() > 0) { if ((aMaterial.mExtraData & 0x1) != 0) { if (GT_Utility.getFluidForFilledItem(aStack, true) == null) { // dust stuffed cell e.g. Phosphate, Phosphorous Pentoxide - GT_Values.RA.addElectrolyzerRecipe(GT_Utility.copyAmount(tItemAmount, aStack), tCapsuleCount <= 0L ? 0 : (int) tCapsuleCount, tList.get(0), tList.size() >= 2 ? tList.get(1) : null, 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 : ItemList.Cell_Empty.get(-tCapsuleCount), (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), Math.min(4, tList.size()) * 30); + GT_Values.RA.addElectrolyzerRecipe( + GT_Utility.copyAmount(tItemAmount, aStack), + tCapsuleCount <= 0L ? 0 : (int) tCapsuleCount, + tList.get(0), + tList.size() >= 2 ? tList.get(1) : null, + 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 + : ItemList.Cell_Empty.get(-tCapsuleCount), + (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), + Math.min(4, tList.size()) * 30); } else { - GT_Values.RA.addElectrolyzerRecipe(aStack, tCapsuleCount + tItemAmount - 1 <= 0L ? 0 : (int) (tCapsuleCount + tItemAmount - 1), tList.get(0), tList.size() >= 2 ? tList.get(1) : null, 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 : ItemList.Cell_Empty.get(-tCapsuleCount - tItemAmount + 1 <= 0 ? 0 : -tCapsuleCount - tItemAmount + 1), (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 8L * tItemAmount)), Math.min(4, tList.size()) * 30); + GT_Values.RA.addElectrolyzerRecipe( + aStack, + tCapsuleCount + tItemAmount - 1 <= 0L + ? 0 + : (int) (tCapsuleCount + tItemAmount - 1), + tList.get(0), + tList.size() >= 2 ? tList.get(1) : null, + 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 + : ItemList.Cell_Empty.get( + -tCapsuleCount - tItemAmount + 1 <= 0 + ? 0 + : -tCapsuleCount - tItemAmount + 1), + (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 8L * tItemAmount)), + Math.min(4, tList.size()) * 30); } } if ((aMaterial.mExtraData & 0x2) != 0) { - GT_Values.RA.addCentrifugeRecipe(GT_Utility.copyAmount(tItemAmount, aStack), tCapsuleCount <= 0L ? 0 : (int) tCapsuleCount, tList.get(0), tList.size() >= 2 ? tList.get(1) : null, 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 : ItemList.Cell_Empty.get(-tCapsuleCount), (int) Math.max(1L, Math.abs(aMaterial.getMass() * 2L * tItemAmount))); + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.copyAmount(tItemAmount, aStack), + tCapsuleCount <= 0L ? 0 : (int) tCapsuleCount, + tList.get(0), + tList.size() >= 2 ? tList.get(1) : null, + 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 + : ItemList.Cell_Empty.get(-tCapsuleCount), + (int) Math.max(1L, Math.abs(aMaterial.getMass() * 2L * tItemAmount))); } } } @@ -94,12 +172,21 @@ public class ProcessingCell implements IOreRecipeRegistrator { if (aMaterial == Materials.Empty) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); } else { - GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aStack), GT_Utility.getFluidForFilledItem(aStack, true) == null ? GT_Utility.getContainerItem(aStack, true) : null, (int) Math.max(1024L, 1024L * aMaterial.getMass()), 4); - GT_Values.RA.addVacuumFreezerRecipe(GT_Utility.copyAmount(1L, aStack), gregtech.api.util.GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), (int) Math.max(aMaterial.getMass() * 2L, 1L)); + GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + GT_Utility.getFluidForFilledItem(aStack, true) == null + ? GT_Utility.getContainerItem(aStack, true) + : null, + (int) Math.max(1024L, 1024L * aMaterial.getMass()), + 4); + GT_Values.RA.addVacuumFreezerRecipe( + GT_Utility.copyAmount(1L, aStack), + gregtech.api.util.GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), + (int) Math.max(aMaterial.getMass() * 2L, 1L)); } break; - default: - break; + default: + break; } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index b46bc8fa70..32e7d9b7ac 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -13,8 +13,9 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi } @Override - 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; + 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": case "Data": @@ -24,18 +25,34 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi case "Superconductor": case "Infinite": case "Bio": - if (!gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack)&&!aModName.equals("gregtech")) + if (!gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals("gregtech")) GT_ModHandler.removeRecipeByOutputDelayed(aStack); break; case "Primitive": case "Advanced": GT_ModHandler.removeRecipeByOutputDelayed(aStack); - break; + 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.addShapelessCraftingRecipe(GT_ModHandler.getIC2Item("electronicCircuit", 1L), new Object[]{ItemList.Circuit_Integrated.getWildcard(1L)}); - break; + 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)}); + break; } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java index fcbaf88746..7c17c7ca27 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java @@ -14,9 +14,11 @@ public class ProcessingCompressed implements IOreRecipeRegistrator { } @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); - //GT_RecipeRegistrator.registerUsagesForMaterials(null, false, GT_Utility.copyAmount(1L, aStack)); + GregTech_API.registerCover( + 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 c7fcb8d711..48d9708f4a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.GT_Values.MOD_ID_DC; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -10,87 +12,383 @@ import gregtech.api.util.GT_Utility; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import static gregtech.api.enums.GT_Values.MOD_ID_DC; - 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(new ItemStack(Blocks.redstone_torch, 3, 32767), GT_Utility.copyAmount(1L, aStack), Materials.Concrete.getMolten(144L), new ItemStack(net.minecraft.init.Items.comparator, 1, 0), 800, 1); + GT_Values.RA.addAssemblerRecipe( + new ItemStack(Blocks.redstone_torch, 3, 32767), + GT_Utility.copyAmount(1L, aStack), + Materials.Concrete.getMolten(144L), + new ItemStack(net.minecraft.init.Items.comparator, 1, 0), + 800, + 1); break; case "craftingWireCopper": case "craftingWireTin": - GT_Values.RA.addAssemblerRecipe(ItemList.Circuit_Basic.get(1L), GT_Utility.copyAmount(1L, aStack), GT_ModHandler.getIC2Item("frequencyTransmitter", 1L), 800, 1); + GT_Values.RA.addAssemblerRecipe( + ItemList.Circuit_Basic.get(1L), + GT_Utility.copyAmount(1L, aStack), + GT_ModHandler.getIC2Item("frequencyTransmitter", 1L), + 800, + 1); break; case "craftingLensBlue": - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), 2000, 1920); - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), 2000, 1920); - GT_Values.RA.addLaserEngraverRecipe(ItemList.IC2_LapotronCrystal.getWildcard(1L), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L), 900, 480, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Chip_CrystalCPU.get(1L), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Chip_CrystalSoC.get(1), 600, 40000, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_PIC.get(1), 1200, 480, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_PIC.get(4), 800, 1920, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_QPIC.get(1), 2400, 500000, true); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.IC2_LapotronCrystal.getWildcard(1L), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Parts_Crystal_Chip_Master.get(3L), + 900, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Chip_CrystalCPU.get(1L), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Chip_CrystalSoC.get(1), + 600, + 40000, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_PIC.get(1), + 1200, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_PIC.get(4), + 800, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_QPIC.get(1), + 2400, + 500000, + true); break; case "craftingLensYellow": - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), 2000, 1920); - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), 2000, 1920); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_LPIC.get(1), 800, 120, false); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_LPIC.get(4), 600, 480, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_SoC.get(1), 900, 1920, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_SoC.get(4), 600, 7680, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_SoC.get(8), 300, 30720, true); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_LPIC.get(1), + 800, + 120, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_LPIC.get(4), + 600, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_SoC.get(1), + 900, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_SoC.get(4), + 600, + 7680, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_SoC.get(8), + 300, + 30720, + true); break; case "craftingLensOrange": - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_Simple_SoC.get(1), 300, 64, false); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_Simple_SoC.get(4), 300, 256, false); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_Simple_SoC.get(16), 300, 1024, false); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_Simple_SoC.get(64), 300, 4096, false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Simple_SoC.get(1), + 300, + 64, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Simple_SoC.get(4), + 300, + 256, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Simple_SoC.get(16), + 300, + 1024, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Simple_SoC.get(64), + 300, + 4096, + false); break; case "craftingLensCyan": - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), 2000, 1920); - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), 2000, 1920); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_Ram.get(1), 1200, 120, false); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_Ram.get(4), 900, 480, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_Ram.get(8), 600, 1920, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_Ram.get(16), 300, 7680, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_Ram.get(32), 150, 30720, true); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), + 2000, + 1920); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(1), + 1200, + 120, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(4), + 900, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(8), + 600, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(16), + 300, + 7680, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_Ram.get(32), + 150, + 30720, + true); break; case "craftingLensRed": - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), GT_Utility.copyAmount(0L, aStack), GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), 50, 120); - GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), GT_Utility.copyAmount(0L, aStack), GT_ModHandler.getModItem(MOD_ID_DC, "item.EtchedLowVoltageWiring", 1L, 0), 200, 16); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_ILC.get(1), 1200, 120, false); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer2.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_ILC.get(4), 900, 480, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer3.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_ILC.get(8), 600, 1920, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer4.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_NPIC.get(1), 1800, 30720, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Silicon_Wafer5.get(1), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Wafer_NPIC.get(4), 1500, 122880, true); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + 50, + 120); + GT_Values.RA.addLaserEngraverRecipe( + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), + GT_Utility.copyAmount(0L, aStack), + GT_ModHandler.getModItem(MOD_ID_DC, "item.EtchedLowVoltageWiring", 1L, 0), + 200, + 16); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_ILC.get(1), + 1200, + 120, + false); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer2.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_ILC.get(4), + 900, + 480, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer3.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_ILC.get(8), + 600, + 1920, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer4.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_NPIC.get(1), + 1800, + 30720, + true); + GT_Values.RA.addLaserEngraverRecipe( + ItemList.Circuit_Silicon_Wafer5.get(1), + GT_Utility.copyAmount(0L, aStack), + ItemList.Circuit_Wafer_NPIC.get(4), + 1500, + 122880, + true); break; case "craftingLensGreen": - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Chip_CrystalCPU.get(1), 600, 10000, true); - GT_Values.RA.addLaserEngraverRecipe(ItemList.Circuit_Chip_CrystalSoC.get(1L), GT_Utility.copyAmount(0L, aStack), ItemList.Circuit_Chip_CrystalSoC2.get(1), 1200, 80000, true); - GT_Values.RA.a