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/preload | |
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/preload')
5 files changed, 168 insertions, 150 deletions
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); |