diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-04-04 13:57:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-04 13:57:15 +0200 |
| commit | 9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca (patch) | |
| tree | 72a719f446d59538cc51768cf780ba142d3512f2 /src/main/java/gregtech/loaders | |
| parent | 769168bf3db04d09bcb8566e72b0dddb64157e7d (diff) | |
| download | GT5-Unofficial-9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca.tar.gz GT5-Unofficial-9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca.tar.bz2 GT5-Unofficial-9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca.zip | |
Modid work (#1833)
* add all mods founds in NHCore
* depracte old strings
* add ars magica 2
* more enum work
* use a switch
* spotless
* more mod id rework
* more mod id rework
* more mod id rework
* should be last
* spotless
* rename to make more sense
* add path attribute
* add getResourcePath to enum
* spotless
Diffstat (limited to 'src/main/java/gregtech/loaders')
52 files changed, 1066 insertions, 1085 deletions
diff --git a/src/main/java/gregtech/loaders/ExtraIcons.java b/src/main/java/gregtech/loaders/ExtraIcons.java index bc90879e5f..82601e5336 100644 --- a/src/main/java/gregtech/loaders/ExtraIcons.java +++ b/src/main/java/gregtech/loaders/ExtraIcons.java @@ -1,6 +1,6 @@ package gregtech.loaders; -import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static gregtech.api.enums.Mods.GregTech; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; @@ -10,6 +10,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ExtraIcons { + private static final String LARGE_FLUID_CELL_CUSTOM = "large_fluid_cell_custom"; public static IIcon steelLargeCellInner; public static IIcon aluminiumLargeCellInner; public static IIcon stainlesssteelLargeCellInner; @@ -24,17 +25,22 @@ public class ExtraIcons { public void regIcons(TextureStitchEvent.Pre event) { TextureMap reg = event.map; if (reg.getTextureType() == 1) { // are for items - steelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/steel_inner"); - aluminiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/aluminium_inner"); + steelLargeCellInner = reg.registerIcon(GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "steel_inner")); + aluminiumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "aluminium_inner")); stainlesssteelLargeCellInner = reg.registerIcon( - RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "stainlesssteel_inner")); tungstensteelLargeCellInner = reg.registerIcon( - RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); - titaniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/titanium_inner"); - chromiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/chromium_inner"); - iridiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/iridium_inner"); - osmiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/osmium_inner"); - neutroniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/neutronium_inner"); + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "tungstensteel_inner")); + titaniumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "titanium_inner")); + chromiumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "chromium_inner")); + iridiumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "iridium_inner")); + osmiumLargeCellInner = reg.registerIcon(GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "osmium_inner")); + neutroniumLargeCellInner = reg.registerIcon( + GregTech.getResourcePath(LARGE_FLUID_CELL_CUSTOM, "neutronium_inner")); } } } diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 9a9837aae9..e87538c831 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -1,5 +1,9 @@ package gregtech.loaders.load; +import static gregtech.api.enums.Mods.BloodMagic; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Thaumcraft; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -123,8 +127,8 @@ public class GT_FuelLoader implements Runnable { // BloodMagic GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L) }, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "blankSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L) }, null, null, null, @@ -133,8 +137,8 @@ public class GT_FuelLoader implements Runnable { 400); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L) }, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L) }, null, null, null, @@ -143,8 +147,8 @@ public class GT_FuelLoader implements Runnable { 1000); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L) }, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L) }, null, null, null, @@ -153,8 +157,8 @@ public class GT_FuelLoader implements Runnable { 8000); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 1L, 27) }, - new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27) }, + new ItemStack[] { GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L) }, null, null, null, @@ -162,7 +166,7 @@ public class GT_FuelLoader implements Runnable { 0, 20000); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 4), null, 4, 5); + GT_Values.RA.addFuel(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4), null, 4, 5); GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5); GT_Values.RA.addFuel(new ItemStack(Items.ghast_tear, 1), null, 50, 5); GT_Values.RA.addFuel( @@ -170,6 +174,6 @@ public class GT_FuelLoader implements Runnable { null, Materials.NetherStar.mFuelPower * 2, Materials.NetherStar.mFuelType); - GT_Values.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketRocket_fuel", 1), null, 250, 1); + GT_Values.RA.addFuel(GT_ModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1), null, 250, 1); } } diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index 2ed494d0c0..102b41a87c 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -1,6 +1,6 @@ package gregtech.loaders.materialprocessing; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index c7ca40e111..06f7884875 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -1,6 +1,6 @@ package gregtech.loaders.misc; -import static gregtech.api.enums.ModIDs.Thaumcraft; +import static gregtech.api.enums.Mods.Thaumcraft; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 84260a32fa..614c730ede 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -5,7 +5,7 @@ import static forestry.api.core.EnumHumidity.ARID; import static forestry.api.core.EnumHumidity.DAMP; import static forestry.api.core.EnumTemperature.*; import static forestry.core.genetics.alleles.EnumAllele.*; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.loaders.misc.GT_BeeDefinitionReference.*; import java.awt.*; @@ -62,9 +62,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { // organic CLAY(GT_BranchDefinition.ORGANIC, "Clay", true, new Color(0xC8C8DA), new Color(0x0000FF), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 0), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f); beeSpecies.addProduct(new ItemStack(Items.clay_ball, 1), 0.15f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem("BiomesOPlenty", "mudball", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(BiomesOPlenty.ID, "mudball", 1, 0), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> { @@ -79,14 +79,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.requireResource(Blocks.clay, 0); // blockStainedHardenedClay }), SLIMEBALL(GT_BranchDefinition.ORGANIC, "SlimeBall", true, new Color(0x4E9E55), new Color(0x00FF15), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 15), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 15), 0.30f); beeSpecies.addProduct(new ItemStack(Items.slime_ball, 1), 0.15f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); if (TinkerConstruct.isModLoaded()) { - beeSpecies.addProduct(GT_ModHandler.getModItem(TinkerConstruct.modID, "strangeFood", 1, 0), 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(TinkerConstruct.modID, "slime.gel", 1, 2), 0.02f); + beeSpecies.addProduct(GT_ModHandler.getModItem(TinkerConstruct.ID, "strangeFood", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(TinkerConstruct.ID, "slime.gel", 1, 2), 0.02f); } }, template -> { AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.MUSHROOMS); @@ -97,13 +97,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Marshy"), CLAY, 7); if (TinkerConstruct.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(TinkerConstruct.modID, "slime.gel"), 1); + tMutation.requireResource(GameRegistry.findBlock(TinkerConstruct.ID, "slime.gel"), 1); }), PEAT(GT_BranchDefinition.ORGANIC, "Peat", true, new Color(0x906237), new Color(0x58300B), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LIGNIE), 0.30f); - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 0), 0.15f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.modID, "peat", 1, 0), 0.15f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.modID, "mulch", 1, 0), 0.05f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.15f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.ID, "peat", 1, 0), 0.15f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(Forestry.ID, "mulch", 1, 0), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> { @@ -115,7 +115,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Rural"), CLAY, 10)), STICKYRESIN(GT_BranchDefinition.ORGANIC, "StickyResin", true, new Color(0x2E8F5B), new Color(0xDCC289), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 0), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.15f); beeSpecies.addSpecialty(ItemList.IC2_Resin.get(1), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); @@ -145,7 +145,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.requireResource("blockCoal"); }), OIL(GT_BranchDefinition.ORGANIC, "Oil", true, new Color(0x4C4C4C), new Color(0x333333), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 0), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 0), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OIL), 0.75f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -160,7 +160,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); }, dis -> dis.registerMutation(COAL, STICKYRESIN, 4)), SANDWICH(GT_BranchDefinition.ORGANIC, "Sandwich", true, new Color(0x32CD32), new Color(0xDAA520), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(ItemList.Food_Sliced_Cucumber.get(1), 0.05f); beeSpecies.addSpecialty(ItemList.Food_Sliced_Onion.get(1), 0.05f); beeSpecies.addSpecialty(ItemList.Food_Sliced_Tomato.get(1), 0.05f); @@ -179,7 +179,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, FLOWERING, Flowering.FASTER); }, dis -> dis.registerMutation(getSpecies(FORESTRY, "Agrarian"), getSpecies(MAGICBEES, "TCBatty"), 10)), ASH(GT_BranchDefinition.ORGANIC, "Ash", true, new Color(0x1e1a18), new Color(0xc6c6c6), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ASH), 0.15f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); @@ -194,7 +194,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.restrictTemperature(HELLISH); }), APATITE(GT_BranchDefinition.ORGANIC, "Apatite", true, new Color(0xc1c1f6), new Color(0x676784), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.APATITE), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(WARM); @@ -210,7 +210,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), FERTILIZER(GT_BranchDefinition.ORGANIC, "Fertilizer", true, new Color(0x7fcef5), new Color(0x654525), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1), 0.2f); beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1), 0.2f); beeSpecies.addSpecialty(ItemList.FR_Fertilizer.get(1), 0.3f); @@ -234,12 +234,12 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(APATITE, ASH, 12); tMutation.restrictTemperature(HOT); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockgem2"), 8); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockgem2"), 8); }), // Tea bee, Humidity: normal, Parents: Ash and Fertilizer, Mutationrate: 10%, combrate: 10% TEA(GT_BranchDefinition.ORGANIC, "Tea", false, new Color(0x65D13A), new Color(0x9a9679), beeSpecies -> { beeSpecies.addProduct( - GT_ModHandler.getModItem("harvestcraft", "tealeafItem", 1, ItemList.Crop_Drop_TeaLeaf.get(1)), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "tealeafItem", 1, ItemList.Crop_Drop_TeaLeaf.get(1)), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(NORMAL); @@ -255,7 +255,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(PEAT, getSpecies(MAGICBEES, "Silicon"), 15); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockcasings5"), 0); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockcasings5"), 0); }), // gems @@ -291,7 +291,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Hermitic"), LAPIS, 10); - tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0); + tMutation.requireResource(GameRegistry.findBlock(AppliedEnergistics2.ID, "tile.BlockQuartz"), 0); }), FLUIX(GT_BranchDefinition.GEM, "FluixDust", true, new Color(0xA375FF), new Color(0xB591FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); @@ -300,7 +300,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(REDSTONE, LAPIS, 7); - tMutation.requireResource(GameRegistry.findBlock("appliedenergistics2", "tile.BlockFluix"), 0); + tMutation.requireResource(GameRegistry.findBlock(AppliedEnergistics2.ID, "tile.BlockFluix"), 0); }), DIAMOND(GT_BranchDefinition.GEM, "Diamond", false, new Color(0xCCFFFF), new Color(0xA3CCCC), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f); @@ -545,7 +545,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(GLOWSTONE, GOLD, 5); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockcasings"), 15); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockcasings"), 15); }), CHROME(GT_BranchDefinition.RAREMETAL, "Chrome", true, new Color(0xEBA1EB), new Color(0xF2C3F2), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); @@ -662,7 +662,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { // IC2 COOLANT(GT_BranchDefinition.IC2, "Coolant", false, new Color(0x144F5A), new Color(0x2494A2), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 4), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 4), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COOLANT), 0.15f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); @@ -681,13 +681,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { 10); tMutation.requireResource( Block.getBlockFromItem( - GT_ModHandler.getModItem("IC2", "fluidCoolant", 1) + GT_ModHandler.getModItem(IndustrialCraft2.ID, "fluidCoolant", 1) .getItem()), 0); tMutation.restrictTemperature(ICY); }), ENERGY(GT_BranchDefinition.IC2, "Energy", false, new Color(0xC11F1F), new Color(0xEBB9B9), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 12), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 12), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGY), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(WARM); @@ -707,7 +707,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { 10); tMutation.requireResource( Block.getBlockFromItem( - GT_ModHandler.getModItem("IC2", "fluidHotCoolant", 1) + GT_ModHandler.getModItem(IndustrialCraft2.ID, "fluidHotCoolant", 1) .getItem()), 0); tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(128, "Boneyard Biome")); // Boneyard Biome @@ -784,11 +784,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(FIRESTONE, COAL, 4); - tMutation.requireResource(GameRegistry.findBlock("IC2", "blockITNT"), 0); + tMutation.requireResource(GameRegistry.findBlock(IndustrialCraft2.ID, "blockITNT"), 0); }), // Alloy REDALLOY(GT_BranchDefinition.GTALLOY, "RedAlloy", false, new Color(0xE60000), new Color(0xB80000), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDALLOY), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -801,7 +801,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), REDSTONEALLOY(GT_BranchDefinition.GTALLOY, "RedStoneAlloy", false, new Color(0xA50808), new Color(0xE80000), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.REDSTONEALLOY), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -814,7 +814,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), CONDUCTIVEIRON(GT_BranchDefinition.GTALLOY, "ConductiveIron", false, new Color(0xCEADA3), new Color(0x817671), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CONDUCTIVEIRON), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(WARM); @@ -828,7 +828,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), ENERGETICALLOY(GT_BranchDefinition.GTALLOY, "EnergeticAlloy", false, new Color(0xFF9933), new Color(0xFFAD5C), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENERGETICALLOY), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -841,7 +841,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), VIBRANTALLOY(GT_BranchDefinition.GTALLOY, "VibrantAlloy", false, new Color(0x86A12D), new Color(0xC4F2AE), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.VIBRANTALLOY), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -860,7 +860,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), ELECTRICALSTEEL(GT_BranchDefinition.GTALLOY, "ElectricalSteel", false, new Color(0x787878), new Color(0xD8D8D8), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ELECTRICALSTEEL), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -872,7 +872,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.requireResource("blockElectricalSteel"); }), DARKSTEEL(GT_BranchDefinition.GTALLOY, "DarkSteel", false, new Color(0x252525), new Color(0x443B44), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DARKSTEEL), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); @@ -885,7 +885,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), PULSATINGIRON(GT_BranchDefinition.GTALLOY, "PulsatingIron", false, new Color(0x6DD284), new Color(0x006600), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 7), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 7), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PULSATINGIRON), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -939,13 +939,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(Explosive, DIAMOND, 2); if (ExtraUtilities.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(ExtraUtilities.modID, "block_bedrockium"), 0); + tMutation.requireResource(GameRegistry.findBlock(ExtraUtilities.ID, "block_bedrockium"), 0); }), // thaumic THAUMIUMDUST(GT_BranchDefinition.THAUMIC, "ThaumiumDust", true, new Color(0x7A007A), new Color(0x5C005C), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMIUMDUST), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -985,7 +985,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { // forest }), AMBER(GT_BranchDefinition.THAUMIC, "Amber", true, new Color(0xEE7700), new Color(0x774B15), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AMBER), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1000,7 +1000,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), QUICKSILVER(GT_BranchDefinition.THAUMIC, "Quicksilver", true, new Color(0x7A007A), new Color(0x5C005C), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.QUICKSILVER), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1013,7 +1013,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> dis.registerMutation(THAUMIUMDUST, SILVER, 10)), SALISMUNDUS(GT_BranchDefinition.THAUMIC, "SalisMundus", true, new Color(0xF7ADDE), new Color(0x592582), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1031,7 +1031,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { // forest }), TAINTED(GT_BranchDefinition.THAUMIC, "Tainted", true, new Color(0x904BB8), new Color(0xE800FF), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 3), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 3), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.TAINTED), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1093,7 +1093,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), THAUMINITE(GT_BranchDefinition.THAUMIC, "Thauminite", true, new Color(0x2E2D79), new Color(0x7581E0), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "comb", 1, 19), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "comb", 1, 19), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.THAUMINITE), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1106,11 +1106,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "TCOrder"), THAUMIUMDUST, 8); if (ThaumicBases.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.modID, "thauminiteBlock"), 0); + tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.ID, "thauminiteBlock"), 0); }), SHADOWMETAL(GT_BranchDefinition.THAUMIC, "ShadowMetal", true, new Color(0x100322), new Color(0x100342), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "comb", 1, 20), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "comb", 1, 20), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SHADOWMETAL), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1132,7 +1132,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }), DIVIDED(GT_BranchDefinition.THAUMIC, "Unstable", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 61), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(ExtraBees.ID, "honeyComb", 1, 61), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIVIDED), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1145,7 +1145,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(DIAMOND, IRON, 3); if (ExtraUtilities.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(ExtraUtilities.modID, "decorativeBlock1"), 5); + tMutation.requireResource(GameRegistry.findBlock(ExtraUtilities.ID, "decorativeBlock1"), 5); }), CAELESTIS(GT_BranchDefinition.THAUMIC, "Caelestis", true, new Color(0xF0F0F0), new Color(0xDCDCDC), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CAELESTISRED), 0.60f); @@ -1162,7 +1162,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> dis.registerMutation(DIAMOND, DIVIDED, 10)), SPARKELING(GT_BranchDefinition.THAUMIC, "NetherStar", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 3), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 1, 3), 0.20f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SPARKELING), 0.125f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1184,7 +1184,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), ESSENTIA(GT_BranchDefinition.THAUMIC, "Essentia", true, new Color(0x7A007A), new Color(0xFFFFFF), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("MagicBees", "miscResources", 1, 3), 0.20f); + beeSpecies.addProduct(GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 1, 3), 0.20f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> { @@ -1195,7 +1195,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SHADOWMETAL, SPARKELING, 5); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 6); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 6); }), // radioctive @@ -1270,7 +1270,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NAQUADAH, THAUMIUMSHARD, 2); if (AdvancedSolarPanel.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(AdvancedSolarPanel.modID, "BlockAdvSolarPanel"), 2); + tMutation.requireResource(GameRegistry.findBlock(AdvancedSolarPanel.ID, "BlockAdvSolarPanel"), 2); tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome }), THORIUM(GT_BranchDefinition.RADIOACTIVE, "Thorium", false, new Color(0x005000), new Color(0x001E00), beeSpecies -> { @@ -1389,7 +1389,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(HYDRA, THAUMIUMDUST, 5); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCosmeticSolid"), 4); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCosmeticSolid"), 4); tMutation.restrictTemperature(HELLISH); }), SNOWQUEEN(GT_BranchDefinition.TWILIGHT, "SnowQueen", true, new Color(0xD02001), new Color(0x9C0018), beeSpecies -> { @@ -1402,12 +1402,12 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> {}, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(URGHAST, SALISMUNDUS, 4); if (ThaumicBases.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.modID, "blockSalisMundus"), 0); + tMutation.requireResource(GameRegistry.findBlock(ThaumicBases.ID, "blockSalisMundus"), 0); tMutation.restrictTemperature(ICY); }), // HEE ENDDUST(GT_BranchDefinition.HEE, "End Dust", true, new Color(0xCC00FA), new Color(0x003A7D), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDDUST), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1417,11 +1417,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "end_powder_ore"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "end_powder_ore"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), ENDIUM(GT_BranchDefinition.HEE, "Endium", true, new Color(0xa0ffff), new Color(0x2F5A6C), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDIUM), 0.10f); beeSpecies.addSpecialty(GT_Bees.propolis.getStackForType(PropolisType.Endium), 0.15f); beeSpecies.addSpecialty(GT_Bees.drop.getStackForType(DropType.ENDERGOO), 0.10f); @@ -1435,7 +1435,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), STARDUST(GT_BranchDefinition.HEE, "Star Dust", true, new Color(0xffff00), new Color(0xDCBE13), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STARDUST), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1448,11 +1448,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), ZINC, 8); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "stardust_ore"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "stardust_ore"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), ECTOPLASMA(GT_BranchDefinition.HEE, "Ectoplasma", true, new Color(0xDCB0E5), new Color(0x381C40), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1465,12 +1465,12 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(FORESTRY, "Ended"), ENDDUST, 5); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "spooky_log"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "spooky_log"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), ARCANESHARDS(GT_BranchDefinition.HEE, "Arcane Shards", true, new Color(0x9010AD), new Color(0x333D82), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ARCANESHARD), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1482,14 +1482,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMSHARD, ENDDUST, 5); tMutation.restrictHumidity(ARID); - if (HardcoreEnderExpansion.isModLoaded()) tMutation.requireResource( - GameRegistry.findBlock(HardcoreEnderExpansion.modID, "laboratory_floor"), - 0); + if (HardcoreEnderExpansion.isModLoaded()) + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "laboratory_floor"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, new Color(0xFFA12B), new Color(0x911ECE), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DRAGONESSENCE), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1503,11 +1502,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(ECTOPLASMA, ARCANESHARDS, 4); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "essence_altar"), 1); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "essence_altar"), 1); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), FIREESSENCE(GT_BranchDefinition.HEE, "Fireessence", true, new Color(0xD41238), new Color(0xFFA157), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIREESSENSE), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); @@ -1521,11 +1520,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(FIRESTONE, ARCANESHARDS, 4); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "essence_altar"), 2); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "essence_altar"), 2); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), ENDERMANHEAD(GT_BranchDefinition.HEE, "Enderman", true, new Color(0x161616), new Color(0x6200e7), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERMAN), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1539,11 +1538,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(ENDERIUM, STARDUST, 4); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "ender_goo"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "ender_goo"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), SILVERFISH(GT_BranchDefinition.HEE, "Silverfisch", true, new Color(0xEE053D), new Color(0x000000), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVERFISH), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -1557,11 +1556,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(ECTOPLASMA, STARDUST, 5); tMutation.restrictHumidity(ARID); if (HardcoreEnderExpansion.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "ender_goo"), 0); + tMutation.requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.ID, "ender_goo"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), RUNE(GT_BranchDefinition.HEE, "Rune", true, new Color(0xE31010), new Color(0x0104D9), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.modID, "beeCombs", 1, 8), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(Forestry.ID, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEI), 0.025f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEII), 0.0125f); beeSpecies.setHumidity(ARID); @@ -1577,7 +1576,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { .setIsSecret(); tMutation.restrictHumidity(ARID); if (EnderStorage.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(EnderStorage.modID, "enderChest"), 0); + tMutation.requireResource(GameRegistry.findBlock(EnderStorage.ID, "enderChest"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), // Walrus Bee, 100% Combchance, Parents: Catty and Watery @@ -1599,7 +1598,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { 45, 2); if (ExtraCells2.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(ExtraCells2.modID, "walrus"), 0); + tMutation.requireResource(GameRegistry.findBlock(ExtraCells2.ID, "walrus"), 0); } }), // Space Bees @@ -1654,7 +1653,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, LEAD, 7); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Ledox"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Ledox"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim } }), @@ -1672,7 +1671,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, getSpecies(EXTRABEES, "freezing"), 7); if (NewHorizonsCoreMod.isModLoaded()) tMutation.requireResource( - GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.CallistoColdIce"), + GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.CallistoColdIce"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto // Dim @@ -1691,7 +1690,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(IO, MITHRIL, 6); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Mytryl"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Mytryl"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim } }), @@ -1708,7 +1707,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(VENUS, OSMIUM, 6); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Quantinum"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Quantinum"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim } }), @@ -1724,7 +1723,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(LEAD, OBERON, 5); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "metalsblock"), 6); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "metalsblock"), 6); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim } }), @@ -1742,7 +1741,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(ENCELADUS, EMERALD, 3); if (NewHorizonsCoreMod.isModLoaded()) tMutation.requireResource( - GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.MysteriousCrystal"), + GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.MysteriousCrystal"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus // Dim @@ -1762,7 +1761,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, PLUTONIUM, 2); if (NewHorizonsCoreMod.isModLoaded()) tMutation.requireResource( - GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.BlackPlutonium"), + GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.BlackPlutonium"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim } @@ -1786,9 +1785,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { // Planet Line MOON(GT_BranchDefinition.PLANET, "Moon", false, new Color(0x373735), new Color(0x7E7E78), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MOON), 0.35f); - if (NewHorizonsCoreMod.isModLoaded()) beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MoonStoneDust", 1, 0), - 0.10f); + if (NewHorizonsCoreMod.isModLoaded()) + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -1796,13 +1794,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SPACE, CLAY, 25); if (GalacticraftCore.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalacticraftCore.modID, "tile.moonBlock"), 4); + tMutation.requireResource(GameRegistry.findBlock(GalacticraftCore.ID, "tile.moonBlock"), 4); } tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28, "Moon")); // Moon Dim }), MARS(GT_BranchDefinition.PLANET, "Mars", false, new Color(0x220D05), new Color(0x3A1505), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MarsStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1810,14 +1808,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MOON, IRON, 20); if (GalacticraftMars.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalacticraftMars.modID, "tile.mars"), 5); + tMutation.requireResource(GameRegistry.findBlock(GalacticraftMars.ID, "tile.mars"), 5); } tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim }), PHOBOS(GT_BranchDefinition.PLANET, "Phobos", true, new Color(0x220D05), new Color(0x7a5706), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); if (NewHorizonsCoreMod.isModLoaded()) beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PhobosStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PhobosStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); @@ -1825,51 +1823,41 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MARS, MOON, 20); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "phobosblocks"), 2); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "phobosblocks"), 2); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(38, "Phobos")); // Phobos Dim }), DEIMOS(GT_BranchDefinition.PLANET, "Deimos", true, new Color(0x220D05), new Color(0x7a3206), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.DeimosStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.DeimosStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MARS, SPACE, 20); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "deimosblocks"), 1); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "deimosblocks"), 1); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(40, "Deimos")); // Deimos Dim }), CERES(GT_BranchDefinition.PLANET, "Ceres", true, new Color(0x3ca5b7), new Color(0x1e7267), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CeresStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CeresStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MARS, METEORICIRON, 20); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "ceresblocks"), 1); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "ceresblocks"), 1); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(42, "Ceres")); // Ceres Dim }), JUPITER(GT_BranchDefinition.PLANET, "Jupiter", false, new Color(0x734B2E), new Color(0xD0CBC4), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoIceDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IoStoneDust", 1, 0), 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaIceDust", 1, 0), 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.GanymedeStoneDust", 1, 0), - 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1877,27 +1865,24 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MARS, DESH, 15); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Ledox"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Ledox"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim }), IO(GT_BranchDefinition.PLANET, "IO", true, new Color(0x734B2E), new Color(0xe5701b), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "volcanic"), 15); tMutation.restrictTemperature(HELLISH); - if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "ioblocks"), 0); + if (GalaxySpace.isModLoaded()) tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "ioblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO")); // IO Dim }), EUROPA(GT_BranchDefinition.PLANET, "Europa", true, new Color(0x5982ea), new Color(0x0b36a3), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1, 0), - 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -1905,137 +1890,115 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, IRON, 15); tMutation.restrictTemperature(ICY); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "europagrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "europagrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim }), GANYMEDE(GT_BranchDefinition.PLANET, "Ganymede", true, new Color(0x3d1b10), new Color(0x190c07), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.GanymedeStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TITANIUM, 15); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "ganymedeblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "ganymedeblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(43, "Ganymede")); // Ganymede Dim }), CALLISTO(GT_BranchDefinition.PLANET, "Callisto", true, new Color(0x0f333d), new Color(0x0d84a5), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoStoneDust", 1, 0), - 0.10f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoIceDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, getSpecies(EXTRABEES, "artic"), 15); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "callistoblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "callistoblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto Dim }), SATURN(GT_BranchDefinition.PLANET, "Saturn", false, new Color(0xD2A472), new Color(0xF8C37B), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitanStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.05f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusIceDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, LEDOX, 25, 2); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Quantinum"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.Quantinum"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteriods")); // Asteriods Dim }), ENCELADUS(GT_BranchDefinition.PLANET, "Enceladus", true, new Color(0xD2A472), new Color(0x193fa0), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusStoneDust", 1, 0), - 0.10f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusIceDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SATURN, CHROME, 25, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "enceladusblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "enceladusblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus Dim }), TITAN(GT_BranchDefinition.PLANET, "Titan", true, new Color(0xa0641b), new Color(0x7c1024), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitanStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SATURN, NICKEL, 25, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "titanblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "titanblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(44, "Titan")); // Titan Dim }), URANUS(GT_BranchDefinition.PLANET, "Uranus", false, new Color(0x75C0C9), new Color(0x84D8EC), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1, 0), - 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(SATURN, TRINIUM, 10); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "metalsblock"), 6); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "metalsblock"), 6); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim }), MIRANDA(GT_BranchDefinition.PLANET, "Miranda", true, new Color(0x75C0C9), new Color(0x0d211c), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(URANUS, TIN, 10); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "mirandablocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "mirandablocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(86, "Miranda")); // Miranda Dim }), OBERON(GT_BranchDefinition.PLANET, "Oberon", true, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(URANUS, IRIDIUM, 10); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "oberonblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "oberonblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim }), NEPTUNE(GT_BranchDefinition.PLANET, "Neptune", false, new Color(0x334CFF), new Color(0x576DFF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1, 0), - 0.05f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1, 0), - 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -2043,41 +2006,37 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(URANUS, ORIHARUKON, 7); if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.MysteriousCrystal"), 0); + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.ID, "tile.MysteriousCrystal"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids")); // Asteroids Dim }), PROTEUS(GT_BranchDefinition.PLANET, "Proteus", true, new Color(0x334CFF), new Color(0x592610), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, COPPER, 7); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "proteusblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "proteusblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(47, "Proteus")); // Proteus Dim }), TRITON(GT_BranchDefinition.PLANET, "Triton", true, new Color(0x334CFF), new Color(0x421118), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, GOLD, 7); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "tritonblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tritonblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(48, "Triton")); // Triton Dim }), PLUTO(GT_BranchDefinition.PLANET, "Pluto", false, new Color(0x34271E), new Color(0x69503D), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLUTO), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoStoneDust", 1, 0), 0.10f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -2085,39 +2044,35 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NEPTUNE, PLUTONIUM, 5); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "plutoblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "plutoblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto")); // Pluto Dim }), HAUMEA(GT_BranchDefinition.PLANET, "Haumea", false, new Color(0x1C1413), new Color(0x392B28), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HAUMEA), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.HaumeaStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADAH, 7, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "haumeablocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "haumeablocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(83, "Haumea")); // Haumea Dim }), MAKEMAKE(GT_BranchDefinition.PLANET, "MakeMake", false, new Color(0x301811), new Color(0x120A07), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MAKEMAKE), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MakeMakeStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, NAQUADRIA, 7, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "makemakegrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "makemakegrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(25, "MakeMake")); // MakeMake Dim }), CENTAURI(GT_BranchDefinition.PLANET, "Centauri", false, new Color(0x2F2A14), new Color(0xB06B32), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.35f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriASurfaceDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); @@ -2125,13 +2080,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, DESH, 3); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "acentauribbgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "acentauribbgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim }), ACENTAURI(GT_BranchDefinition.PLANET, "aCentauri", false, new Color(0x2F2A14), new Color(0xa01e14), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.25f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriASurfaceDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); @@ -2141,15 +2096,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { public void accept(GT_BeeDefinition dis) { IBeeMutationCustom tMutation = dis.registerMutation(CENTAURI, INFINITYCATALYST, 3); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "acentauribbgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "acentauribbgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(31, "aCentauri")); // aCentauri Dim } }), TCETI(GT_BranchDefinition.PLANET, "tCeti", false, new Color(0x46241A), new Color(0x7B412F), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.35f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), - 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); @@ -2157,29 +2110,25 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, HAUMEA, 5, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "tcetieblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tcetieblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim }), TCETIE(GT_BranchDefinition.PLANET, "tCetiE", false, new Color(0x2d561b), new Color(0x0c0f60), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), - 0.10f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(TCETI, getSpecies(MAGICBEES, "TCWater"), 5, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "tcetieblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tcetieblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim }), // Parents: TCETI and TCETIE, 25% combchance, needs Damp Humidity and Normal temperature. Is Mycophilic SEAWEED(GT_BranchDefinition.PLANET, "SeaWeed", true, new Color(0xCBCBCB), new Color(0x83FF83), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SEAWEED), 0.25f); - beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), - 0.15f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1, 0), 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); @@ -2193,17 +2142,17 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(TCETI, TCETIE, 5, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "tcetieblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "tcetieblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(85, "tCeti E")); // tCeti E Dim }), BARNARDA(GT_BranchDefinition.PLANET, "Barnarda", false, new Color(0x0D5A0D), new Color(0xE6C18D), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.35f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaEStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.05f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaFStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); @@ -2211,7 +2160,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, THORIUM, 3, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "barnardaEgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaEgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt Dim }), BARNARDAC(GT_BranchDefinition.PLANET, "BarnardaC", false, new Color(0x0D5A0D), new Color(0x473f0a), beeSpecies -> { @@ -2221,48 +2170,48 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, AMERICIUM, 3, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "barnardaEgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaEgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(32, "Barnarda C")); // Barnarda C Dim } }), BARNARDAE(GT_BranchDefinition.PLANET, "BarnardaE", false, new Color(0x0D5A0D), new Color(0x4c1f0a), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaEStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, DIVIDED, 3, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "barnardaEgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaEgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(81, "Barnard E")); // "Barnard E Dim } }), BARNARDAF(GT_BranchDefinition.PLANET, "BarnardaF", false, new Color(0x0D5A0D), new Color(0x1e0b49), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f); beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaFStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(BARNARDA, NEUTRONIUM, 3, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "barnardaFgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "barnardaFgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(82, "Barnard F")); // "Barnard F Dim } }), VEGA(GT_BranchDefinition.PLANET, "Vega", false, new Color(0x1A2036), new Color(0xB5C0DE), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f); - beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VegaBStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.05f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(MAKEMAKE, NAQUADAH, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "vegabgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "vegabgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(33, "Kuiper Belt")); // Kuiper Belt // Dim } @@ -2270,14 +2219,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { VEGAB(GT_BranchDefinition.PLANET, "VegaB", false, new Color(0x1A2036), new Color(0x81e261), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f); if (NewHorizonsCoreMod.isModLoaded()) beeSpecies.addSpecialty( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VegaBStoneDust", 1, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1, 0), 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(VEGA, NAQUADRIA, 2); if (GalaxySpace.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "vegabgrunt"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "vegabgrunt"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(84, "VegaB")); // VegaB Dim } }), @@ -2289,7 +2238,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, TUNGSTEN, 25, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "mercuryblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "mercuryblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(37, "Mercury")); // Mercury Dim }), VENUS(GT_BranchDefinition.PLANET, "Venus", false, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> { @@ -2300,7 +2249,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, MITHRIL, 25, 2); if (GalaxySpace.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.modID, "venusblocks"), 0); + tMutation.requireResource(GameRegistry.findBlock(GalaxySpace.ID, "venusblocks"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus")); // Venus Dim }), @@ -2317,7 +2266,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NEUTRONIUM, BARNARDAF, 7, 10); if (Avaritia.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Avaritia.modID, "Resource_Block"), 0); + tMutation.requireResource(GameRegistry.findBlock(Avaritia.ID, "Resource_Block"), 0); }), INFINITYCATALYST(GT_BranchDefinition.PLANET, "InfinityCatalyst", false, new Color(0xFFFFFF), new Color(0xFFFFFF), beeSpecies -> { @@ -2335,7 +2284,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IMutationCustom tMutation = dis.registerMutation(DOB, COSMICNEUTRONIUM, 3, 10) .setIsSecret(); if (Avaritia.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(Avaritia.modID, "Resource_Block"), 1); + tMutation.requireResource(GameRegistry.findBlock(Avaritia.ID, "Resource_Block"), 1); } }), INFINITY(GT_BranchDefinition.PLANET, "Infinity", false, new Color(0xFFFFFF), new Color(0xFFFFFF), beeSpecies -> { @@ -2349,7 +2298,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, COSMICNEUTRONIUM, 1, 10); if (AvaritiaAddons.isModLoaded()) { - tMutation.requireResource(GameRegistry.findBlock(AvaritiaAddons.modID, "InfinityChest"), 0); + tMutation.requireResource(GameRegistry.findBlock(AvaritiaAddons.ID, "InfinityChest"), 0); } }), KEVLAR(GT_BranchDefinition.IC2, "kevlar", false, new Color(0x2d542f), new Color(0xa2baa3), beeSpecies -> { @@ -2486,7 +2435,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { 15); tMutation.restrictTemperature(HOT); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 0); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 0); }), FIRE(GT_BranchDefinition.INFUSEDSHARD, "Fire", false, new Color(0xED3801), new Color(0x3B0E00), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDIGNIS), 0.30f); @@ -2496,7 +2445,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "Supernatural"), AIR, 15); tMutation.restrictTemperature(HELLISH); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 1); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 1); }), WATER(GT_BranchDefinition.INFUSEDSHARD, "Water", false, new Color(0x0090FF), new Color(0x002542), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDAQUA), 0.30f); @@ -2506,7 +2455,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(FIRE, AIR, 15); tMutation.restrictTemperature(ICY); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 2); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 2); }), EARTH(GT_BranchDefinition.INFUSEDSHARD, "Earth", false, new Color(0x008600), new Color(0x003300), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDTERRA), 0.30f); @@ -2516,7 +2465,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(WATER, FIRE, 15); tMutation.restrictTemperature(WARM); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 3); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 3); }), ORDER(GT_BranchDefinition.INFUSEDSHARD, "Order", false, new Color(0x8A97B0), new Color(0x5C5F62), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDORDO), 0.30f); @@ -2526,7 +2475,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(EARTH, FIRE, 15); tMutation.restrictTemperature(ICY); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 4); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 4); }), CHAOS(GT_BranchDefinition.INFUSEDSHARD, "Chaos", false, new Color(0x2E2E41), new Color(0x232129), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFUSEDPERDITIO), 0.30f); @@ -2536,7 +2485,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = dis.registerMutation(ORDER, FIRE, 15); tMutation.restrictTemperature(ICY); if (Thaumcraft.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 5); + tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.ID, "blockCrystal"), 5); }), NETHERSHARD(GT_BranchDefinition.INFUSEDSHARD, "Nethershard", false, new Color(0xBE0135), new Color(0x350211), beeSpecies -> { @@ -2546,7 +2495,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(CHAOS, FIRE, 15); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockgem3"), 3); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockgem3"), 3); }), ENDSHARD(GT_BranchDefinition.INFUSEDSHARD, "Endshard", false, new Color(0x2E2E41), new Color(0x232129), beeSpecies -> { @@ -2557,7 +2506,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(NETHERSHARD, ENDDUST, 15); tMutation.restrictTemperature(ICY); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockgem1"), 7); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockgem1"), 7); }), // Organic branch 2.0 UNKNOWNWATER(GT_BranchDefinition.ORGANIC, "UnknownWater", false, new Color(0x4333A5), new Color(0x36ABFF), @@ -2571,13 +2520,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { // Endgame bees JAEGERMEISTER(GT_BranchDefinition.ENDGAME, "JaegerMeister", false, new Color(0x05AD18), new Color(0xE7DAC3), beeSpecies -> { - beeSpecies.addProduct(GT_ModHandler.getModItem("berriespp", "BppPotions", 1L, 8), 0.01f); + beeSpecies.addProduct(GT_ModHandler.getModItem(CropsPlusPlus.ID, "BppPotions", 1L, 8), 0.01f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, NAQUADRIA, 5); - tMutation.requireResource(GameRegistry.findBlock("gregtech", "gt.blockmachines"), 4684); + tMutation.requireResource(GameRegistry.findBlock(GregTech.ID, "gt.blockmachines"), 4684); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(100, "Deep Dark")); // Deep Dark // dim }); diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java index aba1fefc1b..49c5e7e1df 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Bees.java +++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java @@ -1,6 +1,6 @@ package gregtech.loaders.misc; -import static gregtech.api.enums.ModIDs.Forestry; +import static gregtech.api.enums.Mods.Forestry; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index ec380c5c32..43a0656ae4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.Mods.GregTech; + import net.minecraft.item.ItemStack; import gregtech.api.enums.ItemList; @@ -17,10 +19,10 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals("gregtech")) return; + if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals(GregTech.ID)) return; switch (aMaterial.mName) { case "Good", "Data", "Elite", "Master", "Ultimate", "Superconductor", "Infinite", "Bio" -> { - if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals("gregtech")) + if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals(GregTech.ID)) GT_ModHandler.removeRecipeByOutputDelayed(aStack); } case "Primitive", "Advanced" -> GT_ModHandler.removeRecipeByOutputDelayed(aStack); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index e56888c64f..2e9cb9a1d1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -1,6 +1,8 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.BuildCraftSilicon; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -40,13 +42,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 13), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 13), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( @@ -89,13 +91,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 14), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 14), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( @@ -168,13 +170,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 15), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 15), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( @@ -217,13 +219,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("BuildCraft|Silicon", "redstoneChipset", 1L, 0), + GT_ModHandler.getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0), 50, 120); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.foil, Materials.RedAlloy, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EtchedLowVoltageWiring", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EtchedLowVoltageWiring", 1L, 0), 200, 16); GT_Values.RA.addLaserEngraverRecipe( @@ -317,13 +319,13 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.WroughtIron, 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 19), 2000, 1920); GT_Values.RA.addLaserEngraverRecipe( @@ -345,9 +347,9 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 50, 16); GT_Values.RA.addLaserEngraverRecipe( - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartz", 1L), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L), GT_Utility.copyAmount(0L, aStack), - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1L), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L), 50, 16); GT_Values.RA.addLaserEngraverRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 04ef7c4731..7a6a3ec004 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -1,5 +1,6 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.util.GT_Utility.calculateRecipeEU; import net.minecraft.item.ItemStack; @@ -149,7 +150,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.addElectrolyzerRecipe( aStack, 0, - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1), null, null, null, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index 4bb3dd2072..c3b57a61b7 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.Mods.Railcraft; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -98,7 +100,7 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Creosote.getFluid(1000L), - GT_ModHandler.getModItem("Railcraft", "tile.railcraft.cube", 1L, 8), + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.cube", 1L, 8), null, null, null, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java index de46e9d2f1..9d2bad9783 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java @@ -1,6 +1,6 @@ package gregtech.loaders.oreprocessing; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.Railcraft; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java index 72239056cd..7588139cfc 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java @@ -1,5 +1,7 @@ package gregtech.loaders.oreprocessing; +import static gregtech.api.enums.Mods.Railcraft; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -77,7 +79,7 @@ public class ProcessingStone implements IOreRecipeRegistrator { GT_ModHandler.addPulverisationRecipe( GT_Utility.copyAmount(1L, aStack), GT_ModHandler.getModItem( - "Railcraft", + Railcraft.ID, "cube.crushed.obsidian", 1L, GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L)), diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 464b84d11b..5cf6a56ce4 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload; -import static gregtech.api.enums.ModIDs.*; -import static gregtech.api.enums.ModIDs.GraviSuite; +import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.GraviSuite; import static gregtech.api.util.GT_ModHandler.getModItem; import java.util.Arrays; @@ -152,18 +152,18 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("dynamite", 1L)); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("industrialTnt", 1L)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 0)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 1)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 2)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 3)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 4)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 5)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "stamps", 1L, 6)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 0)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 1)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 2)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 3)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 4)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 5)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "stamps", 1L, 6)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 0)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 1)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 2)); - GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 4)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 0)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 1)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 2)); + GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem(Forestry.ID, "engine", 1L, 4)); ItemStack tStack = GT_ModHandler.removeRecipe( new ItemStack(Blocks.planks, 1, 0), @@ -2119,37 +2119,37 @@ public class GT_CraftingRecipeLoader implements Runnable { if (GraviSuite.isModLoaded()) { GT_ModHandler.removeRecipeByOutputDelayed( - GT_ModHandler.getModItem(GraviSuite.modID, "advNanoChestPlate", 1, GT_Values.W)); + GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GT_Values.W)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getModItem(GraviSuite.modID, "advNanoChestPlate", 1, GT_Values.W), + GT_ModHandler.getModItem(GraviSuite.ID, "advNanoChestPlate", 1, GT_Values.W), bits_no_remove_buffered, new Object[] { "CJC", "TNT", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Advanced), 'T', OrePrefixes.plate.get(Materials.TungstenSteel), 'J', - GT_ModHandler.getModItem(GraviSuite.modID, "advJetpack", 1, GT_Values.W), 'N', - GT_ModHandler.getModItem("IC2", "itemArmorNanoChestplate", 1, GT_Values.W), 'W', - OrePrefixes.wireGt12.get(Materials.Platinum), 'P', + GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W), 'N', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoChestplate", 1, GT_Values.W), + 'W', OrePrefixes.wireGt12.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.Elite) }); GT_ModHandler.removeRecipeByOutputDelayed( - GT_ModHandler.getModItem(GraviSuite.modID, "advLappack", 1, GT_Values.W)); + GT_ModHandler.getModItem(GraviSuite.ID, "advLappack", 1, GT_Values.W)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getModItem(GraviSuite.modID, "advLappack", 1, GT_Values.W), + GT_ModHandler.getModItem(GraviSuite.ID, "advLappack", 1, GT_Values.W), bits_no_remove_buffered, new Object[] { "CEC", "EJE", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', - GT_ModHandler.getModItem("IC2", "itemArmorEnergypack", 1L, GT_Values.W), 'E', - GT_ModHandler.getModItem("IC2", "itemBatCrystal", 1L, GT_Values.W), 'W', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorEnergypack", 1L, GT_Values.W), 'E', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, GT_Values.W), 'W', OrePrefixes.wireGt04.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.Data) }); GT_ModHandler.removeRecipeByOutputDelayed( - GT_ModHandler.getModItem(GraviSuite.modID, "advJetpack", 1, GT_Values.W)); + GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W)); GT_ModHandler.addCraftingRecipe( - GT_ModHandler.getModItem(GraviSuite.modID, "advJetpack", 1, GT_Values.W), + GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W), bits_no_remove_buffered, new Object[] { "CJC", "EXE", "YZY", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', - GT_ModHandler.getModItem("IC2", "itemArmorJetpackElectric", 1, GT_Values.W), 'E', - OrePrefixes.plate.get(Materials.Titanium), 'X', - GT_ModHandler.getModItem("IC2", "itemArmorAlloyChestplate", 1L), 'Z', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1, GT_Values.W), + 'E', OrePrefixes.plate.get(Materials.Titanium), 'X', + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAlloyChestplate", 1L), 'Z', OrePrefixes.circuit.get(Materials.Data), 'Y', OrePrefixes.wireGt02.get(Materials.Platinum) }); } @@ -2174,7 +2174,7 @@ public class GT_CraftingRecipeLoader implements Runnable { ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), bits, new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', - GT_ModHandler.getModItem(BartWorks.modID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', + GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', OrePrefixes.frameGt.get(Materials.Chrome) }); } @@ -2189,8 +2189,8 @@ public class GT_CraftingRecipeLoader implements Runnable { ItemList.Plank_Pine.get(2L), ItemList.Plank_Plum.get(2L), ItemList.Plank_Maple.get(2L), ItemList.Plank_Citrus.get(2L) }; for (int i = 0; i < coverIDs.length; i++) { - ItemStack slabWood = getModItem(Forestry.modID, "slabs", 1, i); - ItemStack slabWoodFireproof = getModItem(Forestry.modID, "slabsFireproof", 1, i); + ItemStack slabWood = getModItem(Forestry.ID, "slabs", 1, i); + ItemStack slabWoodFireproof = getModItem(Forestry.ID, "slabsFireproof", 1, i); GT_ModHandler.addCraftingRecipe( coverIDs[i], diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 2d9e2b859a..6053311f40 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload; -import static gregtech.api.enums.ModIDs.NotEnoughItems; +import static gregtech.api.enums.Mods.NotEnoughItems; import gregtech.api.enums.Materials; import gregtech.loaders.postload.chains.GT_BauxiteRefineChain; diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index c2af777700..5af192f33f 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload; import static gregtech.api.enums.GT_Values.VP; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; @@ -245,7 +245,7 @@ public class GT_PostLoad { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1, Short.MAX_VALUE)) + GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1, Short.MAX_VALUE)) .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), @@ -257,7 +257,7 @@ public class GT_PostLoad { if (GalacticraftMars.isModLoaded()) GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1, Short.MAX_VALUE)) + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1, Short.MAX_VALUE)) .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), @@ -270,7 +270,7 @@ public class GT_PostLoad { for (int i = 4; i < 9; i++) { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, - new ItemStack[] { GT_ModHandler.getModItem("GalaxySpace", "item.SchematicTier" + i, 1) + new ItemStack[] { GT_ModHandler.getModItem(GalaxySpace.ID, "item.SchematicTier" + i, 1) .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), @@ -573,7 +573,7 @@ public class GT_PostLoad { GT_OreDictUnificator.get(OrePrefixes.rod, Materials.Blaze, 1)); if (Thaumcraft.isModLoaded()) { GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels.addSolidRecipe( - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1)); } } diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index be48d7b45b..63e4ab98ea 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -1,7 +1,9 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.ModIDs.GTPlusPlus; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.util.GT_ModHandler.getModItem; import net.minecraft.item.ItemStack; @@ -19,9 +21,9 @@ public class GT_NaniteChain { public static void run() { - ItemStack aUVTierLens = getModItem(NewHorizonsCoreMod.modID, "item.MysteriousCrystalLens", 0); - ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.modID, "item.ChromaticLens", 0); - ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.modID, "item.RadoxPolymerLens", 0); + ItemStack aUVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0); + ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0); + ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.RadoxPolymerLens", 0); ItemStack aUIVTierLens = ItemList.EnergisedTesseract.get(0); ItemStack aUMVTierLens = GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false); @@ -66,7 +68,8 @@ public class GT_NaniteChain { // Carbon Nanites - Used to make more Nano Forge Controllers GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUVTierLens, getModItem("bartworks", "bw.werkstoffblockscasingadvanced.01", 8, 31776), + new ItemStack[] { aUVTierLens, + getModItem(BartWorks.ID, "bw.werkstoffblockscasingadvanced.01", 8, 31776), ItemList.Circuit_Chip_SoC.get(64) }, new FluidStack[] { Materials.UUMatter.getFluid(200_000) }, new ItemStack[] { Materials.Carbon.getNanite(64), }, @@ -101,7 +104,7 @@ public class GT_NaniteChain { // Glowstone Nanites - Used in the optical circuit line GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUEVTierLens, getModItem(GTPlusPlus.modID, "blockCompressedObsidian", 8, 7), // Double + new ItemStack[] { aUEVTierLens, getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 8, 7), // Double // compressed // glowstone // blocks @@ -143,13 +146,13 @@ public class GT_NaniteChain { // White Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto - // lens - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any + new ItemStack[] { aUMVTierLens, getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto + // lens + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any // better naming Materials.WhiteDwarfMatter.getBlocks(8), - getModItem(NewHorizonsCoreMod.modID, "item.PicoWafer", 32), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), Materials.Space.getMolten(720), }, @@ -162,13 +165,13 @@ public class GT_NaniteChain { // Black Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto - // lens - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any + new ItemStack[] { aUMVTierLens, getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto + // lens + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any // better naming Materials.BlackDwarfMatter.getBlocks(8), - getModItem(NewHorizonsCoreMod.modID, "item.PicoWafer", 32), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), Materials.Time.getMolten(720), }, @@ -183,10 +186,10 @@ public class GT_NaniteChain { GT_Values.RA.addNanoForgeRecipe( new ItemStack[] { aUMVTierLens, // Quantum Anomaly, couldn't find any better naming. - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8), + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8), ItemList.Optically_Perfected_CPU.get(16), ItemList.Optically_Compatible_Memory.get(16), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576), Materials.UUMatter.getFluid(1_000_000), }, diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 8cbdc42301..51f8c930bf 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -1,6 +1,7 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.ModIDs.GTPlusPlus; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.ArrayList; import java.util.List; @@ -59,7 +60,7 @@ public class GT_PCBFactoryRecipes { 30 * 20, (int) GT_Values.VP[9]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.modID, "blockFrameGtCelestialTungsten", 1), + new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), Materials.get("Quantum") .getPlates(6) }, null, @@ -67,7 +68,7 @@ public class GT_PCBFactoryRecipes { 30 * 20, (int) GT_Values.VP[11]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.modID, "blockFrameGtHypogen", 1), + new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6) }, Materials.SpaceTime.getMolten(144 * 8), @@ -608,7 +609,7 @@ public class GT_PCBFactoryRecipes { GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( - "bartworks", + BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), @@ -642,7 +643,7 @@ public class GT_PCBFactoryRecipes { GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( - "bartworks", + BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), @@ -676,7 +677,7 @@ public class GT_PCBFactoryRecipes { GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( - "bartworks", + BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index 779bd00d32..ae4f840c85 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -198,7 +198,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)) .noFluidInputs() .noFluidOutputs() @@ -207,7 +207,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -218,7 +218,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) @@ -229,7 +229,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)) .noFluidInputs() .noFluidOutputs() @@ -238,7 +238,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -249,7 +249,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L)) @@ -260,7 +260,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -269,7 +269,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3)) .noFluidInputs() .noFluidOutputs() @@ -278,7 +278,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L)) @@ -289,7 +289,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L)) .noFluidInputs() .noFluidOutputs() @@ -298,7 +298,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -309,7 +309,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L)) @@ -320,7 +320,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -329,7 +329,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -340,7 +340,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L)) @@ -351,7 +351,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L)) .noFluidInputs() .noFluidOutputs() @@ -360,7 +360,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -371,7 +371,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L)) @@ -382,7 +382,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -391,7 +391,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -402,7 +402,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NiobiumTitanium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L)) @@ -413,7 +413,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -422,7 +422,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -433,7 +433,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Enderium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L)) @@ -444,7 +444,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -453,7 +453,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -464,7 +464,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L)) @@ -475,7 +475,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L)) .noFluidInputs() .noFluidOutputs() @@ -484,7 +484,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -495,7 +495,7 @@ public class ArcFurnaceRecipes implements Runnable { .addTo(UniversalArcFurnace); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 12L), GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 06c4ad1879..3ee78d3548 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; import static gregtech.api.util.GT_RecipeBuilder.*; @@ -494,7 +494,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0), + getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0), new ItemStack(Items.lead, 1, 32767)) .itemOutputs(new ItemStack(Items.name_tag, 1, 0)) .fluidInputs(Materials.Glue.getFluid(72)) @@ -527,9 +527,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfLife1", 4L, 0), + getModItem(TwilightForest.ID, "item.charmOfLife1", 4L, 0), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfLife2", 1L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfLife2", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -538,9 +538,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping1", 4L, 0), + getModItem(TwilightForest.ID, "item.charmOfKeeping1", 4L, 0), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping2", 1L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -549,9 +549,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping2", 4L, 0), + getModItem(TwilightForest.ID, "item.charmOfKeeping2", 4L, 0), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping3", 1L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping3", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -560,9 +560,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfLife2", 1L, 0), + getModItem(TwilightForest.ID, "item.charmOfLife2", 1L, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfLife1", 4L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfLife1", 4L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -571,9 +571,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping2", 1L, 0), + getModItem(TwilightForest.ID, "item.charmOfKeeping2", 1L, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping1", 4L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping1", 4L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -582,9 +582,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping3", 1L, 0), + getModItem(TwilightForest.ID, "item.charmOfKeeping3", 1L, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping2", 4L, 0)) + .itemOutputs(getModItem(TwilightForest.ID, "item.charmOfKeeping2", 4L, 0)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -593,9 +593,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 23)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 23)) .fluidInputs(Materials.Redstone.getMolten(144)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -604,9 +604,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 17), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 24)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 17), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 24)) .fluidInputs(Materials.Redstone.getMolten(144)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -615,9 +615,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 18), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 22)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 18), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 22)) .fluidInputs(Materials.Redstone.getMolten(144)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -628,7 +628,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1), new ItemStack(Blocks.sand, 1, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 0)) .noFluidInputs() .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -639,7 +639,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1), new ItemStack(Blocks.sand, 1, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 600)) .noFluidInputs() .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -650,7 +650,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Fluix, 1), new ItemStack(Blocks.sand, 1, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 2L, 1200)) .noFluidInputs() .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -659,7 +659,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_Wax.get(6), new ItemStack(Items.string, 1, 32767)) - .itemOutputs(getModItem(Forestry.modID, "candle", 24L, 0)) + .itemOutputs(getModItem(Forestry.ID, "candle", 24L, 0)) .fluidInputs(Materials.Water.getFluid(600)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -668,7 +668,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_Wax.get(2), ItemList.FR_Silk.get(1)) - .itemOutputs(getModItem(Forestry.modID, "candle", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "candle", 8L, 0)) .fluidInputs(Materials.Water.getFluid(200)) .noFluidOutputs() .duration(16 * TICKS) @@ -677,7 +677,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.FR_Silk.get(9), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(getModItem(Forestry.modID, "craftingMaterial", 1L, 3)) + .itemOutputs(getModItem(Forestry.ID, "craftingMaterial", 1L, 3)) .fluidInputs(Materials.Water.getFluid(500)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -685,8 +685,8 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "propolis", 5L, 2), GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(getModItem(Forestry.modID, "craftingMaterial", 1L, 1)) + .itemInputs(getModItem(Forestry.ID, "propolis", 5L, 2), GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(getModItem(Forestry.ID, "craftingMaterial", 1L, 1)) .noFluidInputs() .noFluidOutputs() .duration(16 * TICKS) @@ -695,7 +695,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(Forestry.modID, "sturdyMachine", 1L, 0), + getModItem(Forestry.ID, "sturdyMachine", 1L, 0), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 4)) .itemOutputs(ItemList.FR_Casing_Hardened.get(1)) .fluidInputs(Materials.Water.getFluid(5000)) @@ -727,9 +727,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(Forestry.modID, "craftingMaterial", 5L, 1), - GT_Utility.getIntegratedCircuit(5)) + .itemInputs(getModItem(Forestry.ID, "craftingMaterial", 5L, 1), GT_Utility.getIntegratedCircuit(5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1)) .noFluidInputs() .noFluidOutputs() @@ -826,7 +824,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), - getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0)) + getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0)) .itemOutputs(new ItemStack(Items.book, 1, 0)) .fluidInputs(Materials.Glue.getFluid(20)) .noFluidOutputs() @@ -857,7 +855,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Paper_Printed_Pages.get(1), - getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0)) + getModItem(NewHorizonsCoreMod.ID, "item.ArtificialLeather", 1L, 0)) .itemOutputs(new ItemStack(Items.written_book, 1, 0)) .fluidInputs(Materials.Glue.getFluid(20)) .noFluidOutputs() @@ -3213,7 +3211,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) @@ -3225,7 +3223,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)) @@ -3237,7 +3235,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)) @@ -3249,7 +3247,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4)) @@ -3315,7 +3313,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) @@ -3327,7 +3325,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) @@ -3339,7 +3337,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) @@ -3354,7 +3352,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) @@ -3366,7 +3364,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) @@ -3378,7 +3376,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) @@ -3393,7 +3391,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), + getModItem(IronChests.ID, "BlockIronChest", 1, 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) @@ -3405,7 +3403,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), + getModItem(IronChests.ID, "BlockIronChest", 1, 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) @@ -3420,7 +3418,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), + getModItem(IronChests.ID, "BlockIronChest", 1, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) @@ -3432,7 +3430,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), + getModItem(IronChests.ID, "BlockIronChest", 1, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) @@ -3447,7 +3445,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), + getModItem(IronChests.ID, "BlockIronChest", 1, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) @@ -3459,7 +3457,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), + getModItem(IronChests.ID, "BlockIronChest", 1, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) @@ -3474,7 +3472,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 5), + getModItem(IronChests.ID, "BlockIronChest", 2, 5), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_ZPM.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) @@ -3489,7 +3487,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_UV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 6), + getModItem(IronChests.ID, "BlockIronChest", 2, 6), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_UV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)) @@ -3504,7 +3502,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MAX.get(1), - getModItem(AvaritiaAddons.modID, "CompressedChest", 1), + getModItem(AvaritiaAddons.ID, "CompressedChest", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_Bus_MAX.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)) @@ -3534,7 +3532,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) @@ -3546,7 +3544,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)) @@ -3558,7 +3556,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)) @@ -3570,7 +3568,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + getModItem(NewHorizonsCoreMod.ID, "BabyChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4)) @@ -3640,7 +3638,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) @@ -3652,7 +3650,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) @@ -3664,7 +3662,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), + getModItem(IronChests.ID, "BlockIronChest", 1, 3), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) @@ -3679,7 +3677,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) @@ -3691,7 +3689,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) @@ -3703,7 +3701,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), + getModItem(IronChests.ID, "BlockIronChest", 1, 0), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) @@ -3718,7 +3716,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), + getModItem(IronChests.ID, "BlockIronChest", 1, 4), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) @@ -3730,7 +3728,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), + getModItem(IronChests.ID, "BlockIronChest", 1, 4), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) @@ -3745,7 +3743,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), + getModItem(IronChests.ID, "BlockIronChest", 1, 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) @@ -3757,7 +3755,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), + getModItem(IronChests.ID, "BlockIronChest", 1, 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) @@ -3772,7 +3770,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), + getModItem(IronChests.ID, "BlockIronChest", 1, 2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) @@ -3784,7 +3782,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), + getModItem(IronChests.ID, "BlockIronChest", 1, 2), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) @@ -3799,7 +3797,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 5), + getModItem(IronChests.ID, "BlockIronChest", 2, 5), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ZPM.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) @@ -3814,7 +3812,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_UV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 6), + getModItem(IronChests.ID, "BlockIronChest", 2, 6), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_UV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)) @@ -3833,7 +3831,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MAX.get(1), - getModItem(AvaritiaAddons.modID, "CompressedChest", 1), + getModItem(AvaritiaAddons.ID, "CompressedChest", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MAX.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)) @@ -3913,7 +3911,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LV.get(1)) .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) @@ -3925,7 +3923,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LV.get(1)) .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) @@ -3937,7 +3935,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)) @@ -3949,7 +3947,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(9)) @@ -3968,7 +3966,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_MV.get(1)) .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) @@ -3980,7 +3978,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_MV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) @@ -3992,7 +3990,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_MV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) @@ -4007,7 +4005,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_HV.get(1)) .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) @@ -4019,7 +4017,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_HV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) @@ -4031,7 +4029,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_HV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) @@ -4046,7 +4044,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), + getModItem(IronTanks.ID, "silverTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_EV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) @@ -4058,7 +4056,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), + getModItem(IronTanks.ID, "silverTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_EV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) @@ -4073,7 +4071,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), + getModItem(IronTanks.ID, "goldTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_IV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) @@ -4085,7 +4083,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), + getModItem(IronTanks.ID, "goldTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_IV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) @@ -4100,7 +4098,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), + getModItem(IronTanks.ID, "diamondTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LuV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) @@ -4112,7 +4110,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), + getModItem(IronTanks.ID, "diamondTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_LuV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) @@ -4127,7 +4125,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), - getModItem(IronTanks.modID, "obsidianTank", 1), + getModItem(IronTanks.ID, "obsidianTank", 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Hatch_Input_ZPM.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) @@ -4237,7 +4235,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) @@ -4249,7 +4247,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) @@ -4261,7 +4259,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)) @@ -4273,7 +4271,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), + getModItem(BuildCraftFactory.ID, "tankBlock", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(9)) @@ -4292,7 +4290,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) @@ -4304,7 +4302,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) @@ -4316,7 +4314,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), + getModItem(IronTanks.ID, "copperTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) @@ -4331,7 +4329,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) @@ -4343,7 +4341,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) @@ -4355,7 +4353,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), + getModItem(IronTanks.ID, "ironTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) @@ -4370,7 +4368,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), + getModItem(IronTanks.ID, "silverTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) @@ -4382,7 +4380,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), + getModItem(IronTanks.ID, "silverTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) @@ -4397,7 +4395,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), + getModItem(IronTanks.ID, "goldTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) @@ -4409,7 +4407,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), + getModItem(IronTanks.ID, "goldTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) @@ -4424,7 +4422,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), + getModItem(IronTanks.ID, "diamondTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) @@ -4436,7 +4434,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), + getModItem(IronTanks.ID, "diamondTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) @@ -4451,7 +4449,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Hull_ZPM.get(1), - getModItem(IronTanks.modID, "obsidianTank", 1), + getModItem(IronTanks.ID, "obsidianTank", 1), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(ItemList.Hatch_Output_Bus_ZPM.get(1)) .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) @@ -4823,13 +4821,13 @@ public class AssemblerRecipes implements Runnable { .eut(48) .addTo(sAssemblerRecipes); - ItemStack tRailWood = getModItem(Railcraft.modID, "track", 64, 736); + ItemStack tRailWood = getModItem(Railcraft.ID, "track", 64, 736); if (tRailWood != null) { NBTTagCompound tTagWood = new NBTTagCompound(); tTagWood.setString("track", "railcraft:track.slow"); tRailWood.stackTagCompound = tTagWood; - ItemStack tRailWoodB = getModItem(Railcraft.modID, "track.slow", 16); + ItemStack tRailWoodB = getModItem(Railcraft.ID, "track.slow", 16); NBTTagCompound tTagWoodB = new NBTTagCompound(); tTagWoodB.setString("track", "railcraft:track.slow.boost"); tRailWoodB.stackTagCompound = tTagWoodB; @@ -4883,7 +4881,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); - ItemStack tRailRe = getModItem(Railcraft.modID, "track", 64); + ItemStack tRailRe = getModItem(Railcraft.ID, "track", 64); NBTTagCompound tTagRe = new NBTTagCompound(); tTagRe.setString("track", "railcraft:track.reinforced"); tRailRe.stackTagCompound = tTagRe; @@ -4900,7 +4898,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); - ItemStack tRailReB = getModItem(Railcraft.modID, "track.reinforced", 16); + ItemStack tRailReB = getModItem(Railcraft.ID, "track.reinforced", 16); NBTTagCompound tTagReB = new NBTTagCompound(); tTagReB.setString("track", "railcraft:track.reinforced.boost"); tRailReB.stackTagCompound = tTagReB; @@ -4917,7 +4915,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); - ItemStack tRailEl = getModItem(Railcraft.modID, "track", 64); + ItemStack tRailEl = getModItem(Railcraft.ID, "track", 64); NBTTagCompound tTagEl = new NBTTagCompound(); tTagEl.setString("track", "railcraft:track.electric"); tRailEl.stackTagCompound = tTagEl; @@ -4934,7 +4932,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); - ItemStack tRailHs = getModItem(Railcraft.modID, "track", 64, 816); + ItemStack tRailHs = getModItem(Railcraft.ID, "track", 64, 816); if (tRailHs != null) { NBTTagCompound tTagHs = new NBTTagCompound(); tTagHs.setString("track", "railcraft:track.speed"); @@ -4952,7 +4950,7 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_LV) .addTo(sAssemblerRecipes); } - ItemStack tRailHsB = getModItem(Railcraft.modID, "track.speed", 16); + ItemStack tRailHsB = getModItem(Railcraft.ID, "track.speed", 16); NBTTagCompound tTagHsB = new NBTTagCompound(); tTagHsB.setString("track", "railcraft:track.speed.boost"); tRailHsB.stackTagCompound = tTagHsB; @@ -4970,7 +4968,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); // --- Wooden Switch Track --- - ItemStack tRailSS = getModItem(Railcraft.modID, "track.slow", 1, 19986); + ItemStack tRailSS = getModItem(Railcraft.ID, "track.slow", 1, 19986); if (tRailSS != null) { NBTTagCompound tTagSS = new NBTTagCompound(); tTagSS.setString("track", "railcraft:track.slow.switch"); @@ -5061,7 +5059,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Wooden Wye Track --- - ItemStack tRailSW = getModItem(Railcraft.modID, "track.slow", 1); + ItemStack tRailSW = getModItem(Railcraft.ID, "track.slow", 1); if (tRailSW != null) { NBTTagCompound tTagSW = new NBTTagCompound(); tTagSW.setString("track", "railcraft:track.slow.wye"); @@ -5152,7 +5150,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Wooden Junction Tack --- - ItemStack tRailSJ = getModItem(Railcraft.modID, "track.slow", 1); + ItemStack tRailSJ = getModItem(Railcraft.ID, "track.slow", 1); if (tRailSJ != null) { NBTTagCompound tTagSJ = new NBTTagCompound(); tTagSJ.setString("track", "railcraft:track.slow.junction"); @@ -5243,7 +5241,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Switch Tack --- - ItemStack tRailNS = getModItem(Railcraft.modID, "track", 1, 4767); + ItemStack tRailNS = getModItem(Railcraft.ID, "track", 1, 4767); if (tRailNS != null) { NBTTagCompound tTagNS = new NBTTagCompound(); tTagNS.setString("track", "railcraft:track.switch"); @@ -5335,7 +5333,7 @@ public class AssemblerRecipes implements Runnable { } // --- Wye Tack --- - ItemStack tRailNW = getModItem(Railcraft.modID, "track", 1, 2144); + ItemStack tRailNW = getModItem(Railcraft.ID, "track", 1, 2144); if (tRailNW != null) { NBTTagCompound tTagNW = new NBTTagCompound(); tTagNW.setString("track", "railcraft:track.wye"); @@ -5426,7 +5424,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Junction Tack --- - ItemStack tRailNJ = getModItem(Railcraft.modID, "track", 1); + ItemStack tRailNJ = getModItem(Railcraft.ID, "track", 1); if (tRailNJ != null) { NBTTagCompound tTagNJ = new NBTTagCompound(); tTagNJ.setString("track", "railcraft:track.junction"); @@ -5517,7 +5515,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Reinforced Switch Track --- - ItemStack tRailRS = getModItem(Railcraft.modID, "track.reinforced", 1); + ItemStack tRailRS = getModItem(Railcraft.ID, "track.reinforced", 1); if (tRailRS != null) { NBTTagCompound tTagRS = new NBTTagCompound(); tTagRS.setString("track", "railcraft:track.reinforced.switch"); @@ -5608,7 +5606,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Reinforced Wye Track --- - ItemStack tRailRW = getModItem(Railcraft.modID, "track.reinforced", 1); + ItemStack tRailRW = getModItem(Railcraft.ID, "track.reinforced", 1); if (tRailRW != null) { NBTTagCompound tTagRW = new NBTTagCompound(); tTagRW.setString("track", "railcraft:track.reinforced.wye"); @@ -5699,7 +5697,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Reinforced Junction Track --- - ItemStack tRailRJ = getModItem(Railcraft.modID, "track.reinforced", 1, 764); + ItemStack tRailRJ = getModItem(Railcraft.ID, "track.reinforced", 1, 764); if (tRailRJ != null) { NBTTagCompound tTagRJ = new NBTTagCompound(); tTagRJ.setString("track", "railcraft:track.reinforced.junction"); @@ -5790,7 +5788,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- H.S. Switch Track --- - ItemStack tRailSSw = getModItem(Railcraft.modID, "track.speed", 1, 7916); + ItemStack tRailSSw = getModItem(Railcraft.ID, "track.speed", 1, 7916); if (tRailSSw != null) { NBTTagCompound tTagRSSw = new NBTTagCompound(); tTagRSSw.setString("track", "railcraft:track.speed.switch"); @@ -5881,7 +5879,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- H.S. Wye Track --- - ItemStack tRailSWy = getModItem(Railcraft.modID, "track.speed", 1); + ItemStack tRailSWy = getModItem(Railcraft.ID, "track.speed", 1); if (tRailSWy != null) { NBTTagCompound tTagRSWy = new NBTTagCompound(); tTagRSWy.setString("track", "railcraft:track.speed.wye"); @@ -5972,7 +5970,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- H.S. Transition Track --- - ItemStack tRailSTt = getModItem(Railcraft.modID, "track.speed", 1, 26865); + ItemStack tRailSTt = getModItem(Railcraft.ID, "track.speed", 1, 26865); if (tRailSTt != null) { NBTTagCompound tTagRSTt = new NBTTagCompound(); tTagRSTt.setString("track", "railcraft:track.speed.transition"); @@ -6044,7 +6042,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Electric Switch Track --- - ItemStack tRailES = getModItem(Railcraft.modID, "track.electric", 1, 10488); + ItemStack tRailES = getModItem(Railcraft.ID, "track.electric", 1, 10488); if (tRailES != null) { NBTTagCompound tTagES = new NBTTagCompound(); tTagES.setString("track", "railcraft:track.electric.switch"); @@ -6135,7 +6133,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Electric Wye Track --- - ItemStack tRailEw = getModItem(Railcraft.modID, "track.electric", 1); + ItemStack tRailEw = getModItem(Railcraft.ID, "track.electric", 1); if (tRailEw != null) { NBTTagCompound tTagEw = new NBTTagCompound(); tTagEw.setString("track", "railcraft:track.electric.wye"); @@ -6226,7 +6224,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); } // --- Electric Junction Track --- - ItemStack tRailEJ = getModItem(Railcraft.modID, "track.electric", 1); + ItemStack tRailEJ = getModItem(Railcraft.ID, "track.electric", 1); if (tRailEJ != null) { NBTTagCompound tTagREJ = new NBTTagCompound(); tTagREJ.setString("track", "railcraft:track.electric.junction"); @@ -6411,10 +6409,10 @@ public class AssemblerRecipes implements Runnable { .itemInputs( ItemList.Circuit_Board_Plastic_Advanced.get(1), GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2), - getModItem(Railcraft.modID, "machine.alpha", 1L, 0), - getModItem(OpenComputers.modID, "item", 1L, 26), + getModItem(Railcraft.ID, "machine.alpha", 1L, 0), + getModItem(OpenComputers.ID, "item", 1L, 26), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(OpenComputers.modID, "item", 1L, 62)) + .itemOutputs(getModItem(OpenComputers.ID, "item", 1L, 62)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(12 * SECONDS + 10 * TICKS) @@ -6429,7 +6427,7 @@ public class AssemblerRecipes implements Runnable { ItemList.FR_Casing_Sturdy.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1L, 0)) + .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1L, 0)) .fluidInputs(Materials.SeedOil.getFluid(250)) .noFluidOutputs() .duration(5 * SECONDS) @@ -6442,7 +6440,7 @@ public class AssemblerRecipes implements Runnable { ItemList.FR_Casing_Sturdy.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1L, 0)) + .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1L, 0)) .fluidInputs(Materials.Lubricant.getFluid(125)) .noFluidOutputs() .duration(5 * SECONDS) @@ -6451,10 +6449,10 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(ExtraUtilities.modID, "trashcan", 1L, 0), + getModItem(ExtraUtilities.ID, "trashcan", 1L, 0), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 4), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 11)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 11)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6463,10 +6461,10 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), + getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10), GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 7)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6475,10 +6473,10 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), + getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10), GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 8)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 8)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6487,10 +6485,10 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), + getModItem(NewHorizonsCoreMod.ID, "item.EngineCore", 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10), GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 9)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 9)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6504,7 +6502,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1, 0)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1, 0)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6515,7 +6513,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6527,7 +6525,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6537,9 +6535,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6551,7 +6549,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Bronze, 2), new ItemStack(Blocks.iron_bars, 2, 0), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6562,7 +6560,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6574,7 +6572,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 14)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6584,9 +6582,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 2L, 14)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6596,9 +6594,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2), - getModItem(NewHorizonsCoreMod.modID, "item.SteelBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6609,7 +6607,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6621,7 +6619,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6631,9 +6629,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6643,9 +6641,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2), - getModItem(NewHorizonsCoreMod.modID, "item.AluminiumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.AluminiumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6656,7 +6654,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6668,7 +6666,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6678,9 +6676,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6690,9 +6688,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2), - getModItem(NewHorizonsCoreMod.modID, "item.StainlessSteelBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6703,7 +6701,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6715,7 +6713,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 7)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6725,9 +6723,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 7)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6737,9 +6735,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.TitaniumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.TitaniumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6750,7 +6748,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6762,7 +6760,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 10)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 10)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6772,9 +6770,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 10)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 10)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6784,9 +6782,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2), - getModItem(NewHorizonsCoreMod.modID, "item.TungstenSteelBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6797,7 +6795,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6809,7 +6807,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 13)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 13)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6819,9 +6817,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 13)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 2L, 13)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6831,9 +6829,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.ChromeBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.ChromeBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6844,7 +6842,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6856,7 +6854,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6866,9 +6864,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 1)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6878,9 +6876,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.IridiumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.IridiumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6891,7 +6889,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .noFluidInputs() .noFluidOutputs() .duration(30 * SECONDS) @@ -6903,7 +6901,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6913,9 +6911,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6925,9 +6923,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2), - getModItem(NewHorizonsCoreMod.modID, "item.OsmiumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.OsmiumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .noFluidInputs() .noFluidOutputs() .duration(40 * SECONDS) @@ -6938,7 +6936,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -6950,7 +6948,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), new ItemStack(Blocks.glass_pane, 2, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 7)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6960,9 +6958,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 2L, 0), GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 7)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 2L, 7)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6972,9 +6970,9 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.NeutroniumBars", 2), + getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumBars", 2), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemOutputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -6987,7 +6985,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1L, 14)) .fluidInputs(Materials.Glue.getFluid(36)) .noFluidOutputs() .duration(10 * SECONDS) @@ -6998,7 +6996,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1L, 14)) .fluidInputs(Materials.Glue.getFluid(36)) .noFluidOutputs() .duration(10 * SECONDS) @@ -7009,7 +7007,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 1L, 14)) .fluidInputs(Materials.Glue.getFluid(36)) .noFluidOutputs() .duration(10 * SECONDS) @@ -7020,7 +7018,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 4), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 4)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 3L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 3L, 14)) .fluidInputs(Materials.Glue.getFluid(72)) .noFluidOutputs() .duration(20 * SECONDS) @@ -7031,7 +7029,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 2), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 1)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 3L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 3L, 14)) .fluidInputs(Materials.Plastic.getMolten(36)) .noFluidOutputs() .duration(20 * SECONDS) @@ -7042,7 +7040,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.StainlessSteel, 4), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 4)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 9L, 14)) + .itemOutputs(getModItem(Railcraft.ID, "machine.alpha", 9L, 14)) .fluidInputs(Materials.Plastic.getMolten(72)) .noFluidOutputs() .duration(20 * SECONDS) @@ -7053,7 +7051,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Item_Casing_Iron.get(6), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 3)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 3)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -7062,7 +7060,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Item_Casing_Steel.get(6), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 4)) + .itemOutputs(getModItem(Railcraft.ID, "machine.beta", 1L, 4)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -7077,7 +7075,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(BartWorks.modID, "gt.bwMetaGeneratedplate", 6L, 88), + getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 6L, 88), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1)) .itemOutputs(ItemList.Casing_Advanced_Rhodium_Palladium.get(1)) .noFluidInputs() @@ -7108,7 +7106,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(GalacticraftCore.modID, "item.heavyPlating", 1), + getModItem(GalacticraftCore.ID, "item.heavyPlating", 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MeteoricIron, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Ingot_Heavy2.get(1)) @@ -7120,7 +7118,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(GalacticraftMars.modID, "item.null", 1L, 3), + getModItem(GalacticraftMars.ID, "item.null", 1L, 3), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Ingot_Heavy3.get(1)) @@ -7291,7 +7289,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( ItemList.Electric_Pump_EV.get(4), ItemList.Field_Generator_EV.get(4), - getModItem(GTPlusPlus.modID, "itemPlateInconel690", 4), + getModItem(GTPlusPlus.ID, "itemPlateInconel690", 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), @@ -7313,7 +7311,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemVanillaMachineCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemVanillaMachineCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7324,7 +7322,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemInventoryScannerCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemInventoryScannerCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7335,7 +7333,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemEnergySensorLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemEnergySensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7346,7 +7344,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "RFSensorCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "RFSensorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7357,7 +7355,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemMultipleSensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)) .noFluidInputs() @@ -7370,7 +7368,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 1), + getModItem(IC2NuclearControl.ID, "ItemMultipleSensorLocationCard", 1L, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)) .noFluidInputs() @@ -7383,7 +7381,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 2), + getModItem(IC2NuclearControl.ID, "ItemMultipleSensorLocationCard", 1L, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7396,7 +7394,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemLiquidArrayLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemLiquidArrayLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7409,7 +7407,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemEnergyArrayLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemEnergyArrayLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() @@ -7422,7 +7420,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemSensorLocationCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "ItemSensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) .noFluidInputs() @@ -7435,7 +7433,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "Item55ReactorCard", 1L, 0), + getModItem(IC2NuclearControl.ID, "Item55ReactorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) .noFluidInputs() @@ -7446,7 +7444,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(IC2NuclearControl.modID, "CardAppeng", 1L, 0), + getModItem(IC2NuclearControl.ID, "CardAppeng", 1L, 0), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) .noFluidInputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index ddac3b5623..8a87e2ce2d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.BartWorks; -import static gregtech.api.enums.ModIDs.GTPlusPlus; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; diff --git a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java index 0a9bbe203a..621900167a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.AppliedEnergistics2; +import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes; import static gregtech.api.util.GT_RecipeBuilder.*; @@ -35,8 +35,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)) .outputChances(8000) .fluidInputs(Materials.Water.getFluid(200L)) .noFluidOutputs() @@ -45,8 +45,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)) .outputChances(8000) .fluidInputs(Materials.Water.getFluid(200L)) .noFluidOutputs() @@ -55,8 +55,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12)) .outputChances(8000) .fluidInputs(Materials.Water.getFluid(200L)) .noFluidOutputs() @@ -65,8 +65,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)) .outputChances(9000) .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .noFluidOutputs() @@ -75,8 +75,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)) .outputChances(9000) .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .noFluidOutputs() @@ -85,8 +85,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12)) .outputChances(9000) .fluidInputs(GT_ModHandler.getDistilledWater(100L)) .noFluidOutputs() @@ -95,8 +95,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) .noFluidOutputs() @@ -105,8 +105,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) .noFluidOutputs() @@ -115,8 +115,8 @@ public class AutoclaveRecipes implements Runnable { .addTo(sAutoclaveRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemCrystalSeed", 1L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12)) .outputChances(10000) .fluidInputs(Materials.Void.getMolten(36L)) .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index a34015e5e1..c470a572b7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBlastRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes; @@ -658,7 +658,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 1L, 78), + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) .fluidInputs(Materials.Chlorine.getGas(3000)) @@ -672,7 +672,6 @@ public class BlastFurnaceRecipes implements Runnable { public void registerPrimitiveBlastFurnaceRecipes() { GT_Values.RA.stdBuilder() - .itemInputs(Materials.Iron.getIngots(1)) .itemOutputs(Materials.Steel.getIngots(1)) .noFluidInputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java index 3149888354..d246a464f2 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Forestry; -import static gregtech.api.enums.ModIDs.IndustrialCraft2; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBrewingRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -518,7 +518,7 @@ public class BreweryRecipes implements Runnable { // biomass recipes { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "fertilizerBio", 4L, 0)) + .itemInputs(getModItem(Forestry.ID, "fertilizerBio", 4L, 0)) .noItemOutputs() .fluidInputs(getFluidStack(FluidRegistry.WATER.getUnlocalizedName(), 750)) .fluidOutputs(getFluidStack("biomass", 750)) @@ -527,7 +527,7 @@ public class BreweryRecipes implements Runnable { .addTo(sBrewingRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "mulch", 16L, 0)) + .itemInputs(getModItem(Forestry.ID, "mulch", 16L, 0)) .noItemOutputs() .fluidInputs( getFluidStack( @@ -541,7 +541,7 @@ public class BreweryRecipes implements Runnable { .addTo(sBrewingRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "mulch", 8L, 0)) + .itemInputs(getModItem(Forestry.ID, "mulch", 8L, 0)) .noItemOutputs() .fluidInputs(getFluidStack("juice", 500)) .fluidOutputs(getFluidStack("biomass", 750)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java index b544eef76b..60fa4306eb 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.IndustrialCraft2; +import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index 6c4cebc91a..4eecdc63e2 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.NI; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -28,7 +28,7 @@ public class CentrifugeRecipes implements Runnable { .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), - getModItem(Thaumcraft.modID, "ItemResource", 2L, 14)) + getModItem(Thaumcraft.ID, "ItemResource", 2L, 14)) .outputChances(10000, 10000, 9000) .fluidInputs(Materials.Mercury.getFluid(200)) .noFluidOutputs() @@ -362,7 +362,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.meefRaw", 12L, 32767), + getModItem(TwilightForest.ID, "item.meefRaw", 12L, 32767), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .noFluidInputs() @@ -373,7 +373,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.meefSteak", 16L, 32767), + getModItem(TwilightForest.ID, "item.meefSteak", 16L, 32767), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .noFluidInputs() @@ -384,7 +384,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.venisonRaw", 12L, 32767), + getModItem(TwilightForest.ID, "item.venisonRaw", 12L, 32767), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .noFluidInputs() @@ -395,7 +395,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(TwilightForest.modID, "item.venisonCooked", 16L, 32767), + getModItem(TwilightForest.ID, "item.venisonCooked", 16L, 32767), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .noFluidInputs() @@ -704,7 +704,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 45), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 45), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.BasalticMineralSand, 1), @@ -722,7 +722,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 36L, 45), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 36L, 45), GT_Utility.getIntegratedCircuit(2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 2), @@ -844,7 +844,7 @@ public class CentrifugeRecipes implements Runnable { // air GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 144), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 144), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1)) .noFluidInputs() .noFluidOutputs() @@ -855,7 +855,7 @@ public class CentrifugeRecipes implements Runnable { // fire GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 146), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 146), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1)) .noFluidInputs() .noFluidOutputs() @@ -866,7 +866,7 @@ public class CentrifugeRecipes implements Runnable { // aqua GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 147), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 147), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1)) .noFluidInputs() .noFluidOutputs() @@ -877,7 +877,7 @@ public class CentrifugeRecipes implements Runnable { // terra GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 145), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 145), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1)) .noFluidInputs() .noFluidOutputs() @@ -888,7 +888,7 @@ public class CentrifugeRecipes implements Runnable { // ordo GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 148), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 148), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1)) .noFluidInputs() .noFluidOutputs() @@ -899,7 +899,7 @@ public class CentrifugeRecipes implements Runnable { // perditio GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 149), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 149), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1)) .noFluidInputs() .noFluidOutputs() @@ -910,8 +910,8 @@ public class CentrifugeRecipes implements Runnable { // Nethershard GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 152), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 6)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 152), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) @@ -921,8 +921,8 @@ public class CentrifugeRecipes implements Runnable { // Endshard GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 153), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 7)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 153), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7)) .noFluidInputs() .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) @@ -934,14 +934,14 @@ public class CentrifugeRecipes implements Runnable { // Caelestis red GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 154), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 154), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 2), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 10), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 14), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 1), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 12), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 6)) + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 2), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 10), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 14), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 1), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 12), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(25 * SECONDS + 12 * TICKS) @@ -951,13 +951,13 @@ public class CentrifugeRecipes implements Runnable { // Caelestis green GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 155), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 155), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 13), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 5), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 4), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 8), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 0), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 13), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 5), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 4), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 8), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 0), NI) .noFluidInputs() .noFluidOutputs() @@ -968,13 +968,13 @@ public class CentrifugeRecipes implements Runnable { // Caelestis blue GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 156), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 156), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 3), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 9), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 11), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 7), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 15), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 3), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 9), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 11), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 7), + getModItem(ExtraUtilities.ID, "greenscreen", 1L, 15), NI) .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java index fbcada3e7a..6b6f2526c7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.BuildCraftTransport; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.BuildCraftTransport; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -240,7 +240,7 @@ public class ChemicalBathRecipes implements Runnable { for (int j = 0; j < Dyes.dyeRed.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 0)) + .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 0)) .fluidInputs(Dyes.dyeRed.getFluidDye(j, 72)) .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) @@ -250,7 +250,7 @@ public class ChemicalBathRecipes implements Runnable { for (int j = 0; j < Dyes.dyeBlue.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 1)) + .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 1)) .fluidInputs(Dyes.dyeBlue.getFluidDye(j, 72)) .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) @@ -260,7 +260,7 @@ public class ChemicalBathRecipes implements Runnable { for (int j = 0; j < Dyes.dyeGreen.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 2)) + .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 2)) .fluidInputs(Dyes.dyeGreen.getFluidDye(j, 72)) .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) @@ -270,7 +270,7 @@ public class ChemicalBathRecipes implements Runnable { for (int j = 0; j < Dyes.dyeYellow.getSizeOfFluidList(); j++) { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 3)) + .itemOutputs(getModItem(BuildCraftTransport.ID, "pipeWire", 4L, 3)) .fluidInputs(Dyes.dyeYellow.getFluidDye(j, 72)) .noFluidOutputs() .duration(1 * SECONDS + 12 * TICKS) @@ -369,7 +369,7 @@ public class ChemicalBathRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1)) - .itemOutputs(getModItem(Railcraft.modID, "cube", 1, 8)) + .itemOutputs(getModItem(Railcraft.ID, "cube", 1, 8)) .fluidInputs(Materials.Creosote.getFluid(100)) .noFluidOutputs() .duration(5 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index 3f590b5f6d..3b7db2711c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes; @@ -115,7 +115,7 @@ public class ChemicalRecipes implements Runnable { .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GalaxySpace.modID, "item.UnknowCrystal", 4), Materials.Osmiridium.getDust(2)) + .itemInputs(getModItem(GalaxySpace.ID, "item.UnknowCrystal", 4), Materials.Osmiridium.getDust(2)) .itemOutputs(ItemList.Circuit_Chip_Stemcell.get(64)) .fluidInputs(Materials.GrowthMediumSterilized.getFluid(1000)) .fluidOutputs(getFluidStack("bacterialsludge", 1000)) @@ -1367,7 +1367,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( MaterialsKevlar.CobaltIINitrate.getDust(9), - getModItem(NewHorizonsCoreMod.modID, "item.PotassiumHydroxideDust", 6L, 0)) + getModItem(NewHorizonsCoreMod.ID, "item.PotassiumHydroxideDust", 6L, 0)) .itemOutputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), Materials.Saltpeter.getDust(10)) .noFluidInputs() .noFluidOutputs() @@ -2682,7 +2682,7 @@ public class ChemicalRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1)) - .itemOutputs(getModItem(Railcraft.modID, "tile.railcraft.glass", 6)) + .itemOutputs(getModItem(Railcraft.ID, "tile.railcraft.glass", 6)) .fluidInputs(Materials.Glass.getMolten(864)) .noFluidOutputs() .duration(2 * SECONDS + 10 * TICKS) @@ -3905,7 +3905,7 @@ public class ChemicalRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), - getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 3L, 63)) + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63)) .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) .fluidOutputs(Materials.Hydrogen.getGas(2000)) .duration(45 * SECONDS) @@ -3920,7 +3920,7 @@ public class ChemicalRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 6L, 10052)) + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 6L, 10052)) .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)) .noFluidOutputs() .duration(20 * SECONDS) @@ -3947,7 +3947,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(GTPlusPlus.modID, "Formaldehyde", 4), + getModItem(GTPlusPlus.ID, "Formaldehyde", 4), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), @@ -3979,7 +3979,7 @@ public class ChemicalRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(GTPlusPlus.modID, "itemDustCalciumHydroxide", 5)) + .itemOutputs(getModItem(GTPlusPlus.ID, "itemDustCalciumHydroxide", 5)) .fluidInputs(Materials.Water.getFluid(2000)) .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000)) .duration(15 * SECONDS) @@ -3994,7 +3994,7 @@ public class ChemicalRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) .itemOutputs( MaterialsKevlar.CobaltIIHydroxide.getDust(5), - getModItem(GTPlusPlus.modID, "itemDustSodiumNitrate", 10)) + getModItem(GTPlusPlus.ID, "itemDustSodiumNitrate", 10)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -6216,7 +6216,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(1), - getModItem(GTPlusPlus.modID, "itemDustCalciumChloride", 1), + getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 1), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9)) .noItemOutputs() @@ -6231,7 +6231,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(9), - getModItem(GTPlusPlus.modID, "itemDustCalciumChloride", 7), + getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 7), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63)) .noItemOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index 74f8ebc207..0be78dc630 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -37,7 +37,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Coated_Basic.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), ItemList.Cover_Controller.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(15 * SECONDS) @@ -49,7 +49,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Coated_Basic.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), ItemList.Sensor_LV.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 1)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(15 * SECONDS) @@ -60,8 +60,8 @@ public class CircuitAssemblerRecipes implements Runnable { .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), - getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 2)) + getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 2)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(15 * SECONDS) @@ -73,7 +73,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Phenolic_Good.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), ItemList.Cover_Controller.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(20 * SECONDS) @@ -85,7 +85,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Phenolic_Good.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), ItemList.Sensor_LV.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 1)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(20 * SECONDS) @@ -96,8 +96,8 @@ public class CircuitAssemblerRecipes implements Runnable { .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 2)) + getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 2)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(20 * SECONDS) @@ -109,7 +109,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Epoxy_Advanced.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), ItemList.Cover_Controller.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(25 * SECONDS) @@ -121,7 +121,7 @@ public class CircuitAssemblerRecipes implements Runnable { ItemList.Circuit_Board_Epoxy_Advanced.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), ItemList.Sensor_LV.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 1)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 1)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(25 * SECONDS) @@ -132,8 +132,8 @@ public class CircuitAssemblerRecipes implements Runnable { .itemInputs( ItemList.Circuit_Board_Epoxy_Advanced.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 2)) + getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 2)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) .noFluidOutputs() .duration(25 * SECONDS) @@ -148,7 +148,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -163,7 +163,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 1)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -178,7 +178,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 2)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -193,7 +193,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 3)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -216,7 +216,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.AnnealedCopper, 2)) - .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, 0)) + .itemOutputs(getModItem(Forestry.ID, "thermionicTubes", 4L, 0)) .fluidInputs(Materials.Glass.getMolten(576)) .noFluidOutputs() .duration(10 * SECONDS) @@ -231,7 +231,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 2)) - .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, 3)) + .itemOutputs(getModItem(Forestry.ID, "thermionicTubes", 4L, 3)) .fluidInputs(Materials.Glass.getMolten(576)) .noFluidOutputs() .duration(10 * SECONDS) @@ -245,7 +245,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iron, 2L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Gold, 2L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Diamond, 2L), - getModItem(NewHorizonsCoreMod.modID, "item.LongObsidianRod", 2L, 0), + getModItem(NewHorizonsCoreMod.ID, "item.LongObsidianRod", 2L, 0), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Blaze, 2L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Rubber, 2L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Emerald, 2L), @@ -261,7 +261,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), rodMaterials[metaid]) - .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, metaid)) + .itemOutputs(getModItem(Forestry.ID, "thermionicTubes", 4L, metaid)) .fluidInputs(Materials.Glass.getMolten(576)) .noFluidOutputs() .duration(10 * SECONDS) @@ -282,7 +282,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 0)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -297,7 +297,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 1)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 1)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -312,7 +312,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 2)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 2)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) @@ -327,7 +327,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 3)) + .itemOutputs(getModItem(Forestry.ID, "chipsets", 1L, 3)) .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) .noFluidOutputs() .duration(10 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index ed86b3dd8b..353af1593b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -24,7 +24,7 @@ public class CompressorRecipes implements Runnable { @Override public void run() { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GTPlusPlus.modID, "blockRainforestOakSapling", 8, 0)) + .itemInputs(getModItem(GTPlusPlus.ID, "blockRainforestOakSapling", 8, 0)) .itemOutputs(ItemList.IC2_Plantball.get(1)) .noFluidInputs() .noFluidOutputs() @@ -106,7 +106,7 @@ public class CompressorRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) @@ -114,8 +114,8 @@ public class CompressorRecipes implements Runnable { .addTo(sCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 10)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 10)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) @@ -123,7 +123,7 @@ public class CompressorRecipes implements Runnable { .addTo(sCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 11)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 11)) .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)) .noFluidInputs() .noFluidOutputs() @@ -132,8 +132,8 @@ public class CompressorRecipes implements Runnable { .addTo(sCompressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 12)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockFluix", 1)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 12)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockFluix", 1)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java index 0461e331da..8f684f9a06 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -93,9 +93,9 @@ public class CuttingRecipes implements Runnable { if (TinkerConstruct.isModLoaded()) { recipeWithClassicFluids( - new ItemStack[] { getModItem(TinkerConstruct.modID, "GlassBlock", 3L, 0) }, - new ItemStack[] { getModItem(TinkerConstruct.modID, "GlassBlock", 3L, 0), - getModItem(TinkerConstruct.modID, "GlassPane", 8L, 0) }, + new ItemStack[] { getModItem(TinkerConstruct.ID, "GlassBlock", 3L, 0) }, + new ItemStack[] { getModItem(TinkerConstruct.ID, "GlassBlock", 3L, 0), + getModItem(TinkerConstruct.ID, "GlassPane", 8L, 0) }, 2 * SECONDS + 10 * TICKS, 8, false); @@ -199,8 +199,8 @@ public class CuttingRecipes implements Runnable { ItemList.Plank_Pine.get(2L), ItemList.Plank_Plum.get(2L), ItemList.Plank_Maple.get(2L), ItemList.Plank_Citrus.get(2L) }; for (int i = 0; i < coverIDs.length; i++) { - ItemStack slabWood = getModItem(Forestry.modID, "slabs", 1, i); - ItemStack slabWoodFireproof = getModItem(Forestry.modID, "slabsFireproof", 1, i); + ItemStack slabWood = getModItem(Forestry.ID, "slabs", 1, i); + ItemStack slabWoodFireproof = getModItem(Forestry.ID, "slabsFireproof", 1, i); recipeWithClassicFluids( new ItemStack[] { slabWood }, @@ -221,16 +221,11 @@ public class CuttingRecipes implements Runnable { if (BuildCraftTransport.isModLoaded()) { recipeWithClassicFluids( - new ItemStack[] { getModItem( - BuildCraftTransport.modID, - "item.buildcraftPipe.pipestructurecobblestone", - 1L, - 0) }, - new ItemStack[] { getModItem( - BuildCraftTransport.modID, - "item.buildcraftPipe.pipestructurecobblestone", - 1L, - 0), getModItem(BuildCraftTransport.modID, "pipePlug", 8L, 0) }, + new ItemStack[] { + getModItem(BuildCraftTransport.ID, "item.buildcraftPipe.pipestructurecobblestone", 1L, 0) }, + new ItemStack[] { + getModItem(BuildCraftTransport.ID, "item.buildcraftPipe.pipestructurecobblestone", 1L, 0), + getModItem(BuildCraftTransport.ID, "pipePlug", 8L, 0) }, 1 * SECONDS + 12 * TICKS, 16, false); diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java index 22d65e0634..1c7a5a411c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.TinkerConstruct; +import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistillationRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index af2e1622ae..827d45cf00 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -156,7 +156,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 3)) + .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Mercury.getFluid(1000L)) @@ -183,7 +183,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(IndustrialCraft2.modID, "blockAlloyGlass", 1L, 0)) + .itemInputs(getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.ReinforceGlass.getMolten(144)) @@ -192,7 +192,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassPlate", 1L, 0)) + .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.ReinforceGlass.getMolten(72)) @@ -201,7 +201,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassLense", 1L, 0)) + .itemInputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassLense", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.ReinforceGlass.getMolten(54)) @@ -267,7 +267,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Iron.getMolten(288)) @@ -276,7 +276,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Iron.getMolten(144)) @@ -285,7 +285,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) .outputChances(10000) .noFluidInputs() @@ -295,7 +295,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Steel.getMolten(288)) @@ -304,7 +304,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Steel.getMolten(144)) @@ -313,7 +313,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Steel.getMolten(1836)) @@ -322,7 +322,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Aluminium.getMolten(288)) @@ -331,7 +331,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Aluminium.getMolten(144)) @@ -340,7 +340,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L)) .outputChances(10000) .noFluidInputs() @@ -350,7 +350,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.StainlessSteel.getMolten(288)) @@ -359,7 +359,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.StainlessSteel.getMolten(144)) @@ -368,7 +368,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.StainlessSteel.getMolten(1836)) @@ -377,7 +377,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Titanium.getMolten(288)) @@ -386,7 +386,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Titanium.getMolten(144)) @@ -395,7 +395,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Titanium.getMolten(1836)) @@ -404,7 +404,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.TungstenSteel.getMolten(288)) @@ -413,7 +413,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.TungstenSteel.getMolten(144)) @@ -422,7 +422,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.TungstenSteel.getMolten(1836)) @@ -431,7 +431,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Palladium.getMolten(288)) @@ -440,7 +440,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Palladium.getMolten(144)) @@ -449,7 +449,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L)) .outputChances(10000) .noFluidInputs() @@ -459,7 +459,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Iridium.getMolten(288)) @@ -468,7 +468,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Iridium.getMolten(144)) @@ -477,7 +477,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L)) .outputChances(10000) .noFluidInputs() @@ -487,7 +487,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Osmium.getMolten(288)) @@ -496,7 +496,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Osmium.getMolten(144)) @@ -505,7 +505,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L)) .outputChances(10000) .noFluidInputs() @@ -515,7 +515,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Neutronium.getMolten(288)) @@ -524,7 +524,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Neutronium.getMolten(144)) @@ -533,7 +533,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .noItemOutputs() .noFluidInputs() .fluidOutputs(Materials.Neutronium.getMolten(1836)) @@ -605,7 +605,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(sFluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "phosphor", 1L)) + .itemInputs(getModItem(Forestry.ID, "phosphor", 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L)) .outputChances(1000) .noFluidInputs() @@ -618,7 +618,7 @@ public class FluidExtractorRecipes implements Runnable { if (BartWorks.isModLoaded()) { // xenon GT_Values.RA.addFluidExtractionRecipe( - getModItem(GregTech.modID, "gt.comb", 1L, 134), + getModItem(GregTech.ID, "gt.comb", 1L, 134), null, getFluidStack("xenon", 250), 100 * 100, @@ -626,7 +626,7 @@ public class FluidExtractorRecipes implements Runnable { 8192); // neon GT_Values.RA.addFluidExtractionRecipe( - getModItem(GregTech.modID, "gt.comb", 1L, 135), + getModItem(GregTech.ID, "gt.comb", 1L, 135), null, getFluidStack("neon", 250), 100 * 100, @@ -634,7 +634,7 @@ public class FluidExtractorRecipes implements Runnable { 8192); // krpton GT_Values.RA.addFluidExtractionRecipe( - getModItem(GregTech.modID, "gt.comb", 1L, 136), + getModItem(GregTech.ID, "gt.comb", 1L, 136), null, getFluidStack("krypton", 250), 100 * 100, diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java index 49030f7eeb..ae21f1a311 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidSolidficationRecipes; import static gregtech.api.util.GT_RecipeBuilder.INGOTS; @@ -50,7 +50,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 3)) + .itemOutputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3)) .fluidInputs(Materials.Mercury.getFluid(1000L)) .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) @@ -230,7 +230,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) - .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassPlate", 1L, 0)) + .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0)) .fluidInputs(Materials.ReinforceGlass.getMolten(72)) .noFluidOutputs() .duration(8 * SECONDS) @@ -239,7 +239,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(getModItem(IndustrialCraft2.modID, "blockAlloyGlass", 1L)) + .itemOutputs(getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L)) .fluidInputs(Materials.ReinforceGlass.getMolten(144)) .noFluidOutputs() .duration(8 * SECONDS) @@ -347,7 +347,7 @@ public class FluidSolidifierRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) - .itemOutputs(getModItem(Railcraft.modID, "tile.railcraft.anvil", 1L, 0)) + .itemOutputs(getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 0)) .fluidInputs(Materials.Steel.getMolten(4464L)) .noFluidOutputs() .duration(6 * SECONDS + 8 * TICKS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index cab48ac9b5..9f05b95aa0 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.GTPlusPlus; -import static gregtech.api.enums.ModIDs.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -165,9 +165,7 @@ public class ForgeHammerRecipes implements Runnable { if (GTPlusPlus.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Tesseract.get(1L), - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 1, 32105)) + .itemInputs(ItemList.Tesseract.get(1L), getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) .noItemOutputs() .fluidInputs(Materials.SpaceTime.getMolten(2880L)) .fluidOutputs(Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L)) @@ -178,7 +176,7 @@ public class ForgeHammerRecipes implements Runnable { if (HardcoreEnderExpansion.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(HardcoreEnderExpansion.modID, "endium_ore", 1)) + .itemInputs(getModItem(HardcoreEnderExpansion.ID, "endium_ore", 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 1)) .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java index c53e0df19e..0c0cd555c6 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.AppliedEnergistics2; -import static gregtech.api.enums.ModIDs.BuildCraftSilicon; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.BuildCraftSilicon; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPressRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -22,8 +22,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 1)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -33,8 +33,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 1)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 1)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -44,8 +44,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 2)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 2)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -55,8 +55,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 3)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 3)) .noFluidInputs() .noFluidOutputs() .duration(5 * SECONDS) @@ -66,8 +66,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 2L, 4)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 2L, 4)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -77,8 +77,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 5)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 5)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) @@ -88,8 +88,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Items.comparator, 1, 32767), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 6)) + getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1L, 6)) .noFluidInputs() .noFluidOutputs() .duration(15 * SECONDS) @@ -100,9 +100,9 @@ public class FormingPressRecipes implements Runnable { if (AppliedEnergistics2.isModLoaded()) { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 13)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 13)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -112,8 +112,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 13)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 13)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 16)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -123,8 +123,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 14)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 17)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 14)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 17)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -134,8 +134,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 15)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 18)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 15)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 18)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -145,8 +145,8 @@ public class FormingPressRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SiliconSG, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 19)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 0L, 19)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 20)) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java index a412b822e1..bccafd3983 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; -import static gregtech.api.enums.ModIDs.ThaumicTinkerer; +import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.ThaumicTinkerer; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; @@ -45,7 +45,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Thaumcraft.modID, "ItemShard", 1L, 6)) + .itemInputs(getModItem(Thaumcraft.ID, "ItemShard", 1L, 6)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -56,7 +56,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "GluttonyShard", 1L)) + .itemInputs(getModItem(ForbiddenMagic.ID, "GluttonyShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -67,7 +67,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "FMResource", 1L, 3)) + .itemInputs(getModItem(ForbiddenMagic.ID, "FMResource", 1L, 3)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -78,7 +78,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -89,7 +89,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 1)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 1)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -100,7 +100,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 2)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 2)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -111,7 +111,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 3)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 3)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -122,7 +122,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 4)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 4)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -133,7 +133,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 5)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 5)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -144,7 +144,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 6)) + .itemInputs(getModItem(ForbiddenMagic.ID, "NetherShard", 1L, 6)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -155,7 +155,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(TaintedMagic.modID, "WarpedShard", 1L)) + .itemInputs(getModItem(TaintedMagic.ID, "WarpedShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -166,7 +166,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(TaintedMagic.modID, "FluxShard", 1L)) + .itemInputs(getModItem(TaintedMagic.ID, "FluxShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -177,7 +177,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(TaintedMagic.modID, "EldritchShard", 1L)) + .itemInputs(getModItem(TaintedMagic.ID, "EldritchShard", 1L)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -188,7 +188,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 6)) + .itemInputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() @@ -199,7 +199,7 @@ public class FuelRecipes implements Runnable { .addTo(GT_RecipeConstants.Fuel); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 7)) + .itemInputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7)) .noItemOutputs() .noFluidInputs() .noFluidOutputs() diff --git a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java index c25262933c..f9d85db610 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.GalacticraftCore; -import static gregtech.api.enums.ModIDs.GalacticraftMars; +import static gregtech.api.enums.Mods.GalacticraftCore; +import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sImplosionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -38,19 +38,19 @@ public class ImplosionCompressorRecipes implements Runnable { addImplosionRecipe( ItemList.Ingot_Heavy1.get(1L), 8, - new ItemStack[] { getModItem(GalacticraftCore.modID, "item.heavyPlating", 1L), + new ItemStack[] { getModItem(GalacticraftCore.ID, "item.heavyPlating", 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.StainlessSteel, 1L) }); addImplosionRecipe( ItemList.Ingot_Heavy2.get(1L), 16, - new ItemStack[] { getModItem(GalacticraftMars.modID, "item.null", 1L, 3), + new ItemStack[] { getModItem(GalacticraftMars.ID, "item.null", 1L, 3), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 2L) }); addImplosionRecipe( ItemList.Ingot_Heavy3.get(1L), 24, - new ItemStack[] { getModItem(GalacticraftMars.modID, "item.itemBasicAsteroids", 1L), + new ItemStack[] { getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Platinum, 3L) }); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java index dc136d7f74..58e871713a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Forestry; +import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLatheRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -31,7 +31,7 @@ public class LatheRecipes implements Runnable { .addTo(sLatheRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "slabs", 1L, GT_Values.W)) + .itemInputs(getModItem(Forestry.ID, "slabs", 1L, GT_Values.W)) .itemOutputs( new ItemStack(Items.bowl, 1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index fa0c97c2d0..02828bf884 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -2,13 +2,13 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.GT_Values.NF; import static gregtech.api.enums.GT_Values.NI; -import static gregtech.api.enums.ModIDs.AppliedEnergistics2; -import static gregtech.api.enums.ModIDs.BiomesOPlanty; -import static gregtech.api.enums.ModIDs.Forestry; -import static gregtech.api.enums.ModIDs.Natura; -import static gregtech.api.enums.ModIDs.PamsHarvestCraft; -import static gregtech.api.enums.ModIDs.Railcraft; -import static gregtech.api.enums.ModIDs.Thaumcraft; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.Natura; +import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -645,7 +645,7 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 1), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2)) @@ -657,7 +657,7 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 1), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2)) @@ -672,7 +672,7 @@ public class MixerRecipes implements Runnable { ItemList.IC2_Fertilizer.get(1), new ItemStack(Blocks.dirt, 8, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0)) .fluidInputs(Materials.Water.getFluid(1000)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -684,7 +684,7 @@ public class MixerRecipes implements Runnable { ItemList.FR_Fertilizer.get(1), new ItemStack(Blocks.dirt, 8, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0)) .fluidInputs(Materials.Water.getFluid(1000)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -696,7 +696,7 @@ public class MixerRecipes implements Runnable { ItemList.FR_Compost.get(1), new ItemStack(Blocks.dirt, 8, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0)) .fluidInputs(Materials.Water.getFluid(1000)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -708,7 +708,7 @@ public class MixerRecipes implements Runnable { ItemList.FR_Mulch.get(8), new ItemStack(Blocks.dirt, 8, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .itemOutputs(getModItem(Forestry.ID, "soil", 8L, 0)) .fluidInputs(Materials.Water.getFluid(1000)) .noFluidOutputs() .duration(3 * SECONDS + 4 * TICKS) @@ -720,7 +720,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.sand, 1, 32767), new ItemStack(Blocks.dirt, 1, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 2L, 1)) + .itemOutputs(getModItem(Forestry.ID, "soil", 2L, 1)) .fluidInputs(Materials.Water.getFluid(250)) .noFluidOutputs() .duration(16 * TICKS) @@ -1107,7 +1107,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), ItemList.MSFMixture.get(6), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.NitroFuel.getFluid(1000)) @@ -1120,7 +1120,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), ItemList.MSFMixture.get(4), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.NitroFuel.getFluid(750)) @@ -1133,7 +1133,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.NitroFuel.getFluid(500)) @@ -1146,7 +1146,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), ItemList.MSFMixture.get(6), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.GasolinePremium.getFluid(400)) @@ -1159,7 +1159,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), ItemList.MSFMixture.get(4), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.GasolinePremium.getFluid(300)) @@ -1172,7 +1172,7 @@ public class MixerRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.GasolinePremium.getFluid(200)) @@ -1283,7 +1283,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.dirt, 1, 32767), new ItemStack(Items.wheat, 4, 32767), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1295,7 +1295,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.dirt, 1, 2), new ItemStack(Items.wheat, 4, 32767), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1305,9 +1305,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(BiomesOPlanty.modID, "plants", 4, 6), + getModItem(BiomesOPlenty.ID, "plants", 4, 6), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1317,9 +1317,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(BiomesOPlanty.modID, "plants", 4, 6), + getModItem(BiomesOPlenty.ID, "plants", 4, 6), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1329,9 +1329,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(PamsHarvestCraft.modID, "oatsItem", 4), + getModItem(PamsHarvestCraft.ID, "oatsItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1341,9 +1341,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.modID, "oatsItem", 4), + getModItem(PamsHarvestCraft.ID, "oatsItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1353,9 +1353,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(PamsHarvestCraft.modID, "ryeItem", 4), + getModItem(PamsHarvestCraft.ID, "ryeItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1365,9 +1365,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.modID, "ryeItem", 4), + getModItem(PamsHarvestCraft.ID, "ryeItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1377,9 +1377,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(PamsHarvestCraft.modID, "barleyItem", 4), + getModItem(PamsHarvestCraft.ID, "barleyItem", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1389,9 +1389,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.modID, "barleyItem", 4, 6), + getModItem(PamsHarvestCraft.ID, "barleyItem", 4, 6), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1401,9 +1401,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 32767), - getModItem(Natura.modID, "barleyFood", 4), + getModItem(Natura.ID, "barleyFood", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1413,9 +1413,9 @@ public class MixerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dirt, 1, 2), - getModItem(Natura.modID, "barleyFood", 4), + getModItem(Natura.ID, "barleyFood", 4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1427,7 +1427,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.dirt, 1, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1439,7 +1439,7 @@ public class MixerRecipes implements Runnable { new ItemStack(Blocks.dirt, 1, 2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .itemOutputs(getModItem(Forestry.ID, "fertilizerBio", 1L, 0)) .fluidInputs(Materials.Water.getFluid(100)) .noFluidOutputs() .duration(10 * SECONDS) @@ -1733,7 +1733,7 @@ public class MixerRecipes implements Runnable { .itemInputs( EnumCube.COKE_BLOCK.getItem(), ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.NitroFuel.getFluid(300)) @@ -1746,7 +1746,7 @@ public class MixerRecipes implements Runnable { .itemInputs( EnumCube.COKE_BLOCK.getItem(), ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), + getModItem(Thaumcraft.ID, "ItemResource", 4), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Block_MSSFUEL.get(1)) .fluidInputs(Materials.GasolinePremium.getFluid(120)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java b/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java index 865bee813a..961488991c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java +++ b/src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Forestry; -import static gregtech.api.enums.ModIDs.NotEnoughItems; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.NotEnoughItems; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java b/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java index e45b160352..1b78bfd4e9 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java +++ b/src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.util.GT_ModHandler.getModItem; import gregtech.api.enums.Materials; @@ -15,7 +15,7 @@ public class OreDictUnification implements Runnable { GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.HeeEndium, - getModItem(HardcoreEnderExpansion.modID, "endium_ingot", 1), + getModItem(HardcoreEnderExpansion.ID, "endium_ingot", 1), true, true); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index bc680c40e5..49e2c14011 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -1,7 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.GT_Values.*; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPlasmaForgeRecipes; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; @@ -32,13 +31,13 @@ public class PlasmaForgeRecipes implements Runnable { // Quantum anomaly recipe bypass for UXV. Avoids RNG. GT_Values.RA.stdBuilder() .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.ChromaticLens", 1), - getModItem(GoodGenerator.modID, "huiCircuit", 1, 4)) + getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 1), + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4)) .fluidInputs( Materials.WhiteDwarfMatter.getMolten(144), getFluidStack("molten.shirabon", 72), Materials.BlackDwarfMatter.getMolten(144)) - .itemOutputs(getModItem(GTPlusPlus.modID, "MU-metaitem.01", 1, 32105)) + .itemOutputs(getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) .noFluidOutputs() .duration(50 * 20) .eut((int) TierEU.RECIPE_UXV) diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java index c20609f8e0..0c800b0518 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java +++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; import static gregtech.api.util.GT_RecipeBuilder.*; @@ -70,7 +70,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 18)) + .itemInputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 18)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1)) .noFluidInputs() .noFluidOutputs() @@ -224,7 +224,7 @@ public class Pulverizer implements Runnable { // Iron GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2)) .noFluidInputs() .noFluidOutputs() @@ -233,7 +233,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -244,7 +244,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3)) @@ -257,7 +257,7 @@ public class Pulverizer implements Runnable { // Steel GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2)) .noFluidInputs() .noFluidOutputs() @@ -266,7 +266,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -277,7 +277,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 15)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3)) @@ -290,7 +290,7 @@ public class Pulverizer implements Runnable { // Aluminium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2)) .noFluidInputs() .noFluidOutputs() @@ -299,7 +299,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -310,7 +310,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3)) @@ -323,7 +323,7 @@ public class Pulverizer implements Runnable { // Stainless Steel GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2)) .noFluidInputs() .noFluidOutputs() @@ -332,7 +332,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 4)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -343,7 +343,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 5)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3)) @@ -356,7 +356,7 @@ public class Pulverizer implements Runnable { // Titanium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 6)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2)) .noFluidInputs() .noFluidOutputs() @@ -365,7 +365,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 7)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -376,7 +376,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 8)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3)) @@ -389,7 +389,7 @@ public class Pulverizer implements Runnable { // Tungesten Steel GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 9)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2)) .noFluidInputs() .noFluidOutputs() @@ -398,7 +398,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 10)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -409,7 +409,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 11)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3)) @@ -422,7 +422,7 @@ public class Pulverizer implements Runnable { // Palladium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 12)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2)) .noFluidInputs() .noFluidOutputs() @@ -431,7 +431,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 13)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -442,7 +442,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemInputs(getModItem(Railcraft.ID, "machine.zeta", 1L, 14)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NiobiumTitanium, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3)) @@ -455,7 +455,7 @@ public class Pulverizer implements Runnable { // Iridium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 0)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2)) .noFluidInputs() .noFluidOutputs() @@ -464,7 +464,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -475,7 +475,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 2)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Enderium, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3)) @@ -488,7 +488,7 @@ public class Pulverizer implements Runnable { // Osmium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 3)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2)) .noFluidInputs() .noFluidOutputs() @@ -497,7 +497,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 4)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -508,7 +508,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 5)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3)) @@ -521,7 +521,7 @@ public class Pulverizer implements Runnable { // Neutronium GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 6)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2)) .noFluidInputs() .noFluidOutputs() @@ -530,7 +530,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 7)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) @@ -541,7 +541,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemInputs(getModItem(Railcraft.ID, "machine.eta", 1L, 8)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 12), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3)) @@ -552,7 +552,7 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Railcraft.modID, "cube.crushed.obsidian", 1L)) + .itemInputs(getModItem(Railcraft.ID, "cube.crushed.obsidian", 1L)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L)) .noFluidInputs() .noFluidOutputs() @@ -563,8 +563,8 @@ public class Pulverizer implements Runnable { if (AppliedEnergistics2.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "tile.BlockSkyStone", 1L, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 45)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "tile.BlockSkyStone", 1L, 32767)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 45)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -572,8 +572,8 @@ public class Pulverizer implements Runnable { .addTo(sMaceratorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(AppliedEnergistics2.modID, "tile.BlockSkyChest", 1L, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 45)) + .itemInputs(getModItem(AppliedEnergistics2.ID, "tile.BlockSkyChest", 1L, 32767)) + .itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 8L, 45)) .noFluidInputs() .noFluidOutputs() .duration(20 * SECONDS) @@ -690,7 +690,7 @@ public class Pulverizer implements Runnable { if (HardcoreEnderExpansion.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(HardcoreEnderExpansion.modID, "endium_ore", 1)) + .itemInputs(getModItem(HardcoreEnderExpansion.ID, "endium_ore", 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 2), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java index 64201ce719..062df3d472 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.Forestry; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -84,7 +84,7 @@ public class PyrolyseRecipes implements Runnable { if (Forestry.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "fertilizerBio", 4), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(Forestry.ID, "fertilizerBio", 4), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .fluidInputs(Materials.Water.getFluid(4000)) .fluidOutputs(Materials.Biomass.getFluid(5000)) @@ -93,7 +93,7 @@ public class PyrolyseRecipes implements Runnable { .addTo(sPyrolyseRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "mulch", 32), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(getModItem(Forestry.ID, "mulch", 32), GT_Utility.getIntegratedCircuit(1)) .noItemOutputs() .fluidInputs(Materials.Water.getFluid(4000)) .fluidOutputs(Materials.Biomass.getFluid(5000)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java index 52736232b9..cf2e88f364 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java +++ b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java @@ -1,5 +1,7 @@ package gregtech.loaders.postload.recipes; +import static gregtech.api.enums.Mods.ExtraTrees; +import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.util.GT_ModHandler.getModItem; import java.util.Iterator; @@ -89,16 +91,16 @@ public class RecipeRemover implements Runnable { GT_Utility.removeSimpleIC2MachineRecipe( GT_Values.NI, GT_ModHandler.getMaceratorRecipeList(), - getModItem("IC2", "itemBiochaff", 1L)); + getModItem(IndustrialCraft2.ID, "itemBiochaff", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( new ItemStack(Blocks.cactus, 8, 0), GT_ModHandler.getCompressorRecipeList(), - getModItem("IC2", "itemFuelPlantBall", 1L)); + getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( - getModItem("ExtraTrees", "food", 8L, 24), + getModItem(ExtraTrees.ID, "food", 8L, 24), GT_ModHandler.getCompressorRecipeList(), - getModItem("IC2", "itemFuelPlantBall", 1L)); + getModItem(IndustrialCraft2.ID, "itemFuelPlantBall", 1L)); GT_Utility.removeSimpleIC2MachineRecipe( ItemList.Crop_Drop_BobsYerUncleRanks.get(1L), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java index 43fca26e7a..9af6836ce3 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java @@ -1,7 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.AppliedEnergistics2; -import static gregtech.api.enums.ModIDs.Thaumcraft; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.util.GT_ModHandler.getModItem; import java.util.Arrays; @@ -33,8 +33,8 @@ public class ThaumcraftRecipes implements Runnable { String tKey = "GT_BALANCE_SHARD_RECIPE"; GregTech_API.sThaumcraftCompat.addCrucibleRecipe( "TB.SM", - getModItem(Thaumcraft.modID, "ItemResource", 1L, 14), - getModItem(Thaumcraft.modID, "ItemShard", 1L, 6), + getModItem(Thaumcraft.ID, "ItemResource", 1L, 14), + getModItem(Thaumcraft.ID, "ItemShard", 1L, 6), Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))); @@ -560,7 +560,7 @@ public class ThaumcraftRecipes implements Runnable { "Transformation of obsidian into skystone", new String[] { "GT_ADVANCEDMETALLURGY" }, "ALCHEMY", - getModItem(AppliedEnergistics2.modID, "tile.BlockSkyStone", 1), + getModItem(AppliedEnergistics2.ID, "tile.BlockSkyStone", 1), 4, 0, 19, @@ -576,7 +576,7 @@ public class ThaumcraftRecipes implements Runnable { GregTech_API.sThaumcraftCompat.addCrucibleRecipe( tKey, new ItemStack(Blocks.obsidian), - getModItem(AppliedEnergistics2.modID, "tile.BlockSkyStone", 1), + getModItem(AppliedEnergistics2.ID, "tile.BlockSkyStone", 1), Arrays.asList( new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 1L), @@ -951,11 +951,11 @@ public class ThaumcraftRecipes implements Runnable { new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 32L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 16L)), - new ItemStack[] { getModItem(Thaumcraft.modID, "ItemResource", 1L, 14), + new ItemStack[] { getModItem(Thaumcraft.ID, "ItemResource", 1L, 14), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1), - getModItem(Thaumcraft.modID, "ItemResource", 1L, 14), + getModItem(Thaumcraft.ID, "ItemResource", 1L, 14), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 1) }) }); diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index db006d1ef5..0557d14640 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -1,6 +1,6 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.ModIDs.GTPlusPlus; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes; import static gregtech.api.util.GT_RecipeBuilder.*; diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java index 73ef51c411..2aad0220a2 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java @@ -1,6 +1,11 @@ package gregtech.loaders.preload; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TwilightForest; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -22,53 +27,53 @@ public class GT_Loader_ItemData implements Runnable { public void run() { GT_Log.out.println("GT_Mod: Loading Item Data Tags"); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.giantPick", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.giantPick", 1L, 0), new ItemData(Materials.Stone, 696729600L, new MaterialStack(Materials.Wood, 464486400L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.giantSword", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.giantSword", 1L, 0), new ItemData(Materials.Stone, 464486400L, new MaterialStack(Materials.Wood, 232243200L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "tile.GiantLog", 1L, 32767), + GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantLog", 1L, 32767), new ItemData(Materials.Wood, 232243200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "tile.GiantCobble", 1L, 32767), + GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantCobble", 1L, 32767), new ItemData(Materials.Stone, 232243200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "tile.GiantObsidian", 1L, 32767), + GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantObsidian", 1L, 32767), new ItemData(Materials.Obsidian, 232243200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.minotaurAxe", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.minotaurAxe", 1L, 0), new ItemData( Materials.Diamond, 14515200L, new MaterialStack(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 2L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.armorShards", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.armorShards", 1L, 0), new ItemData(Materials.Knightmetal, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("TwilightForest", "item.shardCluster", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.shardCluster", 1L, 0), new ItemData(Materials.Knightmetal, 3628800L)); GT_OreDictUnificator.addItemData(ItemList.TF_LiveRoot.get(1L), new ItemData(Materials.LiveRoot, 3628800L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 10), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10), new ItemData(Materials.CertusQuartz, 1814400L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 11), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11), new ItemData(Materials.NetherQuartz, 1814400L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 12), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12), new ItemData(Materials.Fluix, 1814400L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.quartz_block, 1, 32767), new ItemData(Materials.NetherQuartz, 14515200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartz", 1L, 32767), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzPillar", 1L, 32767), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzPillar", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1L, 32767), + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L)); GT_OreDictUnificator.addItemData( @@ -94,7 +99,7 @@ public class GT_Loader_ItemData implements Runnable { 14515200L, new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Forestry", "craftingMaterial", 1L, 5), + GT_ModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 5), new ItemData(Materials.Ice, 3628800L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); GT_OreDictUnificator.addItemData( @@ -170,7 +175,7 @@ public class GT_Loader_ItemData implements Runnable { new ItemStack(Blocks.iron_bars, 8, 32767), new ItemData(Materials.Iron, 10886400L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.SteelBars", 8L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 8L, 0), new ItemData(Materials.Steel, 10886400L)); GT_OreDictUnificator.addItemData( GT_ModHandler.getIC2Item("ironFurnace", 1L), @@ -184,13 +189,13 @@ public class GT_Loader_ItemData implements Runnable { new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), new ItemData(Materials.Iron, 7257600L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Railcraft", "tile.railcraft.anvil", 1L, 0), + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 0), new ItemData(Materials.Steel, 108864000L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Railcraft", "tile.railcraft.anvil", 1L, 1), + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 1), new ItemData(Materials.Steel, 72576000L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Railcraft", "tile.railcraft.anvil", 1L, 2), + GT_ModHandler.getModItem(Railcraft.ID, "tile.railcraft.anvil", 1L, 2), new ItemData(Materials.Steel, 36288000L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 0), new ItemData(Materials.Iron, 108864000L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 1), new ItemData(Materials.Iron, 72576000L)); @@ -412,19 +417,19 @@ public class GT_Loader_ItemData implements Runnable { new ItemStack(Blocks.dropper, 1, 32767), new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L))); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetChicken", 1L, 32767), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetChicken", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetBeef", 1L, 32767), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetBeef", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetPork", 1L, 32767), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetPork", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem("Thaumcraft", "ItemNuggetFish", 1L, 32767), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetFish", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); - for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem("TwilightForest", "item.meefRaw", 1L, 0), - GT_ModHandler.getModItem("TwilightForest", "item.venisonRaw", 1L, 0), new ItemStack(Items.porkchop), + for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefRaw", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0), new ItemStack(Items.porkchop), new ItemStack(Items.beef), new ItemStack(Items.chicken), new ItemStack(Items.fish) }) { if (tItem != null) { GT_OreDictUnificator.addItemData( @@ -432,8 +437,8 @@ public class GT_Loader_ItemData implements Runnable { new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } } - for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem("TwilightForest", "item.meefSteak", 1L, 0), - GT_ModHandler.getModItem("TwilightForest", "item.venisonCooked", 1L, 0), + for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefSteak", 1L, 0), + GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonCooked", 1L, 0), new ItemStack(Items.cooked_porkchop), new ItemStack(Items.cooked_beef), new ItemStack(Items.cooked_chicken), new ItemStack(Items.cooked_fished) }) { if (tItem != null) { diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 1a965607ea..780f2afeff 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -4,6 +4,12 @@ import static gregtech.api.enums.FluidState.GAS; import static gregtech.api.enums.FluidState.LIQUID; import static gregtech.api.enums.FluidState.MOLTEN; import static gregtech.api.enums.FluidState.SLURRY; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.BloodArsenal; +import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TwilightForest; import java.util.Locale; @@ -626,18 +632,18 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_Log.out.println("GT_Mod: Registering the BaseMetaTileEntity."); GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity"); FMLInterModComms.sendMessage( - "appliedenergistics2", + AppliedEnergistics2.ID, "whitelist-spatial", tBaseMetaTileEntity.getClass() .getName()); GT_Log.out.println("GT_Mod: Registering the BaseMetaPipeEntity."); GameRegistry.registerTileEntity(BaseMetaPipeEntity.class, "BaseMetaPipeEntity"); - FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", BaseMetaPipeEntity.class.getName()); + FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", BaseMetaPipeEntity.class.getName()); GT_Log.out.println("GT_Mod: Registering the Ore TileEntity."); GameRegistry.registerTileEntity(GT_TileEntity_Ores.class, "GT_TileEntity_Ores"); - FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", GT_TileEntity_Ores.class.getName()); + FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", GT_TileEntity_Ores.class.getName()); if (!GregTech_API.mIC2Classic) { GT_Log.out.println("GT_Mod: Registering Fluids."); Materials.ConstructionFoam.mFluid = GT_Utility.getFluidForFilledItem( @@ -2075,80 +2081,80 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.FierySteel, - GT_ModHandler.getModItem("TwilightForest", "item.fieryIngot", 1L, 0)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryIngot", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.Knightmetal, - GT_ModHandler.getModItem("TwilightForest", "item.knightMetal", 1L, 0)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.knightMetal", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.Steeleaf, - GT_ModHandler.getModItem("TwilightForest", "item.steeleafIngot", 1L, 0)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.steeleafIngot", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.IronWood, - GT_ModHandler.getModItem("TwilightForest", "item.ironwoodIngot", 1L, 0)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.ironwoodIngot", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedAir, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 0)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedFire, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 1)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 1)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedWater, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 2)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 2)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedEarth, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 3)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 3)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedOrder, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 4)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 4)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedEntropy, - GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 5)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 5)); GT_OreDictUnificator.set( OrePrefixes.nugget, Materials.Mercury, - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 5)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 5)); GT_OreDictUnificator.set( OrePrefixes.nugget, Materials.Thaumium, - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 6)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 6)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.Thaumium, - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 2)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 2)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.Mercury, - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 3)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 3)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.Amber, - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 6)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 6)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.Firestone, - GT_ModHandler.getModItem("Railcraft", "firestone.raw", 1L)); + GT_ModHandler.getModItem(Railcraft.ID, "firestone.raw", 1L)); GT_OreDictUnificator.set( OrePrefixes.nugget, Materials.Void, - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 7)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 7)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.Void, - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 16)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 16)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.BloodInfusedIron, - GT_ModHandler.getModItem("BloodArsenal", "blood_infused_iron", 1L, 0)); + GT_ModHandler.getModItem(BloodArsenal.ID, "blood_infused_iron", 1L, 0)); if (GregTech_API.sUnification.get( ConfigCategories.specialunificationtargets + "." + "railcraft", @@ -2157,12 +2163,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Iron, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0)); + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Iron, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0), + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0), false, false); } @@ -2174,12 +2180,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Steel, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 1)); + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Steel, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 1), + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1), false, false); } @@ -2191,12 +2197,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.TinAlloy, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 2)); + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.TinAlloy, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 2), + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2), false, false); } @@ -2208,12 +2214,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Copper, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3)); + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Copper, - GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 3), + GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3), false, false); } @@ -2221,7 +2227,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.set( OrePrefixes.dust, Materials.Cocoa, - GT_ModHandler.getModItem("harvestcraft", "cocoapowderItem", 1L, 0)); + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "cocoapowderItem", 1L, 0)); GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Coffee, ItemList.IC2_CoffeePowder.get(1L)); GregTech_API.registerMachineBlock( diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index d63647b2aa..ec1866b375 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1,6 +1,6 @@ package gregtech.loaders.preload; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -1346,22 +1346,22 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar", 1L, 0) }); + GT_ModHandler.getModItem(Railcraft.ID, "tool.crowbar", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar.reinforced", 1L, 0) }); + GT_ModHandler.getModItem(Railcraft.ID, "tool.crowbar.reinforced", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar.magic", 1L, 0) }); + GT_ModHandler.getModItem(Railcraft.ID, "tool.crowbar.magic", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[] { "dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', - GT_ModHandler.getModItem("Railcraft", "tool.crowbar.void", 1L, 0) }); + GT_ModHandler.getModItem(Railcraft.ID, "tool.crowbar.void", 1L, 0) }); ItemList.Hatch_AutoMaintenance.set( new GT_MetaTileEntity_Hatch_Maintenance( @@ -1475,7 +1475,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC bitsd, new Object[] { aTextPlate, "PTP", aTextPlateMotor, 'M', ItemList.Hull_HP, 'P', OrePrefixes.plate.get(Materials.Steel), 'T', - GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0) }); + GT_ModHandler.getModItem(BuildCraftFactory.ID, "tankBlock", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Bronze_Boiler_Solar.get(1L), bitsd, @@ -1487,7 +1487,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC bitsd, new Object[] { "GGG", "SSS", aTextPlateMotor, 'M', ItemList.Hull_HP_Bricks, 'P', OrePrefixes.pipeSmall.get(Materials.Steel), 'S', OrePrefixes.plateTriple.get(Materials.Silver), - 'G', GT_ModHandler.getModItem("IC2", "blockAlloyGlass", 1L) }); + 'G', GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L) }); ItemList.Machine_Bronze_BlastFurnace.set( new GT_MetaTileEntity_BronzeBlastFurnace( @@ -5747,73 +5747,73 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC if (Gendustry.isModLoaded()) { GT_ModHandler.addShapelessCraftingRecipe( ItemList.Machine_IndustrialApiary.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "IndustrialApiary", 1, 0) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "IndustrialApiary", 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_Frame.get(1), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "UpgradeFrame", 1) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "UpgradeFrame", 1) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_PRODUCTION.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 0) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 0) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_PLAINS.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 17) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 17) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_LIGHT.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 11) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 11) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_FLOWERING.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 2) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 2) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_WINTER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 20) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 20) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_DRYER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 5) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 5) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_AUTOMATION.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 14) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 14) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 4) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 4) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_HELL.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 13) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 13) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_POLLEN.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 22) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 22) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_DESERT.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 16) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 16) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_COOLER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 7) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 7) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_LIFESPAN.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 1) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 1) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_SEAL.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 10) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 10) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_STABILIZER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 19) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 19) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_JUNGLE.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 18) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 18) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_TERRITORY.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 3) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 3) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_OCEAN.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 21) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 21) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_SKY.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 12) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 12) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_HEATER.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 6) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 6) }); GT_ModHandler.addShapelessCraftingRecipe( ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L), - new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 15) }); + new Object[] { GT_ModHandler.getModItem(Gendustry.ID, "ApiaryUpgrade", 1, 15) }); } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index 6ea831b11f..cefc31eef6 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -1,6 +1,13 @@ package gregtech.loaders.preload; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Botania; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.ThermalExpansion; +import static gregtech.api.enums.Mods.TwilightForest; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -29,7 +36,7 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.set( OrePrefixes.cell, Materials.Creosote, - GT_ModHandler.getModItem("Railcraft", "fluid.creosote.cell", 1L)); + GT_ModHandler.getModItem(Railcraft.ID, "fluid.creosote.cell", 1L)); GT_OreDictUnificator.set(OrePrefixes.cell, Materials.UUMatter, GT_ModHandler.getIC2Item("uuMatterCell", 1L)); GT_OreDictUnificator.set(OrePrefixes.cell, Materials.ConstructionFoam, GT_ModHandler.getIC2Item("CFCell", 1L)); @@ -105,14 +112,14 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingAnvil, new ItemStack(Blocks.anvil, 1)); GT_OreDictUnificator.registerOre( OreDictNames.craftingAnvil, - GT_ModHandler.getModItem("Railcraft", "anvil", 1L, 0)); + GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0)); GT_OreDictUnificator.registerOre( OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.dust, Materials.Wood, - GT_ModHandler.getModItem("ThermalExpansion", "sawdust", 1L)); + GT_ModHandler.getModItem(ThermalExpansion.ID, "sawdust", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.glass, Materials.Reinforced, @@ -120,24 +127,24 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre( OrePrefixes.glass, Materials.Reinforced, - GT_ModHandler.getModItem("ThermalExpansion", "glassHardened", 1L)); + GT_ModHandler.getModItem(ThermalExpansion.ID, "glassHardened", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Basalt, - GT_ModHandler.getModItem("Railcraft", "cube", 1L, 6)); + GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 6)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Marble, - GT_ModHandler.getModItem("Railcraft", "cube", 1L, 7)); + GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 7)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Basalt, - GT_ModHandler.getModItem("Railcraft", "brick.abyssal", 1L, 32767)); + GT_ModHandler.getModItem(Railcraft.ID, "brick.abyssal", 1L, 32767)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Marble, - GT_ModHandler.getModItem("Railcraft", "brick.quarried", 1L, 32767)); + GT_ModHandler.getModItem(Railcraft.ID, "brick.quarried", 1L, 32767)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Obsidian, @@ -171,25 +178,25 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre( "paperResearchFragment", - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 9)); + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 9)); GT_OreDictUnificator.registerOre( "itemCertusQuartz", - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)); GT_OreDictUnificator.registerOre( "itemCertusQuartz", - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 10)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)); GT_OreDictUnificator.registerOre( "itemNetherQuartz", - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 11)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)); GT_OreDictUnificator.registerOre( OreDictNames.craftingQuartz, - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)); GT_OreDictUnificator.registerOre( OreDictNames.craftingQuartz, - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 10)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)); GT_OreDictUnificator.registerOre( OreDictNames.craftingQuartz, - GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 11)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)); GT_OreDictUnificator.registerOre("cropLemon", ItemList.FR_Lemon.get(1L)); GT_OreDictUnificator.registerOre("cropCoffee", ItemList.IC2_CoffeeBeans.get(1L)); GT_OreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L)); @@ -308,7 +315,7 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingFeather, new ItemStack(Items.feather, 1, 32767)); GT_OreDictUnificator.registerOre( OreDictNames.craftingFeather, - GT_ModHandler.getModItem("TwilightForest", "item.tfFeather", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.tfFeather", 1L, 32767)); GT_OreDictUnificator.registerOre("itemWheat", new ItemStack(Items.wheat, 1, 32767)); GT_OreDictUnificator.registerOre("paperEmpty", new ItemStack(Items.paper, 1, 32767)); @@ -335,180 +342,180 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Copper, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 0)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Tin, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 1)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 1)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Bronze, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 2)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 2)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Gold, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 3)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 3)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Iron, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 4)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 4)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Steel, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 5)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 5)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Lead, - GT_ModHandler.getModItem("IC2", "itemCasing", 1L, 6)); + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 6)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Osmium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OsmiumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Aluminium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.AluminiumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.AluminiumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.StainlessSteel, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.StainlessSteelItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Tungsten, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TungstenItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Neutronium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NeutroniumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.TungstenSteel, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TungstenSteelItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Iridium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IridiumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IridiumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Titanium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitaniumItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitaniumItemCasing", 1L, 0)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, Materials.Chrome, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ChromeItemCasing", 1L, 0)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeItemCasing", 1L, 0)); // Fake Circuits GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Primitive, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitULV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitULV", 1L)); // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Basic, // GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, // "item.CircuitLV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Good, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitMV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 1L)); // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Advanced, // GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, // "item.CircuitHV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Data, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitEV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitEV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Elite, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitIV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitIV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Master, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitLuV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLuV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Ultimate, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitZPM", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitZPM", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Superconductor, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Infinite, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUHV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUHV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Bio, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUEV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUEV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Optical, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUIV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUIV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Exotic, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUMV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUMV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Cosmic, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUXV", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUXV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, Materials.Transcendent, - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitMAX", 1L)); + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMAX", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Manasteel, - GT_ModHandler.getModItem("Botania", "storage", 1L)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Terrasteel, - GT_ModHandler.getModItem("Botania", "storage", 1L, 1)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 1)); GT_OreDictUnificator.registerOre( OrePrefixes.ingot, MaterialsBotania.ElvenElementium, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 7)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 7)); GT_OreDictUnificator.registerOre( OrePrefixes.nugget, MaterialsBotania.ElvenElementium, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 19)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 19)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.ElvenElementium, - GT_ModHandler.getModItem("Botania", "storage", 1L, 2)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 2)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Livingrock, - GT_ModHandler.getModItem("Botania", "livingrock", 1L)); + GT_ModHandler.getModItem(Botania.ID, "livingrock", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.ingot, MaterialsBotania.GaiaSpirit, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 14)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 14)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Livingwood, - GT_ModHandler.getModItem("Botania", "livingwood", 1L)); + GT_ModHandler.getModItem(Botania.ID, "livingwood", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.Dreamwood, - GT_ModHandler.getModItem("Botania", "dreamwood", 1L)); + GT_ModHandler.getModItem(Botania.ID, "dreamwood", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.gem, MaterialsBotania.ManaDiamond, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 2)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 2)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.ManaDiamond, - GT_ModHandler.getModItem("Botania", "storage", 1L, 3)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 3)); GT_OreDictUnificator.registerOre( OrePrefixes.gem, MaterialsBotania.BotaniaDragonstone, - GT_ModHandler.getModItem("Botania", "manaResource", 1L, 9)); + GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 9)); GT_OreDictUnificator.registerOre( OrePrefixes.block, MaterialsBotania.BotaniaDragonstone, - GT_ModHandler.getModItem("Botania", "storage", 1L, 4)); + GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 4)); } } diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index de1f6dec36..3fb0247162 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -1,7 +1,7 @@ package gregtech.loaders.preload; import static gregtech.GT_Mod.GT_FML_LOGGER; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import java.io.BufferedReader; import java.io.File; @@ -58,7 +58,7 @@ public class GT_PreLoad { for (short i = 0; i < tModList_sS; i = (short) (i + 1)) { ModContainer tMod = tModList.get(i); if (tMod.getModId() - .equalsIgnoreCase("gregtech")) { + .equalsIgnoreCase(GregTech.ID)) { tGregTech = tMod; } else { tNewModsList.add(tMod); |