diff options
Diffstat (limited to 'src/main')
19 files changed, 2483 insertions, 1511 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java index 518db00954..84e2001b38 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java @@ -83,6 +83,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_TileEntity_Windmill> implements ISurvivalConstructable, IGetTitleColor { @@ -612,7 +613,7 @@ public class GT_TileEntity_Windmill extends GT_MetaTileEntity_EnhancedMultiBlock () -> this.mMachine && !this.getBaseMetaTileEntity() .isActive() ? GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTMALLET, 1, null, null, null) + .getToolWithStats(ID_MetaTool_01.SOFTMALLET.ID, 1, null, null, null) : null).asWidget() .setPos(66, 66)) .widget( diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java index 6a66b5209f..e2ab668f47 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java @@ -66,6 +66,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch implements RecipeMapWorkable, IAddGregtechLogo { @@ -435,7 +436,7 @@ public class GT_MetaTileEntity_RadioHatch extends GT_MetaTileEntity_Hatch .widget( new ItemDrawable( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, null, null, null)).asWidget() + .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, null, null, null)).asWidget() .setPos(154, 6)); } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java index 499477a846..8046d200ba 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/ToolLoader.java @@ -50,6 +50,7 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.common.GT_Proxy; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; public class ToolLoader implements IWerkstoffRunnable { @@ -67,7 +68,7 @@ public class ToolLoader implements IWerkstoffRunnable { .isExtension()) GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HARDHAMMER, + ID_MetaTool_01.HARDHAMMER.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial().mHandleMaterial, @@ -88,7 +89,7 @@ public class ToolLoader implements IWerkstoffRunnable { .isExtension()) { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER, + ID_MetaTool_01.SCREWDRIVER.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial().mHandleMaterial, @@ -105,7 +106,7 @@ public class ToolLoader implements IWerkstoffRunnable { screw.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HARDHAMMER, + ID_MetaTool_01.HARDHAMMER.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial().mHandleMaterial, @@ -115,7 +116,7 @@ public class ToolLoader implements IWerkstoffRunnable { stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, + ID_MetaTool_01.FILE.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial().mHandleMaterial, @@ -126,7 +127,7 @@ public class ToolLoader implements IWerkstoffRunnable { stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, + ID_MetaTool_01.SAW.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial().mHandleMaterial, @@ -135,7 +136,7 @@ public class ToolLoader implements IWerkstoffRunnable { stick.get(werkstoff.getBridgeMaterial().mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, + ID_MetaTool_01.SOLDERING_IRON_LV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Rubber, @@ -172,7 +173,7 @@ public class ToolLoader implements IWerkstoffRunnable { if (!werkstoff.hasItemType(gem)) { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HARDHAMMER, + ID_MetaTool_01.HARDHAMMER.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial().mHandleMaterial, @@ -185,7 +186,7 @@ public class ToolLoader implements IWerkstoffRunnable { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLUNGER, + ID_MetaTool_01.PLUNGER.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial(), @@ -195,7 +196,7 @@ public class ToolLoader implements IWerkstoffRunnable { plate.get(Materials.AnyRubber) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH, + ID_MetaTool_01.WRENCH.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial(), @@ -204,7 +205,7 @@ public class ToolLoader implements IWerkstoffRunnable { new Object[] { "IhI", "III", " I ", 'I', ingot.get(werkstoff.getBridgeMaterial()) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CROWBAR, + ID_MetaTool_01.CROWBAR.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial(), @@ -214,7 +215,7 @@ public class ToolLoader implements IWerkstoffRunnable { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WIRECUTTER, + ID_MetaTool_01.WIRECUTTER.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial(), @@ -224,7 +225,7 @@ public class ToolLoader implements IWerkstoffRunnable { plate.get(werkstoff.getBridgeMaterial()), 'T', screw.get(werkstoff.getBridgeMaterial()) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCOOP, + ID_MetaTool_01.SCOOP.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial(), @@ -234,7 +235,7 @@ public class ToolLoader implements IWerkstoffRunnable { new ItemStack(Blocks.wool, 1, 32767) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BRANCHCUTTER, + ID_MetaTool_01.BRANCHCUTTER.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial(), @@ -244,7 +245,7 @@ public class ToolLoader implements IWerkstoffRunnable { plate.get(werkstoff.getBridgeMaterial()), 'T', screw.get(werkstoff.getBridgeMaterial()) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.KNIFE, + ID_MetaTool_01.KNIFE.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial(), @@ -254,7 +255,7 @@ public class ToolLoader implements IWerkstoffRunnable { plate.get(werkstoff.getBridgeMaterial()) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, + ID_MetaTool_01.BUTCHERYKNIFE.ID, 1, werkstoff.getBridgeMaterial(), werkstoff.getBridgeMaterial(), @@ -265,7 +266,7 @@ public class ToolLoader implements IWerkstoffRunnable { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, + ID_MetaTool_01.WRENCH_LV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Steel, @@ -277,7 +278,7 @@ public class ToolLoader implements IWerkstoffRunnable { 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, + ID_MetaTool_01.WRENCH_LV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Steel, @@ -289,7 +290,7 @@ public class ToolLoader implements IWerkstoffRunnable { 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, + ID_MetaTool_01.WRENCH_LV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Steel, @@ -301,7 +302,7 @@ public class ToolLoader implements IWerkstoffRunnable { 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, + ID_MetaTool_01.WRENCH_MV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Aluminium, @@ -314,7 +315,7 @@ public class ToolLoader implements IWerkstoffRunnable { ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, + ID_MetaTool_01.WRENCH_MV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Aluminium, @@ -327,7 +328,7 @@ public class ToolLoader implements IWerkstoffRunnable { ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, + ID_MetaTool_01.WRENCH_MV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Aluminium, @@ -340,7 +341,7 @@ public class ToolLoader implements IWerkstoffRunnable { ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, + ID_MetaTool_01.WRENCH_HV.ID, 1, werkstoff.getBridgeMaterial(), Materials.StainlessSteel, @@ -353,7 +354,7 @@ public class ToolLoader implements IWerkstoffRunnable { ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, + ID_MetaTool_01.WRENCH_HV.ID, 1, werkstoff.getBridgeMaterial(), Materials.StainlessSteel, @@ -366,7 +367,7 @@ public class ToolLoader implements IWerkstoffRunnable { ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, + ID_MetaTool_01.WRENCH_HV.ID, 1, werkstoff.getBridgeMaterial(), Materials.StainlessSteel, @@ -380,7 +381,7 @@ public class ToolLoader implements IWerkstoffRunnable { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + ID_MetaTool_01.SCREWDRIVER_LV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Steel, @@ -392,7 +393,7 @@ public class ToolLoader implements IWerkstoffRunnable { 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + ID_MetaTool_01.SCREWDRIVER_LV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Steel, @@ -404,7 +405,7 @@ public class ToolLoader implements IWerkstoffRunnable { 'G', gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + ID_MetaTool_01.SCREWDRIVER_LV.ID, 1, werkstoff.getBridgeMaterial(), Materials.Steel, @@ -459,7 +460,7 @@ public class ToolLoader implements IWerkstoffRunnable { .itemInputs(werkstoff.get(turbineBlade, 4), GT_OreDictUnificator.get(stickLong, Materials.Magnalium, 1)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.TURBINE_SMALL, + ID_MetaTool_01.TURBINE_SMALL.ID, 1, werkstoff.getBridgeMaterial(), Materials.Magnalium, @@ -472,7 +473,7 @@ public class ToolLoader implements IWerkstoffRunnable { .itemInputs(werkstoff.get(turbineBlade, 8), GT_OreDictUnificator.get(stickLong, Materials.Titanium, 1)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.TURBINE, + ID_MetaTool_01.TURBINE.ID, 1, werkstoff.getBridgeMaterial(), Materials.Titanium, @@ -487,7 +488,7 @@ public class ToolLoader implements IWerkstoffRunnable { GT_OreDictUnificator.get(stickLong, Materials.TungstenSteel, 1)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.TURBINE_LARGE, + ID_MetaTool_01.TURBINE_LARGE.ID, 1, werkstoff.getBridgeMaterial(), Materials.TungstenSteel, @@ -502,7 +503,7 @@ public class ToolLoader implements IWerkstoffRunnable { GT_OreDictUnificator.get(stickLong, Materials.Americium, 1)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.TURBINE_HUGE, + ID_MetaTool_01.TURBINE_HUGE.ID, 1, werkstoff.getBridgeMaterial(), Materials.Americium, diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 0773afa693..fa20a45c95 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -406,6 +406,7 @@ public enum ItemList implements IItemContainer { Circuit_Data, Circuit_Elite, Circuit_Master, + @Deprecated Circuit_Ultimate, Circuit_Biowarecomputer, Circuit_Biowaresupercomputer, diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 5fc0a5f1bb..bfd47d5c2c 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -172,6 +172,7 @@ import gregtech.api.util.WorldSpawnedEventBuilder; import gregtech.common.entities.GT_Entity_Arrow; import gregtech.common.items.GT_MetaGenerated_Item_98; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; import gregtech.common.misc.GlobalEnergyWorldSavedData; import gregtech.common.misc.GlobalMetricsCoverDatabase; import gregtech.common.misc.spaceprojects.SpaceProjectWorldSavedData; @@ -2381,12 +2382,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { aEvent.player.posX, aEvent.player.posY, aEvent.player.posZ, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.AXE, - 1, - Materials.Flint, - Materials.Wood, - null))); + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.AXE.ID, 1, Materials.Flint, Materials.Wood, null))); } } final boolean tHungerEffect = (this.mHungerEffect) && (aEvent.player.ticksExisted % 2400 == 1200); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 875c4e9861..55a1611a9c 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -14,6 +14,202 @@ import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Alcopops; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Apple_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Beer; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Cave_Johnsons_Grenade_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Chilly_Sauce; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Cider; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Dark_Beer; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Diablo_Sauce; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Diabolo_Sauce; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Dragon_Blood; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Glen_McKenner; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Golden_Apple_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Golden_Cider; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Grape_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Holy_Water; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Hops_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Hot_Sauce; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Iduns_Apple_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Lemon_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Lemonade; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Leninade; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Limoncello; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Milk; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Mineral_Water; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Notches_Brew; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Pirate_Brew; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Potato_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Purple_Drink; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Reed_Water; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Rum; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Salty_Water; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Scotch; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Snitches_Glitch_Sauce; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Vinegar; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Vodka; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Wheaty_Hops_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Wheaty_Juice; +import static gregtech.common.items.ID_MetaItem_02.Bottle_Wine; +import static gregtech.common.items.ID_MetaItem_02.Cover_AdvancedRedstoneReceiverExternal; +import static gregtech.common.items.ID_MetaItem_02.Cover_AdvancedRedstoneReceiverInternal; +import static gregtech.common.items.ID_MetaItem_02.Cover_AdvancedRedstoneTransmitterExternal; +import static gregtech.common.items.ID_MetaItem_02.Cover_AdvancedRedstoneTransmitterInternal; +import static gregtech.common.items.ID_MetaItem_02.Cover_WirelessActivityDetector; +import static gregtech.common.items.ID_MetaItem_02.Cover_WirelessFluidDetector; +import static gregtech.common.items.ID_MetaItem_02.Cover_WirelessItemDetector; +import static gregtech.common.items.ID_MetaItem_02.Cover_WirelessNeedsMaintainance; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Argentia; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Aurelia; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Bauxite; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_BobsYerUncleRanks; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Chilly; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Coppon; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Cucumber; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Ferru; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Grapes; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Ilmenite; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Indigo; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Iridium; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Lemon; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_MTomato; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Manganese; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Mica; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_MilkWart; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Naquadah; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Nickel; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_OilBerry; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Onion; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Osmium; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Pitchblende; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Platinum; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Plumbilia; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Rape; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Scheelite; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_TeaLeaf; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Thorium; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Tine; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Tomato; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_UUABerry; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_UUMBerry; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Uraninite; +import static gregtech.common.items.ID_MetaItem_02.Crop_Drop_Zinc; +import static gregtech.common.items.ID_MetaItem_02.Display_ITS_FREE; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_00; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_01; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_02; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_03; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_04; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_05; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_06; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_07; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_08; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_09; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_10; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_11; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_12; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_13; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_14; +import static gregtech.common.items.ID_MetaItem_02.Dye_Color_15; +import static gregtech.common.items.ID_MetaItem_02.Dye_Indigo; +import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Baguette; +import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Bun; +import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Cake; +import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Pizza_Cheese; +import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Pizza_Meat; +import static gregtech.common.items.ID_MetaItem_02.Food_Baked_Pizza_Veggie; +import static gregtech.common.items.ID_MetaItem_02.Food_Burger_Cheese; +import static gregtech.common.items.ID_MetaItem_02.Food_Burger_Chum; +import static gregtech.common.items.ID_MetaItem_02.Food_Burger_Meat; +import static gregtech.common.items.ID_MetaItem_02.Food_Burger_Veggie; +import static gregtech.common.items.ID_MetaItem_02.Food_Cheese; +import static gregtech.common.items.ID_MetaItem_02.Food_ChiliChips; +import static gregtech.common.items.ID_MetaItem_02.Food_Chum; +import static gregtech.common.items.ID_MetaItem_02.Food_Chum_On_Stick; +import static gregtech.common.items.ID_MetaItem_02.Food_Dough; +import static gregtech.common.items.ID_MetaItem_02.Food_Dough_Chocolate; +import static gregtech.common.items.ID_MetaItem_02.Food_Dough_Sugar; +import static gregtech.common.items.ID_MetaItem_02.Food_Flat_Dough; +import static gregtech.common.items.ID_MetaItem_02.Food_Fries; +import static gregtech.common.items.ID_MetaItem_02.Food_Large_Sandwich_Bacon; +import static gregtech.common.items.ID_MetaItem_02.Food_Large_Sandwich_Cheese; +import static gregtech.common.items.ID_MetaItem_02.Food_Large_Sandwich_Steak; +import static gregtech.common.items.ID_MetaItem_02.Food_Large_Sandwich_Veggie; +import static gregtech.common.items.ID_MetaItem_02.Food_Packaged_ChiliChips; +import static gregtech.common.items.ID_MetaItem_02.Food_Packaged_Fries; +import static gregtech.common.items.ID_MetaItem_02.Food_Packaged_PotatoChips; +import static gregtech.common.items.ID_MetaItem_02.Food_PotatoChips; +import static gregtech.common.items.ID_MetaItem_02.Food_Potato_On_Stick; +import static gregtech.common.items.ID_MetaItem_02.Food_Potato_On_Stick_Roasted; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Baguette; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Bread; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Bun; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Cake; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Cookie; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Fries; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Pizza_Cheese; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Pizza_Meat; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_Pizza_Veggie; +import static gregtech.common.items.ID_MetaItem_02.Food_Raw_PotatoChips; +import static gregtech.common.items.ID_MetaItem_02.Food_Sandwich_Bacon; +import static gregtech.common.items.ID_MetaItem_02.Food_Sandwich_Cheese; +import static gregtech.common.items.ID_MetaItem_02.Food_Sandwich_Steak; +import static gregtech.common.items.ID_MetaItem_02.Food_Sandwich_Veggie; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Baguette; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Baguettes; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Bread; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Breads; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Bun; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Buns; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Cheese; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Cucumber; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Lemon; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Onion; +import static gregtech.common.items.ID_MetaItem_02.Food_Sliced_Tomato; +import static gregtech.common.items.ID_MetaItem_02.GelledToluene; +import static gregtech.common.items.ID_MetaItem_02.MSFMixture; +import static gregtech.common.items.ID_MetaItem_02.Plank_Acacia; +import static gregtech.common.items.ID_MetaItem_02.Plank_Acacia_Green; +import static gregtech.common.items.ID_MetaItem_02.Plank_Balsa; +import static gregtech.common.items.ID_MetaItem_02.Plank_Baobab; +import static gregtech.common.items.ID_MetaItem_02.Plank_Birch; +import static gregtech.common.items.ID_MetaItem_02.Plank_Cherry; +import static gregtech.common.items.ID_MetaItem_02.Plank_Chestnut; +import static gregtech.common.items.ID_MetaItem_02.Plank_Citrus; +import static gregtech.common.items.ID_MetaItem_02.Plank_DarkOak; +import static gregtech.common.items.ID_MetaItem_02.Plank_Ebony; +import static gregtech.common.items.ID_MetaItem_02.Plank_Greenheart; +import static gregtech.common.items.ID_MetaItem_02.Plank_Jungle; +import static gregtech.common.items.ID_MetaItem_02.Plank_Kapok; +import static gregtech.common.items.ID_MetaItem_02.Plank_Larch; +import static gregtech.common.items.ID_MetaItem_02.Plank_Lime; +import static gregtech.common.items.ID_MetaItem_02.Plank_Mahagony; +import static gregtech.common.items.ID_MetaItem_02.Plank_Mahoe; +import static gregtech.common.items.ID_MetaItem_02.Plank_Maple; +import static gregtech.common.items.ID_MetaItem_02.Plank_Oak; +import static gregtech.common.items.ID_MetaItem_02.Plank_Palm; +import static gregtech.common.items.ID_MetaItem_02.Plank_Papaya; +import static gregtech.common.items.ID_MetaItem_02.Plank_Pine; +import static gregtech.common.items.ID_MetaItem_02.Plank_Plum; +import static gregtech.common.items.ID_MetaItem_02.Plank_Poplar; +import static gregtech.common.items.ID_MetaItem_02.Plank_Sequoia; +import static gregtech.common.items.ID_MetaItem_02.Plank_Spruce; +import static gregtech.common.items.ID_MetaItem_02.Plank_Teak; +import static gregtech.common.items.ID_MetaItem_02.Plank_Walnut; +import static gregtech.common.items.ID_MetaItem_02.Plank_Wenge; +import static gregtech.common.items.ID_MetaItem_02.Plank_Willow; +import static gregtech.common.items.ID_MetaItem_02.SFMixture; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Cafe_au_lait; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Chocolate_Milk; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Coffee; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Dark_Cafe_au_lait; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Dark_Chocolate_Milk; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Dark_Coffee; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Ice_Tea; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Lait_au_cafe; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Sweet_Tea; +import static gregtech.common.items.ID_MetaItem_02.ThermosCan_Tea; import net.minecraft.dispenser.IBlockSource; import net.minecraft.enchantment.Enchantment; @@ -102,11 +298,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { OrePrefixes.gearGt); INSTANCE = this; - int tLastID = 0; - ItemList.ThermosCan_Dark_Coffee.set( addItem( - tLastID = 0, + ThermosCan_Dark_Coffee.ID, "Dark Coffee", "Coffee, dark, without anything else", new GT_FoodStat( @@ -131,7 +325,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L))); ItemList.ThermosCan_Dark_Cafe_au_lait.set( addItem( - tLastID = 1, + ThermosCan_Dark_Cafe_au_lait.ID, "Dark Coffee au lait", "Keeping you awake the whole night", new GT_FoodStat( @@ -156,7 +350,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L))); ItemList.ThermosCan_Coffee.set( addItem( - tLastID = 2, + ThermosCan_Coffee.ID, "Coffee", "Just the regular morning Coffee", new GT_FoodStat( @@ -181,7 +375,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L))); ItemList.ThermosCan_Cafe_au_lait.set( addItem( - tLastID = 3, + ThermosCan_Cafe_au_lait.ID, "Cafe au lait", "Sweet Coffee", new GT_FoodStat( @@ -206,7 +400,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L))); ItemList.ThermosCan_Lait_au_cafe.set( addItem( - tLastID = 4, + ThermosCan_Lait_au_cafe.ID, "Lait au cafe", "You want Coffee to your Sugar?", new GT_FoodStat( @@ -231,7 +425,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L))); ItemList.ThermosCan_Dark_Chocolate_Milk.set( addItem( - tLastID = 5, + ThermosCan_Dark_Chocolate_Milk.ID, "Dark Chocolate Milk", "A bit bitter, better add a bit Sugar", new GT_FoodStat( @@ -252,7 +446,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); ItemList.ThermosCan_Chocolate_Milk.set( addItem( - tLastID = 6, + ThermosCan_Chocolate_Milk.ID, "Chocolate Milk", "Sweet Goodness", new GT_FoodStat( @@ -273,7 +467,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 2L))); ItemList.ThermosCan_Tea.set( addItem( - tLastID = 7, + ThermosCan_Tea.ID, "Tea", "Keep calm and carry on", new GT_FoodStat( @@ -293,7 +487,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L))); ItemList.ThermosCan_Sweet_Tea.set( addItem( - tLastID = 8, + ThermosCan_Sweet_Tea.ID, "Sweet Tea", "How about a Tea Party? In Boston?", new GT_FoodStat( @@ -309,7 +503,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L))); ItemList.ThermosCan_Ice_Tea.set( addItem( - tLastID = 9, + ThermosCan_Ice_Tea.ID, "Ice Tea", "Better than this purple Junk Drink from failed Potions", new GT_FoodStat( @@ -328,11 +522,11 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L))); - ItemList.GelledToluene.set(addItem(tLastID = 10, "Gelled Toluene", "Raw Explosive")); + ItemList.GelledToluene.set(addItem(GelledToluene.ID, "Gelled Toluene", "Raw Explosive")); ItemList.Bottle_Purple_Drink.set( addItem( - tLastID = 100, + Bottle_Purple_Drink.ID, "Purple Drink", "How about Lemonade. Or some Ice Tea? I got Purple Drink!", new GT_FoodStat( @@ -352,7 +546,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1L))); ItemList.Bottle_Grape_Juice.set( addItem( - tLastID = 101, + Bottle_Grape_Juice.ID, "Grape Juice", "This has a cleaning effect on your internals.", new GT_FoodStat( @@ -372,7 +566,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); ItemList.Bottle_Wine.set( addItem( - tLastID = 102, + Bottle_Wine.ID, "Wine", "Ordinary", new GT_FoodStat( @@ -400,7 +594,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); ItemList.Bottle_Vinegar.set( addItem( - tLastID = 103, + Bottle_Vinegar.ID, "Vinegar", "Exquisite", new GT_FoodStat( @@ -432,7 +626,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); ItemList.Bottle_Potato_Juice.set( addItem( - tLastID = 104, + Bottle_Potato_Juice.ID, "Potato Juice", "Ever seen Potato Juice in stores? No? That has a reason.", new GT_FoodStat( @@ -448,7 +642,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L))); ItemList.Bottle_Vodka.set( addItem( - tLastID = 105, + Bottle_Vodka.ID, "Vodka", "Not to confuse with Water", new GT_FoodStat( @@ -476,7 +670,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L))); ItemList.Bottle_Leninade.set( addItem( - tLastID = 106, + Bottle_Leninade.ID, "Leninade", "Let the Communism flow through you!", new GT_FoodStat( @@ -508,7 +702,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 2L))); ItemList.Bottle_Mineral_Water.set( addItem( - tLastID = 107, + Bottle_Mineral_Water.ID, "Mineral Water", "The best Stuff you can drink to stay healthy", new GT_FoodStat( @@ -528,7 +722,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); ItemList.Bottle_Salty_Water.set( addItem( - tLastID = 108, + Bottle_Salty_Water.ID, "Salty Water", "Like Sea Water but less dirty", SubTag.INVISIBLE, @@ -549,7 +743,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Bottle_Reed_Water.set( addItem( - tLastID = 109, + Bottle_Reed_Water.ID, "Reed Water", "I guess this tastes better when fermented", new GT_FoodStat( @@ -565,7 +759,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); ItemList.Bottle_Rum.set( addItem( - tLastID = 110, + Bottle_Rum.ID, "Rum", "A buddle o' rum", new GT_FoodStat( @@ -593,7 +787,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); ItemList.Bottle_Pirate_Brew.set( addItem( - tLastID = 111, + Bottle_Pirate_Brew.ID, "Pirate Brew", "Set the Sails, we are going to Torrentuga!", new GT_FoodStat( @@ -625,7 +819,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 2L))); ItemList.Bottle_Hops_Juice.set( addItem( - tLastID = 112, + Bottle_Hops_Juice.ID, "Hops Juice", "Every Beer has a start", new GT_FoodStat( @@ -641,7 +835,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L))); ItemList.Bottle_Dark_Beer.set( addItem( - tLastID = 113, + Bottle_Dark_Beer.ID, "Dark Beer", "Dark Beer, for the real Men", new GT_FoodStat( @@ -669,7 +863,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L))); ItemList.Bottle_Dragon_Blood.set( addItem( - tLastID = 114, + Bottle_Dragon_Blood.ID, "Dragon Blood", "FUS RO DAH!", new GT_FoodStat( @@ -701,7 +895,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L))); ItemList.Bottle_Wheaty_Juice.set( addItem( - tLastID = 115, + Bottle_Wheaty_Juice.ID, "Wheaty Juice", "Is this liquefied Bread or what?", new GT_FoodStat( @@ -717,7 +911,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L))); ItemList.Bottle_Scotch.set( addItem( - tLastID = 116, + Bottle_Scotch.ID, "Scotch", "Technically this is just a Whisky", new GT_FoodStat( @@ -745,7 +939,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L))); ItemList.Bottle_Glen_McKenner.set( addItem( - tLastID = 117, + Bottle_Glen_McKenner.ID, "Glen McKenner", "Don't hand to easily surprised people, they will shatter it.", new GT_FoodStat( @@ -777,7 +971,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 2L))); ItemList.Bottle_Wheaty_Hops_Juice.set( addItem( - tLastID = 118, + Bottle_Wheaty_Hops_Juice.ID, "Wheaty Hops Juice", "Also known as 'Duff-Lite'", new GT_FoodStat( @@ -793,7 +987,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 2L))); ItemList.Bottle_Beer.set( addItem( - tLastID = 119, + Bottle_Beer.ID, "Beer", "Good old Beer", new GT_FoodStat( @@ -821,7 +1015,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L))); ItemList.Bottle_Chilly_Sauce.set( addItem( - tLastID = 120, + Bottle_Chilly_Sauce.ID, "Chilly Sauce", "Spicy", new GT_FoodStat( @@ -845,7 +1039,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Bottle_Hot_Sauce.set( addItem( - tLastID = 121, + Bottle_Hot_Sauce.ID, "Hot Sauce", "Very Spicy, I guess?", new GT_FoodStat( @@ -869,7 +1063,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2L))); ItemList.Bottle_Diabolo_Sauce.set( addItem( - tLastID = 122, + Bottle_Diabolo_Sauce.ID, "Diabolo Sauce", "As if the Devil made this Sauce", new GT_FoodStat( @@ -893,7 +1087,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L))); ItemList.Bottle_Diablo_Sauce.set( addItem( - tLastID = 123, + Bottle_Diablo_Sauce.ID, "Diablo Sauce", "Diablo always comes back!", new GT_FoodStat( @@ -917,7 +1111,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 4L))); ItemList.Bottle_Snitches_Glitch_Sauce.set( addItem( - tLastID = 124, + Bottle_Snitches_Glitch_Sauce.ID, "Old Man Snitches glitched Diablo Sauce", "[Missing No]", SubTag.INVISIBLE, @@ -942,7 +1136,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 5L))); ItemList.Bottle_Apple_Juice.set( addItem( - tLastID = 125, + Bottle_Apple_Juice.ID, "Apple Juice", "Made of the Apples from our best Oak Farms", new GT_FoodStat( @@ -962,7 +1156,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); ItemList.Bottle_Cider.set( addItem( - tLastID = 126, + Bottle_Cider.ID, "Cider", "If you have nothing better to do with your Apples", new GT_FoodStat( @@ -990,7 +1184,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L))); ItemList.Bottle_Golden_Apple_Juice.set( addItem( - tLastID = 127, + Bottle_Golden_Apple_Juice.ID, "Golden Apple Juice", "A golden Apple in liquid form", new GT_FoodStat( @@ -1018,7 +1212,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); ItemList.Bottle_Golden_Cider.set( addItem( - tLastID = 128, + Bottle_Golden_Cider.ID, "Golden Cider", "More Resistance, less Regeneration", new GT_FoodStat( @@ -1046,7 +1240,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L))); ItemList.Bottle_Iduns_Apple_Juice.set( addItem( - tLastID = 129, + Bottle_Iduns_Apple_Juice.ID, "Idun's Apple Juice", "So you got the Idea of using Notch Apples for a drink?", new GT_FoodStat( @@ -1078,7 +1272,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 9L))); ItemList.Bottle_Notches_Brew.set( addItem( - tLastID = 130, + Bottle_Notches_Brew.ID, "Notches Brew", "This is just overpowered", new GT_FoodStat( @@ -1114,7 +1308,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 9L))); ItemList.Bottle_Lemon_Juice.set( addItem( - tLastID = 131, + Bottle_Lemon_Juice.ID, "Lemon Juice", "Maybe adding Sugar will make it less sour", new GT_FoodStat( @@ -1134,7 +1328,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L))); ItemList.Bottle_Limoncello.set( addItem( - tLastID = 132, + Bottle_Limoncello.ID, "Limoncello", "An alcoholic Drink which tastes like Lemons", new GT_FoodStat( @@ -1158,7 +1352,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L))); ItemList.Bottle_Lemonade.set( addItem( - tLastID = 133, + Bottle_Lemonade.ID, "Lemonade", "Cold and refreshing Lemonade", new GT_FoodStat( @@ -1178,7 +1372,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L))); ItemList.Bottle_Alcopops.set( addItem( - tLastID = 134, + Bottle_Alcopops.ID, "Alcopops", "Don't let your Children drink this junk!", new GT_FoodStat( @@ -1202,7 +1396,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1L))); ItemList.Bottle_Cave_Johnsons_Grenade_Juice.set( addItem( - tLastID = 135, + Bottle_Cave_Johnsons_Grenade_Juice.ID, "Cave Johnson's Grenade Juice", "When life gives you Lemons, make Life take them Lemons back!", new GT_FoodStat( @@ -1218,7 +1412,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 1L))); ItemList.Bottle_Milk.set( addItem( - tLastID = 136, + Bottle_Milk.ID, "Milk", "Got Milk?", OrePrefixes.bottle.get(Materials.Milk), @@ -1235,7 +1429,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); ItemList.Bottle_Holy_Water.set( addItem( - tLastID = 137, + Bottle_Holy_Water.ID, "Holy Water", "May the holy Planks be with you", OrePrefixes.bottle.get(Materials.HolyWater), @@ -1257,7 +1451,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Food_Potato_On_Stick.set( addItem( - tLastID = 200, + Food_Potato_On_Stick.ID, "Potato on a Stick", "Totally looks like a Crab Claw", new GT_FoodStat(1, 0.3F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false), @@ -1266,7 +1460,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Food_Potato_On_Stick_Roasted.set( addItem( - tLastID = 201, + Food_Potato_On_Stick_Roasted.ID, "Roasted Potato on a Stick", "Still looks like a Crab Claw", new GT_FoodStat(6, 0.6F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false), @@ -1276,17 +1470,16 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Raw_Fries.set( addItem( - tLastID = 202, + Food_Raw_Fries.ID, "Potato Strips", "It's Potato in Stripe Form", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 16L); ItemList.Food_Fries.set( addItem( - tLastID = 203, + Food_Fries.ID, "Fries", "Not to confuse with Fry the Delivery Boy", new GT_FoodStat(7, 0.5F, EnumAction.eat, null, false, true, false), @@ -1294,10 +1487,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 16L); ItemList.Food_Packaged_Fries.set( addItem( - tLastID = 204, + Food_Packaged_Fries.ID, "Fries", "Ketchup not included", new GT_FoodStat( @@ -1314,17 +1506,16 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Raw_PotatoChips.set( addItem( - tLastID = 205, + Food_Raw_PotatoChips.ID, "Potato Chips (Raw)", "Just like a Potato", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 16L); ItemList.Food_PotatoChips.set( addItem( - tLastID = 206, + Food_PotatoChips.ID, "Potato Chips", "Crunchy", new GT_FoodStat(7, 0.5F, EnumAction.eat, null, false, true, false), @@ -1332,10 +1523,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 16L); ItemList.Food_ChiliChips.set( addItem( - tLastID = 207, + Food_ChiliChips.ID, "Chili Chips", "Spicy", new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false), @@ -1343,10 +1533,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 16L); ItemList.Food_Packaged_PotatoChips.set( addItem( - tLastID = 208, + Food_Packaged_PotatoChips.ID, "Bag of Potato Chips", "Full of delicious Air", new GT_FoodStat( @@ -1363,7 +1552,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Packaged_ChiliChips.set( addItem( - tLastID = 209, + Food_Packaged_ChiliChips.ID, "Bag of Chili Chips", "Stop making noises Baj!", new GT_FoodStat( @@ -1380,7 +1569,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Chum.set( addItem( - tLastID = 210, + Food_Chum.ID, "Chum", "Chum is Fum!", new GT_FoodStat( @@ -1404,7 +1593,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Chum_On_Stick.set( addItem( - tLastID = 211, + Food_Chum_On_Stick.ID, "Chum on a Stick", "Don't forget to try our Chum-balaya", new GT_FoodStat( @@ -1428,7 +1617,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Dough_Sugar.set( addItem( - tLastID = 212, + Food_Dough_Sugar.ID, "Sugary Dough", "Don't eat the Dough before it is baken", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), @@ -1436,7 +1625,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Food_Dough_Chocolate.set( addItem( - tLastID = 213, + Food_Dough_Chocolate.ID, "Chocolate Dough", "I said don't eat the Dough!", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), @@ -1444,7 +1633,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Food_Raw_Cookie.set( addItem( - tLastID = 214, + Food_Raw_Cookie.ID, "Cookie shaped Dough", "For baking Cookies", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), @@ -1453,7 +1642,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Food_Sliced_Buns.set( addItem( - tLastID = 220, + Food_Sliced_Buns.ID, "Buns", "Pre Sliced", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), @@ -1462,7 +1651,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Burger_Veggie.set( addItem( - tLastID = 221, + Food_Burger_Veggie.ID, "Veggieburger", "No matter how you call this, this is NOT a Burger!", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), @@ -1471,7 +1660,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Burger_Cheese.set( addItem( - tLastID = 222, + Food_Burger_Cheese.ID, "Cheeseburger", "Cheesy!", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), @@ -1481,7 +1670,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new ItemData(Materials.Cheese, 907200L))); ItemList.Food_Burger_Meat.set( addItem( - tLastID = 223, + Food_Burger_Meat.ID, "Hamburger", "The Mc Burger Queen Burger", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), @@ -1490,7 +1679,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Burger_Chum.set( addItem( - tLastID = 224, + Food_Burger_Chum.ID, "Chumburger", "Fum is Chum!", new GT_FoodStat( @@ -1515,7 +1704,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Food_Sliced_Breads.set( addItem( - tLastID = 230, + Food_Sliced_Breads.ID, "Breads", "Pre Sliced", new GT_FoodStat(5, 0.6F, EnumAction.eat, null, false, true, false), @@ -1524,48 +1713,43 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Sandwich_Veggie.set( addItem( - tLastID = 231, + Food_Sandwich_Veggie.ID, "Veggie Sandwich", "Meatless", new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 32L); ItemList.Food_Sandwich_Cheese.set( addItem( - tLastID = 232, + Food_Sandwich_Cheese.ID, "Cheese Sandwich", "Say Cheese!", new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 32L); ItemList.Food_Sandwich_Bacon.set( addItem( - tLastID = 233, + Food_Sandwich_Bacon.ID, "Bacon Sandwich", "The best Sandwich ever!", new GT_FoodStat(10, 0.8F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 32L); ItemList.Food_Sandwich_Steak.set( addItem( - tLastID = 234, + Food_Sandwich_Steak.ID, "Steak Sandwich", "Not a 'Steam Sandwich'", new GT_FoodStat(10, 0.8F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 32L); - ItemList.Food_Sliced_Baguettes.set( addItem( - tLastID = 240, + Food_Sliced_Baguettes.ID, "Baguettes", "Pre Sliced", new GT_FoodStat(8, 0.5F, EnumAction.eat, null, false, true, false), @@ -1574,48 +1758,43 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Large_Sandwich_Veggie.set( addItem( - tLastID = 241, + Food_Large_Sandwich_Veggie.ID, "Large Veggie Sandwich", "Just not worth it", new GT_FoodStat(15, 0.8F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 16L); ItemList.Food_Large_Sandwich_Cheese.set( addItem( - tLastID = 242, + Food_Large_Sandwich_Cheese.ID, "Large Cheese Sandwich", "I need another cheesy tooltip for this", new GT_FoodStat(15, 0.8F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 16L); ItemList.Food_Large_Sandwich_Bacon.set( addItem( - tLastID = 243, + Food_Large_Sandwich_Bacon.ID, "Large Bacon Sandwich", "For Men! (and manly Women)", new GT_FoodStat(20, 1.0F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 16L); ItemList.Food_Large_Sandwich_Steak.set( addItem( - tLastID = 244, + Food_Large_Sandwich_Steak.ID, "Large Steak Sandwich", "Yes, I once accidentially called it 'Steam Sandwich'", new GT_FoodStat(20, 1.0F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_Raw_Pizza_Veggie.set( addItem( - tLastID = 250, + Food_Raw_Pizza_Veggie.ID, "Raw Veggie Pizza", "Into the Oven with it!", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false), @@ -1624,7 +1803,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Raw_Pizza_Cheese.set( addItem( - tLastID = 251, + Food_Raw_Pizza_Cheese.ID, "Raw Cheese Pizza", "Into the Oven with it!", new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false), @@ -1633,7 +1812,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Raw_Pizza_Meat.set( addItem( - tLastID = 252, + Food_Raw_Pizza_Meat.ID, "Raw Mince Meat Pizza", "Into the Oven with it!", new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false), @@ -1643,7 +1822,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Food_Baked_Pizza_Veggie.set( addItem( - tLastID = 260, + Food_Baked_Pizza_Veggie.ID, "Veggie Pizza", "The next they want is Gluten Free Pizzas...", new GT_FoodStat(3, 0.3F, EnumAction.eat, null, false, true, false), @@ -1652,7 +1831,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Baked_Pizza_Cheese.set( addItem( - tLastID = 261, + Food_Baked_Pizza_Cheese.ID, "Cheese Pizza", "Pizza Magarita", new GT_FoodStat(4, 0.4F, EnumAction.eat, null, false, true, false), @@ -1661,7 +1840,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Baked_Pizza_Meat.set( addItem( - tLastID = 262, + Food_Baked_Pizza_Meat.ID, "Mince Meat Pizza", "Emo Pizza, it cuts itself!", new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false), @@ -1671,326 +1850,116 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Dye_Indigo.set( addItem( - tLastID = 410, + Dye_Indigo.ID, "Indigo Dye", "Blue Dye", new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L), Dyes.dyeBlue)); - for (byte i = 0; i < 16; i = (byte) (i + 1)) { + + int[] Dye_Colors = new int[] { Dye_Color_00.ID, Dye_Color_01.ID, Dye_Color_02.ID, Dye_Color_03.ID, + Dye_Color_04.ID, Dye_Color_05.ID, Dye_Color_06.ID, Dye_Color_07.ID, Dye_Color_08.ID, Dye_Color_09.ID, + Dye_Color_10.ID, Dye_Color_11.ID, Dye_Color_12.ID, Dye_Color_13.ID, Dye_Color_14.ID, Dye_Color_15.ID }; + for (int i = 0; i < 16; i = i + 1) { ItemList.DYE_ONLY_ITEMS[i].set( addItem( - tLastID = 414 + i, + Dye_Colors[i], Dyes.get(i).mName + " Dye", "", Dyes.get(i) .name(), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L))); } + ItemList.Plank_Oak - .set(addItem(tLastID = 470, "Oak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + .set(addItem(Plank_Oak.ID, "Oak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Spruce.set( - addItem(tLastID = 471, "Spruce Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Spruce.ID, "Spruce Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Birch.set( - addItem(tLastID = 472, "Birch Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Birch.ID, "Birch Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Jungle.set( - addItem(tLastID = 473, "Jungle Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Jungle.ID, "Jungle Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Acacia.set( - addItem(tLastID = 474, "Acacia Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Acacia.ID, "Acacia Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_DarkOak.set( - addItem(tLastID = 475, "Dark Oak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem( + Plank_DarkOak.ID, + "Dark Oak Plank", + aTextCover, + new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Larch.set( - addItem(tLastID = 476, "Larch Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Larch.ID, "Larch Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Teak - .set(addItem(tLastID = 477, "Teak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + .set(addItem(Plank_Teak.ID, "Teak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Acacia_Green.set( addItem( - tLastID = 478, + Plank_Acacia_Green.ID, "Green Acacia Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); ItemList.Plank_Lime - .set(addItem(tLastID = 479, "Lime Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + .set(addItem(Plank_Lime.ID, "Lime Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Chestnut.set( - addItem(tLastID = 480, "Chestnut Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem( + Plank_Chestnut.ID, + "Chestnut Plank", + aTextCover, + new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Wenge.set( - addItem(tLastID = 481, "Wenge Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Wenge.ID, "Wenge Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Baobab.set( - addItem(tLastID = 482, "Baobab Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Baobab.ID, "Baobab Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Sequoia.set( - addItem(tLastID = 483, "Sequoia Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem( + Plank_Sequoia.ID, + "Sequoia Plank", + aTextCover, + new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Kapok.set( - addItem(tLastID = 484, "Kapok Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Kapok.ID, "Kapok Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Ebony.set( - addItem(tLastID = 485, "Ebony Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Ebony.ID, "Ebony Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Mahagony.set( - addItem(tLastID = 486, "Mahagony Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem( + Plank_Mahagony.ID, + "Mahagony Plank", + aTextCover, + new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Balsa.set( - addItem(tLastID = 487, "Balsa Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Balsa.ID, "Balsa Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Willow.set( - addItem(tLastID = 488, "Willow Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Willow.ID, "Willow Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Walnut.set( - addItem(tLastID = 489, "Walnut Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Walnut.ID, "Walnut Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Greenheart.set( addItem( - tLastID = 490, + Plank_Greenheart.ID, "Greenheart Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); ItemList.Plank_Cherry.set( - addItem(tLastID = 491, "Cherry Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Cherry.ID, "Cherry Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Mahoe.set( - addItem(tLastID = 492, "Mahoe Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Mahoe.ID, "Mahoe Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Poplar.set( - addItem(tLastID = 493, "Poplar Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Poplar.ID, "Poplar Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Palm - .set(addItem(tLastID = 494, "Palm Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + .set(addItem(Plank_Palm.ID, "Palm Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Papaya.set( - addItem(tLastID = 495, "Papaya Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Papaya.ID, "Papaya Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Pine - .set(addItem(tLastID = 496, "Pine Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + .set(addItem(Plank_Pine.ID, "Pine Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Plum - .set(addItem(tLastID = 497, "Plum Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + .set(addItem(Plank_Plum.ID, "Plum Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Maple.set( - addItem(tLastID = 498, "Maple Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); + addItem(Plank_Maple.ID, "Maple Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); ItemList.Plank_Citrus.set( - addItem(tLastID = 499, "Citrus Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 75); - - ItemList.SFMixture.set(addItem(tLastID = 270, "Super Fuel Binder", "Raw Material")); - ItemList.MSFMixture.set(addItem(tLastID = 271, "Magic Super Fuel Binder", "Raw Material")); - - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Oak.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 0) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Spruce.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 1) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Birch.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 2) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Jungle.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 3) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_Acacia.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 4) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Plank_DarkOak.get(2L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 5) }); - - GregTech_API.registerCover(ItemList.Plank_Oak.get(1L), TextureFactory.of(Blocks.planks, 0), null); - GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L), TextureFactory.of(Blocks.planks, 1), null); - GregTech_API.registerCover(ItemList.Plank_Birch.get(1L), TextureFactory.of(Blocks.planks, 2), null); - GregTech_API.registerCover(ItemList.Plank_Jungle.get(1L), TextureFactory.of(Blocks.planks, 3), null); - GregTech_API.registerCover(ItemList.Plank_Acacia.get(1L), TextureFactory.of(Blocks.planks, 4), null); - GregTech_API.registerCover(ItemList.Plank_DarkOak.get(1L), TextureFactory.of(Blocks.planks, 5), null); - GregTech_API.registerCover( - ItemList.Plank_Larch.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 0, new ItemStack(Blocks.planks, 1, 0))), - 0), - null); - GregTech_API.registerCover( - ItemList.Plank_Teak.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 1, new ItemStack(Blocks.planks, 1, 0))), - 1), - null); - GregTech_API.registerCover( - ItemList.Plank_Acacia_Green.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 2, new ItemStack(Blocks.planks, 1, 0))), - 2), - null); - GregTech_API.registerCover( - ItemList.Plank_Lime.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 3, new ItemStack(Blocks.planks, 1, 0))), - 3), - null); - GregTech_API.registerCover( - ItemList.Plank_Chestnut.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 4, new ItemStack(Blocks.planks, 1, 0))), - 4), - null); - GregTech_API.registerCover( - ItemList.Plank_Wenge.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 5, new ItemStack(Blocks.planks, 1, 0))), - 5), - null); - GregTech_API.registerCover( - ItemList.Plank_Baobab.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 6, new ItemStack(Blocks.planks, 1, 0))), - 6), - null); - GregTech_API.registerCover( - ItemList.Plank_Sequoia.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 7, new ItemStack(Blocks.planks, 1, 0))), - 7), - null); - GregTech_API.registerCover( - ItemList.Plank_Kapok.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 8, new ItemStack(Blocks.planks, 1, 0))), - 8), - null); - GregTech_API.registerCover( - ItemList.Plank_Ebony.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 9, new ItemStack(Blocks.planks, 1, 0))), - 9), - null); - GregTech_API.registerCover( - ItemList.Plank_Mahagony.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 10, new ItemStack(Blocks.planks, 1, 0))), - 10), - null); - GregTech_API.registerCover( - ItemList.Plank_Balsa.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 11, new ItemStack(Blocks.planks, 1, 0))), - 11), - null); - GregTech_API.registerCover( - ItemList.Plank_Willow.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 12, new ItemStack(Blocks.planks, 1, 0))), - 12), - null); - GregTech_API.registerCover( - ItemList.Plank_Walnut.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 13, new ItemStack(Blocks.planks, 1, 0))), - 13), - null); - GregTech_API.registerCover( - ItemList.Plank_Greenheart.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 14, new ItemStack(Blocks.planks, 1, 0))), - 14), - null); - GregTech_API.registerCover( - ItemList.Plank_Cherry.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 15, new ItemStack(Blocks.planks, 1, 0))), - 15), - null); - GregTech_API.registerCover( - ItemList.Plank_Mahoe.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 16, new ItemStack(Blocks.planks, 1, 0))), - 0), - null); - GregTech_API.registerCover( - ItemList.Plank_Poplar.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 17, new ItemStack(Blocks.planks, 1, 0))), - 1), - null); - GregTech_API.registerCover( - ItemList.Plank_Palm.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 18, new ItemStack(Blocks.planks, 1, 0))), - 2), - null); - GregTech_API.registerCover( - ItemList.Plank_Papaya.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 19, new ItemStack(Blocks.planks, 1, 0))), - 3), - null); - GregTech_API.registerCover( - ItemList.Plank_Pine.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 20, new ItemStack(Blocks.planks, 1, 0))), - 4), - null); - GregTech_API.registerCover( - ItemList.Plank_Plum.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 21, new ItemStack(Blocks.planks, 1, 0))), - 5), - null); - GregTech_API.registerCover( - ItemList.Plank_Maple.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 22, new ItemStack(Blocks.planks, 1, 0))), - 6), - null); - GregTech_API.registerCover( - ItemList.Plank_Citrus.get(1L), - TextureFactory.of( - GT_Utility.getBlockFromStack( - GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 23, new ItemStack(Blocks.planks, 1, 0))), - 7), - null); + addItem(Plank_Citrus.ID, "Citrus Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); + ItemList.SFMixture.set(addItem(SFMixture.ID, "Super Fuel Binder", "Raw Material")); + ItemList.MSFMixture.set(addItem(MSFMixture.ID, "Magic Super Fuel Binder", "Raw Material")); ItemList.Crop_Drop_Plumbilia.set( addItem( - tLastID = 500, + Crop_Drop_Plumbilia.ID, "Plumbilia Leaf", "Source of Lead", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -1998,7 +1967,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))); ItemList.Crop_Drop_Argentia.set( addItem( - tLastID = 501, + Crop_Drop_Argentia.ID, "Argentia Leaf", "Source of Silver", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -2006,21 +1975,21 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); ItemList.Crop_Drop_Indigo.set( addItem( - tLastID = 502, + Crop_Drop_Indigo.ID, "Indigo Blossom", "Used for making Blue Dye", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L))); ItemList.Crop_Drop_Ferru.set( addItem( - tLastID = 503, + Crop_Drop_Ferru.ID, "Ferru Leaf", "Source of Iron", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L))); ItemList.Crop_Drop_Aurelia.set( addItem( - tLastID = 504, + Crop_Drop_Aurelia.ID, "Aurelia Leaf", "Source of Gold", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -2028,7 +1997,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); ItemList.Crop_Drop_TeaLeaf.set( addItem( - tLastID = 505, + Crop_Drop_TeaLeaf.ID, "Tea Leaf", "Source of Tea", "cropTea", @@ -2037,7 +2006,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Crop_Drop_OilBerry.set( addItem( - tLastID = 510, + Crop_Drop_OilBerry.ID, "Oil Berry", "Oil in Berry form", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -2045,7 +2014,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L))); ItemList.Crop_Drop_BobsYerUncleRanks.set( addItem( - tLastID = 511, + Crop_Drop_BobsYerUncleRanks.ID, "Bobs-Yer-Uncle-Berry", "Source of Emeralds", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -2053,7 +2022,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); ItemList.Crop_Drop_UUMBerry.set( addItem( - tLastID = 512, + Crop_Drop_UUMBerry.ID, "UUM Berry", "UUM in Berry form", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -2061,7 +2030,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L))); ItemList.Crop_Drop_UUABerry.set( addItem( - tLastID = 513, + Crop_Drop_UUABerry.ID, "UUA Berry", "UUA in Berry form", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -2070,7 +2039,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Crop_Drop_MilkWart.set( addItem( - tLastID = 520, + Crop_Drop_MilkWart.ID, "Milk Wart", "Source of Milk", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -2079,7 +2048,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Crop_Drop_Coppon.set( addItem( - tLastID = 530, + Crop_Drop_Coppon.ID, "Coppon Fiber", "ORANGE WOOOOOOOL!!!", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -2088,41 +2057,39 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Crop_Drop_Tine.set( addItem( - tLastID = 540, + Crop_Drop_Tine.ID, "Tine Twig", "Source of Tin", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 100); ItemList.Crop_Drop_Mica.set( addItem( - tLastID = 538, + Crop_Drop_Mica.ID, "Micadia Twig", "Source of Mica", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); - setBurnValue(32000 + tLastID, 240); - - ItemList.Crop_Drop_Bauxite.set(addItem(tLastID = 521, "Bauxia Leaf", "Source of Aluminium")); - ItemList.Crop_Drop_Ilmenite.set(addItem(tLastID = 522, "Titania Leaf", "Source of Titanium")); - ItemList.Crop_Drop_Pitchblende.set(addItem(tLastID = 523, "Reactoria Leaf", "Source of Uranium")); - ItemList.Crop_Drop_Uraninite.set(addItem(tLastID = 524, "Uranium Leaf", "Source of Uranite")); - ItemList.Crop_Drop_Thorium.set(addItem(tLastID = 526, "Thunder Leaf", "Source of Thorium")); - ItemList.Crop_Drop_Nickel.set(addItem(tLastID = 527, "Nickelback Leaf", "Source of Nickel")); - ItemList.Crop_Drop_Zinc.set(addItem(tLastID = 528, "Galvania Leaf", "Source of Zinc")); - ItemList.Crop_Drop_Manganese.set(addItem(tLastID = 529, "Pyrolusium Leaf", "Source of Manganese")); - ItemList.Crop_Drop_Scheelite.set(addItem(tLastID = 531, "Scheelinium Leaf", "Source of Tungsten")); - ItemList.Crop_Drop_Platinum.set(addItem(tLastID = 532, "Platina Leaf", "Source of Platinum")); - ItemList.Crop_Drop_Iridium.set(addItem(tLastID = 533, "Quantaria Leaf", "Source of Iridium")); - ItemList.Crop_Drop_Osmium.set(addItem(tLastID = 534, "Quantaria Leaf", "Source of Osmium")); - ItemList.Crop_Drop_Naquadah.set(addItem(tLastID = 535, "Stargatium Leaf", "Source of Naquadah")); + + ItemList.Crop_Drop_Bauxite.set(addItem(Crop_Drop_Bauxite.ID, "Bauxia Leaf", "Source of Aluminium")); + ItemList.Crop_Drop_Ilmenite.set(addItem(Crop_Drop_Ilmenite.ID, "Titania Leaf", "Source of Titanium")); + ItemList.Crop_Drop_Pitchblende.set(addItem(Crop_Drop_Pitchblende.ID, "Reactoria Leaf", "Source of Uranium")); + ItemList.Crop_Drop_Uraninite.set(addItem(Crop_Drop_Uraninite.ID, "Uranium Leaf", "Source of Uranite")); + ItemList.Crop_Drop_Thorium.set(addItem(Crop_Drop_Thorium.ID, "Thunder Leaf", "Source of Thorium")); + ItemList.Crop_Drop_Nickel.set(addItem(Crop_Drop_Nickel.ID, "Nickelback Leaf", "Source of Nickel")); + ItemList.Crop_Drop_Zinc.set(addItem(Crop_Drop_Zinc.ID, "Galvania Leaf", "Source of Zinc")); + ItemList.Crop_Drop_Manganese.set(addItem(Crop_Drop_Manganese.ID, "Pyrolusium Leaf", "Source of Manganese")); + ItemList.Crop_Drop_Scheelite.set(addItem(Crop_Drop_Scheelite.ID, "Scheelinium Leaf", "Source of Tungsten")); + ItemList.Crop_Drop_Platinum.set(addItem(Crop_Drop_Platinum.ID, "Platina Leaf", "Source of Platinum")); + ItemList.Crop_Drop_Iridium.set(addItem(Crop_Drop_Iridium.ID, "Quantaria Leaf", "Source of Iridium")); + ItemList.Crop_Drop_Osmium.set(addItem(Crop_Drop_Osmium.ID, "Quantaria Leaf", "Source of Osmium")); + ItemList.Crop_Drop_Naquadah.set(addItem(Crop_Drop_Naquadah.ID, "Stargatium Leaf", "Source of Naquadah")); ItemList.Crop_Drop_Chilly.set( addItem( - tLastID = 550, + Crop_Drop_Chilly.ID, "Chilly Pepper", "It is red and hot", "cropChilipepper", @@ -2132,7 +2099,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Crop_Drop_Lemon.set( addItem( - tLastID = 551, + Crop_Drop_Lemon.ID, "Lemon", "Don't make Lemonade", "cropLemon", @@ -2142,7 +2109,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Crop_Drop_Tomato.set( addItem( - tLastID = 552, + Crop_Drop_Tomato.ID, "Tomato", "Solid Ketchup", "cropTomato", @@ -2152,7 +2119,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Crop_Drop_MTomato.set( addItem( - tLastID = 553, + Crop_Drop_MTomato.ID, "Max Tomato", "Full Health in one Tomato", "cropTomato", @@ -2173,7 +2140,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Crop_Drop_Grapes.set( addItem( - tLastID = 554, + Crop_Drop_Grapes.ID, "Grapes", "Source of Wine", "cropGrape", @@ -2183,7 +2150,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Crop_Drop_Onion.set( addItem( - tLastID = 555, + Crop_Drop_Onion.ID, "Onion", "Taking over the whole Taste", "cropOnion", @@ -2193,7 +2160,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Crop_Drop_Cucumber.set( addItem( - tLastID = 556, + Crop_Drop_Cucumber.ID, "Cucumber", "Not a Sea Cucumber!", "cropCucumber", @@ -2203,7 +2170,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Crop_Drop_Rape.set( addItem( - tLastID = 557, + Crop_Drop_Rape.ID, "Rape", "Time to oil up!", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), @@ -2212,7 +2179,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Food_Cheese.set( addItem( - tLastID = 558, + Food_Cheese.ID, "Cheese", "Click the Cheese", "foodCheese", @@ -2220,7 +2187,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L))); ItemList.Food_Dough.set( addItem( - tLastID = 559, + Food_Dough.ID, "Dough", "For making Breads", "foodDough", @@ -2229,7 +2196,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Food_Flat_Dough.set( addItem( - tLastID = 560, + Food_Flat_Dough.ID, "Flattened Dough", "For making Pizza", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), @@ -2237,7 +2204,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Food_Raw_Bread.set( addItem( - tLastID = 561, + Food_Raw_Bread.ID, "Dough", "In Bread Shape", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false), @@ -2245,7 +2212,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Food_Raw_Bun.set( addItem( - tLastID = 562, + Food_Raw_Bun.ID, "Dough", "In Bun Shape", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), @@ -2253,7 +2220,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Food_Raw_Baguette.set( addItem( - tLastID = 563, + Food_Raw_Baguette.ID, "Dough", "In Baguette Shape", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false), @@ -2261,7 +2228,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Food_Baked_Bun.set( addItem( - tLastID = 564, + Food_Baked_Bun.ID, "Bun", "Do not teleport Bread!", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), @@ -2270,7 +2237,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Baked_Baguette.set( addItem( - tLastID = 565, + Food_Baked_Baguette.ID, "Baguette", "I teleported nothing BUT Bread!!!", new GT_FoodStat(8, 0.5F, EnumAction.eat, null, false, true, false), @@ -2279,7 +2246,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Sliced_Bread.set( addItem( - tLastID = 566, + Food_Sliced_Bread.ID, "Sliced Bread", "Just half a Bread", new GT_FoodStat(2, 0.3F, EnumAction.eat, null, false, true, false), @@ -2288,7 +2255,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Sliced_Bun.set( addItem( - tLastID = 567, + Food_Sliced_Bun.ID, "Sliced Bun", "Just half a Bun", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false), @@ -2297,7 +2264,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Sliced_Baguette.set( addItem( - tLastID = 568, + Food_Sliced_Baguette.ID, "Sliced Baguette", "Just half a Baguette", new GT_FoodStat(4, 0.3F, EnumAction.eat, null, false, true, false), @@ -2306,7 +2273,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); ItemList.Food_Raw_Cake.set( addItem( - tLastID = 569, + Food_Raw_Cake.ID, "Cake Bottom", "For making Cake", new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false), @@ -2314,7 +2281,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Food_Baked_Cake.set( addItem( - tLastID = 570, + Food_Baked_Cake.ID, "Baked Cake Bottom", "I know I promised you an actual Cake, but well...", new GT_FoodStat(3, 0.3F, EnumAction.eat, null, false, true, false), @@ -2322,28 +2289,28 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); ItemList.Food_Sliced_Lemon.set( addItem( - tLastID = 571, + Food_Sliced_Lemon.ID, "Lemon Slice", "Ideal to put on your Drink", new GT_FoodStat(1, 0.075F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); ItemList.Food_Sliced_Tomato.set( addItem( - tLastID = 572, + Food_Sliced_Tomato.ID, "Tomato Slice", "Solid Ketchup", new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); ItemList.Food_Sliced_Onion.set( addItem( - tLastID = 573, + Food_Sliced_Onion.ID, "Onion Slice", "ONIONS, UNITE!", new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); ItemList.Food_Sliced_Cucumber.set( addItem( - tLastID = 574, + Food_Sliced_Cucumber.ID, "Cucumber Slice", "QUEWWW-CUMMM-BERRR!!!", new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false), @@ -2351,7 +2318,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Food_Sliced_Cheese.set( addItem( - tLastID = 576, + Food_Sliced_Cheese.ID, "Cheese Slice", "ALIEN ATTACK!!!, throw the CHEEEEESE!!!", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), @@ -2359,28 +2326,28 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_AdvancedRedstoneTransmitterExternal.set( addItem( - tLastID = 577, + Cover_AdvancedRedstoneTransmitterExternal.ID, "Advanced Redstone Transmitter (External)", "Transfers Redstone signals wirelessly/n Can only connect with advanced wireless covers", new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); ItemList.Cover_AdvancedRedstoneTransmitterInternal.set( addItem( - tLastID = 578, + Cover_AdvancedRedstoneTransmitterInternal.ID, "Advanced Redstone Transmitter (Internal)", "Transfers Redstone signals wirelessly/n Can only connect with advanced wireless covers", new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); ItemList.Cover_AdvancedRedstoneReceiverExternal.set( addItem( - tLastID = 579, + Cover_AdvancedRedstoneReceiverExternal.ID, "Advanced Redstone Receiver (External)", "Transfers Redstone signals wirelessly/n Can only connect with advanced wireless covers", new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L))); ItemList.Cover_AdvancedRedstoneReceiverInternal.set( addItem( - tLastID = 580, + Cover_AdvancedRedstoneReceiverInternal.ID, "Advanced Redstone Receiver (Internal)", "Transfers Redstone signals wirelessly/n Can only connect with advanced wireless covers", new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), @@ -2388,7 +2355,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_WirelessFluidDetector.set( addItem( - tLastID = 581, + Cover_WirelessFluidDetector.ID, "Wireless Fluid Detector Cover", "Transfers Fluid Amount as Redstone wirelessly/n Can only connect with advanced wireless covers", new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), @@ -2397,7 +2364,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L))); ItemList.Cover_WirelessItemDetector.set( addItem( - tLastID = 582, + Cover_WirelessItemDetector.ID, "Wireless Item Detector Cover", "Transfers Item Amount as Redstone wirelessly/n Can only connect with advanced wireless covers", new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), @@ -2407,7 +2374,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_WirelessNeedsMaintainance.set( addItem( - tLastID = 583, + Cover_WirelessNeedsMaintainance.ID, "Wireless Needs Maintenance Cover", "Transfers Maintenance Issues as Redstone wirelessly/n Can only connect with advanced wireless covers", new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L), @@ -2415,7 +2382,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Cover_WirelessActivityDetector.set( addItem( - tLastID = 584, + Cover_WirelessActivityDetector.ID, "Wireless Activity Detector Cover", "Transfers Activity as Redstone wirelessly/n Can only connect with advanced wireless covers", new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L), @@ -2423,46 +2390,181 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1L))); - GregTech_API.registerCover( - ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)), - new GT_Cover_AdvancedRedstoneTransmitterExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER))); + ItemList.Display_ITS_FREE.set( + addItem( + Display_ITS_FREE.ID, + "ITS FREE", + "(or at least almost free)", + SubTag.INVISIBLE, + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); - GregTech_API.registerCover( - ItemList.Cover_AdvancedRedstoneTransmitterInternal.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)), - new GT_Cover_AdvancedRedstoneTransmitterInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER))); + try { + CropCard tCrop; + GT_Utility.getField(tCrop = Crops.instance.getCropList()[13], "mDrop") + .set(tCrop, ItemList.Crop_Drop_Ferru.get(1L)); + GT_Utility.getField(tCrop = Crops.instance.getCropList()[14], "mDrop") + .set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L)); + } catch (Throwable e) { + if (GT_Values.D1) { + e.printStackTrace(GT_Log.err); + } + } - GregTech_API.registerCover( - ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)), - new GT_Cover_AdvancedRedstoneReceiverExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER))); + setAllFluidContainerStats(); + setBurnValues(); + registerCovers(); + initCraftingShapedRecipes(); + initCraftingShapelessRecipes(); + initAssemblerRecipes(); + initExtractorRecipes(); + initMaceratorRecipes(); + initCompressorRecipes(); + } - GregTech_API.registerCover( - ItemList.Cover_AdvancedRedstoneReceiverInternal.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)), - new GT_Cover_AdvancedRedstoneReceiverInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER))); + @Override + public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { + super.onLeftClickEntity(aStack, aPlayer, aEntity); + int aDamage = aStack.getItemDamage(); + if ((aDamage >= 25000) && (aDamage < 27000)) { + if (aDamage >= 26000) { + return Behaviour_Arrow.DEFAULT_PLASTIC.onLeftClickEntity(this, aStack, aPlayer, aEntity); + } + return Behaviour_Arrow.DEFAULT_WOODEN.onLeftClickEntity(this, aStack, aPlayer, aEntity); + } + return false; + } - GregTech_API.registerCover( - ItemList.Cover_WirelessFluidDetector.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR)), - new GT_Cover_WirelessFluidDetector(TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR))); + @Override + public boolean hasProjectile(SubTag aProjectileType, ItemStack aStack) { + int aDamage = aStack.getItemDamage(); + return ((aDamage >= 25000) && (aDamage < 27000)) || (super.hasProjectile(aProjectileType, aStack)); + } - GregTech_API.registerCover( - ItemList.Cover_WirelessItemDetector.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR)), - new GT_Cover_WirelessItemDetector(TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR))); + @Override + public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, + double aZ) { + int aDamage = aStack.getItemDamage(); + if ((aDamage >= 25000) && (aDamage < 27000)) { + if (aDamage >= 26000) { + return Behaviour_Arrow.DEFAULT_PLASTIC.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ); + } + return Behaviour_Arrow.DEFAULT_WOODEN.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ); + } + return super.getProjectile(aProjectileType, aStack, aWorld, aX, aY, aZ); + } - GregTech_API.registerCover( - ItemList.Cover_WirelessActivityDetector.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_ACTIVITYDETECTOR)), - new GT_Cover_WirelessDoesWorkDetector(TextureFactory.of(OVERLAY_WIRELESS_ACTIVITYDETECTOR))); + @Override + public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, + float aSpeed) { + int aDamage = aStack.getItemDamage(); + if ((aDamage >= 25000) && (aDamage < 27000)) { + if (aDamage >= 26000) { + return Behaviour_Arrow.DEFAULT_PLASTIC + .getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); + } + return Behaviour_Arrow.DEFAULT_WOODEN.getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); + } + return super.getProjectile(aProjectileType, aStack, aWorld, aEntity, aSpeed); + } - GregTech_API.registerCover( - ItemList.Cover_WirelessNeedsMaintainance.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_MAINTENANCE_DETECTOR)), - new GT_Cover_WirelessMaintenanceDetector(TextureFactory.of(OVERLAY_WIRELESS_MAINTENANCE_DETECTOR))); + @Override + public boolean isItemStackUsable(ItemStack aStack) { + int aDamage = aStack.getItemDamage(); + Materials aMaterial = GregTech_API.sGeneratedMaterials[(aDamage % 1000)]; + if ((aDamage >= 25000) && (aDamage < 27000) && (aMaterial != null) && (aMaterial.mEnchantmentTools != null)) { + Enchantment tEnchant = aMaterial.mEnchantmentTools == Enchantment.fortune ? Enchantment.looting + : aMaterial.mEnchantmentTools; + if (tEnchant.type == EnumEnchantmentType.weapon) { + NBTTagCompound tNBT = GT_Utility.ItemNBT.getNBT(aStack); + if (!tNBT.getBoolean("GT.HasBeenUpdated")) { + tNBT.setBoolean("GT.HasBeenUpdated", true); + GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GT_Utility.ItemNBT.addEnchantment(aStack, tEnchant, aMaterial.mEnchantmentToolsLevel); + } + } + } + return super.isItemStackUsable(aStack); + } + + private void setAllFluidContainerStats() { + setFluidContainerStats(32000 + Food_Raw_Fries.ID, 0L, 16L); + setFluidContainerStats(32000 + Food_Fries.ID, 0L, 16L); + setFluidContainerStats(32000 + Food_Raw_PotatoChips.ID, 0L, 16L); + setFluidContainerStats(32000 + Food_PotatoChips.ID, 0L, 16L); + setFluidContainerStats(32000 + Food_ChiliChips.ID, 0L, 16L); + setFluidContainerStats(32000 + Food_Sandwich_Veggie.ID, 0L, 32L); + setFluidContainerStats(32000 + Food_Sandwich_Cheese.ID, 0L, 32L); + setFluidContainerStats(32000 + Food_Sandwich_Bacon.ID, 0L, 32L); + setFluidContainerStats(32000 + Food_Sandwich_Steak.ID, 0L, 32L); + setFluidContainerStats(32000 + Food_Large_Sandwich_Veggie.ID, 0L, 16L); + setFluidContainerStats(32000 + Food_Large_Sandwich_Cheese.ID, 0L, 16L); + setFluidContainerStats(32000 + Food_Large_Sandwich_Bacon.ID, 0L, 16L); + setFluidContainerStats(32000 + Food_Large_Sandwich_Steak.ID, 0L, 16L); + } + + private void setBurnValues() { + setBurnValue(32000 + Plank_Oak.ID, 75); + setBurnValue(32000 + Plank_Spruce.ID, 75); + setBurnValue(32000 + Plank_Birch.ID, 75); + setBurnValue(32000 + Plank_Jungle.ID, 75); + setBurnValue(32000 + Plank_Acacia.ID, 75); + setBurnValue(32000 + Plank_DarkOak.ID, 75); + setBurnValue(32000 + Plank_Larch.ID, 75); + setBurnValue(32000 + Plank_Teak.ID, 75); + setBurnValue(32000 + Plank_Acacia_Green.ID, 75); + setBurnValue(32000 + Plank_Lime.ID, 75); + setBurnValue(32000 + Plank_Chestnut.ID, 75); + setBurnValue(32000 + Plank_Wenge.ID, 75); + setBurnValue(32000 + Plank_Baobab.ID, 75); + setBurnValue(32000 + Plank_Sequoia.ID, 75); + setBurnValue(32000 + Plank_Kapok.ID, 75); + setBurnValue(32000 + Plank_Ebony.ID, 75); + setBurnValue(32000 + Plank_Mahagony.ID, 75); + setBurnValue(32000 + Plank_Balsa.ID, 75); + setBurnValue(32000 + Plank_Willow.ID, 75); + setBurnValue(32000 + Plank_Walnut.ID, 75); + setBurnValue(32000 + Plank_Greenheart.ID, 75); + setBurnValue(32000 + Plank_Cherry.ID, 75); + setBurnValue(32000 + Plank_Mahoe.ID, 75); + setBurnValue(32000 + Plank_Poplar.ID, 75); + setBurnValue(32000 + Plank_Palm.ID, 75); + setBurnValue(32000 + Plank_Papaya.ID, 75); + setBurnValue(32000 + Plank_Pine.ID, 75); + setBurnValue(32000 + Plank_Plum.ID, 75); + setBurnValue(32000 + Plank_Maple.ID, 75); + setBurnValue(32000 + Plank_Citrus.ID, 75); + setBurnValue(32000 + Crop_Drop_Tine.ID, 100); + setBurnValue(32000 + Crop_Drop_Mica.ID, 240); + } + + public void initCraftingShapedRecipes() { + GT_ModHandler.addCraftingRecipe( + ItemList.Plank_Oak.get(2L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 0) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Plank_Spruce.get(2L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Plank_Birch.get(2L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 2) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Plank_Jungle.get(2L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 3) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Plank_Acacia.get(2L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 4) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Plank_DarkOak.get(2L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + new Object[] { "s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 5) }); + } + public void initAssemblerRecipes() { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Cover_RedstoneTransmitterExternal.get(1L), @@ -2517,6 +2619,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { .duration(2 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); + } + + public void initCraftingShapelessRecipes() { GT_ModHandler.addShapelessCraftingRecipe( ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L), new Object[] { ItemList.Cover_AdvancedRedstoneReceiverInternal.get(1L) }); @@ -2529,7 +2634,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_ModHandler.addShapelessCraftingRecipe( ItemList.Cover_AdvancedRedstoneTransmitterInternal.get(1L), new Object[] { ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L) }); + } + public void initExtractorRecipes() { GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.red_flower, 1, 0), new ItemStack(Items.dye, 2, 1)); GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.red_flower, 1, 1), new ItemStack(Items.dye, 2, 12)); GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.red_flower, 1, 2), new ItemStack(Items.dye, 2, 13)); @@ -2560,94 +2667,95 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_ModHandler.addExtractionRecipe( ItemList.Crop_Drop_Tine.get(1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L)); + } - // Compression recipes - { - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Coppon.get(4L)) - .itemOutputs(new ItemStack(Blocks.wool, 1, 1)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Plumbilia.get(4L)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Argentia.get(4L)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Indigo.get(4L)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Ferru.get(4L)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Aurelia.get(4L)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_OilBerry.get(4L)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_BobsYerUncleRanks.get(4L)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Tine.get(4L)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Rape.get(4L)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.red_flower, 8, 32767)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.yellow_flower, 8, 32767)) - .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) - .duration(15 * SECONDS) - .eut(2) - .addTo(compressorRecipes); - } + public void initCompressorRecipes() { + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Coppon.get(4L)) + .itemOutputs(new ItemStack(Blocks.wool, 1, 1)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Plumbilia.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Argentia.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Indigo.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Ferru.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Aurelia.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_OilBerry.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_BobsYerUncleRanks.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Tine.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Rape.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.red_flower, 8, 32767)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.yellow_flower, 8, 32767)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .duration(15 * SECONDS) + .eut(2) + .addTo(compressorRecipes); + } + public void initMaceratorRecipes() { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Food_Sliced_Cheese.get(1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cheese, 1L)) @@ -2711,89 +2819,223 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { .duration(5 * SECONDS) .eut(32_000_000) .addTo(maceratorRecipes); - try { - CropCard tCrop; - GT_Utility.getField(tCrop = Crops.instance.getCropList()[13], "mDrop") - .set(tCrop, ItemList.Crop_Drop_Ferru.get(1L)); - GT_Utility.getField(tCrop = Crops.instance.getCropList()[14], "mDrop") - .set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L)); - } catch (Throwable e) { - if (GT_Values.D1) { - e.printStackTrace(GT_Log.err); - } - } - ItemList.Display_ITS_FREE.set( - addItem( - tLastID = 765, - "ITS FREE", - "(or at least almost free)", - SubTag.INVISIBLE, - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); } - @Override - public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { - super.onLeftClickEntity(aStack, aPlayer, aEntity); - int aDamage = aStack.getItemDamage(); - if ((aDamage >= 25000) && (aDamage < 27000)) { - if (aDamage >= 26000) { - return Behaviour_Arrow.DEFAULT_PLASTIC.onLeftClickEntity(this, aStack, aPlayer, aEntity); - } - return Behaviour_Arrow.DEFAULT_WOODEN.onLeftClickEntity(this, aStack, aPlayer, aEntity); - } - return false; - } + public void registerCovers() { + GregTech_API.registerCover(ItemList.Plank_Oak.get(1L), TextureFactory.of(Blocks.planks, 0), null); + GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L), TextureFactory.of(Blocks.planks, 1), null); + GregTech_API.registerCover(ItemList.Plank_Birch.get(1L), TextureFactory.of(Blocks.planks, 2), null); + GregTech_API.registerCover(ItemList.Plank_Jungle.get(1L), TextureFactory.of(Blocks.planks, 3), null); + GregTech_API.registerCover(ItemList.Plank_Acacia.get(1L), TextureFactory.of(Blocks.planks, 4), null); + GregTech_API.registerCover(ItemList.Plank_DarkOak.get(1L), TextureFactory.of(Blocks.planks, 5), null); + GregTech_API.registerCover( + ItemList.Plank_Larch.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 0, new ItemStack(Blocks.planks, 1, 0))), + 0), + null); + GregTech_API.registerCover( + ItemList.Plank_Teak.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 1, new ItemStack(Blocks.planks, 1, 0))), + 1), + null); + GregTech_API.registerCover( + ItemList.Plank_Acacia_Green.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 2, new ItemStack(Blocks.planks, 1, 0))), + 2), + null); + GregTech_API.registerCover( + ItemList.Plank_Lime.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 3, new ItemStack(Blocks.planks, 1, 0))), + 3), + null); + GregTech_API.registerCover( + ItemList.Plank_Chestnut.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 4, new ItemStack(Blocks.planks, 1, 0))), + 4), + null); + GregTech_API.registerCover( + ItemList.Plank_Wenge.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 5, new ItemStack(Blocks.planks, 1, 0))), + 5), + null); + GregTech_API.registerCover( + ItemList.Plank_Baobab.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 6, new ItemStack(Blocks.planks, 1, 0))), + 6), + null); + GregTech_API.registerCover( + ItemList.Plank_Sequoia.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 7, new ItemStack(Blocks.planks, 1, 0))), + 7), + null); + GregTech_API.registerCover( + ItemList.Plank_Kapok.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 8, new ItemStack(Blocks.planks, 1, 0))), + 8), + null); + GregTech_API.registerCover( + ItemList.Plank_Ebony.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 9, new ItemStack(Blocks.planks, 1, 0))), + 9), + null); + GregTech_API.registerCover( + ItemList.Plank_Mahagony.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 10, new ItemStack(Blocks.planks, 1, 0))), + 10), + null); + GregTech_API.registerCover( + ItemList.Plank_Balsa.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 11, new ItemStack(Blocks.planks, 1, 0))), + 11), + null); + GregTech_API.registerCover( + ItemList.Plank_Willow.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 12, new ItemStack(Blocks.planks, 1, 0))), + 12), + null); + GregTech_API.registerCover( + ItemList.Plank_Walnut.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 13, new ItemStack(Blocks.planks, 1, 0))), + 13), + null); + GregTech_API.registerCover( + ItemList.Plank_Greenheart.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 14, new ItemStack(Blocks.planks, 1, 0))), + 14), + null); + GregTech_API.registerCover( + ItemList.Plank_Cherry.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 15, new ItemStack(Blocks.planks, 1, 0))), + 15), + null); + GregTech_API.registerCover( + ItemList.Plank_Mahoe.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 16, new ItemStack(Blocks.planks, 1, 0))), + 0), + null); + GregTech_API.registerCover( + ItemList.Plank_Poplar.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 17, new ItemStack(Blocks.planks, 1, 0))), + 1), + null); + GregTech_API.registerCover( + ItemList.Plank_Palm.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 18, new ItemStack(Blocks.planks, 1, 0))), + 2), + null); + GregTech_API.registerCover( + ItemList.Plank_Papaya.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 19, new ItemStack(Blocks.planks, 1, 0))), + 3), + null); + GregTech_API.registerCover( + ItemList.Plank_Pine.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 20, new ItemStack(Blocks.planks, 1, 0))), + 4), + null); + GregTech_API.registerCover( + ItemList.Plank_Plum.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 21, new ItemStack(Blocks.planks, 1, 0))), + 5), + null); + GregTech_API.registerCover( + ItemList.Plank_Maple.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 22, new ItemStack(Blocks.planks, 1, 0))), + 6), + null); + GregTech_API.registerCover( + ItemList.Plank_Citrus.get(1L), + TextureFactory.of( + GT_Utility.getBlockFromStack( + GT_ModHandler.getModItem(Forestry.ID, "planks", 1L, 23, new ItemStack(Blocks.planks, 1, 0))), + 7), + null); - @Override - public boolean hasProjectile(SubTag aProjectileType, ItemStack aStack) { - int aDamage = aStack.getItemDamage(); - return ((aDamage >= 25000) && (aDamage < 27000)) || (super.hasProjectile(aProjectileType, aStack)); - } + GregTech_API.registerCover( + ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)), + new GT_Cover_AdvancedRedstoneTransmitterExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER))); - @Override - public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, - double aZ) { - int aDamage = aStack.getItemDamage(); - if ((aDamage >= 25000) && (aDamage < 27000)) { - if (aDamage >= 26000) { - return Behaviour_Arrow.DEFAULT_PLASTIC.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ); - } - return Behaviour_Arrow.DEFAULT_WOODEN.getProjectile(this, aProjectileType, aStack, aWorld, aX, aY, aZ); - } - return super.getProjectile(aProjectileType, aStack, aWorld, aX, aY, aZ); - } + GregTech_API.registerCover( + ItemList.Cover_AdvancedRedstoneTransmitterInternal.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER)), + new GT_Cover_AdvancedRedstoneTransmitterInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_TRANSMITTER))); - @Override - public EntityArrow getProjectile(SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, - float aSpeed) { - int aDamage = aStack.getItemDamage(); - if ((aDamage >= 25000) && (aDamage < 27000)) { - if (aDamage >= 26000) { - return Behaviour_Arrow.DEFAULT_PLASTIC - .getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); - } - return Behaviour_Arrow.DEFAULT_WOODEN.getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); - } - return super.getProjectile(aProjectileType, aStack, aWorld, aEntity, aSpeed); - } + GregTech_API.registerCover( + ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)), + new GT_Cover_AdvancedRedstoneReceiverExternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER))); - @Override - public boolean isItemStackUsable(ItemStack aStack) { - int aDamage = aStack.getItemDamage(); - Materials aMaterial = GregTech_API.sGeneratedMaterials[(aDamage % 1000)]; - if ((aDamage >= 25000) && (aDamage < 27000) && (aMaterial != null) && (aMaterial.mEnchantmentTools != null)) { - Enchantment tEnchant = aMaterial.mEnchantmentTools == Enchantment.fortune ? Enchantment.looting - : aMaterial.mEnchantmentTools; - if (tEnchant.type == EnumEnchantmentType.weapon) { - NBTTagCompound tNBT = GT_Utility.ItemNBT.getNBT(aStack); - if (!tNBT.getBoolean("GT.HasBeenUpdated")) { - tNBT.setBoolean("GT.HasBeenUpdated", true); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); - GT_Utility.ItemNBT.addEnchantment(aStack, tEnchant, aMaterial.mEnchantmentToolsLevel); - } - } - } - return super.isItemStackUsable(aStack); + GregTech_API.registerCover( + ItemList.Cover_AdvancedRedstoneReceiverInternal.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER)), + new GT_Cover_AdvancedRedstoneReceiverInternal(TextureFactory.of(OVERLAY_ADVANCED_REDSTONE_RECEIVER))); + + GregTech_API.registerCover( + ItemList.Cover_WirelessFluidDetector.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR)), + new GT_Cover_WirelessFluidDetector(TextureFactory.of(OVERLAY_WIRELESS_FLUID_DETECTOR))); + + GregTech_API.registerCover( + ItemList.Cover_WirelessItemDetector.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR)), + new GT_Cover_WirelessItemDetector(TextureFactory.of(OVERLAY_WIRELESS_ITEM_DETECTOR))); + + GregTech_API.registerCover( + ItemList.Cover_WirelessActivityDetector.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_ACTIVITYDETECTOR)), + new GT_Cover_WirelessDoesWorkDetector(TextureFactory.of(OVERLAY_WIRELESS_ACTIVITYDETECTOR))); + + GregTech_API.registerCover( + ItemList.Cover_WirelessNeedsMaintainance.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_WIRELESS_MAINTENANCE_DETECTOR)), + new GT_Cover_WirelessMaintenanceDetector(TextureFactory.of(OVERLAY_WIRELESS_MAINTENANCE_DETECTOR))); } @Override diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 3a0c4a95d8..35d1603587 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -21,6 +21,223 @@ import static gregtech.client.GT_TooltipHandler.Tier.UV; import static gregtech.client.GT_TooltipHandler.Tier.UXV; import static gregtech.client.GT_TooltipHandler.Tier.ZPM; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Biomainframe; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Bioprocessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Biowarecomputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Biowaresupercomputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Bio; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Bio_Ultra; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Coated_Basic; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Epoxy_Advanced; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Fiberglass_Advanced; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Multifiberglass_Elite; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Optical; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Phenolic_Good; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Plastic; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Plastic_Advanced; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Wetware; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Board_Wetware_Extreme; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_BioCPU; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Biocell; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_CPU; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_CrystalCPU; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_CrystalSoC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_CrystalSoC2; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_HPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_ILC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_LPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NAND; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NOR; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NanoCPU; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_NeuroCPU; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Optical; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_PIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_PPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_QPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_QuantumCPU; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Ram; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Simple_SoC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_SoC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_SoC2; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_Stemcell; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_UHPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Chip_ULPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_CosmicAssembly; +import static gregtech.common.items.ID_MetaItem_03.Circuit_CosmicComputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_CosmicMainframe; +import static gregtech.common.items.ID_MetaItem_03.Circuit_CosmicProcessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Crystalcomputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Crystalmainframe; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Crystalprocessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Elitenanocomputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_ExoticAssembly; +import static gregtech.common.items.ID_MetaItem_03.Circuit_ExoticComputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_ExoticMainframe; +import static gregtech.common.items.ID_MetaItem_03.Circuit_ExoticProcessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Integrated_Good; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Masterquantumcomputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Microprocessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Nanocomputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Nanoprocessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Neuroprocessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_OpticalAssembly; +import static gregtech.common.items.ID_MetaItem_03.Circuit_OpticalComputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_OpticalMainframe; +import static gregtech.common.items.ID_MetaItem_03.Circuit_OpticalProcessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_CapacitorASMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_CapacitorSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_CapacitorXSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_Chip_Bioware; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_Coil; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_DiodeASMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_DiodeSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_DiodeXSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_GlassFiber; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_Glass_Tube; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_InductorASMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_InductorSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_InductorXSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_PetriDish; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_RawCrystalChip; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_RawCrystalParts; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_Reinforced_Glass_Tube; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_ResistorASMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_ResistorSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_ResistorXSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_TransistorASMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_TransistorSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Parts_TransistorXSMD; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Processor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Quantumcomputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Quantummainframe; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Quantumprocessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot2; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot3; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot4; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot5; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Ingot6; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer2; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer3; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer4; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer5; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer6; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Silicon_Wafer7; +import static gregtech.common.items.ID_MetaItem_03.Circuit_TranscendentAssembly; +import static gregtech.common.items.ID_MetaItem_03.Circuit_TranscendentComputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_TranscendentMainframe; +import static gregtech.common.items.ID_MetaItem_03.Circuit_TranscendentProcessor; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Ultimatecrystalcomputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_Bioware; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_CPU; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_HPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_ILC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_LPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_NAND; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_NOR; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_NPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_NanoCPU; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_PIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_PPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_QPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_QuantumCPU; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_Ram; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_Simple_SoC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_SoC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_SoC2; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_UHPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wafer_ULPIC; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wetwarecomputer; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wetwaremainframe; +import static gregtech.common.items.ID_MetaItem_03.Circuit_Wetwaresupercomputer; +import static gregtech.common.items.ID_MetaItem_03.Cover_Metrics_Transmitter; +import static gregtech.common.items.ID_MetaItem_03.Cover_SolarPanel_UEV; +import static gregtech.common.items.ID_MetaItem_03.Cover_SolarPanel_UHV; +import static gregtech.common.items.ID_MetaItem_03.Cover_SolarPanel_UIV; +import static gregtech.common.items.ID_MetaItem_03.EV_Coil; +import static gregtech.common.items.ID_MetaItem_03.GalliumArsenideCrystal; +import static gregtech.common.items.ID_MetaItem_03.GalliumArsenideCrystalSmallPart; +import static gregtech.common.items.ID_MetaItem_03.HV_Coil; +import static gregtech.common.items.ID_MetaItem_03.IV_Coil; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_AUTOMATION; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_1; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_2; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_3; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_4; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_5; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_6; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_7; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_8; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Acceleration_8_Upgraded; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_COOLER; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_DESERT; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_DRYER; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_FLOWERING; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_Frame; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_HEATER; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_HELL; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_HUMIDIFIER; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_JUNGLE; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_LIFESPAN; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_LIGHT; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_OCEAN; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_PLAINS; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_POLLEN; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_PRODUCTION; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_SEAL; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_SIEVE; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_SKY; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_STABILIZER; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_TERRITORY; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_UNLIGHT; +import static gregtech.common.items.ID_MetaItem_03.IndustrialApiary_Upgrade_WINTER; +import static gregtech.common.items.ID_MetaItem_03.KevlarFiber; +import static gregtech.common.items.ID_MetaItem_03.LV_Coil; +import static gregtech.common.items.ID_MetaItem_03.LuV_Coil; +import static gregtech.common.items.ID_MetaItem_03.MV_Coil; +import static gregtech.common.items.ID_MetaItem_03.NandChip; +import static gregtech.common.items.ID_MetaItem_03.NuclearStar; +import static gregtech.common.items.ID_MetaItem_03.Optical_Cpu_Containment_Housing; +import static gregtech.common.items.ID_MetaItem_03.Optically_Compatible_Memory; +import static gregtech.common.items.ID_MetaItem_03.Optically_Perfected_CPU; +import static gregtech.common.items.ID_MetaItem_03.Spinneret; +import static gregtech.common.items.ID_MetaItem_03.Timepiece; +import static gregtech.common.items.ID_MetaItem_03.Tube_Wires; +import static gregtech.common.items.ID_MetaItem_03.UHV_Coil; +import static gregtech.common.items.ID_MetaItem_03.ULV_Coil; +import static gregtech.common.items.ID_MetaItem_03.UV_Coil; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Axe; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Block; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Bolt; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Bottle; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Casing; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Cell; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_File; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Gear; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Hammer; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Hoe; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Ingot; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pickaxe; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Huge; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Large; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Medium; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Small; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Pipe_Tiny; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Plate; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Ring; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Rod; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Rotor; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Saw; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Shovel; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Small_Gear; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Sword; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_ToolHeadDrill; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Turbine_Blade; +import static gregtech.common.items.ID_MetaItem_03.White_Dwarf_Shape_Extruder_Wire; +import static gregtech.common.items.ID_MetaItem_03.WovenKevlar; +import static gregtech.common.items.ID_MetaItem_03.ZPM_Coil; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; @@ -57,10 +274,12 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { * copper foil + sulfuric acid fiberglass circuit board (simple + multilayer) / glass + plastic + electrum foil * + sulfuric acid wetware lifesupport board / fiberglass CB + teflon + */ - ItemList.Circuit_Board_Wetware - .set(addItem(6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); - ItemList.Circuit_Board_Plastic.set(addItem(7, "Plastic Circuit Board", "A Good Board", o)); - ItemList.Circuit_Board_Bio.set(addItem(8, "Bio Circuit Board", "Bio genetic mutated Board", o)); + ItemList.Circuit_Board_Wetware.set( + addItem(Circuit_Board_Wetware.ID, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); + ItemList.Circuit_Board_Plastic + .set(addItem(Circuit_Board_Plastic.ID, "Plastic Circuit Board", "A Good Board", o)); + ItemList.Circuit_Board_Bio + .set(addItem(Circuit_Board_Bio.ID, "Bio Circuit Board", "Bio genetic mutated Board", o)); /* * electronic components: vacuum tube (glass tube + red alloy cables) basic electronic circuits normal+smd coils @@ -68,102 +287,78 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { */ ItemList.Circuit_Parts_ResistorSMD.set( addItem( - 11, + Circuit_Parts_ResistorSMD.ID, "SMD Resistor", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Resistor), SubTag.NO_UNIFICATION)); - ItemList.Circuit_Parts_Glass_Tube.set(addItem(12, "Glass Tube", "", o)); - ItemList.Circuit_Parts_Coil.set(addItem(14, "Small Coil", "Basic Electronic Component", o)); + ItemList.Circuit_Parts_Glass_Tube.set(addItem(Circuit_Parts_Glass_Tube.ID, "Glass Tube", "", o)); + ItemList.Circuit_Parts_Coil.set(addItem(Circuit_Parts_Coil.ID, "Small Coil", "Basic Electronic Component", o)); ItemList.Circuit_Parts_DiodeSMD.set( addItem( - 16, + Circuit_Parts_DiodeSMD.ID, "SMD Diode", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Diode), SubTag.NO_UNIFICATION)); ItemList.Circuit_Parts_TransistorSMD.set( addItem( - 18, + Circuit_Parts_TransistorSMD.ID, "SMD Transistor", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Transistor), SubTag.NO_UNIFICATION)); ItemList.Circuit_Parts_CapacitorSMD.set( addItem( - 20, + Circuit_Parts_CapacitorSMD.ID, "SMD Capacitor", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Capacitor), SubTag.NO_UNIFICATION)); ItemList.Circuit_Parts_GlassFiber - .set(addItem(21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); - ItemList.Circuit_Parts_PetriDish.set(addItem(22, "Petri Dish", "For cultivating cells", o)); - ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(23, "Reinforced Glass Tube", "", o)); + .set(addItem(Circuit_Parts_GlassFiber.ID, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); + ItemList.Circuit_Parts_PetriDish + .set(addItem(Circuit_Parts_PetriDish.ID, "Petri Dish", "For cultivating cells", o)); + ItemList.Circuit_Parts_Reinforced_Glass_Tube + .set(addItem(Circuit_Parts_Reinforced_Glass_Tube.ID, "Reinforced Glass Tube", "", o)); ItemList.Circuit_Parts_ResistorASMD - .set(addItem(24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_DiodeASMD.set(addItem(25, "Advanced SMD Diode", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_TransistorASMD - .set(addItem(26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); + .set(addItem(Circuit_Parts_ResistorASMD.ID, "Advanced SMD Resistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_DiodeASMD + .set(addItem(Circuit_Parts_DiodeASMD.ID, "Advanced SMD Diode", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_TransistorASMD.set( + addItem(Circuit_Parts_TransistorASMD.ID, "Advanced SMD Transistor", "Advanced Electronic Component", o)); ItemList.Circuit_Parts_CapacitorASMD - .set(addItem(27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); + .set(addItem(Circuit_Parts_CapacitorASMD.ID, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_ResistorXSMD - .set(addItem(178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_ResistorXSMD.set( + addItem(Circuit_Parts_ResistorXSMD.ID, "Optical SMD Resistor", "Highly Advanced Electronic Component", o)); ItemList.Circuit_Parts_DiodeXSMD - .set(addItem(179, "Optical SMD Diode", "Highly Advanced Electronic Component", o)); - ItemList.Circuit_Parts_TransistorXSMD - .set(addItem(180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o)); - ItemList.Circuit_Parts_CapacitorXSMD - .set(addItem(181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o)); + .set(addItem(Circuit_Parts_DiodeXSMD.ID, "Optical SMD Diode", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_TransistorXSMD.set( + addItem( + Circuit_Parts_TransistorXSMD.ID, + "Optical SMD Transistor", + "Highly Advanced Electronic Component", + o)); + ItemList.Circuit_Parts_CapacitorXSMD.set( + addItem( + Circuit_Parts_CapacitorXSMD.ID, + "Optical SMD Capacitor", + "Highly Advanced Electronic Component", + o)); ItemList.Circuit_Parts_InductorSMD.set( addItem( - 182, + Circuit_Parts_InductorSMD.ID, "SMD Inductor", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Inductor), SubTag.NO_UNIFICATION)); ItemList.Circuit_Parts_InductorASMD - .set(addItem(183, "Advanced SMD Inductor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_InductorXSMD - .set(addItem(184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o)); - - GT_OreDictUnificator - .set(OrePrefixes.componentCircuit, Materials.Resistor, ItemList.Circuit_Parts_Resistor.get(1L)); - GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Diode, ItemList.Circuit_Parts_Diode.get(1L)); - GT_OreDictUnificator - .set(OrePrefixes.componentCircuit, Materials.Transistor, ItemList.Circuit_Parts_Transistor.get(1L)); - GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Inductor, ItemList.Circuit_Parts_Coil.get(1L)); - GT_OreDictUnificator - .set(OrePrefixes.componentCircuit, Materials.Capacitor, ItemList.Circuit_Parts_Capacitor.get(1L)); - - GT_OreDictUnificator.addAssociation( - OrePrefixes.componentCircuit, - Materials.Resistor, - ItemList.Circuit_Parts_ResistorSMD.get(1L), - true); - GT_OreDictUnificator.addAssociation( - OrePrefixes.componentCircuit, - Materials.Diode, - ItemList.Circuit_Parts_DiodeSMD.get(1L), - true); - GT_OreDictUnificator.addAssociation( - OrePrefixes.componentCircuit, - Materials.Transistor, - ItemList.Circuit_Parts_TransistorSMD.get(1L), - true); - GT_OreDictUnificator.addAssociation( - OrePrefixes.componentCircuit, - Materials.Capacitor, - ItemList.Circuit_Parts_CapacitorSMD.get(1L), - true); - GT_OreDictUnificator.addAssociation( - OrePrefixes.componentCircuit, - Materials.Inductor, - ItemList.Circuit_Parts_InductorSMD.get(1L), - true); + .set(addItem(Circuit_Parts_InductorASMD.ID, "Advanced SMD Inductor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_InductorXSMD.set( + addItem(Circuit_Parts_InductorXSMD.ID, "Optical SMD Inductor", "Highly Advanced Electronic Component", o)); /* * ICs Lenses made from perfect crystals first instead of plates Monocrystalline silicon ingot @@ -174,109 +369,133 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { * nanotube interconnected circuit (H-IC + nanotubes) * quantum chips */ - ItemList.Circuit_Silicon_Ingot.set(addItem(30, "Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot2 - .set(addItem(31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot + .set(addItem(Circuit_Silicon_Ingot.ID, "Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot2.set( + addItem(Circuit_Silicon_Ingot2.ID, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o)); ItemList.Circuit_Silicon_Ingot3 - .set(addItem(32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + .set(addItem(Circuit_Silicon_Ingot3.ID, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o)); ItemList.Circuit_Silicon_Ingot4 - .set(addItem(150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + .set(addItem(Circuit_Silicon_Ingot4.ID, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); ItemList.Circuit_Silicon_Ingot5 - .set(addItem(152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot6.set(addItem(721, "Optically Enriched Crystalline Boule", "Raw Circuit", o)); + .set(addItem(Circuit_Silicon_Ingot5.ID, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot6 + .set(addItem(Circuit_Silicon_Ingot6.ID, "Optically Enriched Crystalline Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer.set(addItem(33, "Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer2.set(addItem(34, "Phosphorus doped Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer3.set(addItem(35, "Naquadah doped Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer4.set(addItem(151, "Europium doped Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer5.set(addItem(153, "Americium doped Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer6.set(addItem(722, "Photonically Prepared Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer7.set(addItem(723, "Photonically Enhanced Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer.set(addItem(Circuit_Silicon_Wafer.ID, "Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer2 + .set(addItem(Circuit_Silicon_Wafer2.ID, "Phosphorus doped Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer3 + .set(addItem(Circuit_Silicon_Wafer3.ID, "Naquadah doped Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer4 + .set(addItem(Circuit_Silicon_Wafer4.ID, "Europium doped Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer5 + .set(addItem(Circuit_Silicon_Wafer5.ID, "Americium doped Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer6 + .set(addItem(Circuit_Silicon_Wafer6.ID, "Photonically Prepared Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer7 + .set(addItem(Circuit_Silicon_Wafer7.ID, "Photonically Enhanced Wafer", "Raw Circuit", o)); - ItemList.Circuit_Wafer_ILC.set(addItem(36, "Integrated Logic Circuit (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_ILC.set(addItem(37, "Integrated Logic Circuit", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_ILC + .set(addItem(Circuit_Wafer_ILC.ID, "Integrated Logic Circuit (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_ILC + .set(addItem(Circuit_Chip_ILC.ID, "Integrated Logic Circuit", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_Ram.set(addItem(38, "Random Access Memory Chip (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_Ram.set(addItem(39, "Random Access Memory Chip", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_Ram + .set(addItem(Circuit_Wafer_Ram.ID, "Random Access Memory Chip (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_Ram + .set(addItem(Circuit_Chip_Ram.ID, "Random Access Memory Chip", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_NAND.set(addItem(40, "NAND Memory Chip (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_NAND.set(addItem(41, "NAND Memory Chip", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_NAND.set(addItem(Circuit_Wafer_NAND.ID, "NAND Memory Chip (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_NAND.set(addItem(Circuit_Chip_NAND.ID, "NAND Memory Chip", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_NOR.set(addItem(42, "NOR Memory Chip (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_NOR.set(addItem(43, "NOR Memory Chip", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_NOR.set(addItem(Circuit_Wafer_NOR.ID, "NOR Memory Chip (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_NOR.set(addItem(Circuit_Chip_NOR.ID, "NOR Memory Chip", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_CPU.set(addItem(44, "Central Processing Unit (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_CPU.set(addItem(45, "Central Processing Unit", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_CPU + .set(addItem(Circuit_Wafer_CPU.ID, "Central Processing Unit (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_CPU.set(addItem(Circuit_Chip_CPU.ID, "Central Processing Unit", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_SoC.set(addItem(46, "SoC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_SoC.set(addItem(47, "SoC", "System on a Chip", o)); + ItemList.Circuit_Wafer_SoC.set(addItem(Circuit_Wafer_SoC.ID, "SoC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_SoC.set(addItem(Circuit_Chip_SoC.ID, "SoC", "System on a Chip", o)); - ItemList.Circuit_Wafer_SoC2.set(addItem(48, "ASoC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_SoC2.set(addItem(49, "ASoC", "Advanced System on a Chip", o)); + ItemList.Circuit_Wafer_SoC2.set(addItem(Circuit_Wafer_SoC2.ID, "ASoC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_SoC2.set(addItem(Circuit_Chip_SoC2.ID, "ASoC", "Advanced System on a Chip", o)); - ItemList.Circuit_Wafer_PIC.set(addItem(50, "PIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_PIC.set(addItem(51, "Power IC", "Power Circuit", o)); + ItemList.Circuit_Wafer_PIC.set(addItem(Circuit_Wafer_PIC.ID, "PIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_PIC.set(addItem(Circuit_Chip_PIC.ID, "Power IC", "Power Circuit", o)); - ItemList.Circuit_Wafer_HPIC.set(addItem(52, "HPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_HPIC.set(addItem(53, "High Power IC", "High Power Circuit", o)); + ItemList.Circuit_Wafer_HPIC.set(addItem(Circuit_Wafer_HPIC.ID, "HPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_HPIC.set(addItem(Circuit_Chip_HPIC.ID, "High Power IC", "High Power Circuit", o)); - ItemList.Circuit_Wafer_NanoCPU.set(addItem(54, "NanoCPU Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_NanoCPU.set(addItem(55, "Nanocomponent Central Processing Unit", "Power Circuit", o)); + ItemList.Circuit_Wafer_NanoCPU.set(addItem(Circuit_Wafer_NanoCPU.ID, "NanoCPU Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_NanoCPU + .set(addItem(Circuit_Chip_NanoCPU.ID, "Nanocomponent Central Processing Unit", "Power Circuit", o)); - ItemList.Circuit_Wafer_QuantumCPU.set(addItem(56, "QBit Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_QuantumCPU.set(addItem(57, "QBit Processing Unit", "Quantum CPU", o)); + ItemList.Circuit_Wafer_QuantumCPU.set(addItem(Circuit_Wafer_QuantumCPU.ID, "QBit Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_QuantumCPU + .set(addItem(Circuit_Chip_QuantumCPU.ID, "QBit Processing Unit", "Quantum CPU", o)); - ItemList.Circuit_Wafer_UHPIC.set(addItem(58, "UHPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_UHPIC.set(addItem(59, "Ultra High Power IC", "Ultra High Power Circuit", o)); + ItemList.Circuit_Wafer_UHPIC.set(addItem(Circuit_Wafer_UHPIC.ID, "UHPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_UHPIC + .set(addItem(Circuit_Chip_UHPIC.ID, "Ultra High Power IC", "Ultra High Power Circuit", o)); - ItemList.Circuit_Wafer_Simple_SoC.set(addItem(60, "Simple SoC Wafer", "Raw Primitive Circuit", o)); - ItemList.Circuit_Chip_Simple_SoC.set(addItem(61, "Simple SoC", "Simple System on a Chip", o)); + ItemList.Circuit_Wafer_Simple_SoC + .set(addItem(Circuit_Wafer_Simple_SoC.ID, "Simple SoC Wafer", "Raw Primitive Circuit", o)); + ItemList.Circuit_Chip_Simple_SoC + .set(addItem(Circuit_Chip_Simple_SoC.ID, "Simple SoC", "Simple System on a Chip", o)); - ItemList.Circuit_Wafer_ULPIC.set(addItem(62, "ULPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_ULPIC.set(addItem(63, "Ultra Low Power IC", "Ultra Low Power Circuit", o)); + ItemList.Circuit_Wafer_ULPIC.set(addItem(Circuit_Wafer_ULPIC.ID, "ULPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_ULPIC + .set(addItem(Circuit_Chip_ULPIC.ID, "Ultra Low Power IC", "Ultra Low Power Circuit", o)); - ItemList.Circuit_Wafer_LPIC.set(addItem(64, "LPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_LPIC.set(addItem(65, "Low Power IC", "Low Power Circuit", o)); + ItemList.Circuit_Wafer_LPIC.set(addItem(Circuit_Wafer_LPIC.ID, "LPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_LPIC.set(addItem(Circuit_Chip_LPIC.ID, "Low Power IC", "Low Power Circuit", o)); - ItemList.Circuit_Wafer_NPIC.set(addItem(160, "NPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_NPIC.set(addItem(161, "Nano Power IC", "Nano Power Circuit", o)); + ItemList.Circuit_Wafer_NPIC.set(addItem(Circuit_Wafer_NPIC.ID, "NPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_NPIC.set(addItem(Circuit_Chip_NPIC.ID, "Nano Power IC", "Nano Power Circuit", o)); - ItemList.Circuit_Wafer_PPIC.set(addItem(162, "PPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_PPIC.set(addItem(163, "Piko Power IC", "Piko Power Circuit", o)); + ItemList.Circuit_Wafer_PPIC.set(addItem(Circuit_Wafer_PPIC.ID, "PPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_PPIC.set(addItem(Circuit_Chip_PPIC.ID, "Piko Power IC", "Piko Power Circuit", o)); - ItemList.Circuit_Wafer_QPIC.set(addItem(164, "QPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_QPIC.set(addItem(165, "Quantum Power IC", "Quantum Power Circuit", o)); + ItemList.Circuit_Wafer_QPIC.set(addItem(Circuit_Wafer_QPIC.ID, "QPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_QPIC.set(addItem(Circuit_Chip_QPIC.ID, "Quantum Power IC", "Quantum Power Circuit", o)); - ItemList.Circuit_Wafer_Bioware.set(addItem(188, "Living Bio Wafer", "Raw Circuit", o)); - ItemList.Circuit_Parts_Chip_Bioware.set(addItem(189, "Living Bio Chip", "Needed for Circuits", o)); + ItemList.Circuit_Wafer_Bioware.set(addItem(Circuit_Wafer_Bioware.ID, "Living Bio Wafer", "Raw Circuit", o)); + ItemList.Circuit_Parts_Chip_Bioware + .set(addItem(Circuit_Parts_Chip_Bioware.ID, "Living Bio Chip", "Needed for Circuits", o)); /* * Engraved Crystal Chip Engraved Lapotron Chip Crystal CPU SoCrystal stem cells (disassemble eggs) */ - ItemList.Circuit_Chip_CrystalSoC2 - .set(addItem(68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o)); - ItemList.Circuit_Parts_RawCrystalChip.set(addItem(69, "Raw Crystal Chip", "Raw Crystal Processor", o)); - ItemList.Circuit_Chip_CrystalCPU.set(addItem(70, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal - // chip - // elite - // part - ItemList.Circuit_Chip_CrystalSoC.set(addItem(71, "Crystal SoC", "Crystal System on a Chip", o)); - ItemList.Circuit_Chip_NeuroCPU.set(addItem(72, "Neuro Processing Unit", "Neuro CPU", o)); - ItemList.Circuit_Chip_Stemcell.set(addItem(73, "Stemcells", "Raw inteligence", o)); + ItemList.Circuit_Chip_CrystalSoC2.set( + addItem(Circuit_Chip_CrystalSoC2.ID, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o)); + ItemList.Circuit_Parts_RawCrystalChip + .set(addItem(Circuit_Parts_RawCrystalChip.ID, "Raw Crystal Chip", "Raw Crystal Processor", o)); + ItemList.Circuit_Chip_CrystalCPU + .set(addItem(Circuit_Chip_CrystalCPU.ID, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal + // chip + // elite + // part + ItemList.Circuit_Chip_CrystalSoC + .set(addItem(Circuit_Chip_CrystalSoC.ID, "Crystal SoC", "Crystal System on a Chip", o)); + ItemList.Circuit_Chip_NeuroCPU.set(addItem(Circuit_Chip_NeuroCPU.ID, "Neuro Processing Unit", "Neuro CPU", o)); + ItemList.Circuit_Chip_Stemcell.set(addItem(Circuit_Chip_Stemcell.ID, "Stemcells", "Raw inteligence", o)); ItemList.Circuit_Parts_RawCrystalParts - .set(addItem(74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o)); - ItemList.Circuit_Chip_Biocell.set(addItem(76, "Biocells", "Mutated Raw inteligence", o)); - ItemList.Circuit_Chip_BioCPU.set(addItem(77, "Bio Processing Unit", "Bio CPU", o)); - ItemList.Circuit_Chip_Optical.set(addItem(724, "Raw Exposed Optical Chip", "Raw Optical Chip", o)); + .set(addItem(Circuit_Parts_RawCrystalParts.ID, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o)); + ItemList.Circuit_Chip_Biocell.set(addItem(Circuit_Chip_Biocell.ID, "Biocells", "Mutated Raw inteligence", o)); + ItemList.Circuit_Chip_BioCPU.set(addItem(Circuit_Chip_BioCPU.ID, "Bio Processing Unit", "Bio CPU", o)); + ItemList.Circuit_Chip_Optical + .set(addItem(Circuit_Chip_Optical.ID, "Raw Exposed Optical Chip", "Raw Optical Chip", o)); // Nand Chip ItemList.NandChip.set( addItem( - 75, + NandChip.ID, "NAND Chip", "A very simple Circuit", OrePrefixes.circuit.get(Materials.Primitive), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.NandChip.get(1), ULV); + // Vacuum Tube Item01 // Basic Circuit IC2 // Good Circuit Item01 @@ -284,129 +503,120 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Integrated Logic Circuit Item01 ItemList.Circuit_Integrated_Good.set( addItem( - 79, + Circuit_Integrated_Good.ID, "Good Integrated Circuit", "Good Circuit", OrePrefixes.circuit.get(Materials.Good), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Integrated_Good.get(1), MV); + // Good Integrated Circuit Item01 // Advanced Circuit IC2 ItemList.Circuit_Microprocessor.set( addItem( - 78, + Circuit_Microprocessor.ID, "Microprocessor", "A Basic Circuit", OrePrefixes.circuit.get(Materials.Basic), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Microprocessor.get(1), LV); + ItemList.Circuit_Processor.set( addItem( - 80, + Circuit_Processor.ID, "Integrated Processor", "A Good Circuit", OrePrefixes.circuit.get(Materials.Good), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Processor.get(1), MV); - // ItemList.Circuit_Computer.set(addItem(tLastID = 81, "Processor Assembly", "Advanced Circuit", new - // Object[]{OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION})); - // Workstation/ Item01 Datacircuit - // Mainframe Item01 DataProcessor ItemList.Circuit_Nanoprocessor.set( addItem( - 82, + Circuit_Nanoprocessor.ID, "Nanoprocessor", "An Advanced Circuit", OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Nanoprocessor.get(1), HV); + ItemList.Circuit_Nanocomputer.set( addItem( - 83, + Circuit_Nanocomputer.ID, "Nanoprocessor Assembly", "An Extreme Circuit", OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Nanocomputer.get(1), EV); + ItemList.Circuit_Elitenanocomputer.set( addItem( - 84, + Circuit_Elitenanocomputer.ID, "Elite Nanocomputer", "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Elitenanocomputer.get(1), IV); - // Nanoprocessor Mainframe Item01 Energy Flow Circuit // Quantum circuits ItemList.Circuit_Quantumprocessor.set( addItem( - 85, + Circuit_Quantumprocessor.ID, "Quantumprocessor", "An Extreme Circuit", OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Quantumprocessor.get(1), EV); + ItemList.Circuit_Quantumcomputer.set( addItem( - 86, + Circuit_Quantumcomputer.ID, "Quantumprocessor Assembly", "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Quantumcomputer.get(1), IV); + ItemList.Circuit_Masterquantumcomputer.set( addItem( - 87, + Circuit_Masterquantumcomputer.ID, "Master Quantumcomputer", "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Masterquantumcomputer.get(1), LuV); + ItemList.Circuit_Quantummainframe.set( addItem( - 88, + Circuit_Quantummainframe.ID, "Quantumprocessor Mainframe", "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Quantummainframe.get(1), ZPM); // Crystal circuits ItemList.Circuit_Crystalprocessor.set( addItem( - 89, + Circuit_Crystalprocessor.ID, "Crystalprocessor", "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Crystalprocessor.get(1), IV); + ItemList.Circuit_Crystalcomputer.set( addItem( - 96, + Circuit_Crystalcomputer.ID, "Crystalprocessor Assembly", "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Crystalcomputer.get(1), LuV); + ItemList.Circuit_Ultimatecrystalcomputer.set( addItem( - 90, + Circuit_Ultimatecrystalcomputer.ID, "Ultimate Crystalcomputer", "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Ultimatecrystalcomputer.get(1), ZPM); + ItemList.Circuit_Crystalmainframe.set( addItem( - 91, + Circuit_Crystalmainframe.ID, "Crystalprocessor Mainframe", "A Super Circuit", OrePrefixes.circuit.get(Materials.SuperconductorUHV), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Crystalmainframe.get(1), UV); // ???? Scared to remove. ItemList.Circuit_Ultimate.set(ItemList.Circuit_Ultimatecrystalcomputer.get(1L)); // maybe should be removed @@ -414,227 +624,233 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Wetware circuits ItemList.Circuit_Neuroprocessor.set( addItem( - 92, + Circuit_Neuroprocessor.ID, "Wetwareprocessor", "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Neuroprocessor.get(1), LuV); + ItemList.Circuit_Wetwarecomputer.set( addItem( - 93, + Circuit_Wetwarecomputer.ID, "Wetwareprocessor Assembly", "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Wetwarecomputer.get(1), ZPM); + ItemList.Circuit_Wetwaresupercomputer.set( addItem( - 94, + Circuit_Wetwaresupercomputer.ID, "Wetware Supercomputer", "A Super Circuit", OrePrefixes.circuit.get(Materials.SuperconductorUHV), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Wetwaresupercomputer.get(1), UV); + ItemList.Circuit_Wetwaremainframe.set( addItem( - 95, + Circuit_Wetwaremainframe.ID, "Wetware Mainframe", "An Infinite Circuit", OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Wetwaremainframe.get(1), UHV); // Bioware circuits. ItemList.Circuit_Bioprocessor.set( addItem( - 97, + Circuit_Bioprocessor.ID, "Bioprocessor", "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Bioprocessor.get(1), ZPM); + ItemList.Circuit_Biowarecomputer.set( addItem( - 98, + Circuit_Biowarecomputer.ID, "Biowareprocessor Assembly", "A Super Circuit", OrePrefixes.circuit.get(Materials.SuperconductorUHV), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Biowarecomputer.get(1), UV); + ItemList.Circuit_Biowaresupercomputer.set( addItem( - 99, + Circuit_Biowaresupercomputer.ID, "Bioware Supercomputer", "An Infinite Circuit", OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Biowaresupercomputer.get(1), UHV); + ItemList.Circuit_Biomainframe.set( addItem( - 120, + Circuit_Biomainframe.ID, "Bio Mainframe", "A Bio Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_Biomainframe.get(1), UEV); - ItemList.Circuit_Board_Coated_Basic.set(addItem(100, "Circuit Board", "A basic Circuit Board", o)); - ItemList.Circuit_Board_Phenolic_Good.set(addItem(101, "Good Circuit Board", "A good Circuit Board", o)); + ItemList.Circuit_Board_Coated_Basic + .set(addItem(Circuit_Board_Coated_Basic.ID, "Circuit Board", "A basic Circuit Board", o)); + ItemList.Circuit_Board_Phenolic_Good + .set(addItem(Circuit_Board_Phenolic_Good.ID, "Good Circuit Board", "A good Circuit Board", o)); ItemList.Circuit_Board_Epoxy_Advanced - .set(addItem(102, "Advanced Circuit Board", "A advanced Circuit Board", o)); - ItemList.Circuit_Board_Fiberglass_Advanced - .set(addItem(103, "More Advanced Circuit Board", "A more advanced Circuit Board", o)); + .set(addItem(Circuit_Board_Epoxy_Advanced.ID, "Advanced Circuit Board", "A advanced Circuit Board", o)); + ItemList.Circuit_Board_Fiberglass_Advanced.set( + addItem( + Circuit_Board_Fiberglass_Advanced.ID, + "More Advanced Circuit Board", + "A more advanced Circuit Board", + o)); ItemList.Circuit_Board_Multifiberglass_Elite - .set(addItem(104, "Elite Circuit Board", "A elite Circuit Board", o)); - ItemList.Circuit_Board_Wetware_Extreme - .set(addItem(105, "Extreme Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); - ItemList.Circuit_Board_Plastic_Advanced.set(addItem(106, "Plastic Circuit Board", "A good Board", o)); - ItemList.Circuit_Board_Bio_Ultra - .set(addItem(107, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o)); - ItemList.Circuit_Board_Optical.set(addItem(728, "Optical Circuit Board", "Optically Infused Board", o)); + .set(addItem(Circuit_Board_Multifiberglass_Elite.ID, "Elite Circuit Board", "A elite Circuit Board", o)); + ItemList.Circuit_Board_Wetware_Extreme.set( + addItem( + Circuit_Board_Wetware_Extreme.ID, + "Extreme Wetware Lifesupport Circuit Board", + "The Board that keeps life", + o)); + ItemList.Circuit_Board_Plastic_Advanced + .set(addItem(Circuit_Board_Plastic_Advanced.ID, "Plastic Circuit Board", "A good Board", o)); + ItemList.Circuit_Board_Bio_Ultra.set( + addItem(Circuit_Board_Bio_Ultra.ID, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o)); + ItemList.Circuit_Board_Optical + .set(addItem(Circuit_Board_Optical.ID, "Optical Circuit Board", "Optically Infused Board", o)); // Optical circuits ItemList.Circuit_OpticalProcessor.set( addItem( - 154, + Circuit_OpticalProcessor.ID, "Optical Processor", "An Optical Circuit", OrePrefixes.circuit.get(Materials.SuperconductorUHV), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_OpticalProcessor.get(1), UV); + ItemList.Circuit_OpticalAssembly.set( addItem( - 155, + Circuit_OpticalAssembly.ID, "Optical Assembly", "An Optical Circuit", OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_OpticalAssembly.get(1), UHV); + ItemList.Circuit_OpticalComputer.set( addItem( - 156, + Circuit_OpticalComputer.ID, "Optical Computer", "An Optical Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_OpticalComputer.get(1), UEV); + ItemList.Circuit_OpticalMainframe.set( addItem( - 157, + Circuit_OpticalMainframe.ID, "Optical Mainframe", "An Optical Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_OpticalMainframe.get(1), UIV); // Exotic circuits ItemList.Circuit_ExoticProcessor.set( addItem( - 166, + Circuit_ExoticProcessor.ID, "Exotic Processor", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_ExoticProcessor.get(1), UHV); + ItemList.Circuit_ExoticAssembly.set( addItem( - 167, + Circuit_ExoticAssembly.ID, "Exotic Assembly", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_ExoticAssembly.get(1), UEV); + ItemList.Circuit_ExoticComputer.set( addItem( - 168, + Circuit_ExoticComputer.ID, "Exotic Computer", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_ExoticComputer.get(1), UIV); + ItemList.Circuit_ExoticMainframe.set( addItem( - 169, + Circuit_ExoticMainframe.ID, "Exotic Mainframe", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_ExoticMainframe.get(1), UMV); // Cosmic circuits ItemList.Circuit_CosmicProcessor.set( addItem( - 170, + Circuit_CosmicProcessor.ID, "Cosmic Processor", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_CosmicProcessor.get(1), UEV); + ItemList.Circuit_CosmicAssembly.set( addItem( - 171, + Circuit_CosmicAssembly.ID, "Cosmic Assembly", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_CosmicAssembly.get(1), UIV); + ItemList.Circuit_CosmicComputer.set( addItem( - 172, + Circuit_CosmicComputer.ID, "Cosmic Computer", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_CosmicComputer.get(1), UMV); + ItemList.Circuit_CosmicMainframe.set( addItem( - 173, + Circuit_CosmicMainframe.ID, "Cosmic Mainframe", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_CosmicMainframe.get(1), UXV); // Transcendent circuits ItemList.Circuit_TranscendentProcessor.set( addItem( - 174, + Circuit_TranscendentProcessor.ID, "Temporally Transcendent Processor", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_TranscendentProcessor.get(1), UIV); + ItemList.Circuit_TranscendentAssembly.set( addItem( - 175, + Circuit_TranscendentAssembly.ID, "Temporally Transcendent Assembly", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_TranscendentAssembly.get(1), UMV); + ItemList.Circuit_TranscendentComputer.set( addItem( - 176, + Circuit_TranscendentComputer.ID, "Temporally Transcendent Computer", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_TranscendentComputer.get(1), UXV); + ItemList.Circuit_TranscendentMainframe.set( addItem( - 177, + Circuit_TranscendentMainframe.ID, "Temporally Transcendent Mainframe", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION)); - registerTieredTooltip(ItemList.Circuit_TranscendentMainframe.get(1), MAX); - ItemList.Tube_Wires.set(addItem(110, "Tube Wires", "For the Vacuum Tubes", o)); + ItemList.Tube_Wires.set(addItem(Tube_Wires.ID, "Tube Wires", "For the Vacuum Tubes", o)); ItemList.Cover_SolarPanel_UHV.set( addItem( - 130, + Cover_SolarPanel_UHV.ID, "Solar Panel (UHV)", "Ultimate High Voltage Solar Panel (Needs cleaning with right click)", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), @@ -642,7 +858,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L))); ItemList.Cover_SolarPanel_UEV.set( addItem( - 131, + Cover_SolarPanel_UEV.ID, "Solar Panel (UEV)", "Ultimate Extreme Voltage Solar Panel (Needs cleaning with right click)", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), @@ -650,275 +866,232 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L))); ItemList.Cover_SolarPanel_UIV.set( addItem( - 132, + Cover_SolarPanel_UIV.ID, "Solar Panel (UIV)", "Ultimate Insane Voltage Solar Panel (Needs cleaning with right click)", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 512L))); - GregTech_API.registerCover( - ItemList.Cover_SolarPanel_UHV.get(1L), - TextureFactory.of(SOLARPANEL_UHV), - new GT_Cover_SolarPanel(2097152)); - GregTech_API.registerCover( - ItemList.Cover_SolarPanel_UEV.get(1L), - TextureFactory.of(SOLARPANEL_UEV), - new GT_Cover_SolarPanel(8388608)); - GregTech_API.registerCover( - ItemList.Cover_SolarPanel_UIV.get(1L), - TextureFactory.of(SOLARPANEL_UIV), - new GT_Cover_SolarPanel(33554432)); + ItemList.ULV_Coil.set(addItem(ULV_Coil.ID, "Ultra Low Voltage Coil", "Primitive Coil", o)); + ItemList.LV_Coil.set(addItem(LV_Coil.ID, "Low Voltage Coil", "Basic Coil", o)); + ItemList.MV_Coil.set(addItem(MV_Coil.ID, "Medium Voltage Coil", "Good Coil", o)); + ItemList.HV_Coil.set(addItem(HV_Coil.ID, "High Voltage Coil", "Advanced Coil", o)); + ItemList.EV_Coil.set(addItem(EV_Coil.ID, "Extreme Voltage Coil", "Extreme Coil", o)); + ItemList.IV_Coil.set(addItem(IV_Coil.ID, "Insane Voltage Coil", "Elite Coil", o)); + ItemList.LuV_Coil.set(addItem(LuV_Coil.ID, "Ludicrous Voltage Coil", "Master Coil", o)); + ItemList.ZPM_Coil.set(addItem(ZPM_Coil.ID, "ZPM Voltage Coil", "Ultimate Coil", o)); + ItemList.UV_Coil.set(addItem(UV_Coil.ID, "Ultimate Voltage Coil", "Super Coil", o)); + ItemList.UHV_Coil.set(addItem(UHV_Coil.ID, "Highly Ultimate Voltage Coil", "Infinite Coil", o)); - ItemList.ULV_Coil.set(addItem(140, "Ultra Low Voltage Coil", "Primitive Coil", o)); - ItemList.LV_Coil.set(addItem(141, "Low Voltage Coil", "Basic Coil", o)); - ItemList.MV_Coil.set(addItem(142, "Medium Voltage Coil", "Good Coil", o)); - ItemList.HV_Coil.set(addItem(143, "High Voltage Coil", "Advanced Coil", o)); - ItemList.EV_Coil.set(addItem(144, "Extreme Voltage Coil", "Extreme Coil", o)); - ItemList.IV_Coil.set(addItem(145, "Insane Voltage Coil", "Elite Coil", o)); - ItemList.LuV_Coil.set(addItem(146, "Ludicrous Voltage Coil", "Master Coil", o)); - ItemList.ZPM_Coil.set(addItem(147, "ZPM Voltage Coil", "Ultimate Coil", o)); - ItemList.UV_Coil.set(addItem(148, "Ultimate Voltage Coil", "Super Coil", o)); - ItemList.UHV_Coil.set(addItem(149, "Highly Ultimate Voltage Coil", "Infinite Coil", o)); - - ItemList.GalliumArsenideCrystal.set(addItem(190, "Gallium Arsenide Crystal", "For making boules", o)); + ItemList.GalliumArsenideCrystal + .set(addItem(GalliumArsenideCrystal.ID, "Gallium Arsenide Crystal", "For making boules", o)); ItemList.GalliumArsenideCrystalSmallPart - .set(addItem(191, "Small Gallium Arsenide Crystal", "For making boules", o)); - ItemList.KevlarFiber.set(addItem(192, "Kevlar Fiber", "For making Kevlar Plates", o)); - ItemList.WovenKevlar.set(addItem(193, "Woven Kevlar", "For making Kevlar Plates", o)); - ItemList.Spinneret.set(addItem(194, "Spinneret", "For making Kevlar Fiber", o)); + .set(addItem(GalliumArsenideCrystalSmallPart.ID, "Small Gallium Arsenide Crystal", "For making boules", o)); + ItemList.KevlarFiber.set(addItem(KevlarFiber.ID, "Kevlar Fiber", "For making Kevlar Plates", o)); + ItemList.WovenKevlar.set(addItem(WovenKevlar.ID, "Woven Kevlar", "For making Kevlar Plates", o)); + ItemList.Spinneret.set(addItem(Spinneret.ID, "Spinneret", "For making Kevlar Fiber", o)); - ItemList.IndustrialApiary_Upgrade_Frame.set(addItem(199, "Upgrade Frame", "Crafting component", o)); + ItemList.IndustrialApiary_Upgrade_Frame + .set(addItem(IndustrialApiary_Upgrade_Frame.ID, "Upgrade Frame", "Crafting component", o)); ItemList.IndustrialApiary_Upgrade_Acceleration_1.set( addItem( - 200, + IndustrialApiary_Upgrade_Acceleration_1.ID, "Acceleration Upgrade x2", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 2x acceleration level/n * Energy Consumption +1 AMP LV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_2.set( addItem( - 201, + IndustrialApiary_Upgrade_Acceleration_2.ID, "Acceleration Upgrade x4", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 4x acceleration level/n * Energy Consumption +1 AMP MV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_3.set( addItem( - 202, + IndustrialApiary_Upgrade_Acceleration_3.ID, "Acceleration Upgrade x8", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 8x acceleration level/n * Energy Consumption +1 AMP HV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_4.set( addItem( - 203, + IndustrialApiary_Upgrade_Acceleration_4.ID, "Acceleration Upgrade x16", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 16x acceleration level/n * Energy Consumption +1 AMP EV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_5.set( addItem( - 204, + IndustrialApiary_Upgrade_Acceleration_5.ID, "Acceleration Upgrade x32", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 32x acceleration level/n * Energy Consumption +1 AMP IV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_6.set( addItem( - 205, + IndustrialApiary_Upgrade_Acceleration_6.ID, "Acceleration Upgrade x64", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 64x acceleration level/n * Energy Consumption +1 AMP LuV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_7.set( addItem( - 206, + IndustrialApiary_Upgrade_Acceleration_7.ID, "Acceleration Upgrade x128", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 128x acceleration level/n * Energy Consumption +1 AMP ZPM", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_8.set( addItem( - 207, + IndustrialApiary_Upgrade_Acceleration_8.ID, "Acceleration Upgrade x256", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 256x acceleration level/n * Energy Consumption +1 AMP UV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.set( addItem( - 208, + IndustrialApiary_Upgrade_Acceleration_8_Upgraded.ID, "Upgraded Acceleration Upgrade x256", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 256x acceleration level/n * Will also grant 8x production upgrade/n * Energy Consumption +1 AMP UV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_PRODUCTION.set( addItem( - 209, + IndustrialApiary_Upgrade_PRODUCTION.ID, "Production Upgrade", "Production upgrade for Industrial Apiary/n Maximum Installed: 8/n Increases production modifier by 0.25/n Energy Consumption +40%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_PLAINS.set( addItem( - 210, + IndustrialApiary_Upgrade_PLAINS.ID, "Plains Emulation Upgrade", "Plains emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Plains/n * Energy Consumption +40%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_LIGHT.set( addItem( - 211, + IndustrialApiary_Upgrade_LIGHT.ID, "Light Upgrade", "Light upgrade for Industrial Apiary/n Maximum Installed: 1/n * Internal Lighting/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_FLOWERING.set( addItem( - 212, + IndustrialApiary_Upgrade_FLOWERING.ID, "Flowering Upgrade", "Flowering upgrade for Industrial Apiary/n Maximum Installed: 8/n * Flowering and Pollination +20%/n * Energy Consumption +10%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_WINTER.set( addItem( - 213, + IndustrialApiary_Upgrade_WINTER.ID, "Winter Emulation Upgrade", "Winter emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Taiga/n * Energy Consumption +50%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_DRYER.set( addItem( - 214, + IndustrialApiary_Upgrade_DRYER.ID, "Dryer Upgrade", "Dryer upgrade for Industrial Apiary/n Maximum Installed: 16/n * Humidity -12.5%/n * Energy Consumption +2.5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_AUTOMATION.set( addItem( - 215, + IndustrialApiary_Upgrade_AUTOMATION.ID, "Automation Upgrade", "Automation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Automation/n * Energy Consumption +10%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.set( addItem( - 216, + IndustrialApiary_Upgrade_HUMIDIFIER.ID, "Humidifier Upgrade", "Humidifier upgrade for Industrial Apiary/n Maximum Installed: 16/n * Humidity +12.5%/n * Energy Consumption +2.5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_HELL.set( addItem( - 217, + IndustrialApiary_Upgrade_HELL.ID, "HELL Emulation Upgrade", "HELL emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: HELL/n * Energy Consumption +50%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_POLLEN.set( addItem( - 218, + IndustrialApiary_Upgrade_POLLEN.ID, "Pollen Scrubber Upgrade", "Pollen scrubber upgrade for Industrial Apiary/n Maximum Installed: 1/n * Flowering and Pollination -100%/n * Energy Consumption +30%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_DESERT.set( addItem( - 219, + IndustrialApiary_Upgrade_DESERT.ID, "Desert Emulation Upgrade", "Desert emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Desert/n * Energy Consumption +20%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_COOLER.set( addItem( - 220, + IndustrialApiary_Upgrade_COOLER.ID, "Cooler Upgrade", "Cooler upgrade for Industrial Apiary/n Maximum Installed: 16/n * Temperature -12.5%/n * Energy Consumption +2.5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_LIFESPAN.set( addItem( - 221, + IndustrialApiary_Upgrade_LIFESPAN.ID, "Lifespan Upgrade", "Lifespan upgrade for Industrial Apiary/n Maximum Installed: 4/n * Lifespan -33%/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_SEAL.set( addItem( - 222, + IndustrialApiary_Upgrade_SEAL.ID, "Seal Upgrade", "Seal upgrade for Industrial Apiary/n Maximum Installed: 1/n * Rain Protection/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_STABILIZER.set( addItem( - 223, + IndustrialApiary_Upgrade_STABILIZER.ID, "Genetic Stabilizer Upgrade", "Genetic stabilizer upgrade for Industrial Apiary/n Maximum Installed: 1/n * Genetic Decay -100%/n * Energy Consumption +150%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_JUNGLE.set( addItem( - 224, + IndustrialApiary_Upgrade_JUNGLE.ID, "Jungle Emulation Upgrade", "Jungle emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Jungle/n * Energy Consumption +20%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_TERRITORY.set( addItem( - 225, + IndustrialApiary_Upgrade_TERRITORY.ID, "Territory Upgrade", "Territory upgrade for Industrial Apiary/n Maximum Installed: 4/n * Territory +50%/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_OCEAN.set( addItem( - 226, + IndustrialApiary_Upgrade_OCEAN.ID, "Ocean Emulation Upgrade", "Ocean emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Ocean/n * Energy Consumption +20%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_SKY.set( addItem( - 227, + IndustrialApiary_Upgrade_SKY.ID, "Open Sky Upgrade", "Open sky upgrade for Industrial Apiary/n Maximum Installed: 1/n * Open Sky Simulation/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_HEATER.set( addItem( - 228, + IndustrialApiary_Upgrade_HEATER.ID, "Heater Upgrade", "Heater upgrade for Industrial Apiary/n Maximum Installed: 16/n * Temperature +12.5%/n * Energy Consumption +2.5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_SIEVE.set( addItem( - 229, + IndustrialApiary_Upgrade_SIEVE.ID, "Sieve Upgrade", "Sieve upgrade for Industrial Apiary/n Maximum Installed: 1/n * Pollen Collection/n * Energy Consumption +25%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_UNLIGHT.set( addItem( - 231, + IndustrialApiary_Upgrade_UNLIGHT.ID, "Night Upgrade", "Night upgrade for Industrial Apiary/n Maximum Installed: 1/n * Internal Darkness/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_1.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_2.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_3.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_4.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_5.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_6.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_7.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_8.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_PRODUCTION.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_PLAINS.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_LIGHT.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_FLOWERING.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_WINTER.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_DRYER.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_AUTOMATION.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_HELL.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_POLLEN.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_DESERT.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_COOLER.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_LIFESPAN.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SEAL.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_STABILIZER.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_JUNGLE.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_TERRITORY.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_OCEAN.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SKY.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_HEATER.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L)); - OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_UNLIGHT.get(1L)); - ItemList.NuclearStar.set( addItem( - 230, + NuclearStar.ID, "Nuclear Star", "By the powers of Greg, I command this star to be really hot.", SubTag.NO_UNIFICATION)); ItemList.Cover_Metrics_Transmitter.set( addItem( - 232, + Cover_Metrics_Transmitter.ID, "Metrics Transmitter Cover", String.join( "/n ", @@ -927,152 +1100,293 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "Works across dimensions or if machine is dismantled", "Removing this cover will destroy the linked card", GT_Values.AuthorQuerns))); - GregTech_API.registerCover( - ItemList.Cover_Metrics_Transmitter.get(1L), - TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_METRICS_TRANSMITTER)), - new GT_Cover_Metrics_Transmitter(TextureFactory.of(OVERLAY_METRICS_TRANSMITTER))); - ItemList.Optical_Cpu_Containment_Housing.set(addItem(727, "Optical CPU Containment Housing", "CPU Housing", o)); - ItemList.Optically_Perfected_CPU.set(addItem(726, "Optically Perfected CPU", "Perfected CPU!", o)); - ItemList.Optically_Compatible_Memory.set(addItem(725, "Optically Compatible Memory", "Its in the name!", o)); + ItemList.Optical_Cpu_Containment_Housing + .set(addItem(Optical_Cpu_Containment_Housing.ID, "Optical CPU Containment Housing", "CPU Housing", o)); + ItemList.Optically_Perfected_CPU + .set(addItem(Optically_Perfected_CPU.ID, "Optically Perfected CPU", "Perfected CPU!", o)); + ItemList.Optically_Compatible_Memory + .set(addItem(Optically_Compatible_Memory.ID, "Optically Compatible Memory", "Its in the name!", o)); - ItemList.Timepiece.set(addItem(757, "Timepiece", "Beware of the kid with the hat", o)); + ItemList.Timepiece.set(addItem(Timepiece.ID, "Timepiece", "Beware of the kid with the hat", o)); - int whiteDwarfIDs = 729; ItemList.White_Dwarf_Shape_Extruder_Plate.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Plate.ID, "White Dwarf Extruder Shape (Plate)", "Ultra Strong Stellar Shape for making Plates")); ItemList.White_Dwarf_Shape_Extruder_Rod.set( - addItem(whiteDwarfIDs++, "White Dwarf Extruder Shape (Rod)", "Ultra Strong Stellar Shape for making Rods")); + addItem( + White_Dwarf_Shape_Extruder_Rod.ID, + "White Dwarf Extruder Shape (Rod)", + "Ultra Strong Stellar Shape for making Rods")); ItemList.White_Dwarf_Shape_Extruder_Bolt.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Bolt.ID, "White Dwarf Extruder Shape (Bolt)", "Ultra Strong Stellar Shape for making Bolts")); ItemList.White_Dwarf_Shape_Extruder_Ring.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Ring.ID, "White Dwarf Extruder Shape (Ring)", "Ultra Strong Stellar Shape for making Rings")); ItemList.White_Dwarf_Shape_Extruder_Cell.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Cell.ID, "White Dwarf Extruder Shape (Cell)", "Ultra Strong Stellar Shape for making Cells")); ItemList.White_Dwarf_Shape_Extruder_Ingot.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Ingot.ID, "White Dwarf Extruder Shape (Ingot)", "Ultra Strong Stellar Shape for, wait, can't we just use a Furnace?")); ItemList.White_Dwarf_Shape_Extruder_Wire.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Wire.ID, "White Dwarf Extruder Shape (Wire)", "Ultra Strong Stellar Shape for making Wires")); ItemList.White_Dwarf_Shape_Extruder_Casing.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Casing.ID, "White Dwarf Extruder Shape (Casing)", "Ultra Strong Stellar Shape for making Item Casings")); ItemList.White_Dwarf_Shape_Extruder_Pipe_Tiny.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Pipe_Tiny.ID, "White Dwarf Extruder Shape (Tiny Pipe)", "Ultra Strong Stellar Shape for making tiny Pipes")); ItemList.White_Dwarf_Shape_Extruder_Pipe_Small.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Pipe_Small.ID, "White Dwarf Extruder Shape (Small Pipe)", "Ultra Strong Stellar Shape for making small Pipes")); ItemList.White_Dwarf_Shape_Extruder_Pipe_Medium.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Pipe_Medium.ID, "White Dwarf Extruder Shape (Normal Pipe)", "Ultra Strong Stellar Shape for making Pipes")); ItemList.White_Dwarf_Shape_Extruder_Pipe_Large.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Pipe_Large.ID, "White Dwarf Extruder Shape (Large Pipe)", "Ultra Strong Stellar Shape for making large Pipes")); ItemList.White_Dwarf_Shape_Extruder_Pipe_Huge.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Pipe_Huge.ID, "White Dwarf Extruder Shape (Huge Pipe)", "Ultra Strong Stellar Shape for making full Block Pipes")); ItemList.White_Dwarf_Shape_Extruder_Block.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Block.ID, "White Dwarf Extruder Shape (Block)", "Ultra Strong Stellar Shape for making Blocks")); ItemList.White_Dwarf_Shape_Extruder_Sword.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Sword.ID, "White Dwarf Extruder Shape (Sword Blade)", "Ultra Strong Stellar Shape for making Swords")); ItemList.White_Dwarf_Shape_Extruder_Pickaxe.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Pickaxe.ID, "White Dwarf Extruder Shape (Pickaxe Head)", "Ultra Strong Stellar Shape for making Pickaxes")); ItemList.White_Dwarf_Shape_Extruder_Shovel.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Shovel.ID, "White Dwarf Extruder Shape (Shovel Head)", "Ultra Strong Stellar Shape for making Shovels")); ItemList.White_Dwarf_Shape_Extruder_Axe.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Axe.ID, "White Dwarf Extruder Shape (Axe Head)", "Ultra Strong Stellar Shape for making Axes")); ItemList.White_Dwarf_Shape_Extruder_Hoe.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Hoe.ID, "White Dwarf Extruder Shape (Hoe Head)", "Ultra Strong Stellar Shape for making Hoes")); ItemList.White_Dwarf_Shape_Extruder_Hammer.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Hammer.ID, "White Dwarf Extruder Shape (Hammer Head)", "Ultra Strong Stellar Shape for making Hammers")); ItemList.White_Dwarf_Shape_Extruder_File.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_File.ID, "White Dwarf Extruder Shape (File Head)", "Ultra Strong Stellar Shape for making Files")); ItemList.White_Dwarf_Shape_Extruder_Saw.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Saw.ID, "White Dwarf Extruder Shape (Saw Blade)", "Ultra Strong Stellar Shape for making Saws")); ItemList.White_Dwarf_Shape_Extruder_Gear.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Gear.ID, "White Dwarf Extruder Shape (Gear)", "Ultra Strong Stellar Shape for making Gears")); ItemList.White_Dwarf_Shape_Extruder_Bottle.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Bottle.ID, "White Dwarf Extruder Shape (Bottle)", "Ultra Strong Stellar Shape for making Bottles")); ItemList.White_Dwarf_Shape_Extruder_Rotor.set( - addItem(whiteDwarfIDs++, "White Dwarf Extruder Shape (Rotor)", "Ultra Strong Stellar Shape for a Rotor")); + addItem( + White_Dwarf_Shape_Extruder_Rotor.ID, + "White Dwarf Extruder Shape (Rotor)", + "Ultra Strong Stellar Shape for a Rotor")); ItemList.White_Dwarf_Shape_Extruder_Small_Gear.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Small_Gear.ID, "White Dwarf Extruder Shape (Small Gear)", "Ultra Strong Stellar Shape for a Small Gear")); ItemList.White_Dwarf_Shape_Extruder_Turbine_Blade.set( addItem( - whiteDwarfIDs++, + White_Dwarf_Shape_Extruder_Turbine_Blade.ID, "White Dwarf Extruder Shape (Turbine Blade)", "Ultra Strong Stellar Extruder Shape for a Turbine Blade")); ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill.set( addItem( - whiteDwarfIDs, + White_Dwarf_Shape_Extruder_ToolHeadDrill.ID, "White Dwarf Extruder Shape (Drill Head)", "White Dwarf Extruder Shape for a Drill Head")); + registerAllTieredTooltips(); + initOrePrefixes(); + initOreDictUnificatorEntries(); + registerCovers(); + } + + private void registerAllTieredTooltips() { + registerTieredTooltip(ItemList.NandChip.get(1), ULV); + registerTieredTooltip(ItemList.Circuit_Integrated_Good.get(1), MV); + registerTieredTooltip(ItemList.Circuit_Microprocessor.get(1), LV); + registerTieredTooltip(ItemList.Circuit_Processor.get(1), MV); + registerTieredTooltip(ItemList.Circuit_Nanoprocessor.get(1), HV); + registerTieredTooltip(ItemList.Circuit_Nanocomputer.get(1), EV); + registerTieredTooltip(ItemList.Circuit_Elitenanocomputer.get(1), IV); + registerTieredTooltip(ItemList.Circuit_Quantumprocessor.get(1), EV); + registerTieredTooltip(ItemList.Circuit_Quantumcomputer.get(1), IV); + registerTieredTooltip(ItemList.Circuit_Masterquantumcomputer.get(1), LuV); + registerTieredTooltip(ItemList.Circuit_Quantummainframe.get(1), ZPM); + registerTieredTooltip(ItemList.Circuit_Crystalprocessor.get(1), IV); + registerTieredTooltip(ItemList.Circuit_Crystalcomputer.get(1), LuV); + registerTieredTooltip(ItemList.Circuit_Ultimatecrystalcomputer.get(1), ZPM); + registerTieredTooltip(ItemList.Circuit_Crystalmainframe.get(1), UV); + registerTieredTooltip(ItemList.Circuit_Neuroprocessor.get(1), LuV); + registerTieredTooltip(ItemList.Circuit_Wetwarecomputer.get(1), ZPM); + registerTieredTooltip(ItemList.Circuit_Wetwaresupercomputer.get(1), UV); + registerTieredTooltip(ItemList.Circuit_Wetwaremainframe.get(1), UHV); + registerTieredTooltip(ItemList.Circuit_Bioprocessor.get(1), ZPM); + registerTieredTooltip(ItemList.Circuit_Biowarecomputer.get(1), UV); + registerTieredTooltip(ItemList.Circuit_Biowaresupercomputer.get(1), UHV); + registerTieredTooltip(ItemList.Circuit_Biomainframe.get(1), UEV); + registerTieredTooltip(ItemList.Circuit_OpticalProcessor.get(1), UV); + registerTieredTooltip(ItemList.Circuit_OpticalAssembly.get(1), UHV); + registerTieredTooltip(ItemList.Circuit_OpticalComputer.get(1), UEV); + registerTieredTooltip(ItemList.Circuit_OpticalMainframe.get(1), UIV); + registerTieredTooltip(ItemList.Circuit_ExoticProcessor.get(1), UHV); + registerTieredTooltip(ItemList.Circuit_ExoticAssembly.get(1), UEV); + registerTieredTooltip(ItemList.Circuit_ExoticComputer.get(1), UIV); + registerTieredTooltip(ItemList.Circuit_ExoticMainframe.get(1), UMV); + registerTieredTooltip(ItemList.Circuit_CosmicProcessor.get(1), UEV); + registerTieredTooltip(ItemList.Circuit_CosmicAssembly.get(1), UIV); + registerTieredTooltip(ItemList.Circuit_CosmicComputer.get(1), UMV); + registerTieredTooltip(ItemList.Circuit_CosmicMainframe.get(1), UXV); + registerTieredTooltip(ItemList.Circuit_TranscendentProcessor.get(1), UIV); + registerTieredTooltip(ItemList.Circuit_TranscendentAssembly.get(1), UMV); + registerTieredTooltip(ItemList.Circuit_TranscendentComputer.get(1), UXV); + registerTieredTooltip(ItemList.Circuit_TranscendentMainframe.get(1), MAX); + } + + private void initOreDictUnificatorEntries() { + GT_OreDictUnificator + .set(OrePrefixes.componentCircuit, Materials.Resistor, ItemList.Circuit_Parts_Resistor.get(1L)); + GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Diode, ItemList.Circuit_Parts_Diode.get(1L)); + GT_OreDictUnificator + .set(OrePrefixes.componentCircuit, Materials.Transistor, ItemList.Circuit_Parts_Transistor.get(1L)); + GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Inductor, ItemList.Circuit_Parts_Coil.get(1L)); + GT_OreDictUnificator + .set(OrePrefixes.componentCircuit, Materials.Capacitor, ItemList.Circuit_Parts_Capacitor.get(1L)); + + GT_OreDictUnificator.addAssociation( + OrePrefixes.componentCircuit, + Materials.Resistor, + ItemList.Circuit_Parts_ResistorSMD.get(1L), + true); + GT_OreDictUnificator.addAssociation( + OrePrefixes.componentCircuit, + Materials.Diode, + ItemList.Circuit_Parts_DiodeSMD.get(1L), + true); + GT_OreDictUnificator.addAssociation( + OrePrefixes.componentCircuit, + Materials.Transistor, + ItemList.Circuit_Parts_TransistorSMD.get(1L), + true); + GT_OreDictUnificator.addAssociation( + OrePrefixes.componentCircuit, + Materials.Capacitor, + ItemList.Circuit_Parts_CapacitorSMD.get(1L), + true); + GT_OreDictUnificator.addAssociation( + OrePrefixes.componentCircuit, + Materials.Inductor, + ItemList.Circuit_Parts_InductorSMD.get(1L), + true); + + } + + private void initOrePrefixes() { + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_1.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_2.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_3.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_4.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_5.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_6.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_7.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_8.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_PRODUCTION.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_PLAINS.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_LIGHT.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_FLOWERING.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_WINTER.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_DRYER.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_AUTOMATION.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_HELL.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_POLLEN.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_DESERT.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_COOLER.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_LIFESPAN.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SEAL.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_STABILIZER.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_JUNGLE.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_TERRITORY.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_OCEAN.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SKY.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_HEATER.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_UNLIGHT.get(1L)); + } + + private void registerCovers() { + GregTech_API.registerCover( + ItemList.Cover_Metrics_Transmitter.get(1L), + TextureFactory.of(MACHINE_CASINGS[2][0], TextureFactory.of(OVERLAY_METRICS_TRANSMITTER)), + new GT_Cover_Metrics_Transmitter(TextureFactory.of(OVERLAY_METRICS_TRANSMITTER))); + GregTech_API.registerCover( + ItemList.Cover_SolarPanel_UHV.get(1L), + TextureFactory.of(SOLARPANEL_UHV), + new GT_Cover_SolarPanel(2097152)); + GregTech_API.registerCover( + ItemList.Cover_SolarPanel_UEV.get(1L), + TextureFactory.of(SOLARPANEL_UEV), + new GT_Cover_SolarPanel(8388608)); + GregTech_API.registerCover( + ItemList.Cover_SolarPanel_UIV.get(1L), + TextureFactory.of(SOLARPANEL_UIV), + new GT_Cover_SolarPanel(33554432)); } @Override diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java index 309507f2a9..33cf67cfd5 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java @@ -1,5 +1,59 @@ package gregtech.common.items; +import static gregtech.common.items.ID_MetaTool_01.AXE; +import static gregtech.common.items.ID_MetaTool_01.BRANCHCUTTER; +import static gregtech.common.items.ID_MetaTool_01.BUTCHERYKNIFE; +import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_HV; +import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_LV; +import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_MV; +import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_HV; +import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_LV; +import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_MV; +import static gregtech.common.items.ID_MetaTool_01.CROWBAR; +import static gregtech.common.items.ID_MetaTool_01.DRILL_HV; +import static gregtech.common.items.ID_MetaTool_01.DRILL_LV; +import static gregtech.common.items.ID_MetaTool_01.DRILL_MV; +import static gregtech.common.items.ID_MetaTool_01.FILE; +import static gregtech.common.items.ID_MetaTool_01.HARDHAMMER; +import static gregtech.common.items.ID_MetaTool_01.HOE; +import static gregtech.common.items.ID_MetaTool_01.JACKHAMMER; +import static gregtech.common.items.ID_MetaTool_01.KNIFE; +import static gregtech.common.items.ID_MetaTool_01.MORTAR; +import static gregtech.common.items.ID_MetaTool_01.PICKAXE; +import static gregtech.common.items.ID_MetaTool_01.PLOW; +import static gregtech.common.items.ID_MetaTool_01.PLUNGER; +import static gregtech.common.items.ID_MetaTool_01.POCKET_BRANCHCUTTER; +import static gregtech.common.items.ID_MetaTool_01.POCKET_FILE; +import static gregtech.common.items.ID_MetaTool_01.POCKET_KNIFE; +import static gregtech.common.items.ID_MetaTool_01.POCKET_MULTITOOL; +import static gregtech.common.items.ID_MetaTool_01.POCKET_SAW; +import static gregtech.common.items.ID_MetaTool_01.POCKET_SCREWDRIVER; +import static gregtech.common.items.ID_MetaTool_01.POCKET_WIRECUTTER; +import static gregtech.common.items.ID_MetaTool_01.ROLLING_PIN; +import static gregtech.common.items.ID_MetaTool_01.SAW; +import static gregtech.common.items.ID_MetaTool_01.SCOOP; +import static gregtech.common.items.ID_MetaTool_01.SCREWDRIVER; +import static gregtech.common.items.ID_MetaTool_01.SCREWDRIVER_HV; +import static gregtech.common.items.ID_MetaTool_01.SCREWDRIVER_LV; +import static gregtech.common.items.ID_MetaTool_01.SCREWDRIVER_MV; +import static gregtech.common.items.ID_MetaTool_01.SENSE; +import static gregtech.common.items.ID_MetaTool_01.SHOVEL; +import static gregtech.common.items.ID_MetaTool_01.SOFTMALLET; +import static gregtech.common.items.ID_MetaTool_01.SOLDERING_IRON_HV; +import static gregtech.common.items.ID_MetaTool_01.SOLDERING_IRON_LV; +import static gregtech.common.items.ID_MetaTool_01.SOLDERING_IRON_MV; +import static gregtech.common.items.ID_MetaTool_01.SWORD; +import static gregtech.common.items.ID_MetaTool_01.TURBINE; +import static gregtech.common.items.ID_MetaTool_01.TURBINE_HUGE; +import static gregtech.common.items.ID_MetaTool_01.TURBINE_LARGE; +import static gregtech.common.items.ID_MetaTool_01.TURBINE_SMALL; +import static gregtech.common.items.ID_MetaTool_01.UNIVERSALSPADE; +import static gregtech.common.items.ID_MetaTool_01.WIRECUTTER; +import static gregtech.common.items.ID_MetaTool_01.WRENCH; +import static gregtech.common.items.ID_MetaTool_01.WRENCH_HV; +import static gregtech.common.items.ID_MetaTool_01.WRENCH_LV; +import static gregtech.common.items.ID_MetaTool_01.WRENCH_MV; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -63,83 +117,13 @@ import gregtech.common.tools.pocket.GT_Tool_Pocket_WireCutter; public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { - public static final short SWORD = 0; - public static final short PICKAXE = 2; - public static final short SHOVEL = 4; - public static final short AXE = 6; - public static final short HOE = 8; - public static final short SAW = 10; - public static final short HARDHAMMER = 12; - public static final short SOFTMALLET = 14; - - @Deprecated - public static final short SOFTHAMMER = SOFTMALLET; - - public static final short WRENCH = 16; - public static final short FILE = 18; - public static final short CROWBAR = 20; - public static final short SCREWDRIVER = 22; - public static final short MORTAR = 24; - public static final short WIRECUTTER = 26; - public static final short SCOOP = 28; - public static final short BRANCHCUTTER = 30; - public static final short UNIVERSALSPADE = 32; - public static final short KNIFE = 34; - public static final short BUTCHERYKNIFE = 36; - - @Deprecated - public static final short SICKLE = 38; - - public static final short SENSE = 40; - public static final short PLOW = 42; - public static final short PLUNGER = 44; - public static final short ROLLING_PIN = 46; - public static final short DRILL_LV = 100; - public static final short DRILL_MV = 102; - public static final short DRILL_HV = 104; - public static final short CHAINSAW_LV = 110; - public static final short CHAINSAW_MV = 112; - public static final short CHAINSAW_HV = 114; - public static final short WRENCH_LV = 120; - public static final short WRENCH_MV = 122; - public static final short WRENCH_HV = 124; - public static final short JACKHAMMER = 130; - public static final short BUZZSAW_LV = 140; - public static final short BUZZSAW_MV = 142; - public static final short BUZZSAW_HV = 144; - - @Deprecated - public static final short BUZZSAW = BUZZSAW_LV; - - public static final short SCREWDRIVER_LV = 150; - public static final short SCREWDRIVER_MV = 152; - public static final short SCREWDRIVER_HV = 154; - public static final short SOLDERING_IRON_LV = 160; - public static final short SOLDERING_IRON_MV = 162; - public static final short SOLDERING_IRON_HV = 164; - public static final short TURBINE_SMALL = 170; - public static final short TURBINE = 172; - public static final short TURBINE_LARGE = 174; - public static final short TURBINE_HUGE = 176; - - @Deprecated - public static final short TURBINE_BLADE = 178; - - public static final short POCKET_MULTITOOL = 180; - public static final short POCKET_BRANCHCUTTER = 182; - public static final short POCKET_FILE = 184; - public static final short POCKET_KNIFE = 186; - public static final short POCKET_SAW = 188; - public static final short POCKET_SCREWDRIVER = 190; - public static final short POCKET_WIRECUTTER = 192; - public static GT_MetaGenerated_Tool_01 INSTANCE; public GT_MetaGenerated_Tool_01() { super("metatool.01"); INSTANCE = this; addTool( - SWORD, + SWORD.ID, "Sword", "", new GT_Tool_Sword(), @@ -148,7 +132,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 4L)); addTool( - PICKAXE, + PICKAXE.ID, "Pickaxe", "", new GT_Tool_Pickaxe(), @@ -156,7 +140,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); addTool( - SHOVEL, + SHOVEL.ID, "Shovel", "", new GT_Tool_Shovel(), @@ -164,7 +148,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); addTool( - AXE, + AXE.ID, "Axe", "", new GT_Tool_Axe(), @@ -173,7 +157,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L)); addTool( - HOE, + HOE.ID, "Hoe", "", new GT_Tool_Hoe(), @@ -181,7 +165,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 4L)); addTool( - SAW, + SAW.ID, "Saw", "Can also harvest Ice", new GT_Tool_Saw(), @@ -191,7 +175,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L)); GregTech_API.registerTool( addTool( - HARDHAMMER, + HARDHAMMER.ID, "Hammer", "Crushes Ores instead of harvesting them", new GT_Tool_HardHammer(), @@ -202,7 +186,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sHardHammerList); GregTech_API.registerTool( addTool( - SOFTMALLET, + SOFTMALLET.ID, "Soft Mallet", "", new GT_Tool_SoftHammer(), @@ -212,7 +196,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sSoftHammerList); GregTech_API.registerTool( addTool( - WRENCH, + WRENCH.ID, "Wrench", "Hold Leftclick to dismantle Machines", new GT_Tool_Wrench(), @@ -222,7 +206,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)), GregTech_API.sWrenchList); addTool( - FILE, + FILE.ID, "File", "", new GT_Tool_File(), @@ -232,7 +216,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)); GregTech_API.registerTool( addTool( - CROWBAR, + CROWBAR.ID, "Crowbar", "Dismounts Covers and Rotates Rails", new GT_Tool_Crowbar(), @@ -243,7 +227,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sCrowbarList); GregTech_API.registerTool( addTool( - SCREWDRIVER, + SCREWDRIVER.ID, "Screwdriver", "Adjusts Covers and Machines", new GT_Tool_Screwdriver(), @@ -253,7 +237,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)), GregTech_API.sScrewdriverList); addTool( - MORTAR, + MORTAR.ID, "Mortar", "", new GT_Tool_Mortar(), @@ -263,7 +247,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L)); GregTech_API.registerTool( addTool( - WIRECUTTER, + WIRECUTTER.ID, "Wire Cutter", "", new GT_Tool_WireCutter(), @@ -273,7 +257,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)), GregTech_API.sWireCutterList); addTool( - SCOOP, + SCOOP.ID, "Scoop", "", new GT_Tool_Scoop(), @@ -282,7 +266,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.BESTIA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PANNUS, 2L)); addTool( - BRANCHCUTTER, + BRANCHCUTTER.ID, "Branch Cutter", "", new GT_Tool_BranchCutter(), @@ -292,7 +276,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L)); GregTech_API.registerTool( addTool( - UNIVERSALSPADE, + UNIVERSALSPADE.ID, "Universal Spade", "", new GT_Tool_UniversalSpade(), @@ -306,7 +290,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 1L)), GregTech_API.sCrowbarList); addTool( - KNIFE, + KNIFE.ID, "Knife", "", new GT_Tool_Knife(), @@ -316,7 +300,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L)); addTool( - BUTCHERYKNIFE, + BUTCHERYKNIFE.ID, "Butchery Knife", "Has a slow Attack Rate", new GT_Tool_ButcheryKnife(), @@ -326,7 +310,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 4L)); addTool( - SENSE, + SENSE.ID, "Sense", "Because a Scythe doesn't make Sense", new GT_Tool_Sense(), @@ -336,7 +320,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 2L)); addTool( - PLOW, + PLOW.ID, "Plow", "Used to get rid of Snow", new GT_Tool_Plow(), @@ -345,7 +329,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 2L)); addTool( - PLUNGER, + PLUNGER.ID, "Plunger", "", new GT_Tool_Plunger(), @@ -354,7 +338,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 2L)); addTool( - ROLLING_PIN, + ROLLING_PIN.ID, "Rolling Pin", "", new GT_Tool_RollingPin(), @@ -363,7 +347,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 4L)); addTool( - DRILL_LV, + DRILL_LV.ID, "Drill (LV)", "", new GT_Tool_Drill_LV(), @@ -371,7 +355,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); addTool( - DRILL_MV, + DRILL_MV.ID, "Drill (MV)", "", new GT_Tool_Drill_MV(), @@ -379,7 +363,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); addTool( - DRILL_HV, + DRILL_HV.ID, "Drill (HV)", "", new GT_Tool_Drill_HV(), @@ -387,7 +371,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); addTool( - CHAINSAW_LV, + CHAINSAW_LV.ID, "Chainsaw (LV)", "Can also harvest Ice", new GT_Tool_Chainsaw_LV(), @@ -396,7 +380,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L)); addTool( - CHAINSAW_MV, + CHAINSAW_MV.ID, "Chainsaw (MV)", "Can also harvest Ice", new GT_Tool_Chainsaw_MV(), @@ -405,7 +389,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.METO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L)); addTool( - CHAINSAW_HV, + CHAINSAW_HV.ID, "Chainsaw (HV)", "Can also harvest Ice", new GT_Tool_Chainsaw_HV(), @@ -415,7 +399,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L)); GregTech_API.registerTool( addTool( - WRENCH_LV, + WRENCH_LV.ID, "Wrench (LV)", "Hold Left Button to dismantle Machines", new GT_Tool_Wrench_LV(), @@ -425,7 +409,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sWrenchList); GregTech_API.registerTool( addTool( - WRENCH_MV, + WRENCH_MV.ID, "Wrench (MV)", "Hold Left Button to dismantle Machines", new GT_Tool_Wrench_MV(), @@ -435,7 +419,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sWrenchList); GregTech_API.registerTool( addTool( - WRENCH_HV, + WRENCH_HV.ID, "Wrench (HV)", "Hold Left Button to dismantle Machines", new GT_Tool_Wrench_HV(), @@ -445,7 +429,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sWrenchList); GregTech_API.registerTool( addTool( - JACKHAMMER, + JACKHAMMER.ID, "JackHammer (HV)", "Breaks Rocks into pieces", new GT_Tool_JackHammer(), @@ -455,7 +439,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L)), GregTech_API.sJackhammerList); addTool( - BUZZSAW_LV, + BUZZSAW_LV.ID, "Buzzsaw (LV)", "Not suitable for harvesting Blocks", new GT_Tool_BuzzSaw(), @@ -464,7 +448,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L)); addTool( - BUZZSAW_MV, + BUZZSAW_MV.ID, "Buzzsaw (MV)", "Not suitable for harvesting Blocks", new GT_Tool_BuzzSaw(), @@ -473,7 +457,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L)); addTool( - BUZZSAW_HV, + BUZZSAW_HV.ID, "Buzzsaw (HV)", "Not suitable for harvesting Blocks", new GT_Tool_BuzzSaw(), @@ -483,7 +467,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 2L)); GregTech_API.registerTool( addTool( - SCREWDRIVER_LV, + SCREWDRIVER_LV.ID, "Screwdriver (LV)", "Adjusts Covers and Machines", new GT_Tool_Screwdriver_LV(), @@ -494,7 +478,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sScrewdriverList); GregTech_API.registerTool( addTool( - SCREWDRIVER_MV, + SCREWDRIVER_MV.ID, "Screwdriver (MV)", "Adjusts Covers and Machines", new GT_Tool_Screwdriver_LV(), @@ -505,7 +489,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sScrewdriverList); GregTech_API.registerTool( addTool( - SCREWDRIVER_HV, + SCREWDRIVER_HV.ID, "Screwdriver (HV)", "Adjusts Covers and Machines", new GT_Tool_Screwdriver_LV(), @@ -516,7 +500,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sScrewdriverList); GregTech_API.registerTool( addTool( - SOLDERING_IRON_LV, + SOLDERING_IRON_LV.ID, "Soldering Iron (LV)", "Fixes burned out Circuits. Needs soldering materials in inventory.", new GT_Tool_Soldering_Iron(), @@ -527,7 +511,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sSolderingToolList); GregTech_API.registerTool( addTool( - SOLDERING_IRON_MV, + SOLDERING_IRON_MV.ID, "Soldering Iron (MV)", "Fixes burned out Circuits. Needs soldering materials in inventory.", new GT_Tool_Soldering_Iron(), @@ -538,7 +522,7 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sSolderingToolList); GregTech_API.registerTool( addTool( - SOLDERING_IRON_HV, + SOLDERING_IRON_HV.ID, "Soldering Iron (HV)", "Fixes burned out Circuits. Needs soldering materials in inventory.", new GT_Tool_Soldering_Iron(), @@ -548,54 +532,62 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)), GregTech_API.sSolderingToolList); - addTool(TURBINE_SMALL, "Small Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Small()); - addTool(TURBINE, "Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Normal()); - addTool(TURBINE_LARGE, "Large Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Large()); - addTool(TURBINE_HUGE, "Huge Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Huge()); + addTool( + TURBINE_SMALL.ID, + "Small Turbine", + "Turbine Rotors for your power station", + new GT_Tool_Turbine_Small()); + addTool(TURBINE.ID, "Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Normal()); + addTool( + TURBINE_LARGE.ID, + "Large Turbine", + "Turbine Rotors for your power station", + new GT_Tool_Turbine_Large()); + addTool(TURBINE_HUGE.ID, "Huge Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Huge()); addTool( - POCKET_MULTITOOL, + POCKET_MULTITOOL.ID, "Pocket Multitool", "6 useful Tools in one!", - new GT_Tool_Pocket_Multitool(POCKET_KNIFE), + new GT_Tool_Pocket_Multitool(POCKET_KNIFE.ID), null, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3)); addTool( - POCKET_KNIFE, + POCKET_KNIFE.ID, "Pocket Multitool (Knife)", "", - new GT_Tool_Pocket_Knife(POCKET_SAW), + new GT_Tool_Pocket_Knife(POCKET_SAW.ID), ToolDictNames.craftingToolKnife, ToolDictNames.craftingToolBlade, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3)); addTool( - POCKET_SAW, + POCKET_SAW.ID, "Pocket Multitool (Saw)", "Can also harvest Ice", - new GT_Tool_Pocket_Saw(POCKET_FILE), + new GT_Tool_Pocket_Saw(POCKET_FILE.ID), ToolDictNames.craftingToolSaw, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3)); addTool( - POCKET_FILE, + POCKET_FILE.ID, "Pocket Multitool (File)", "", - new GT_Tool_Pocket_File(POCKET_SCREWDRIVER), + new GT_Tool_Pocket_File(POCKET_SCREWDRIVER.ID), ToolDictNames.craftingToolFile, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3)); GregTech_API.registerTool( addTool( - POCKET_SCREWDRIVER, + POCKET_SCREWDRIVER.ID, "Pocket Multitool (Screwdriver)", "Adjusts Covers and Machines", - new GT_Tool_Pocket_Screwdriver(POCKET_WIRECUTTER), + new GT_Tool_Pocket_Screwdriver(POCKET_WIRECUTTER.ID), ToolDictNames.craftingToolScrewdriver, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3), @@ -603,222 +595,160 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { GregTech_API.sScrewdriverList); GregTech_API.registerTool( addTool( - POCKET_WIRECUTTER, + POCKET_WIRECUTTER.ID, "Pocket Multitool (Wire Cutter)", "", - new GT_Tool_Pocket_WireCutter(POCKET_BRANCHCUTTER), + new GT_Tool_Pocket_WireCutter(POCKET_BRANCHCUTTER.ID), ToolDictNames.craftingToolWireCutter, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3)), GregTech_API.sWireCutterList); addTool( - POCKET_BRANCHCUTTER, + POCKET_BRANCHCUTTER.ID, "Pocket Multitool (Branch Cutter)", "", - new GT_Tool_Pocket_BranchCutter(POCKET_MULTITOOL), + new GT_Tool_Pocket_BranchCutter(POCKET_MULTITOOL.ID), ToolDictNames.craftingToolBranchCutter, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 6), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 3), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 3)); + initCraftingShapedRecipes(); + initCraftingShapelessRecipes(); + } + + private void initCraftingShapelessRecipes() { + if (GregTech_API.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)) { + return; + } + + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.clay, 1) }); + GT_ModHandler.addShapelessCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.wheat, 1) }); + GT_ModHandler.addShapelessCraftingRecipe( + new ItemStack(Items.flint, 1), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.gravel, 1) }); + GT_ModHandler.addShapelessCraftingRecipe( + new ItemStack(Items.blaze_powder, 2), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.blaze_rod, 1) }); + } + private void initCraftingShapedRecipes() { GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Flint, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Flint, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', new ItemStack(Items.flint, 1), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Bronze, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Bronze, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Bronze), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Iron, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Iron, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Iron), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Steel, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Steel, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Steel), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.WroughtIron, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.WroughtIron, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.WroughtIron), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.RedSteel, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.RedSteel, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.RedSteel), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.BlueSteel, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.BlueSteel, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.BlueSteel), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.BlackSteel, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.BlackSteel, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.BlackSteel), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.DamascusSteel, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.DamascusSteel, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.DamascusSteel), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Thaumium, Materials.Stone, null), + INSTANCE.getToolWithStats(MORTAR.ID, 1, Materials.Thaumium, Materials.Stone, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Thaumium), 'S', OrePrefixes.stone }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(ROLLING_PIN, 1, Materials.Wood, Materials.Wood, null), + INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.Wood, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", 'I', OrePrefixes.plank.get(Materials.Wood), 'S', OrePrefixes.stick.get(Materials.Wood) }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(ROLLING_PIN, 1, Materials.Plastic, Materials.Plastic, null), + INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.Plastic, Materials.Plastic, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.Plastic), 'S', OrePrefixes.stick.get(Materials.Plastic) }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(ROLLING_PIN, 1, Materials.Aluminium, Materials.Aluminium, null), + INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.Aluminium, Materials.Aluminium, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.Aluminium), 'S', OrePrefixes.stick.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(ROLLING_PIN, 1, Materials.StainlessSteel, Materials.StainlessSteel, null), + INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.StainlessSteel, Materials.StainlessSteel, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.StainlessSteel), 'S', OrePrefixes.stick.get(Materials.StainlessSteel) }); + GT_ModHandler.addCraftingRecipe( + INSTANCE.getToolWithStats(ROLLING_PIN.ID, 1, Materials.IronWood, Materials.IronWood, null), + GT_ModHandler.RecipeBits.NOT_REMOVABLE, + new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.IronWood), 'S', + OrePrefixes.stick.get(Materials.IronWood) }); if (!GregTech_API.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)) { GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(SWORD, 1, Materials.Flint, Materials.Wood, null), + INSTANCE.getToolWithStats(SWORD.ID, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', new ItemStack(Items.flint, 1) }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(PICKAXE, 1, Materials.Flint, Materials.Wood, null), + INSTANCE.getToolWithStats(PICKAXE.ID, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FFF", " S ", " S ", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', new ItemStack(Items.flint, 1) }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(SHOVEL, 1, Materials.Flint, Materials.Wood, null), + INSTANCE.getToolWithStats(SHOVEL.ID, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "S", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', new ItemStack(Items.flint, 1) }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(AXE, 1, Materials.Flint, Materials.Wood, null), + INSTANCE.getToolWithStats(AXE.ID, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FF", "FS", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', new ItemStack(Items.flint, 1) }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(HOE, 1, Materials.Flint, Materials.Wood, null), + INSTANCE.getToolWithStats(HOE.ID, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FF", " S", " S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', new ItemStack(Items.flint, 1) }); GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(KNIFE, 1, Materials.Flint, Materials.Wood, null), + INSTANCE.getToolWithStats(KNIFE.ID, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "S", 'S', OrePrefixes.stick.get(Materials.Wood), 'F', new ItemStack(Items.flint, 1) }); - - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Flint, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', new ItemStack(Items.flint, 1), 'S', OrePrefixes.stone }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Bronze, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Bronze), 'S', - OrePrefixes.stone }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Iron, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Iron), 'S', - OrePrefixes.stone }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Steel, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Steel), 'S', - OrePrefixes.stone }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.WroughtIron, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.WroughtIron), 'S', - OrePrefixes.stone }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.RedSteel, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.RedSteel), 'S', - OrePrefixes.stone }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.BlueSteel, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.BlueSteel), 'S', - OrePrefixes.stone }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.BlackSteel, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.BlackSteel), 'S', - OrePrefixes.stone }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.DamascusSteel, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.DamascusSteel), 'S', - OrePrefixes.stone }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(MORTAR, 1, Materials.Thaumium, Materials.Stone, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " I ", "SIS", "SSS", 'I', OrePrefixes.ingot.get(Materials.Thaumium), 'S', - OrePrefixes.stone }); - - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(ROLLING_PIN, 1, Materials.Wood, Materials.Wood, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " S", " I ", "S f", 'I', OrePrefixes.plank.get(Materials.Wood), 'S', - OrePrefixes.stick.get(Materials.Wood) }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(ROLLING_PIN, 1, Materials.Plastic, Materials.Plastic, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.Plastic), 'S', - OrePrefixes.stick.get(Materials.Plastic) }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(ROLLING_PIN, 1, Materials.Aluminium, Materials.Aluminium, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.Aluminium), 'S', - OrePrefixes.stick.get(Materials.Aluminium) }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(ROLLING_PIN, 1, Materials.StainlessSteel, Materials.StainlessSteel, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.StainlessSteel), 'S', - OrePrefixes.stick.get(Materials.StainlessSteel) }); - GT_ModHandler.addCraftingRecipe( - INSTANCE.getToolWithStats(ROLLING_PIN, 1, Materials.IronWood, Materials.IronWood, null), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { " S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.IronWood), 'S', - OrePrefixes.stick.get(Materials.IronWood) }); - - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.clay, 1) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.wheat, 1) }); - GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Items.flint, 1), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.gravel, 1) }); - GT_ModHandler.addShapelessCraftingRecipe( - new ItemStack(Items.blaze_powder, 2), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.blaze_rod, 1) }); - } } } diff --git a/src/main/java/gregtech/common/items/ID_MetaItem_02.java b/src/main/java/gregtech/common/items/ID_MetaItem_02.java new file mode 100644 index 0000000000..a13b858bd7 --- /dev/null +++ b/src/main/java/gregtech/common/items/ID_MetaItem_02.java @@ -0,0 +1,208 @@ +package gregtech.common.items; + +public enum ID_MetaItem_02 { + + // Please pretty please, add your entries while conserving the order + ThermosCan_Dark_Coffee(0), + ThermosCan_Dark_Cafe_au_lait(1), + ThermosCan_Coffee(2), + ThermosCan_Cafe_au_lait(3), + ThermosCan_Lait_au_cafe(4), + ThermosCan_Dark_Chocolate_Milk(5), + ThermosCan_Chocolate_Milk(6), + ThermosCan_Tea(7), + ThermosCan_Sweet_Tea(8), + ThermosCan_Ice_Tea(9), + GelledToluene(10), + Bottle_Purple_Drink(100), + Bottle_Grape_Juice(101), + Bottle_Wine(102), + Bottle_Vinegar(103), + Bottle_Potato_Juice(104), + Bottle_Vodka(105), + Bottle_Leninade(106), + Bottle_Mineral_Water(107), + Bottle_Salty_Water(108), + Bottle_Reed_Water(109), + Bottle_Rum(110), + Bottle_Pirate_Brew(111), + Bottle_Hops_Juice(112), + Bottle_Dark_Beer(113), + Bottle_Dragon_Blood(114), + Bottle_Wheaty_Juice(115), + Bottle_Scotch(116), + Bottle_Glen_McKenner(117), + Bottle_Wheaty_Hops_Juice(118), + Bottle_Beer(119), + Bottle_Chilly_Sauce(120), + Bottle_Hot_Sauce(121), + Bottle_Diabolo_Sauce(122), + Bottle_Diablo_Sauce(123), + Bottle_Snitches_Glitch_Sauce(124), + Bottle_Apple_Juice(125), + Bottle_Cider(126), + Bottle_Golden_Apple_Juice(127), + Bottle_Golden_Cider(128), + Bottle_Iduns_Apple_Juice(129), + Bottle_Notches_Brew(130), + Bottle_Lemon_Juice(131), + Bottle_Limoncello(132), + Bottle_Lemonade(133), + Bottle_Alcopops(134), + Bottle_Cave_Johnsons_Grenade_Juice(135), + Bottle_Milk(136), + Bottle_Holy_Water(137), + Food_Potato_On_Stick(200), + Food_Potato_On_Stick_Roasted(201), + Food_Raw_Fries(202), + Food_Fries(203), + Food_Packaged_Fries(204), + Food_Raw_PotatoChips(205), + Food_PotatoChips(206), + Food_ChiliChips(207), + Food_Packaged_PotatoChips(208), + Food_Packaged_ChiliChips(209), + Food_Chum(210), + Food_Chum_On_Stick(211), + Food_Dough_Sugar(212), + Food_Dough_Chocolate(213), + Food_Raw_Cookie(214), + Food_Sliced_Buns(220), + Food_Burger_Veggie(221), + Food_Burger_Cheese(222), + Food_Burger_Meat(223), + Food_Burger_Chum(224), + Food_Sliced_Breads(230), + Food_Sandwich_Veggie(231), + Food_Sandwich_Cheese(232), + Food_Sandwich_Bacon(233), + Food_Sandwich_Steak(234), + Food_Sliced_Baguettes(240), + Food_Large_Sandwich_Veggie(241), + Food_Large_Sandwich_Cheese(242), + Food_Large_Sandwich_Bacon(243), + Food_Large_Sandwich_Steak(244), + Food_Raw_Pizza_Veggie(250), + Food_Raw_Pizza_Cheese(251), + Food_Raw_Pizza_Meat(252), + Food_Baked_Pizza_Veggie(260), + Food_Baked_Pizza_Cheese(261), + Food_Baked_Pizza_Meat(262), + SFMixture(270), + MSFMixture(271), + Dye_Indigo(410), + Dye_Color_00(414), + Dye_Color_01(415), + Dye_Color_02(416), + Dye_Color_03(417), + Dye_Color_04(418), + Dye_Color_05(419), + Dye_Color_06(420), + Dye_Color_07(421), + Dye_Color_08(422), + Dye_Color_09(423), + Dye_Color_10(424), + Dye_Color_11(425), + Dye_Color_12(426), + Dye_Color_13(427), + Dye_Color_14(428), + Dye_Color_15(429), + Plank_Oak(470), + Plank_Spruce(471), + Plank_Birch(472), + Plank_Jungle(473), + Plank_Acacia(474), + Plank_DarkOak(475), + Plank_Larch(476), + Plank_Teak(477), + Plank_Acacia_Green(478), + Plank_Lime(479), + Plank_Chestnut(480), + Plank_Wenge(481), + Plank_Baobab(482), + Plank_Sequoia(483), + Plank_Kapok(484), + Plank_Ebony(485), + Plank_Mahagony(486), + Plank_Balsa(487), + Plank_Willow(488), + Plank_Walnut(489), + Plank_Greenheart(490), + Plank_Cherry(491), + Plank_Mahoe(492), + Plank_Poplar(493), + Plank_Palm(494), + Plank_Papaya(495), + Plank_Pine(496), + Plank_Plum(497), + Plank_Maple(498), + Plank_Citrus(499), + Crop_Drop_Plumbilia(500), + Crop_Drop_Argentia(501), + Crop_Drop_Indigo(502), + Crop_Drop_Ferru(503), + Crop_Drop_Aurelia(504), + Crop_Drop_TeaLeaf(505), + Crop_Drop_OilBerry(510), + Crop_Drop_BobsYerUncleRanks(511), + Crop_Drop_UUMBerry(512), + Crop_Drop_UUABerry(513), + Crop_Drop_MilkWart(520), + Crop_Drop_Bauxite(521), + Crop_Drop_Ilmenite(522), + Crop_Drop_Pitchblende(523), + Crop_Drop_Uraninite(524), + Crop_Drop_Thorium(526), + Crop_Drop_Nickel(527), + Crop_Drop_Zinc(528), + Crop_Drop_Manganese(529), + Crop_Drop_Coppon(530), + Crop_Drop_Scheelite(531), + Crop_Drop_Platinum(532), + Crop_Drop_Iridium(533), + Crop_Drop_Osmium(534), + Crop_Drop_Naquadah(535), + Crop_Drop_Mica(538), + Crop_Drop_Tine(540), + Crop_Drop_Chilly(550), + Crop_Drop_Lemon(551), + Crop_Drop_Tomato(552), + Crop_Drop_MTomato(553), + Crop_Drop_Grapes(554), + Crop_Drop_Onion(555), + Crop_Drop_Cucumber(556), + Crop_Drop_Rape(557), + Food_Cheese(558), + Food_Dough(559), + Food_Flat_Dough(560), + Food_Raw_Bread(561), + Food_Raw_Bun(562), + Food_Raw_Baguette(563), + Food_Baked_Bun(564), + Food_Baked_Baguette(565), + Food_Sliced_Bread(566), + Food_Sliced_Bun(567), + Food_Sliced_Baguette(568), + Food_Raw_Cake(569), + Food_Baked_Cake(570), + Food_Sliced_Lemon(571), + Food_Sliced_Tomato(572), + Food_Sliced_Onion(573), + Food_Sliced_Cucumber(574), + Food_Sliced_Cheese(576), + Cover_AdvancedRedstoneTransmitterExternal(577), + Cover_AdvancedRedstoneTransmitterInternal(578), + Cover_AdvancedRedstoneReceiverExternal(579), + Cover_AdvancedRedstoneReceiverInternal(580), + Cover_WirelessFluidDetector(581), + Cover_WirelessItemDetector(582), + Cover_WirelessNeedsMaintainance(583), + Cover_WirelessActivityDetector(584), + Display_ITS_FREE(765); + + public final int ID; + + ID_MetaItem_02(int ID) { + this.ID = ID; + } +} diff --git a/src/main/java/gregtech/common/items/ID_MetaItem_03.java b/src/main/java/gregtech/common/items/ID_MetaItem_03.java new file mode 100644 index 0000000000..25083fee3c --- /dev/null +++ b/src/main/java/gregtech/common/items/ID_MetaItem_03.java @@ -0,0 +1,229 @@ +package gregtech.common.items; + +public enum ID_MetaItem_03 { + + // Please pretty please, add your entries while conserving the order + Circuit_Board_Wetware(6), + Circuit_Board_Plastic(7), + Circuit_Board_Bio(8), + Circuit_Parts_ResistorSMD(11), + Circuit_Parts_Glass_Tube(12), + Circuit_Parts_Coil(14), + Circuit_Parts_DiodeSMD(16), + Circuit_Parts_TransistorSMD(18), + Circuit_Parts_CapacitorSMD(20), + Circuit_Parts_GlassFiber(21), + Circuit_Parts_PetriDish(22), + Circuit_Parts_Reinforced_Glass_Tube(23), + Circuit_Parts_ResistorASMD(24), + Circuit_Parts_DiodeASMD(25), + Circuit_Parts_TransistorASMD(26), + Circuit_Parts_CapacitorASMD(27), + Circuit_Silicon_Ingot(30), + Circuit_Silicon_Ingot2(31), + Circuit_Silicon_Ingot3(32), + Circuit_Silicon_Wafer(33), + Circuit_Silicon_Wafer2(34), + Circuit_Silicon_Wafer3(35), + Circuit_Wafer_ILC(36), + Circuit_Chip_ILC(37), + Circuit_Wafer_Ram(38), + Circuit_Chip_Ram(39), + Circuit_Wafer_NAND(40), + Circuit_Chip_NAND(41), + Circuit_Wafer_NOR(42), + Circuit_Chip_NOR(43), + Circuit_Wafer_CPU(44), + Circuit_Chip_CPU(45), + Circuit_Wafer_SoC(46), + Circuit_Chip_SoC(47), + Circuit_Wafer_SoC2(48), + Circuit_Chip_SoC2(49), + Circuit_Wafer_PIC(50), + Circuit_Chip_PIC(51), + Circuit_Wafer_HPIC(52), + Circuit_Chip_HPIC(53), + Circuit_Wafer_NanoCPU(54), + Circuit_Chip_NanoCPU(55), + Circuit_Wafer_QuantumCPU(56), + Circuit_Chip_QuantumCPU(57), + Circuit_Wafer_UHPIC(58), + Circuit_Chip_UHPIC(59), + Circuit_Wafer_Simple_SoC(60), + Circuit_Chip_Simple_SoC(61), + Circuit_Wafer_ULPIC(62), + Circuit_Chip_ULPIC(63), + Circuit_Wafer_LPIC(64), + Circuit_Chip_LPIC(65), + Circuit_Chip_CrystalSoC2(68), + Circuit_Parts_RawCrystalChip(69), + Circuit_Chip_CrystalCPU(70), + Circuit_Chip_CrystalSoC(71), + Circuit_Chip_NeuroCPU(72), + Circuit_Chip_Stemcell(73), + Circuit_Parts_RawCrystalParts(74), + NandChip(75), + Circuit_Chip_Biocell(76), + Circuit_Chip_BioCPU(77), + Circuit_Microprocessor(78), + Circuit_Integrated_Good(79), + Circuit_Processor(80), + Circuit_Nanoprocessor(82), + Circuit_Nanocomputer(83), + Circuit_Elitenanocomputer(84), + Circuit_Quantumprocessor(85), + Circuit_Quantumcomputer(86), + Circuit_Masterquantumcomputer(87), + Circuit_Quantummainframe(88), + Circuit_Crystalprocessor(89), + Circuit_Ultimatecrystalcomputer(90), + Circuit_Crystalmainframe(91), + Circuit_Neuroprocessor(92), + Circuit_Wetwarecomputer(93), + Circuit_Wetwaresupercomputer(94), + Circuit_Wetwaremainframe(95), + Circuit_Crystalcomputer(96), + Circuit_Bioprocessor(97), + Circuit_Biowarecomputer(98), + Circuit_Biowaresupercomputer(99), + Circuit_Board_Coated_Basic(100), + Circuit_Board_Phenolic_Good(101), + Circuit_Board_Epoxy_Advanced(102), + Circuit_Board_Fiberglass_Advanced(103), + Circuit_Board_Multifiberglass_Elite(104), + Circuit_Board_Wetware_Extreme(105), + Circuit_Board_Plastic_Advanced(106), + Circuit_Board_Bio_Ultra(107), + Tube_Wires(110), + Circuit_Biomainframe(120), + Cover_SolarPanel_UHV(130), + Cover_SolarPanel_UEV(131), + Cover_SolarPanel_UIV(132), + ULV_Coil(140), + LV_Coil(141), + MV_Coil(142), + HV_Coil(143), + EV_Coil(144), + IV_Coil(145), + LuV_Coil(146), + ZPM_Coil(147), + UV_Coil(148), + UHV_Coil(149), + Circuit_Silicon_Ingot4(150), + Circuit_Silicon_Wafer4(151), + Circuit_Silicon_Ingot5(152), + Circuit_Silicon_Wafer5(153), + Circuit_OpticalProcessor(154), + Circuit_OpticalAssembly(155), + Circuit_OpticalComputer(156), + Circuit_OpticalMainframe(157), + Circuit_Wafer_NPIC(160), + Circuit_Chip_NPIC(161), + Circuit_Wafer_PPIC(162), + Circuit_Chip_PPIC(163), + Circuit_Wafer_QPIC(164), + Circuit_Chip_QPIC(165), + Circuit_ExoticProcessor(166), + Circuit_ExoticAssembly(167), + Circuit_ExoticComputer(168), + Circuit_ExoticMainframe(169), + Circuit_CosmicProcessor(170), + Circuit_CosmicAssembly(171), + Circuit_CosmicComputer(172), + Circuit_CosmicMainframe(173), + Circuit_TranscendentProcessor(174), + Circuit_TranscendentAssembly(175), + Circuit_TranscendentComputer(176), + Circuit_TranscendentMainframe(177), + Circuit_Parts_ResistorXSMD(178), + Circuit_Parts_DiodeXSMD(179), + Circuit_Parts_TransistorXSMD(180), + Circuit_Parts_CapacitorXSMD(181), + Circuit_Parts_InductorSMD(182), + Circuit_Parts_InductorASMD(183), + Circuit_Parts_InductorXSMD(184), + Circuit_Wafer_Bioware(188), + Circuit_Parts_Chip_Bioware(189), + GalliumArsenideCrystal(190), + GalliumArsenideCrystalSmallPart(191), + KevlarFiber(192), + WovenKevlar(193), + Spinneret(194), + IndustrialApiary_Upgrade_Frame(199), + IndustrialApiary_Upgrade_Acceleration_1(200), + IndustrialApiary_Upgrade_Acceleration_2(201), + IndustrialApiary_Upgrade_Acceleration_3(202), + IndustrialApiary_Upgrade_Acceleration_4(203), + IndustrialApiary_Upgrade_Acceleration_5(204), + IndustrialApiary_Upgrade_Acceleration_6(205), + IndustrialApiary_Upgrade_Acceleration_7(206), + IndustrialApiary_Upgrade_Acceleration_8(207), + IndustrialApiary_Upgrade_Acceleration_8_Upgraded(208), + IndustrialApiary_Upgrade_PRODUCTION(209), + IndustrialApiary_Upgrade_PLAINS(210), + IndustrialApiary_Upgrade_LIGHT(211), + IndustrialApiary_Upgrade_FLOWERING(212), + IndustrialApiary_Upgrade_WINTER(213), + IndustrialApiary_Upgrade_DRYER(214), + IndustrialApiary_Upgrade_AUTOMATION(215), + IndustrialApiary_Upgrade_HUMIDIFIER(216), + IndustrialApiary_Upgrade_HELL(217), + IndustrialApiary_Upgrade_POLLEN(218), + IndustrialApiary_Upgrade_DESERT(219), + IndustrialApiary_Upgrade_COOLER(220), + IndustrialApiary_Upgrade_LIFESPAN(221), + IndustrialApiary_Upgrade_SEAL(222), + IndustrialApiary_Upgrade_STABILIZER(223), + IndustrialApiary_Upgrade_JUNGLE(224), + IndustrialApiary_Upgrade_TERRITORY(225), + IndustrialApiary_Upgrade_OCEAN(226), + IndustrialApiary_Upgrade_SKY(227), + IndustrialApiary_Upgrade_HEATER(228), + IndustrialApiary_Upgrade_SIEVE(229), + NuclearStar(230), + IndustrialApiary_Upgrade_UNLIGHT(231), + Cover_Metrics_Transmitter(232), + Circuit_Silicon_Ingot6(721), + Circuit_Silicon_Wafer6(722), + Circuit_Silicon_Wafer7(723), + Circuit_Chip_Optical(724), + Optically_Compatible_Memory(725), + Optically_Perfected_CPU(726), + Optical_Cpu_Containment_Housing(727), + Circuit_Board_Optical(728), + White_Dwarf_Shape_Extruder_Plate(729), + White_Dwarf_Shape_Extruder_Rod(730), + White_Dwarf_Shape_Extruder_Bolt(731), + White_Dwarf_Shape_Extruder_Ring(732), + White_Dwarf_Shape_Extruder_Cell(733), + White_Dwarf_Shape_Extruder_Ingot(734), + White_Dwarf_Shape_Extruder_Wire(735), + White_Dwarf_Shape_Extruder_Casing(736), + White_Dwarf_Shape_Extruder_Pipe_Tiny(737), + White_Dwarf_Shape_Extruder_Pipe_Small(738), + White_Dwarf_Shape_Extruder_Pipe_Medium(739), + White_Dwarf_Shape_Extruder_Pipe_Large(740), + White_Dwarf_Shape_Extruder_Pipe_Huge(741), + White_Dwarf_Shape_Extruder_Block(742), + White_Dwarf_Shape_Extruder_Sword(743), + White_Dwarf_Shape_Extruder_Pickaxe(744), + White_Dwarf_Shape_Extruder_Shovel(745), + White_Dwarf_Shape_Extruder_Axe(746), + White_Dwarf_Shape_Extruder_Hoe(747), + White_Dwarf_Shape_Extruder_Hammer(748), + White_Dwarf_Shape_Extruder_File(749), + White_Dwarf_Shape_Extruder_Saw(750), + White_Dwarf_Shape_Extruder_Gear(751), + White_Dwarf_Shape_Extruder_Bottle(752), + White_Dwarf_Shape_Extruder_Rotor(753), + White_Dwarf_Shape_Extruder_Small_Gear(754), + White_Dwarf_Shape_Extruder_Turbine_Blade(755), + White_Dwarf_Shape_Extruder_ToolHeadDrill(756), + Timepiece(757); + + public final int ID; + + ID_MetaItem_03(int ID) { + this.ID = ID; + } +} diff --git a/src/main/java/gregtech/common/items/ID_MetaTool_01.java b/src/main/java/gregtech/common/items/ID_MetaTool_01.java new file mode 100644 index 0000000000..195bd1aef8 --- /dev/null +++ b/src/main/java/gregtech/common/items/ID_MetaTool_01.java @@ -0,0 +1,73 @@ +package gregtech.common.items; + +public enum ID_MetaTool_01 { + + // Please pretty please, add your entries while conserving the order + SWORD(0), + PICKAXE(2), + SHOVEL(4), + AXE(6), + HOE(8), + SAW(10), + HARDHAMMER(12), + SOFTMALLET(14), + @Deprecated + SOFTHAMMER(14), + WRENCH(16), + FILE(18), + CROWBAR(20), + SCREWDRIVER(22), + MORTAR(24), + WIRECUTTER(26), + SCOOP(28), + BRANCHCUTTER(30), + UNIVERSALSPADE(32), + KNIFE(34), + BUTCHERYKNIFE(36), + @Deprecated + SICKLE(38), + SENSE(40), + PLOW(42), + PLUNGER(44), + ROLLING_PIN(46), + DRILL_LV(100), + DRILL_MV(102), + DRILL_HV(104), + CHAINSAW_LV(110), + CHAINSAW_MV(112), + CHAINSAW_HV(114), + WRENCH_LV(120), + WRENCH_MV(122), + WRENCH_HV(124), + JACKHAMMER(130), + BUZZSAW_LV(140), + @Deprecated + BUZZSAW(140), + BUZZSAW_MV(142), + BUZZSAW_HV(144), + SCREWDRIVER_LV(150), + SCREWDRIVER_MV(152), + SCREWDRIVER_HV(154), + SOLDERING_IRON_LV(160), + SOLDERING_IRON_MV(162), + SOLDERING_IRON_HV(164), + TURBINE_SMALL(170), + TURBINE(172), + TURBINE_LARGE(174), + TURBINE_HUGE(176), + @Deprecated + TURBINE_BLADE(178), + POCKET_MULTITOOL(180), + POCKET_BRANCHCUTTER(182), + POCKET_FILE(184), + POCKET_KNIFE(186), + POCKET_SAW(188), + POCKET_SCREWDRIVER(190), + POCKET_WIRECUTTER(192); + + public final int ID; + + ID_MetaTool_01(int ID) { + this.ID = ID; + } +} diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 8d30240012..c72afedebd 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -33,6 +33,7 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; import ic2.core.Ic2Items; import thaumcraft.api.ThaumcraftApiHelper; @@ -75,19 +76,15 @@ public class GT_Achievements { 0, 4, GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), + .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, Materials.Iron, Materials.Wood, null), "flintpick", false); registerAchievement( "driltime", 2, 4, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, - 1, - Materials.BlueSteel, - Materials.StainlessSteel, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.DRILL_LV.ID, 1, Materials.BlueSteel, Materials.StainlessSteel, null), "tools", false); registerAchievement( @@ -95,7 +92,7 @@ public class GT_Achievements { 2, 6, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, + ID_MetaTool_01.CHAINSAW_LV.ID, 1, Materials.BlueSteel, Materials.StainlessSteel, @@ -107,7 +104,7 @@ public class GT_Achievements { 3, 5, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, + ID_MetaTool_01.DRILL_HV.ID, 1, Materials.TungstenSteel, Materials.TungstenSteel, @@ -119,7 +116,7 @@ public class GT_Achievements { 3, 7, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.JACKHAMMER, + ID_MetaTool_01.JACKHAMMER.ID, 1, Materials.TungstenSteel, Materials.TungstenSteel, @@ -132,7 +129,7 @@ public class GT_Achievements { -2, 4, GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, Materials.Steel, Materials.Iron, null), + .getToolWithStats(ID_MetaTool_01.UNIVERSALSPADE.ID, 1, Materials.Steel, Materials.Iron, null), "tools", false); registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1), "unitool", false); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index 4b610fea8e..9b6e4edc68 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -23,6 +23,7 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Proxy; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeRegistrator { // TODO COMPARE WITH OLD TOOL // HEAD??? generator @@ -84,7 +85,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadAxe -> { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.AXE, 1, aMaterial, aMaterial.mHandleMaterial, null), + .getToolWithStats(ID_MetaTool_01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { GT_Values.RA.stdBuilder() @@ -93,12 +94,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), GT_Utility.getIntegratedCircuit(2)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.AXE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null)) + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.AXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); @@ -116,7 +113,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadBuzzSaw -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, + ID_MetaTool_01.BUZZSAW_LV.ID, 1, aMaterial, Materials.Steel, @@ -128,7 +125,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, + ID_MetaTool_01.BUZZSAW_LV.ID, 1, aMaterial, Materials.Steel, @@ -140,7 +137,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_LV, + ID_MetaTool_01.BUZZSAW_LV.ID, 1, aMaterial, Materials.Steel, @@ -152,7 +149,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, + ID_MetaTool_01.BUZZSAW_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -165,7 +162,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, + ID_MetaTool_01.BUZZSAW_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -178,7 +175,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_MV, + ID_MetaTool_01.BUZZSAW_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -191,7 +188,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_HV, + ID_MetaTool_01.BUZZSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -205,7 +202,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_HV, + ID_MetaTool_01.BUZZSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -219,7 +216,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.BUZZSAW_HV, + ID_MetaTool_01.BUZZSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -239,7 +236,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadChainsaw -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, + ID_MetaTool_01.CHAINSAW_LV.ID, 1, aMaterial, Materials.Steel, @@ -251,7 +248,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, + ID_MetaTool_01.CHAINSAW_LV.ID, 1, aMaterial, Materials.Steel, @@ -263,7 +260,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, + ID_MetaTool_01.CHAINSAW_LV.ID, 1, aMaterial, Materials.Steel, @@ -275,7 +272,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, + ID_MetaTool_01.CHAINSAW_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -288,7 +285,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, + ID_MetaTool_01.CHAINSAW_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -301,7 +298,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_MV, + ID_MetaTool_01.CHAINSAW_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -314,7 +311,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_HV, + ID_MetaTool_01.CHAINSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -328,7 +325,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_HV, + ID_MetaTool_01.CHAINSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -342,7 +339,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_HV, + ID_MetaTool_01.CHAINSAW_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -363,7 +360,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadDrill -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, + ID_MetaTool_01.DRILL_LV.ID, 1, aMaterial, Materials.Steel, @@ -375,7 +372,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, + ID_MetaTool_01.DRILL_LV.ID, 1, aMaterial, Materials.Steel, @@ -387,7 +384,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, + ID_MetaTool_01.DRILL_LV.ID, 1, aMaterial, Materials.Steel, @@ -399,7 +396,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, + ID_MetaTool_01.DRILL_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -412,7 +409,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, + ID_MetaTool_01.DRILL_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -425,7 +422,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_MV, + ID_MetaTool_01.DRILL_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -438,7 +435,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, + ID_MetaTool_01.DRILL_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -452,7 +449,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, + ID_MetaTool_01.DRILL_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -466,7 +463,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, + ID_MetaTool_01.DRILL_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -480,7 +477,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.JACKHAMMER, + ID_MetaTool_01.JACKHAMMER.ID, 1, aMaterial, Materials.StainlessSteel, @@ -494,7 +491,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.JACKHAMMER, + ID_MetaTool_01.JACKHAMMER.ID, 1, aMaterial, Materials.StainlessSteel, @@ -508,7 +505,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.JACKHAMMER, + ID_MetaTool_01.JACKHAMMER.ID, 1, aMaterial, Materials.StainlessSteel, @@ -549,19 +546,15 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadFile -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if ((!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.BOUNCY))) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, + ID_MetaTool_01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -581,7 +574,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Utility.getIntegratedCircuit(15)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.FILE, + ID_MetaTool_01.FILE.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -594,12 +587,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadHoe -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HOE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); } if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { @@ -609,12 +598,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), GT_Utility.getIntegratedCircuit(16)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HOE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null)) + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.HOE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); @@ -633,12 +618,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PICKAXE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.PICKAXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( @@ -660,7 +641,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Utility.getIntegratedCircuit(5)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PICKAXE, + ID_MetaTool_01.PICKAXE.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -674,12 +655,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLOW, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.PLOW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( @@ -700,7 +677,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Utility.getIntegratedCircuit(6)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.PLOW, + ID_MetaTool_01.PLOW.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -714,12 +691,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( @@ -740,12 +713,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), GT_Utility.getIntegratedCircuit(7)) .itemOutputs( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SAW, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null)) + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.SAW.ID, 1, aMaterial, aMaterial.mHandleMaterial, null)) .duration(10 * SECONDS) .eut(calculateRecipeEU(aMaterial, (int) TierEU.RECIPE_MV)) .addTo(assemblerRecipes); @@ -755,12 +724,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SENSE, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.SENSE.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( @@ -782,7 +747,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Utility.getIntegratedCircuit(8)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SENSE, + ID_MetaTool_01.SENSE.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -794,12 +759,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg } case toolHeadShovel -> { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SHOVEL, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.SHOVEL.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null) { GT_Values.RA.stdBuilder() @@ -809,7 +770,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Utility.getIntegratedCircuit(9)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SHOVEL, + ID_MetaTool_01.SHOVEL.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -832,12 +793,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SWORD, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.SWORD.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); if (aSpecialRecipeReq1) GT_ModHandler.addCraftingRecipe( @@ -859,7 +816,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Utility.getIntegratedCircuit(10)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SWORD, + ID_MetaTool_01.SWORD.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -872,7 +829,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadUniversalSpade -> { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, aMaterial, aMaterial, null), + .getToolWithStats(ID_MetaTool_01.UNIVERSALSPADE.ID, 1, aMaterial, aMaterial, null), new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial), OrePrefixes.screw.get(aMaterial), ToolDictNames.craftingToolScrewdriver }); if (GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L) != null @@ -885,7 +842,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Utility.getIntegratedCircuit(11)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.UNIVERSALSPADE, + ID_MetaTool_01.UNIVERSALSPADE.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -902,7 +859,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg case toolHeadWrench -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, + ID_MetaTool_01.WRENCH_LV.ID, 1, aMaterial, Materials.Steel, @@ -914,7 +871,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, + ID_MetaTool_01.WRENCH_LV.ID, 1, aMaterial, Materials.Steel, @@ -926,7 +883,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_LV, + ID_MetaTool_01.WRENCH_LV.ID, 1, aMaterial, Materials.Steel, @@ -938,7 +895,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Steel), 'B', ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, + ID_MetaTool_01.WRENCH_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -951,7 +908,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, + ID_MetaTool_01.WRENCH_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -964,7 +921,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_MV, + ID_MetaTool_01.WRENCH_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -977,7 +934,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, + ID_MetaTool_01.WRENCH_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -991,7 +948,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, + ID_MetaTool_01.WRENCH_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -1005,7 +962,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.WRENCH_HV, + ID_MetaTool_01.WRENCH_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -1019,7 +976,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + ID_MetaTool_01.SCREWDRIVER_LV.ID, 1, aMaterial, Materials.Steel, @@ -1032,7 +989,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + ID_MetaTool_01.SCREWDRIVER_LV.ID, 1, aMaterial, Materials.Steel, @@ -1045,7 +1002,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_LV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_LV, + ID_MetaTool_01.SCREWDRIVER_LV.ID, 1, aMaterial, Materials.Steel, @@ -1058,7 +1015,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_LV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + ID_MetaTool_01.SCREWDRIVER_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -1072,7 +1029,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + ID_MetaTool_01.SCREWDRIVER_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -1086,7 +1043,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_MV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_MV, + ID_MetaTool_01.SCREWDRIVER_MV.ID, 1, aMaterial, Materials.Aluminium, @@ -1099,7 +1056,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg OrePrefixes.gearGtSmall.get(Materials.Aluminium), 'B', ItemList.Battery_RE_MV_Sodium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, + ID_MetaTool_01.SCREWDRIVER_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -1113,7 +1070,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, + ID_MetaTool_01.SCREWDRIVER_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -1127,7 +1084,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg ItemList.Battery_RE_HV_Cadmium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER_HV, + ID_MetaTool_01.SCREWDRIVER_HV.ID, 1, aMaterial, Materials.StainlessSteel, @@ -1155,8 +1112,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Utility.getIntegratedCircuit(14)) .itemOutputs( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - aProducesSoftMallet ? GT_MetaGenerated_Tool_01.SOFTMALLET - : GT_MetaGenerated_Tool_01.HARDHAMMER, + aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -1168,8 +1124,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - aProducesSoftMallet ? GT_MetaGenerated_Tool_01.SOFTMALLET - : GT_MetaGenerated_Tool_01.HARDHAMMER, + aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -1178,8 +1133,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg new Object[] { aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - aProducesSoftMallet ? GT_MetaGenerated_Tool_01.SOFTMALLET - : GT_MetaGenerated_Tool_01.HARDHAMMER, + aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID, 1, aMaterial, aMaterial.mHandleMaterial, @@ -1191,8 +1145,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg 'S', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - aProducesSoftMallet ? GT_MetaGenerated_Tool_01.SOFTMALLET - : GT_MetaGenerated_Tool_01.HARDHAMMER, + aProducesSoftMallet ? ID_MetaTool_01.SOFTMALLET.ID : ID_MetaTool_01.HARDHAMMER.ID, 1, aMaterial, aMaterial.mHandleMaterial, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java index a0e282dc1b..cbb0ca3668 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java @@ -10,6 +10,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.util.GT_ModHandler; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -29,7 +30,7 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.PLUNGER, 1, aMaterial, aMaterial, null), + .getToolWithStats(ID_MetaTool_01.PLUNGER.ID, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xRR", " SR", "S f", 'S', OrePrefixes.stick.get(aMaterial), 'R', OrePrefixes.plate.get(Materials.AnyRubber) }); @@ -42,57 +43,53 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, aMaterial, aMaterial, null), + .getToolWithStats(ID_MetaTool_01.WRENCH.ID, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, aMaterial, aMaterial, null), + .getToolWithStats(ID_MetaTool_01.CROWBAR.ID, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SCREWDRIVER, - 1, - aMaterial, - aMaterial.mHandleMaterial, - null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, aMaterial, aMaterial.mHandleMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { " fS", " Sh", "W ", 'S', OrePrefixes.stick.get(aMaterial), 'W', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null), + .getToolWithStats(ID_MetaTool_01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PfP", "hPd", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SCOOP, 1, aMaterial, aMaterial, null), + .getToolWithStats(ID_MetaTool_01.SCOOP.ID, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SWS", "SSS", "xSh", 'S', OrePrefixes.stick.get(aMaterial), 'W', new ItemStack(Blocks.wool, 1, 32767) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.BRANCHCUTTER, 1, aMaterial, aMaterial, null), + .getToolWithStats(ID_MetaTool_01.BRANCHCUTTER.ID, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PfP", "PdP", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.KNIFE, 1, aMaterial, aMaterial, null), + .getToolWithStats(ID_MetaTool_01.KNIFE.ID, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null), + .getToolWithStats(ID_MetaTool_01.BUTCHERYKNIFE.ID, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPf", "PP ", "Sh ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, + ID_MetaTool_01.SOLDERING_IRON_LV.ID, 1, aMaterial, Materials.Rubber, @@ -103,7 +100,7 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe ItemList.Battery_RE_LV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_MV, + ID_MetaTool_01.SOLDERING_IRON_MV.ID, 1, aMaterial, Materials.Rubber, @@ -114,7 +111,7 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe ItemList.Battery_RE_MV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.SOLDERING_IRON_HV, + ID_MetaTool_01.SOLDERING_IRON_HV.ID, 1, aMaterial, Materials.AnySyntheticRubber, @@ -125,7 +122,7 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe OrePrefixes.stick.get(Materials.StainlessSteel), 'L', ItemList.Battery_RE_HV_Lithium.get(1L) }); GT_ModHandler.addCraftingRecipe( (GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.POCKET_MULTITOOL, 1, aMaterial, aMaterial, null)), + .getToolWithStats(ID_MetaTool_01.POCKET_MULTITOOL.ID, 1, aMaterial, aMaterial, null)), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "ABC", "DEF", "CFG", 'A', OrePrefixes.stickLong.get(aMaterial), 'B', OrePrefixes.toolHeadSaw.get(aMaterial), 'C', OrePrefixes.ring.get(aMaterial), 'D', diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 0a38677d51..e19a25981d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -74,6 +74,7 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.api.util.IGT_HatchAdder; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.GTplusplus; import gtPlusPlus.GTplusplus.INIT_PHASE; @@ -1606,52 +1607,52 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex mToolStacks.put( true + "WRENCH", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, GOOD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.WRENCH.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "CROWBAR", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, GOOD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.CROWBAR.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "HARDHAMMER", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, GOOD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "SOFTHAMMER", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTMALLET, 1, GOOD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.SOFTMALLET.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "SCREWDRIVER", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, GOOD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( true + "SOLDERING_IRON_LV", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, GOOD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.SOLDERING_IRON_LV.ID, 1, GOOD, Materials.Tungsten, null)); mToolStacks.put( false + "WRENCH", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, BAD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.WRENCH.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "CROWBAR", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, BAD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.CROWBAR.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "HARDHAMMER", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, BAD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "SOFTHAMMER", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SOFTMALLET, 1, BAD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.SOFTMALLET.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "SCREWDRIVER", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, BAD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.SCREWDRIVER.ID, 1, BAD, Materials.Tungsten, null)); mToolStacks.put( false + "SOLDERING_IRON_LV", GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, BAD, Materials.Tungsten, null)); + .getToolWithStats(ID_MetaTool_01.SOLDERING_IRON_LV.ID, 1, BAD, Materials.Tungsten, null)); ItemStack aGlassPane1 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassRed", 1); ItemStack aGlassPane2 = ItemUtils.getItemStackOfAmountFromOreDict("paneGlassLime", 1); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java index 9f2789b520..b03532807d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java @@ -33,6 +33,7 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.general.ItemAirFilter; @@ -825,11 +826,11 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (sGregTurbines == null) { sGregTurbines = new ItemStack[3]; sGregTurbines[0] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01") - .getToolWithStats(GT_MetaGenerated_Tool_01.TURBINE_SMALL, 1, Materials.Iron, Materials.Iron, null); + .getToolWithStats(ID_MetaTool_01.TURBINE_SMALL.ID, 1, Materials.Iron, Materials.Iron, null); sGregTurbines[1] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01") - .getToolWithStats(GT_MetaGenerated_Tool_01.TURBINE_SMALL, 1, Materials.Bronze, Materials.Bronze, null); + .getToolWithStats(ID_MetaTool_01.TURBINE_SMALL.ID, 1, Materials.Bronze, Materials.Bronze, null); sGregTurbines[2] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01") - .getToolWithStats(GT_MetaGenerated_Tool_01.TURBINE_SMALL, 1, Materials.Steel, Materials.Steel, null); + .getToolWithStats(ID_MetaTool_01.TURBINE_SMALL.ID, 1, Materials.Steel, Materials.Steel, null); } else { return sGregTurbines[aTier]; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 0441907f40..c920a4a6a4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -12,6 +12,21 @@ import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.enums.GT_HatchElement.OutputHatch; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.common.items.ID_MetaTool_01.BRANCHCUTTER; +import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_HV; +import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_LV; +import static gregtech.common.items.ID_MetaTool_01.BUZZSAW_MV; +import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_HV; +import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_LV; +import static gregtech.common.items.ID_MetaTool_01.CHAINSAW_MV; +import static gregtech.common.items.ID_MetaTool_01.KNIFE; +import static gregtech.common.items.ID_MetaTool_01.POCKET_BRANCHCUTTER; +import static gregtech.common.items.ID_MetaTool_01.POCKET_KNIFE; +import static gregtech.common.items.ID_MetaTool_01.POCKET_MULTITOOL; +import static gregtech.common.items.ID_MetaTool_01.POCKET_SAW; +import static gregtech.common.items.ID_MetaTool_01.POCKET_WIRECUTTER; +import static gregtech.common.items.ID_MetaTool_01.SAW; +import static gregtech.common.items.ID_MetaTool_01.WIRECUTTER; import static gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase.GTPPHatchElement.TTEnergy; import java.util.ArrayList; @@ -55,6 +70,7 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.api.util.VoidProtectionHelper; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_InputBus_ME; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; @@ -282,7 +298,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< /** * Return the output multiplier for a given power tier. - * + * * @param tier Power tier the machine runs on. * @return Factor to multiply all outputs by. */ @@ -371,7 +387,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< /** * Attempts to find a tool appropriate for the given mode, and damage/discharge it by one use. - * + * * @param mode The mode to use. This specifies which tools are valid. * @return Production multiplier based on the tool used, or -1 if no appropriate tool was found. */ @@ -402,7 +418,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< /** * Calculate output multiplier for a given tool and mode. - * + * * @param toolStack The tool to use. * @param mode The mode to use. * @return Output multiplier for the given tool used in the given mode. If the tool is not appropriate for this @@ -410,34 +426,30 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< */ public static int getToolMultiplier(ItemStack toolStack, Mode mode) { Item tool = toolStack.getItem(); + int damage = toolStack.getItemDamage(); switch (mode) { case LOG: if (tool instanceof GT_MetaGenerated_Tool_01) { - switch (toolStack.getItemDamage()) { - case GT_MetaGenerated_Tool_01.SAW: - case GT_MetaGenerated_Tool_01.POCKET_SAW: - case GT_MetaGenerated_Tool_01.POCKET_MULTITOOL: - return 1; - case GT_MetaGenerated_Tool_01.BUZZSAW_LV: - case GT_MetaGenerated_Tool_01.BUZZSAW_MV: - case GT_MetaGenerated_Tool_01.BUZZSAW_HV: - return 2; - case GT_MetaGenerated_Tool_01.CHAINSAW_LV: - case GT_MetaGenerated_Tool_01.CHAINSAW_MV: - case GT_MetaGenerated_Tool_01.CHAINSAW_HV: - return 4; + + if (damage == SAW.ID || damage == POCKET_SAW.ID || damage == POCKET_MULTITOOL.ID) { + return 1; + } + + if (damage == BUZZSAW_LV.ID || damage == BUZZSAW_MV.ID || damage == BUZZSAW_HV.ID) { + return 2; + } + + if (damage == CHAINSAW_LV.ID || damage == CHAINSAW_MV.ID || damage == CHAINSAW_HV.ID) { + return 4; } } break; case SAPLING: - if (tool instanceof GT_MetaGenerated_Tool_01) { - switch (toolStack.getItemDamage()) { - case GT_MetaGenerated_Tool_01.BRANCHCUTTER: - case GT_MetaGenerated_Tool_01.POCKET_BRANCHCUTTER: - case GT_MetaGenerated_Tool_01.POCKET_MULTITOOL: - return 1; - } + if (tool instanceof GT_MetaGenerated_Tool_01 + && (damage == BRANCHCUTTER.ID || damage == POCKET_BRANCHCUTTER.ID + || damage == POCKET_MULTITOOL.ID)) { + return 1; } if (tool instanceof IToolGrafter && tool.isDamageable()) { return 3; @@ -450,12 +462,11 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< return 1; } if (tool instanceof GT_MetaGenerated_Tool_01) { - switch (toolStack.getItemDamage()) { - case GT_MetaGenerated_Tool_01.POCKET_MULTITOOL: - return 1; - case GT_MetaGenerated_Tool_01.WIRECUTTER: - case GT_MetaGenerated_Tool_01.POCKET_WIRECUTTER: - return 2; + if (damage == POCKET_MULTITOOL.ID) { + return 1; + } + if (damage == WIRECUTTER.ID || damage == POCKET_WIRECUTTER.ID) { + return 2; } } if (tool instanceof MetaGeneratedGregtechTools) { @@ -466,13 +477,9 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< break; case FRUIT: - if (tool instanceof GT_MetaGenerated_Tool_01) { - switch (toolStack.getItemDamage()) { - case GT_MetaGenerated_Tool_01.KNIFE: - case GT_MetaGenerated_Tool_01.POCKET_KNIFE: - case GT_MetaGenerated_Tool_01.POCKET_MULTITOOL: - return 1; - } + if (tool instanceof GT_MetaGenerated_Tool_01 + && (damage == KNIFE.ID || damage == POCKET_KNIFE.ID || damage == POCKET_MULTITOOL.ID)) { + return 1; } break; } @@ -582,7 +589,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< * <li>yield: Affects fruit output.</li> * </ul> * See {@link forestry.core.genetics.alleles.EnumAllele} for detailed numeric values for each allele. - * + * * @param sapling A sapling to farm. Must be a Forestry sapling with a valid genome. * @return A map of outputs for each mode. Outputs for some modes might be null. */ @@ -650,7 +657,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< * Registers outputs for a sapling. This method assumes that output in mode SAPLING is the same as the input * sapling. Output amount is further modified by mode, machine tier, and tool used. Recipes are added in * {@link gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_TreeFarm}. - * + * * @param sapling The input sapling to farm, and also the output in mode SAPLING. * @param log ItemStack to output in mode LOG. * @param leaves ItemStack to output in mode LEAVES. @@ -723,32 +730,32 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< GT_MetaGenerated_Tool toolInstance = GT_MetaGenerated_Tool_01.INSTANCE; altToolsForNEI = new ItemStack[][] { // Mode.LOG - { toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.SAW, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.POCKET_SAW, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.BUZZSAW_LV, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.BUZZSAW_MV, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.CHAINSAW_MV, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.BUZZSAW_HV, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.CHAINSAW_HV, 1, null, null, null), }, + { toolInstance.getToolWithStats(SAW.ID, 1, null, null, null), + toolInstance.getToolWithStats(POCKET_SAW.ID, 1, null, null, null), + toolInstance.getToolWithStats(ID_MetaTool_01.BUZZSAW_LV.ID, 1, null, null, null), + toolInstance.getToolWithStats(CHAINSAW_LV.ID, 1, null, null, null), + toolInstance.getToolWithStats(ID_MetaTool_01.BUZZSAW_MV.ID, 1, null, null, null), + toolInstance.getToolWithStats(CHAINSAW_MV.ID, 1, null, null, null), + toolInstance.getToolWithStats(ID_MetaTool_01.BUZZSAW_HV.ID, 1, null, null, null), + toolInstance.getToolWithStats(CHAINSAW_HV.ID, 1, null, null, null), }, // Mode.SAPLING - { toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.BRANCHCUTTER, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.POCKET_BRANCHCUTTER, 1, null, null, null), + { toolInstance.getToolWithStats(ID_MetaTool_01.BRANCHCUTTER.ID, 1, null, null, null), + toolInstance.getToolWithStats(ID_MetaTool_01.POCKET_BRANCHCUTTER.ID, 1, null, null, null), GT_ModHandler.getModItem(Mods.Forestry.ID, "grafter", 1, 0), }, // Mode.LEAVES { new ItemStack(Items.shears), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.POCKET_WIRECUTTER, 1, null, null, null), + toolInstance.getToolWithStats(ID_MetaTool_01.WIRECUTTER.ID, 1, null, null, null), + toolInstance.getToolWithStats(ID_MetaTool_01.POCKET_WIRECUTTER.ID, 1, null, null, null), MetaGeneratedGregtechTools.getInstance() .getToolWithStats(MetaGeneratedGregtechTools.ELECTRIC_SNIPS, 1, null, null, null), }, // Mode.FRUIT - { toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.KNIFE, 1, null, null, null), - toolInstance.getToolWithStats(GT_MetaGenerated_Tool_01.POCKET_KNIFE, 1, null, null, null), } }; + { toolInstance.getToolWithStats(ID_MetaTool_01.KNIFE.ID, 1, null, null, null), + toolInstance.getToolWithStats(ID_MetaTool_01.POCKET_KNIFE.ID, 1, null, null, null), } }; } /** * Add a recipe for this tree to NEI. These recipes are only used in NEI, they are never used for processing logic. - * + * * @return True if the recipe was added successfully. */ public static boolean addFakeRecipeToNEI(ItemStack saplingIn, ItemStack log, ItemStack saplingOut, ItemStack leaves, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java index 9a60f2c6bf..a894a7ad62 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java @@ -9,6 +9,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.util.GT_OreDictUnificator; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.items.ID_MetaTool_01; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.recipe.common.CI; @@ -112,7 +113,7 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null); + .getToolWithStats(ID_MetaTool_01.WIRECUTTER.ID, 1, aMaterial, aMaterial, null); long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); if (aDura <= 32000) { diff --git a/src/main/java/net/glease/ggfab/GigaGramFab.java b/src/main/java/net/glease/ggfab/GigaGramFab.java index e03c1eacc5..d73377dae6 100644 --- a/src/main/java/net/glease/ggfab/GigaGramFab.java +++ b/src/main/java/net/glease/ggfab/GigaGramFab.java @@ -2,6 +2,13 @@ package net.glease.ggfab; import static gregtech.api.enums.ToolDictNames.*; import static gregtech.common.items.GT_MetaGenerated_Tool_01.*; +import static gregtech.common.items.ID_MetaTool_01.CROWBAR; +import static gregtech.common.items.ID_MetaTool_01.FILE; +import static gregtech.common.items.ID_MetaTool_01.HARDHAMMER; +import static gregtech.common.items.ID_MetaTool_01.SCREWDRIVER; +import static gregtech.common.items.ID_MetaTool_01.SOFTMALLET; +import static gregtech.common.items.ID_MetaTool_01.WIRECUTTER; +import static gregtech.common.items.ID_MetaTool_01.WRENCH; import static net.glease.ggfab.api.GGFabRecipeMaps.toolCastRecipes; import net.glease.ggfab.api.GigaGramFabAPI; @@ -105,16 +112,27 @@ public class GigaGramFab { .getStackForm(1L)); long plate = OrePrefixes.plate.mMaterialAmount, ingot = OrePrefixes.ingot.mMaterialAmount, screw = OrePrefixes.screw.mMaterialAmount, rod = OrePrefixes.stick.mMaterialAmount; - GigaGramFabAPI.addSingleUseToolType(craftingToolFile, INSTANCE.mToolStats.get(FILE), 2 * plate); - GigaGramFabAPI.addSingleUseToolType(craftingToolWrench, INSTANCE.mToolStats.get(WRENCH), 6 * ingot); - GigaGramFabAPI.addSingleUseToolType(craftingToolCrowbar, INSTANCE.mToolStats.get(CROWBAR), 3 * rod); + GigaGramFabAPI.addSingleUseToolType(craftingToolFile, INSTANCE.mToolStats.get((short) FILE.ID), 2 * plate); + GigaGramFabAPI + .addSingleUseToolType(craftingToolWrench, INSTANCE.mToolStats.get((short) WRENCH.ID), 6 * ingot); + GigaGramFabAPI + .addSingleUseToolType(craftingToolCrowbar, INSTANCE.mToolStats.get((short) CROWBAR.ID), 3 * rod); GigaGramFabAPI.addSingleUseToolType( craftingToolWireCutter, - INSTANCE.mToolStats.get(WIRECUTTER), + INSTANCE.mToolStats.get((short) WIRECUTTER.ID), 3 * plate + 2 * rod + screw); - GigaGramFabAPI.addSingleUseToolType(craftingToolHardHammer, INSTANCE.mToolStats.get(HARDHAMMER), 6 * ingot); - GigaGramFabAPI.addSingleUseToolType(craftingToolSoftHammer, INSTANCE.mToolStats.get(SOFTMALLET), 6 * ingot); - GigaGramFabAPI.addSingleUseToolType(craftingToolScrewdriver, INSTANCE.mToolStats.get(SCREWDRIVER), 2 * rod); + GigaGramFabAPI.addSingleUseToolType( + craftingToolHardHammer, + INSTANCE.mToolStats.get((short) HARDHAMMER.ID), + 6 * ingot); + GigaGramFabAPI.addSingleUseToolType( + craftingToolSoftHammer, + INSTANCE.mToolStats.get((short) SOFTMALLET.ID), + 6 * ingot); + GigaGramFabAPI.addSingleUseToolType( + craftingToolScrewdriver, + INSTANCE.mToolStats.get((short) SCREWDRIVER.ID), + 2 * rod); GT_ProcessingArray_Manager.addRecipeMapToPA("ggfab.toolcast", toolCastRecipes); }); GregTech_API.sBeforeGTPostload.add(new ComponentRecipeLoader()); |