diff options
Diffstat (limited to 'src')
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", |