From 0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 30 Jan 2023 10:56:42 -0800 Subject: [ci skip] spotlessApply with the new settings --- src/main/java/gregtech/common/items/CombType.java | 39 +- src/main/java/gregtech/common/items/DropType.java | 18 +- .../common/items/GT_DepletetCell_Item.java | 22 +- .../gregtech/common/items/GT_FluidDisplayItem.java | 58 +- .../common/items/GT_IntegratedCircuit_Item.java | 269 +- .../common/items/GT_MetaGenerated_Item_01.java | 6526 +++++++++----------- .../common/items/GT_MetaGenerated_Item_02.java | 4319 +++++++------ .../common/items/GT_MetaGenerated_Item_03.java | 1434 +++-- .../common/items/GT_MetaGenerated_Item_98.java | 76 +- .../common/items/GT_MetaGenerated_Item_99.java | 42 +- .../common/items/GT_MetaGenerated_Tool_01.java | 243 +- .../common/items/GT_NeutronReflector_Item.java | 15 +- .../gregtech/common/items/GT_SensorCard_Item.java | 21 +- .../gregtech/common/items/GT_VolumetricFlask.java | 113 +- src/main/java/gregtech/common/items/ItemComb.java | 1390 ++--- src/main/java/gregtech/common/items/ItemDrop.java | 33 +- .../java/gregtech/common/items/ItemPollen.java | 11 +- .../java/gregtech/common/items/ItemPropolis.java | 38 +- .../java/gregtech/common/items/PollenType.java | 8 +- .../java/gregtech/common/items/PropolisType.java | 7 +- .../common/items/behaviors/Behaviour_Arrow.java | 65 +- .../items/behaviors/Behaviour_Arrow_Potion.java | 40 +- .../items/behaviors/Behaviour_Cover_Tool.java | 94 +- .../common/items/behaviors/Behaviour_Crowbar.java | 24 +- .../common/items/behaviors/Behaviour_DataOrb.java | 7 +- .../items/behaviors/Behaviour_DataStick.java | 7 +- .../common/items/behaviors/Behaviour_Hoe.java | 36 +- .../common/items/behaviors/Behaviour_Lighter.java | 63 +- .../common/items/behaviors/Behaviour_None.java | 62 +- .../behaviors/Behaviour_Plunger_Essentia.java | 45 +- .../items/behaviors/Behaviour_Plunger_Fluid.java | 47 +- .../items/behaviors/Behaviour_Plunger_Item.java | 52 +- .../items/behaviors/Behaviour_PrintedPages.java | 7 +- .../items/behaviors/Behaviour_Prospecting.java | 75 +- .../common/items/behaviors/Behaviour_Scanner.java | 31 +- .../common/items/behaviors/Behaviour_Scoop.java | 42 +- .../items/behaviors/Behaviour_Screwdriver.java | 24 +- .../common/items/behaviors/Behaviour_Sense.java | 29 +- .../items/behaviors/Behaviour_SensorKit.java | 30 +- .../items/behaviors/Behaviour_SoftHammer.java | 65 +- .../items/behaviors/Behaviour_Sonictron.java | 34 +- .../items/behaviors/Behaviour_Spray_Color.java | 40 +- .../items/behaviors/Behaviour_Switch_Metadata.java | 25 +- .../common/items/behaviors/Behaviour_Wrench.java | 67 +- .../items/behaviors/Behaviour_WrittenBook.java | 25 +- 45 files changed, 7601 insertions(+), 8117 deletions(-) (limited to 'src/main/java/gregtech/common/items') diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index b010cba824..ff08fde695 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -1,10 +1,12 @@ package gregtech.common.items; +import java.util.Arrays; + import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; -import java.util.Arrays; public enum CombType { + // Organic Line LIGNIE(0, "lignite", true, Materials.Lignite, 100, 0x58300B, 0x906237, ItemComb.Voltage.LV), COAL(1, "coal", true, Materials.Coal, 100, 0x525252, 0x666666, ItemComb.Voltage.LV), @@ -26,8 +28,8 @@ public enum CombType { CONDUCTIVEIRON(13, "conductiveiron", true, Materials.ConductiveIron, 80, 0x817671, 0xCEADA3, ItemComb.Voltage.MV), VIBRANTALLOY(14, "vibrantalloy", true, Materials.VibrantAlloy, 50, 0x86A12D, 0xC4F2AE, ItemComb.Voltage.HV), ENERGETICALLOY(15, "energeticalloy", true, Materials.EnergeticAlloy, 70, 0xFF9933, 0xFFAD5C, ItemComb.Voltage.HV), - ELECTRICALSTEEL( - 16, "electricalsteel", true, Materials.ElectricalSteel, 90, 0x787878, 0xD8D8D8, ItemComb.Voltage.LV), + ELECTRICALSTEEL(16, "electricalsteel", true, Materials.ElectricalSteel, 90, 0x787878, 0xD8D8D8, + ItemComb.Voltage.LV), DARKSTEEL(17, "darksteel", true, Materials.DarkSteel, 80, 0x252525, 0x443B44, ItemComb.Voltage.MV), PULSATINGIRON(18, "pulsatingiron", true, Materials.PulsatingIron, 80, 0x006600, 0x6DD284, ItemComb.Voltage.HV), STAINLESSSTEEL(19, "stainlesssteel", true, Materials.StainlessSteel, 75, 0x778899, 0xC8C8DC, ItemComb.Voltage.HV), @@ -124,8 +126,8 @@ public enum CombType { MYTRYL(96, "mytryl", true, Materials.Mytryl, 65, 0xDAA520, 0xF26404, ItemComb.Voltage.IV), QUANTIUM(97, "quantium", true, Materials.Quantium, 50, 0x00FF00, 0x00D10B, ItemComb.Voltage.IV), ORIHARUKON(98, "oriharukon", true, Materials.Oriharukon, 50, 0x228B22, 0x677D68, ItemComb.Voltage.IV), - MYSTERIOUSCRYSTAL( - 99, "mysteriouscrystal", true, Materials.MysteriousCrystal, 45, 0x3CB371, 0x16856C, ItemComb.Voltage.LuV), + MYSTERIOUSCRYSTAL(99, "mysteriouscrystal", true, Materials.MysteriousCrystal, 45, 0x3CB371, 0x16856C, + ItemComb.Voltage.LuV), BLACKPLUTONIUM(100, "blackplutonium", true, Materials.Quantium, 25, 0x000000, 0x323232, ItemComb.Voltage.LuV), TRINIUM(101, "trinium", true, Materials.Trinium, 25, 0xB0E0E6, 0xC8C8D2, ItemComb.Voltage.ZPM), @@ -224,19 +226,13 @@ public enum CombType { this.material = material; this.chance = chance; this.showInList = show; - this.color = new int[] {color1, color2}; + this.color = new int[] { color1, color2 }; this.localizedName = GT_LanguageManager.addStringLocalization( - "comb." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb"); + "comb." + this.name, + this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb"); } - CombType( - int id, - String pName, - boolean show, - Materials material, - int chance, - int color1, - int color2, + CombType(int id, String pName, boolean show, Materials material, int chance, int color1, int color2, ItemComb.Voltage voltage) { if (id < 0 && !"INVALIDCOMB".equals(pName)) throw new IllegalArgumentException(); this.id = id; @@ -245,9 +241,10 @@ public enum CombType { this.material = material; this.chance = chance; this.showInList = show; - this.color = new int[] {color1, color2}; + this.color = new int[] { color1, color2 }; this.localizedName = GT_LanguageManager.addStringLocalization( - "comb." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb"); + "comb." + this.name, + this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb"); } public void setHidden() { @@ -260,7 +257,7 @@ public enum CombType { } public int[] getColours() { - return color == null || color.length != 2 ? new int[] {0, 0} : color; + return color == null || color.length != 2 ? new int[] { 0, 0 } : color; } public int getId() { @@ -272,13 +269,11 @@ public enum CombType { } private static final class Companion { + private static final CombType[] VALUES; static { - int biggestId = Arrays.stream(CombType.values()) - .mapToInt(CombType::getId) - .max() - .getAsInt(); + int biggestId = Arrays.stream(CombType.values()).mapToInt(CombType::getId).max().getAsInt(); VALUES = new CombType[biggestId + 1]; Arrays.fill(VALUES, _NULL); for (CombType type : CombType.values()) { diff --git a/src/main/java/gregtech/common/items/DropType.java b/src/main/java/gregtech/common/items/DropType.java index 6bc8eadcf7..3195e9ecbd 100644 --- a/src/main/java/gregtech/common/items/DropType.java +++ b/src/main/java/gregtech/common/items/DropType.java @@ -4,6 +4,7 @@ import gregtech.api.enums.Materials; import gregtech.api.util.GT_LanguageManager; public enum DropType { + OIL("oil", true), MUTAGEN("small mutagen catalyst", true), COOLANT("coolant", true), @@ -14,17 +15,9 @@ public enum DropType { LAPIS("lapis coolant", true), ENDERGOO("ender goo", true); - private static int[][] colours = new int[][] { - {0x19191B, 0x303032}, - {0xffc100, 0x00ff11}, - {0x144F5A, 0x2494A2}, - {0xC11F1F, 0xEBB9B9}, - {0x872836, 0xB8132C}, - {0xD02001, 0x9C0018}, - {0x003366, 0x0066BB}, - {0x1727b1, 0x008ce3}, - {0xA005E7, 0x161616}, - }; + private static int[][] colours = new int[][] { { 0x19191B, 0x303032 }, { 0xffc100, 0x00ff11 }, + { 0x144F5A, 0x2494A2 }, { 0xC11F1F, 0xEBB9B9 }, { 0x872836, 0xB8132C }, { 0xD02001, 0x9C0018 }, + { 0x003366, 0x0066BB }, { 0x1727b1, 0x008ce3 }, { 0xA005E7, 0x161616 }, }; public boolean showInList; public Materials material; public int chance; @@ -42,7 +35,8 @@ public enum DropType { public String getName() { return GT_LanguageManager.addStringLocalization( - "drop." + this.name, this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Drop"); + "drop." + this.name, + this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Drop"); } public int[] getColours() { diff --git a/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java b/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java index 7a4df4f1a3..a7505f8953 100644 --- a/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java +++ b/src/main/java/gregtech/common/items/GT_DepletetCell_Item.java @@ -1,8 +1,9 @@ package gregtech.common.items; +import net.minecraft.item.ItemStack; + import gregtech.api.items.GT_RadioactiveCellIC_Item; import ic2.api.reactor.IReactor; -import net.minecraft.item.ItemStack; public class GT_DepletetCell_Item extends GT_RadioactiveCellIC_Item { @@ -11,19 +12,12 @@ public class GT_DepletetCell_Item extends GT_RadioactiveCellIC_Item { } @Override - public void processChamber( - IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, boolean paramBoolean) {} + public void processChamber(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, + boolean paramBoolean) {} @Override - public boolean acceptUraniumPulse( - IReactor paramIReactor, - ItemStack paramItemStack1, - ItemStack paramItemStack2, - int paramInt1, - int paramInt2, - int paramInt3, - int paramInt4, - boolean paramBoolean) { + public boolean acceptUraniumPulse(IReactor paramIReactor, ItemStack paramItemStack1, ItemStack paramItemStack2, + int paramInt1, int paramInt2, int paramInt3, int paramInt4, boolean paramBoolean) { return false; } @@ -43,8 +37,8 @@ public class GT_DepletetCell_Item extends GT_RadioactiveCellIC_Item { } @Override - public int alterHeat( - IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, int paramInt3) { + public int alterHeat(IReactor paramIReactor, ItemStack paramItemStack, int paramInt1, int paramInt2, + int paramInt3) { return 0; } diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java index 373147a738..624e326268 100644 --- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java +++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java @@ -1,17 +1,11 @@ package gregtech.common.items; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.items.GT_Generic_Item; -import gregtech.api.util.GT_Utility; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Stream; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -26,7 +20,15 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -@SuppressWarnings({"rawtypes", "unchecked"}) +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.items.GT_Generic_Item; +import gregtech.api.util.GT_Utility; + +@SuppressWarnings({ "rawtypes", "unchecked" }) public class GT_FluidDisplayItem extends GT_Generic_Item { private static final Map sFluidTooltips = new HashMap<>(); @@ -39,8 +41,8 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { @Override protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) { if (FluidRegistry.getFluid(aStack.getItemDamage()) != null) { - String tChemicalFormula = - getChemicalFormula(new FluidStack(FluidRegistry.getFluid(aStack.getItemDamage()), 1)); + String tChemicalFormula = getChemicalFormula( + new FluidStack(FluidRegistry.getFluid(aStack.getItemDamage()), 1)); if (!tChemicalFormula.isEmpty()) aList.add(EnumChatFormatting.YELLOW + tChemicalFormula + EnumChatFormatting.RESET); } @@ -54,14 +56,21 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { if (aNBT != null) { long tToolTipAmount = aNBT.getLong("mFluidDisplayAmount"); if (tToolTipAmount > 0L) { - aList.add(EnumChatFormatting.BLUE + "Amount: " + GT_Utility.formatNumbers(tToolTipAmount) + " L" - + EnumChatFormatting.GRAY); + aList.add( + EnumChatFormatting.BLUE + "Amount: " + + GT_Utility.formatNumbers(tToolTipAmount) + + " L" + + EnumChatFormatting.GRAY); } - aList.add(EnumChatFormatting.RED + "Temperature: " - + GT_Utility.formatNumbers(aNBT.getLong("mFluidDisplayHeat")) + " K" + EnumChatFormatting.GRAY); - aList.add(EnumChatFormatting.GREEN - + String.format(transItem("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") - + EnumChatFormatting.GRAY); + aList.add( + EnumChatFormatting.RED + "Temperature: " + + GT_Utility.formatNumbers(aNBT.getLong("mFluidDisplayHeat")) + + " K" + + EnumChatFormatting.GRAY); + aList.add( + EnumChatFormatting.GREEN + String + .format(transItem("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + + EnumChatFormatting.GRAY); } } @@ -71,12 +80,8 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { @Override public IIcon getIconFromDamage(int aMetaData) { - return Stream.of(FluidRegistry.getFluid(aMetaData), FluidRegistry.WATER) - .filter(Objects::nonNull) - .map(Fluid::getStillIcon) - .filter(Objects::nonNull) - .findFirst() - .orElseThrow(IllegalStateException::new); + return Stream.of(FluidRegistry.getFluid(aMetaData), FluidRegistry.WATER).filter(Objects::nonNull) + .map(Fluid::getStillIcon).filter(Objects::nonNull).findFirst().orElseThrow(IllegalStateException::new); } @Override @@ -125,8 +130,7 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { // tooltip List tTooltip = tContainer.getTooltip(null, true); for (Object tInfo : tTooltip) { - if (!((String) tInfo).contains(" ") - && !((String) tInfo).contains(":") + if (!((String) tInfo).contains(" ") && !((String) tInfo).contains(":") && tTooltip.indexOf(tInfo) != 0) { return (String) tInfo; } @@ -164,8 +168,8 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { for (int tOreDict : OreDictionary.getOreIDs(tItemStack)) { String tOreDictName = OreDictionary.getOreName(tOreDict); if (tOreDictName.startsWith("cell")) { - return Materials.getRealMaterial( - tOreDictName.replace("cell", "").replace("Molten", "").replace("Plasma", "")); + return Materials + .getRealMaterial(tOreDictName.replace("cell", "").replace("Molten", "").replace("Plasma", "")); } } return Materials._NULL; diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index a5842bb9c1..3fa06018f0 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -3,29 +3,12 @@ package gregtech.common.items; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; -import com.gtnewhorizons.modularui.api.UIInfos; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.interfaces.INetworkUpdatableItem; -import gregtech.api.items.GT_Generic_Item; -import gregtech.api.net.GT_Packet_UpdateItem; -import gregtech.api.objects.XSTR; -import gregtech.api.util.GT_Config; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.function.BiFunction; import java.util.function.Predicate; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -40,9 +23,31 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.FakePlayer; + import org.apache.commons.lang3.tuple.Pair; +import com.gtnewhorizons.modularui.api.UIInfos; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.GregTech_API; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.interfaces.INetworkUpdatableItem; +import gregtech.api.items.GT_Generic_Item; +import gregtech.api.net.GT_Packet_UpdateItem; +import gregtech.api.objects.XSTR; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; +import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory; + public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetworkUpdatableItem { + private static final String aTextEmptyRow = " "; private static final List ALL_VARIANTS = new ArrayList<>(); protected IIcon[] mIconDamage = new IIcon[25]; @@ -64,81 +69,105 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo GT_ModHandler.addShapelessCraftingRecipe( ItemList.Circuit_Integrated.getWithDamage(1L, 0L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {OrePrefixes.circuit.get(Materials.Basic)}); + new Object[] { OrePrefixes.circuit.get(Materials.Basic) }); long bits = GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE; - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 1L), bits, new Object[] { - "d ", " P ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 2L), bits, new Object[] { - " d ", " P ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 3L), bits, new Object[] { - " d", " P ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 4L), bits, new Object[] { - aTextEmptyRow, " Pd", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 5L), bits, new Object[] { - aTextEmptyRow, " P ", " d", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 6L), bits, new Object[] { - aTextEmptyRow, " P ", " d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 7L), bits, new Object[] { - aTextEmptyRow, " P ", "d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 8L), bits, new Object[] { - aTextEmptyRow, "dP ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 1L), + bits, + new Object[] { "d ", " P ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 2L), + bits, + new Object[] { " d ", " P ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 3L), + bits, + new Object[] { " d", " P ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 4L), + bits, + new Object[] { aTextEmptyRow, " Pd", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 5L), + bits, + new Object[] { aTextEmptyRow, " P ", " d", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 6L), + bits, + new Object[] { aTextEmptyRow, " P ", " d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 7L), + bits, + new Object[] { aTextEmptyRow, " P ", "d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 8L), + bits, + new Object[] { aTextEmptyRow, "dP ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 9L), bits, new Object[] { - "P d", aTextEmptyRow, aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 10L), bits, new Object[] { - "P ", " d", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 11L), bits, new Object[] { - "P ", aTextEmptyRow, " d", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 12L), bits, new Object[] { - "P ", aTextEmptyRow, " d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 13L), bits, new Object[] { - " P", aTextEmptyRow, " d", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 14L), bits, new Object[] { - " P", aTextEmptyRow, " d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 15L), bits, new Object[] { - " P", aTextEmptyRow, "d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 16L), bits, new Object[] { - " P", "d ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 17L), bits, new Object[] { - aTextEmptyRow, aTextEmptyRow, "d P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 18L), bits, new Object[] { - aTextEmptyRow, "d ", " P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 19L), bits, new Object[] { - "d ", aTextEmptyRow, " P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 20L), bits, new Object[] { - " d ", aTextEmptyRow, " P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 21L), bits, new Object[] { - "d ", aTextEmptyRow, "P ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 22L), bits, new Object[] { - " d ", aTextEmptyRow, "P ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 23L), bits, new Object[] { - " d", aTextEmptyRow, "P ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); - GT_ModHandler.addCraftingRecipe(ItemList.Circuit_Integrated.getWithDamage(1L, 24L), bits, new Object[] { - aTextEmptyRow, " d", "P ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 9L), + bits, + new Object[] { "P d", aTextEmptyRow, aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 10L), + bits, + new Object[] { "P ", " d", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 11L), + bits, + new Object[] { "P ", aTextEmptyRow, " d", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 12L), + bits, + new Object[] { "P ", aTextEmptyRow, " d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 13L), + bits, + new Object[] { " P", aTextEmptyRow, " d", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 14L), + bits, + new Object[] { " P", aTextEmptyRow, " d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 15L), + bits, + new Object[] { " P", aTextEmptyRow, "d ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 16L), + bits, + new Object[] { " P", "d ", aTextEmptyRow, 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 17L), + bits, + new Object[] { aTextEmptyRow, aTextEmptyRow, "d P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 18L), + bits, + new Object[] { aTextEmptyRow, "d ", " P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 19L), + bits, + new Object[] { "d ", aTextEmptyRow, " P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 20L), + bits, + new Object[] { " d ", aTextEmptyRow, " P", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 21L), + bits, + new Object[] { "d ", aTextEmptyRow, "P ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 22L), + bits, + new Object[] { " d ", aTextEmptyRow, "P ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 23L), + bits, + new Object[] { " d", aTextEmptyRow, "P ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Circuit_Integrated.getWithDamage(1L, 24L), + bits, + new Object[] { aTextEmptyRow, " d", "P ", 'P', ItemList.Circuit_Integrated.getWildcard(1L) }); } private static String getModeString(int aMetaData) { @@ -164,25 +193,18 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo @Override public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) { super.addAdditionalToolTips(aList, aStack, aPlayer); - aList.add(GT_LanguageManager.addStringLocalization( - new StringBuilder() - .append(getUnlocalizedName()) - .append(".configuration") - .toString(), - "Configuration: ") - + getConfigurationString(getDamage(aStack))); - aList.add(GT_LanguageManager.addStringLocalization( - new StringBuilder() - .append(getUnlocalizedName()) - .append(".tooltip.0") - .toString(), - "Right click to reconfigure")); - aList.add(GT_LanguageManager.addStringLocalization( - new StringBuilder() - .append(getUnlocalizedName()) - .append(".tooltip.1") - .toString(), - "Needs a screwdriver or circuit programming tool")); + aList.add( + GT_LanguageManager.addStringLocalization( + new StringBuilder().append(getUnlocalizedName()).append(".configuration").toString(), + "Configuration: ") + getConfigurationString(getDamage(aStack))); + aList.add( + GT_LanguageManager.addStringLocalization( + new StringBuilder().append(getUnlocalizedName()).append(".tooltip.0").toString(), + "Right click to reconfigure")); + aList.add( + GT_LanguageManager.addStringLocalization( + new StringBuilder().append(getUnlocalizedName()).append(".tooltip.1").toString(), + "Needs a screwdriver or circuit programming tool")); } @Override @@ -201,8 +223,8 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo public void registerIcons(IIconRegister aIconRegister) { super.registerIcons(aIconRegister); for (int i = 0; i < mIconDamage.length; i++) { - mIconDamage[i] = aIconRegister.registerIcon( - RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); + mIconDamage[i] = aIconRegister + .registerIcon(RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); } if (GregTech_API.sPostloadFinished) { GT_Log.out.println("GT_Mod: Starting Item Icon Load Phase"); @@ -259,13 +281,15 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo count = Integer.parseInt( StatCollector.translateToLocal("GT5U.item.programmed_circuit.no_screwdriver.count")); } catch (NumberFormatException e) { - player.addChatComponentMessage(new ChatComponentText( - "Error in translation GT5U.item.programmed_circuit.no_screwdriver.count: " - + e.getMessage())); + player.addChatComponentMessage( + new ChatComponentText( + "Error in translation GT5U.item.programmed_circuit.no_screwdriver.count: " + + e.getMessage())); count = 1; } - player.addChatComponentMessage(new ChatComponentTranslation( - "GT5U.item.programmed_circuit.no_screwdriver." + XSTR.XSTR_INSTANCE.nextInt(count))); + player.addChatComponentMessage( + new ChatComponentTranslation( + "GT5U.item.programmed_circuit.no_screwdriver." + XSTR.XSTR_INSTANCE.nextInt(count))); return stack; } configuratorStack = player.inventory.mainInventory[configurator.getKey()]; @@ -275,14 +299,15 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo } private void openSelectorGui(ItemStack configurator, int meta, EntityPlayer player) { - UIInfos.openClientUI(player, buildContext -> new SelectItemUIFactory( + UIInfos.openClientUI( + player, + buildContext -> new SelectItemUIFactory( StatCollector.translateToLocal("GT5U.item.programmed_circuit.select.header"), configurator, GT_IntegratedCircuit_Item::onConfigured, ALL_VARIANTS, meta, - true) - .createWindow(buildContext)); + true).createWindow(buildContext)); } private static void onConfigured(ItemStack stack) { @@ -299,8 +324,8 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo if (!GT_Utility.isStackValid(toolStack)) continue; - for (Map.Entry, BiFunction> p : - GregTech_API.sCircuitProgrammerList.entrySet()) + for (Map.Entry, BiFunction> p : GregTech_API.sCircuitProgrammerList + .entrySet()) if (p.getKey().test(toolStack)) return Pair.of(j, p.getValue()); } return null; diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index e6882c4977..2abb7ff209 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -2,6 +2,23 @@ package gregtech.common.items; import static gregtech.api.enums.Textures.BlockIcons.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.util.MathHelper; +import net.minecraftforge.oredict.OreDictionary; + import cpw.mods.fml.common.Loader; import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; @@ -27,26 +44,12 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.common.covers.*; import gregtech.common.items.behaviors.*; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.EnumAction; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.util.MathHelper; -import net.minecraftforge.oredict.OreDictionary; public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { + public static GT_MetaGenerated_Item_01 INSTANCE; - private final String mToolTipPurify = GT_LanguageManager.addStringLocalization( - "metaitem.01.tooltip.purify", "Throw into Cauldron to get clean Dust"); + private final String mToolTipPurify = GT_LanguageManager + .addStringLocalization("metaitem.01.tooltip.purify", "Throw into Cauldron to get clean Dust"); private static final String aTextArrow = " A"; private static final String aTextStick = " S "; private static final String aTextFeather = "F "; @@ -57,8 +60,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { private static final String PartNotCoverText = "Cannot be used as a Cover"; private static final String RAText = "Grabs from and inserts into specific slots"; private static final String FRText1 = "Configurable up to "; - private static final String FRText2 = - " L/sec (as Cover)/n Rightclick/Screwdriver-rightclick/Shift-screwdriver-rightclick/n to adjust the pump speed by 1/16/256 L/sec per click"; + private static final String FRText2 = " L/sec (as Cover)/n Rightclick/Screwdriver-rightclick/Shift-screwdriver-rightclick/n to adjust the pump speed by 1/16/256 L/sec per click"; public GT_MetaGenerated_Item_01() { super( @@ -112,805 +114,560 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemStack tStack = new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID); tStack.setStackDisplayName("The holy Planks of Sengir"); GT_Utility.ItemNBT.addEnchantment(tStack, Enchantment.smite, 10); - GT_ModHandler.addCraftingRecipe(tStack, GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { - "XXX", - "XDX", - "XXX", - 'X', - OrePrefixes.gem.get(Materials.NetherStar), - 'D', - new ItemStack(Blocks.dragon_egg, 1, 32767) - }); + GT_ModHandler.addCraftingRecipe( + tStack, + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { "XXX", "XDX", "XXX", 'X', OrePrefixes.gem.get(Materials.NetherStar), 'D', + new ItemStack(Blocks.dragon_egg, 1, 32767) }); ItemList.Credit_Greg_Copper.set(addItem(tLastID = 0, "Copper GT Credit", "0.125 Credits")); - ItemList.Credit_Greg_Cupronickel.set(addItem( - tLastID = 1, "Cupronickel GT Credit", "1 Credit", new ItemData(Materials.Cupronickel, 907200L))); - ItemList.Credit_Greg_Silver.set(addItem( - tLastID = 2, "Silver GT Credit", "8 Credits", new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); + ItemList.Credit_Greg_Cupronickel.set( + addItem( + tLastID = 1, + "Cupronickel GT Credit", + "1 Credit", + new ItemData(Materials.Cupronickel, 907200L))); + ItemList.Credit_Greg_Silver.set( + addItem( + tLastID = 2, + "Silver GT Credit", + "8 Credits", + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); ItemList.Credit_Greg_Gold.set(addItem(tLastID = 3, "Gold GT Credit", "64 Credits")); ItemList.Credit_Greg_Platinum.set(addItem(tLastID = 4, "Platinum GT Credit", "512 Credits")); ItemList.Credit_Greg_Osmium.set(addItem(tLastID = 5, "Osmium GT Credit", "4,096 Credits")); ItemList.Credit_Greg_Naquadah.set(addItem(tLastID = 6, "Naquadah GT Credit", "32,768 Credits")); ItemList.Credit_Greg_Neutronium.set(addItem(tLastID = 7, "Neutronium GT Credit", "262,144 Credits")); - ItemList.Coin_Gold_Ancient.set(addItem( - tLastID = 8, - "Ancient Gold Coin", - "Found in ancient Ruins", - new ItemData(Materials.Gold, 907200L), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 8L))); - ItemList.Coin_Doge.set(addItem( - tLastID = 9, - "Doge Coin", - "wow much coin how money so crypto plz mine v rich very currency wow", - new ItemData(Materials.Brass, 907200L), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); - ItemList.Coin_Chocolate.set(addItem( - tLastID = 10, - "Chocolate Coin", - "Wrapped in Gold", - new ItemData(Materials.Gold, OrePrefixes.foil.mMaterialAmount), - new GT_FoodStat( - 1, - 0.1F, - EnumAction.eat, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1L), - true, - false, - false, - Potion.moveSpeed.id, - 200, - 1, - 100))); + ItemList.Coin_Gold_Ancient.set( + addItem( + tLastID = 8, + "Ancient Gold Coin", + "Found in ancient Ruins", + new ItemData(Materials.Gold, 907200L), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 8L))); + ItemList.Coin_Doge.set( + addItem( + tLastID = 9, + "Doge Coin", + "wow much coin how money so crypto plz mine v rich very currency wow", + new ItemData(Materials.Brass, 907200L), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); + ItemList.Coin_Chocolate.set( + addItem( + tLastID = 10, + "Chocolate Coin", + "Wrapped in Gold", + new ItemData(Materials.Gold, OrePrefixes.foil.mMaterialAmount), + new GT_FoodStat( + 1, + 0.1F, + EnumAction.eat, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1L), + true, + false, + false, + Potion.moveSpeed.id, + 200, + 1, + 100))); ItemList.Credit_Copper.set(addItem(tLastID = 11, "Industrial Copper Credit", "0.125 Credits")); - ItemList.Credit_Silver.set(addItem( - tLastID = 13, - "Industrial Silver Credit", - "8 Credits", - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); + ItemList.Credit_Silver.set( + addItem( + tLastID = 13, + "Industrial Silver Credit", + "8 Credits", + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); ItemList.Credit_Gold.set(addItem(tLastID = 14, "Industrial Gold Credit", "64 Credits")); ItemList.Credit_Platinum.set(addItem(tLastID = 15, "Industrial Platinum Credit", "512 Credits")); ItemList.Credit_Osmium.set(addItem(tLastID = 16, "Industrial Osmium Credit", "4096 Credits")); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Coin_Chocolate.get(1L), new Object[] { - OrePrefixes.dust.get(Materials.Cocoa), - OrePrefixes.dust.get(Materials.Milk), - OrePrefixes.dust.get(Materials.Sugar), - OrePrefixes.foil.get(Materials.Gold) - }); + GT_ModHandler.addShapelessCraftingRecipe( + ItemList.Coin_Chocolate.get(1L), + new Object[] { OrePrefixes.dust.get(Materials.Cocoa), OrePrefixes.dust.get(Materials.Milk), + OrePrefixes.dust.get(Materials.Sugar), OrePrefixes.foil.get(Materials.Gold) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Copper.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Iron}); + new Object[] { ItemList.Credit_Iron }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Iron.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Silver}); + new Object[] { ItemList.Credit_Silver }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Silver.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Gold}); + new Object[] { ItemList.Credit_Gold }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Gold.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Platinum}); + new Object[] { ItemList.Credit_Platinum }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Platinum.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Osmium}); + new Object[] { ItemList.Credit_Osmium }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Iron.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Copper, - ItemList.Credit_Copper, - ItemList.Credit_Copper, - ItemList.Credit_Copper, - ItemList.Credit_Copper, - ItemList.Credit_Copper, - ItemList.Credit_Copper, - ItemList.Credit_Copper - }); + new Object[] { ItemList.Credit_Copper, ItemList.Credit_Copper, ItemList.Credit_Copper, + ItemList.Credit_Copper, ItemList.Credit_Copper, ItemList.Credit_Copper, ItemList.Credit_Copper, + ItemList.Credit_Copper }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Silver.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Iron, - ItemList.Credit_Iron, - ItemList.Credit_Iron, - ItemList.Credit_Iron, - ItemList.Credit_Iron, - ItemList.Credit_Iron, - ItemList.Credit_Iron, - ItemList.Credit_Iron - }); + new Object[] { ItemList.Credit_Iron, ItemList.Credit_Iron, ItemList.Credit_Iron, ItemList.Credit_Iron, + ItemList.Credit_Iron, ItemList.Credit_Iron, ItemList.Credit_Iron, ItemList.Credit_Iron }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Gold.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Silver, - ItemList.Credit_Silver, - ItemList.Credit_Silver, - ItemList.Credit_Silver, - ItemList.Credit_Silver, - ItemList.Credit_Silver, - ItemList.Credit_Silver, - ItemList.Credit_Silver - }); + new Object[] { ItemList.Credit_Silver, ItemList.Credit_Silver, ItemList.Credit_Silver, + ItemList.Credit_Silver, ItemList.Credit_Silver, ItemList.Credit_Silver, ItemList.Credit_Silver, + ItemList.Credit_Silver }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Platinum.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Gold, - ItemList.Credit_Gold, - ItemList.Credit_Gold, - ItemList.Credit_Gold, - ItemList.Credit_Gold, - ItemList.Credit_Gold, - ItemList.Credit_Gold, - ItemList.Credit_Gold - }); + new Object[] { ItemList.Credit_Gold, ItemList.Credit_Gold, ItemList.Credit_Gold, ItemList.Credit_Gold, + ItemList.Credit_Gold, ItemList.Credit_Gold, ItemList.Credit_Gold, ItemList.Credit_Gold }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Osmium.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Platinum, - ItemList.Credit_Platinum, - ItemList.Credit_Platinum, - ItemList.Credit_Platinum, - ItemList.Credit_Platinum, - ItemList.Credit_Platinum, - ItemList.Credit_Platinum, - ItemList.Credit_Platinum - }); + new Object[] { ItemList.Credit_Platinum, ItemList.Credit_Platinum, ItemList.Credit_Platinum, + ItemList.Credit_Platinum, ItemList.Credit_Platinum, ItemList.Credit_Platinum, + ItemList.Credit_Platinum, ItemList.Credit_Platinum }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Copper.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Greg_Cupronickel}); + new Object[] { ItemList.Credit_Greg_Cupronickel }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Cupronickel.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Greg_Silver}); + new Object[] { ItemList.Credit_Greg_Silver }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Silver.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Greg_Gold}); + new Object[] { ItemList.Credit_Greg_Gold }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Gold.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Greg_Platinum}); + new Object[] { ItemList.Credit_Greg_Platinum }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Platinum.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Greg_Osmium}); + new Object[] { ItemList.Credit_Greg_Osmium }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Osmium.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Greg_Naquadah}); + new Object[] { ItemList.Credit_Greg_Naquadah }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Naquadah.get(8L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {ItemList.Credit_Greg_Neutronium}); + new Object[] { ItemList.Credit_Greg_Neutronium }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Cupronickel.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Greg_Copper, - ItemList.Credit_Greg_Copper, - ItemList.Credit_Greg_Copper, - ItemList.Credit_Greg_Copper, - ItemList.Credit_Greg_Copper, - ItemList.Credit_Greg_Copper, - ItemList.Credit_Greg_Copper, - ItemList.Credit_Greg_Copper - }); + new Object[] { ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper, + ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper, + ItemList.Credit_Greg_Copper, ItemList.Credit_Greg_Copper }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Silver.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Greg_Cupronickel, - ItemList.Credit_Greg_Cupronickel, - ItemList.Credit_Greg_Cupronickel, - ItemList.Credit_Greg_Cupronickel, - ItemList.Credit_Greg_Cupronickel, - ItemList.Credit_Greg_Cupronickel, - ItemList.Credit_Greg_Cupronickel, - ItemList.Credit_Greg_Cupronickel - }); + new Object[] { ItemList.Credit_Greg_Cupronickel, ItemList.Credit_Greg_Cupronickel, + ItemList.Credit_Greg_Cupronickel, ItemList.Credit_Greg_Cupronickel, + ItemList.Credit_Greg_Cupronickel, ItemList.Credit_Greg_Cupronickel, + ItemList.Credit_Greg_Cupronickel, ItemList.Credit_Greg_Cupronickel }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Gold.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Greg_Silver, - ItemList.Credit_Greg_Silver, - ItemList.Credit_Greg_Silver, - ItemList.Credit_Greg_Silver, - ItemList.Credit_Greg_Silver, - ItemList.Credit_Greg_Silver, - ItemList.Credit_Greg_Silver, - ItemList.Credit_Greg_Silver - }); + new Object[] { ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver, + ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver, + ItemList.Credit_Greg_Silver, ItemList.Credit_Greg_Silver }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Platinum.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Greg_Gold, - ItemList.Credit_Greg_Gold, - ItemList.Credit_Greg_Gold, - ItemList.Credit_Greg_Gold, - ItemList.Credit_Greg_Gold, - ItemList.Credit_Greg_Gold, - ItemList.Credit_Greg_Gold, - ItemList.Credit_Greg_Gold - }); + new Object[] { ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold, + ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold, + ItemList.Credit_Greg_Gold, ItemList.Credit_Greg_Gold }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Osmium.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Greg_Platinum, - ItemList.Credit_Greg_Platinum, - ItemList.Credit_Greg_Platinum, - ItemList.Credit_Greg_Platinum, - ItemList.Credit_Greg_Platinum, - ItemList.Credit_Greg_Platinum, - ItemList.Credit_Greg_Platinum, - ItemList.Credit_Greg_Platinum - }); + new Object[] { ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum, + ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum, + ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum, ItemList.Credit_Greg_Platinum }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Naquadah.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Greg_Osmium, - ItemList.Credit_Greg_Osmium, - ItemList.Credit_Greg_Osmium, - ItemList.Credit_Greg_Osmium, - ItemList.Credit_Greg_Osmium, - ItemList.Credit_Greg_Osmium, - ItemList.Credit_Greg_Osmium, - ItemList.Credit_Greg_Osmium - }); + new Object[] { ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium, + ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium, + ItemList.Credit_Greg_Osmium, ItemList.Credit_Greg_Osmium }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.Credit_Greg_Neutronium.get(1L), GT_ModHandler.RecipeBits.KEEPNBT | GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { - ItemList.Credit_Greg_Naquadah, - ItemList.Credit_Greg_Naquadah, - ItemList.Credit_Greg_Naquadah, - ItemList.Credit_Greg_Naquadah, - ItemList.Credit_Greg_Naquadah, - ItemList.Credit_Greg_Naquadah, - ItemList.Credit_Greg_Naquadah, - ItemList.Credit_Greg_Naquadah - }); - - ItemList.Component_Minecart_Wheels_Iron.set(addItem( - tLastID = 100, - "Iron Minecart Wheels", - "To get things rolling", - new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L))); - ItemList.Component_Minecart_Wheels_Steel.set(addItem( - tLastID = 101, - "Steel Minecart Wheels", - "To get things rolling", - new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L))); + new Object[] { ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah, + ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah, + ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah, ItemList.Credit_Greg_Naquadah }); + + ItemList.Component_Minecart_Wheels_Iron.set( + addItem( + tLastID = 100, + "Iron Minecart Wheels", + "To get things rolling", + new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L))); + ItemList.Component_Minecart_Wheels_Steel.set( + addItem( + tLastID = 101, + "Steel Minecart Wheels", + "To get things rolling", + new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L))); GT_ModHandler.addCraftingRecipe( ItemList.Component_Minecart_Wheels_Iron.get(1L), - GT_ModHandler.RecipeBits.BUFFERED - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE |