diff options
Diffstat (limited to 'src/main/java/gregtech/common')
29 files changed, 593 insertions, 624 deletions
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 505fa1a96d..af7a4a6c00 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -7,7 +7,8 @@ package gregtech.common; import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES; import static gregtech.api.enums.GT_Values.calculateMaxPlasmaTurbineEfficiency; -import static gregtech.api.enums.ModIDs.Forestry; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GregTech; import static org.lwjgl.opengl.GL11.GL_LINE_LOOP; import java.net.URL; @@ -761,7 +762,7 @@ public class GT_Client extends GT_Proxy implements Runnable { @SubscribeEvent public void onConfigChange(ConfigChangedEvent.OnConfigChangedEvent e) { - if ("gregtech".equals(e.modID) && "client".equals(e.configID)) { + if (GregTech.ID.equals(e.modID) && "client".equals(e.configID)) { GregTech_API.sClientDataFile.mConfig.save(); // refresh client preference and send to server, since it's the only config we allow changing at runtime. mPreference = new GT_ClientPreference(GregTech_API.sClientDataFile); diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index df8d0bb39b..ef5a893f5e 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -5,10 +5,9 @@ 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.PLASMA; -import static gregtech.api.enums.GT_Values.MOD_ID; import static gregtech.api.enums.GT_Values.W; import static gregtech.api.enums.GT_Values.debugEntityCramming; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY; import java.io.File; @@ -574,8 +573,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG public int mTicksUntilNextCraftSound = 0; public double mMagneticraftBonusOutputPercent = 0d; private World mUniverse = null; - private final String aTextForestry = "Forestry"; - private final String aTextArsmagica2 = "arsmagica2"; public boolean mTEMachineRecipes = false; public boolean mEnableAllMaterials = false; public boolean mEnableAllComponents = false; @@ -792,62 +789,62 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } } GT_Log.out.println("GT_Mod: Getting required Items of other Mods."); - ItemList.TE_Slag.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "slag", 1L)); - ItemList.TE_Slag_Rich.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "slagRich", 1L)); - ItemList.TE_Rockwool.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "rockwool", 1L)); - ItemList.TE_Hardened_Glass.set(GT_ModHandler.getModItem(ThermalExpansion.modID, "glassHardened", 1L)); - - ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem(Railcraft.modID, "machine.delta", 1L, 0)); - ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem(Railcraft.modID, "frame", 1L, 0)); - ItemList.RC_Rail_Standard.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 0)); - ItemList.RC_Rail_Adv.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 1)); - ItemList.RC_Rail_Wooden.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 2)); - ItemList.RC_Rail_HS.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 3)); - ItemList.RC_Rail_Reinforced.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 4)); - ItemList.RC_Rail_Electric.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rail", 1L, 5)); - ItemList.RC_Tie_Wood.set(GT_ModHandler.getModItem(Railcraft.modID, "part.tie", 1L, 0)); - ItemList.RC_Tie_Stone.set(GT_ModHandler.getModItem(Railcraft.modID, "part.tie", 1L, 1)); - ItemList.RC_Bed_Wood.set(GT_ModHandler.getModItem(Railcraft.modID, "part.railbed", 1L, 0)); - ItemList.RC_Bed_Stone.set(GT_ModHandler.getModItem(Railcraft.modID, "part.railbed", 1L, 1)); - ItemList.RC_Rebar.set(GT_ModHandler.getModItem(Railcraft.modID, "part.rebar", 1L)); - ItemList.TC_Thaumometer.set(GT_ModHandler.getModItem(Thaumcraft.modID, "ItemThaumometer", 1L, 0)); - ItemList.Tool_Sword_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.sword", 1L)); - ItemList.Tool_Pickaxe_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.pickaxe", 1L)); - ItemList.Tool_Shovel_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.shovel", 1L)); - ItemList.Tool_Axe_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.axe", 1L)); - ItemList.Tool_Hoe_Steel.set(GT_ModHandler.getModItem(Railcraft.modID, "tool.steel.hoe", 1L)); - - ItemList.TF_LiveRoot.set(GT_ModHandler.getModItem(TwilightForest.modID, "item.liveRoot", 1L, 0)); - ItemList.TF_Vial_FieryBlood.set(GT_ModHandler.getModItem(TwilightForest.modID, "item.fieryBlood", 1L)); - ItemList.TF_Vial_FieryTears.set(GT_ModHandler.getModItem(TwilightForest.modID, "item.fieryTears", 1L)); - - ItemList.FR_Lemon.set(GT_ModHandler.getModItem(aTextForestry, "fruits", 1L, 3)); - ItemList.FR_Mulch.set(GT_ModHandler.getModItem(aTextForestry, "mulch", 1L)); - ItemList.FR_Fertilizer.set(GT_ModHandler.getModItem(aTextForestry, "fertilizerCompound", 1L)); - ItemList.FR_Compost.set(GT_ModHandler.getModItem(aTextForestry, "fertilizerBio", 1L)); - ItemList.FR_Silk.set(GT_ModHandler.getModItem(aTextForestry, "craftingMaterial", 1L, 2)); - ItemList.FR_Wax.set(GT_ModHandler.getModItem(aTextForestry, "beeswax", 1L)); - ItemList.FR_WaxCapsule.set(GT_ModHandler.getModItem(aTextForestry, "waxCapsule", 1L)); - ItemList.FR_RefractoryWax.set(GT_ModHandler.getModItem(aTextForestry, "refractoryWax", 1L)); - ItemList.FR_RefractoryCapsule.set(GT_ModHandler.getModItem(aTextForestry, "refractoryEmpty", 1L)); - ItemList.FR_Bee_Drone.set(GT_ModHandler.getModItem(aTextForestry, "beeDroneGE", 1L)); - ItemList.FR_Bee_Princess.set(GT_ModHandler.getModItem(aTextForestry, "beePrincessGE", 1L)); - ItemList.FR_Bee_Queen.set(GT_ModHandler.getModItem(aTextForestry, "beeQueenGE", 1L)); + ItemList.TE_Slag.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "slag", 1L)); + ItemList.TE_Slag_Rich.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "slagRich", 1L)); + ItemList.TE_Rockwool.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "rockwool", 1L)); + ItemList.TE_Hardened_Glass.set(GT_ModHandler.getModItem(ThermalExpansion.ID, "glassHardened", 1L)); + + ItemList.RC_ShuntingWire.set(GT_ModHandler.getModItem(Railcraft.ID, "machine.delta", 1L, 0)); + ItemList.RC_ShuntingWireFrame.set(GT_ModHandler.getModItem(Railcraft.ID, "frame", 1L, 0)); + ItemList.RC_Rail_Standard.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 0)); + ItemList.RC_Rail_Adv.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 1)); + ItemList.RC_Rail_Wooden.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 2)); + ItemList.RC_Rail_HS.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 3)); + ItemList.RC_Rail_Reinforced.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 4)); + ItemList.RC_Rail_Electric.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rail", 1L, 5)); + ItemList.RC_Tie_Wood.set(GT_ModHandler.getModItem(Railcraft.ID, "part.tie", 1L, 0)); + ItemList.RC_Tie_Stone.set(GT_ModHandler.getModItem(Railcraft.ID, "part.tie", 1L, 1)); + ItemList.RC_Bed_Wood.set(GT_ModHandler.getModItem(Railcraft.ID, "part.railbed", 1L, 0)); + ItemList.RC_Bed_Stone.set(GT_ModHandler.getModItem(Railcraft.ID, "part.railbed", 1L, 1)); + ItemList.RC_Rebar.set(GT_ModHandler.getModItem(Railcraft.ID, "part.rebar", 1L)); + ItemList.TC_Thaumometer.set(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemThaumometer", 1L, 0)); + ItemList.Tool_Sword_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.sword", 1L)); + ItemList.Tool_Pickaxe_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.pickaxe", 1L)); + ItemList.Tool_Shovel_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.shovel", 1L)); + ItemList.Tool_Axe_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.axe", 1L)); + ItemList.Tool_Hoe_Steel.set(GT_ModHandler.getModItem(Railcraft.ID, "tool.steel.hoe", 1L)); + + ItemList.TF_LiveRoot.set(GT_ModHandler.getModItem(TwilightForest.ID, "item.liveRoot", 1L, 0)); + ItemList.TF_Vial_FieryBlood.set(GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryBlood", 1L)); + ItemList.TF_Vial_FieryTears.set(GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryTears", 1L)); + + ItemList.FR_Lemon.set(GT_ModHandler.getModItem(Forestry.ID, "fruits", 1L, 3)); + ItemList.FR_Mulch.set(GT_ModHandler.getModItem(Forestry.ID, "mulch", 1L)); + ItemList.FR_Fertilizer.set(GT_ModHandler.getModItem(Forestry.ID, "fertilizerCompound", 1L)); + ItemList.FR_Compost.set(GT_ModHandler.getModItem(Forestry.ID, "fertilizerBio", 1L)); + ItemList.FR_Silk.set(GT_ModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 2)); + ItemList.FR_Wax.set(GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L)); + ItemList.FR_WaxCapsule.set(GT_ModHandler.getModItem(Forestry.ID, "waxCapsule", 1L)); + ItemList.FR_RefractoryWax.set(GT_ModHandler.getModItem(Forestry.ID, "refractoryWax", 1L)); + ItemList.FR_RefractoryCapsule.set(GT_ModHandler.getModItem(Forestry.ID, "refractoryEmpty", 1L)); + ItemList.FR_Bee_Drone.set(GT_ModHandler.getModItem(Forestry.ID, "beeDroneGE", 1L)); + ItemList.FR_Bee_Princess.set(GT_ModHandler.getModItem(Forestry.ID, "beePrincessGE", 1L)); + ItemList.FR_Bee_Queen.set(GT_ModHandler.getModItem(Forestry.ID, "beeQueenGE", 1L)); ItemList.FR_Tree_Sapling.set( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "sapling", 1L, - GT_ModHandler.getModItem(aTextForestry, "saplingGE", 1L))); - ItemList.FR_Butterfly.set(GT_ModHandler.getModItem(aTextForestry, "butterflyGE", 1L)); - ItemList.FR_Larvae.set(GT_ModHandler.getModItem(aTextForestry, "beeLarvaeGE", 1L)); - ItemList.FR_Serum.set(GT_ModHandler.getModItem(aTextForestry, "serumGE", 1L)); - ItemList.FR_Caterpillar.set(GT_ModHandler.getModItem(aTextForestry, "caterpillarGE", 1L)); - ItemList.FR_PollenFertile.set(GT_ModHandler.getModItem(aTextForestry, "pollenFertile", 1L)); - ItemList.FR_Stick.set(GT_ModHandler.getModItem(aTextForestry, "oakStick", 1L)); - ItemList.FR_Casing_Impregnated.set(GT_ModHandler.getModItem(aTextForestry, "impregnatedCasing", 1L)); - ItemList.FR_Casing_Sturdy.set(GT_ModHandler.getModItem(aTextForestry, "sturdyMachine", 1L)); - ItemList.FR_Casing_Hardened.set(GT_ModHandler.getModItem(aTextForestry, "hardenedMachine", 1L)); + GT_ModHandler.getModItem(Forestry.ID, "saplingGE", 1L))); + ItemList.FR_Butterfly.set(GT_ModHandler.getModItem(Forestry.ID, "butterflyGE", 1L)); + ItemList.FR_Larvae.set(GT_ModHandler.getModItem(Forestry.ID, "beeLarvaeGE", 1L)); + ItemList.FR_Serum.set(GT_ModHandler.getModItem(Forestry.ID, "serumGE", 1L)); + ItemList.FR_Caterpillar.set(GT_ModHandler.getModItem(Forestry.ID, "caterpillarGE", 1L)); + ItemList.FR_PollenFertile.set(GT_ModHandler.getModItem(Forestry.ID, "pollenFertile", 1L)); + ItemList.FR_Stick.set(GT_ModHandler.getModItem(Forestry.ID, "oakStick", 1L)); + ItemList.FR_Casing_Impregnated.set(GT_ModHandler.getModItem(Forestry.ID, "impregnatedCasing", 1L)); + ItemList.FR_Casing_Sturdy.set(GT_ModHandler.getModItem(Forestry.ID, "sturdyMachine", 1L)); + ItemList.FR_Casing_Hardened.set(GT_ModHandler.getModItem(Forestry.ID, "hardenedMachine", 1L)); ItemList.Bottle_Empty.set(new ItemStack(Items.glass_bottle, 1)); @@ -968,52 +965,45 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "part.turbine.disk", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "part.turbine.blade", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "part.turbine.rotor", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "borehead.diamond", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "borehead.steel", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.ID, "borehead.iron", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.disk", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.plateNaga", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(TwilightForest.ID, "item.legsNaga", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.blade", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticHelm", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.rotor", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticPlate", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(Railcraft.modID, "borehead.diamond", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.steel", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.iron", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticLegs", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.plateNaga", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.arcticBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiHelm", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.legsNaga", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiPlate", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiLegs", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticHelm", 1L, 32767)); + GT_ModHandler.getModItem(TwilightForest.ID, "item.yetiBoots", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticPlate", 1L, 32767)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticLegs", 1L, 32767)); + GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristHelmet", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristChest", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristLegs", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "apiaristBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "frameUntreated", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "frameImpregnated", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "frameProven", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Forestry.ID, "waxCast", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticBoots", 1L, 32767)); + GT_ModHandler.getModItem(GalacticraftCore.ID, "item.sensorGlasses", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristHelmet", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristChest", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameUntreated", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameImpregnated", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameProven", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "waxCast", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems.add( - GT_ModHandler.getModItem("IC2NuclearControl", "ItemToolThermometer", 1L, 32767)); + GT_ModHandler.getModItem(IC2NuclearControl.ID, "ItemToolThermometer", 1L, 32767)); RecipeSorter.register( "gregtech:shaped", @@ -1035,38 +1025,38 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Log.ore.println("GT_Mod: Beginning Load-Phase."); GT_OreDictUnificator.registerOre( "cropChilipepper", - GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 2)); + GT_ModHandler.getModItem(MagicalCrops.ID, "magicalcrops_CropProduce", 1L, 2)); GT_OreDictUnificator.registerOre( "cropTomato", - GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); + GT_ModHandler.getModItem(MagicalCrops.ID, "magicalcrops_CropProduce", 1L, 8)); GT_OreDictUnificator.registerOre( "cropGrape", - GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4)); - GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0)); + GT_ModHandler.getModItem(MagicalCrops.ID, "magicalcrops_CropProduce", 1L, 4)); + GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem(GanysSurface.ID, "teaLeaves", 1L, 0)); // Clay buckets, which don't get registered until Iguana Tweaks pre-init if (IguanaTweaksTinkerConstruct.isModLoaded()) { OrePrefixes.bucketClay.mContainerItem = GT_ModHandler.getModItem( - IguanaTweaksTinkerConstruct.modID, + IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Empty, - GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketFired", 1L, 0)); + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Water, - GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketWater", 1L, 0)); + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketWater", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Lava, - GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketLava", 1L, 0)); + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketLava", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Milk, - GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketMilk", 1L, 0)); + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketMilk", 1L, 0)); FluidContainerRegistry.registerFluidContainer( new FluidContainerRegistry.FluidContainerData( @@ -1093,64 +1083,64 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG addFullHazmatToIC2Item("quantumBoots"); // GraviSuite Hazmat - addFullHazmatToGeneralItem("GraviSuite", "graviChestPlate", 1L); - addFullHazmatToGeneralItem("GraviSuite", "advNanoChestPlate", 1L); + addFullHazmatToGeneralItem(GraviSuite.ID, "graviChestPlate", 1L); + addFullHazmatToGeneralItem(GraviSuite.ID, "advNanoChestPlate", 1L); // EMT Hazmat - addFullHazmatToGeneralItem("EMT", "itemArmorQuantumChestplate", 1L); - addFullHazmatToGeneralItem("EMT", "NanoBootsTraveller", 1L); - addFullHazmatToGeneralItem("EMT", "NanosuitGogglesRevealing", 1L); - addFullHazmatToGeneralItem("EMT", "QuantumBootsTraveller", 1L); - addFullHazmatToGeneralItem("EMT", "QuantumGogglesRevealing", 1L); - addFullHazmatToGeneralItem("EMT", "SolarHelmetRevealing", 1L); - addFullHazmatToGeneralItem("EMT", "NanosuitWing", 1L); - addFullHazmatToGeneralItem("EMT", "QuantumWing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "itemArmorQuantumChestplate", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "NanoBootsTraveller", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "NanosuitGogglesRevealing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "QuantumBootsTraveller", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "QuantumGogglesRevealing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "SolarHelmetRevealing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "NanosuitWing", 1L); + addFullHazmatToGeneralItem(ElectroMagicTools.ID, "QuantumWing", 1L); // DraconicEvolution Hazmat - addFullHazmatToGeneralItem("DraconicEvolution", "draconicBoots", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "draconicHelm", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "draconicLeggs", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "draconicChest", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "wyvernBoots", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "wyvernHelm", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "wyvernLeggs", 1L, 0); - addFullHazmatToGeneralItem("DraconicEvolution", "wyvernChest", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "draconicBoots", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "draconicHelm", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "draconicLeggs", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "draconicChest", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "wyvernBoots", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "wyvernHelm", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "wyvernLeggs", 1L, 0); + addFullHazmatToGeneralItem(DraconicEvolution.ID, "wyvernChest", 1L, 0); // AdvancedSolarPanel - addFullHazmatToGeneralItem("AdvancedSolarPanel", "advanced_solar_helmet", 1L); - addFullHazmatToGeneralItem("AdvancedSolarPanel", "hybrid_solar_helmet", 1L); - addFullHazmatToGeneralItem("AdvancedSolarPanel", "ultimate_solar_helmet", 1L); + addFullHazmatToGeneralItem(AdvancedSolarPanel.ID, "advanced_solar_helmet", 1L); + addFullHazmatToGeneralItem(AdvancedSolarPanel.ID, "hybrid_solar_helmet", 1L); + addFullHazmatToGeneralItem(AdvancedSolarPanel.ID, "ultimate_solar_helmet", 1L); // TaintedMagic Hazmat - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidwalkerBoots", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemShadowFortressHelmet", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemShadowFortressChestplate", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemShadowFortressLeggings", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressHelmet", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressChestplate", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidFortressLeggings", 1L); - addFullHazmatToGeneralItem("TaintedMagic", "ItemVoidmetalGoggles", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidwalkerBoots", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemShadowFortressHelmet", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemShadowFortressChestplate", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemShadowFortressLeggings", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidFortressHelmet", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidFortressChestplate", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidFortressLeggings", 1L); + addFullHazmatToGeneralItem(TaintedMagic.ID, "ItemVoidmetalGoggles", 1L); // WitchingGadgets Hazmat - addFullHazmatToGeneralItem("WitchingGadgets", "item.WG_PrimordialHelm", 1L); - addFullHazmatToGeneralItem("WitchingGadgets", "item.WG_PrimordialChest", 1L); - addFullHazmatToGeneralItem("WitchingGadgets", "item.WG_PrimordialLegs", 1L); - addFullHazmatToGeneralItem("WitchingGadgets", "item.WG_PrimordialBoots", 1L); + addFullHazmatToGeneralItem(WitchingGadgets.ID, "item.WG_PrimordialHelm", 1L); + addFullHazmatToGeneralItem(WitchingGadgets.ID, "item.WG_PrimordialChest", 1L); + addFullHazmatToGeneralItem(WitchingGadgets.ID, "item.WG_PrimordialLegs", 1L); + addFullHazmatToGeneralItem(WitchingGadgets.ID, "item.WG_PrimordialBoots", 1L); // ThaumicTinkerer Hazmat - addFullHazmatToGeneralItem("ThaumicTinkerer", "ichorclothChestGem", 1L); - addFullHazmatToGeneralItem("ThaumicTinkerer", "ichorclothBootsGem", 1L); - addFullHazmatToGeneralItem("ThaumicTinkerer", "ichorclothHelmGem", 1L); - addFullHazmatToGeneralItem("ThaumicTinkerer", "ichorclothLegsGem", 1L); + addFullHazmatToGeneralItem(ThaumicTinkerer.ID, "ichorclothChestGem", 1L); + addFullHazmatToGeneralItem(ThaumicTinkerer.ID, "ichorclothBootsGem", 1L); + addFullHazmatToGeneralItem(ThaumicTinkerer.ID, "ichorclothHelmGem", 1L); + addFullHazmatToGeneralItem(ThaumicTinkerer.ID, "ichorclothLegsGem", 1L); // GalaxySpace Hazmat - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_helmet", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_helmetglasses", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_plate", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_jetplate", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_leg", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_boots", 1L); - addFullHazmatToGeneralItem("GalaxySpace", "item.spacesuit_gravityboots", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_helmet", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_helmetglasses", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_plate", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_jetplate", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_leg", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_boots", 1L); + addFullHazmatToGeneralItem(GalaxySpace.ID, "item.spacesuit_gravityboots", 1L); // Extra Hazmat GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_helmet, 1, W)); @@ -1159,20 +1149,20 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GregTech_API.sElectroHazmatList.add(new ItemStack(Items.chainmail_boots, 1, W)); // Infinity Hazmat - addFullHazmatToGeneralItem("Avaritia", "Infinity_Helm", 1L); - addFullHazmatToGeneralItem("Avaritia", "Infinity_Chest", 1L); - addFullHazmatToGeneralItem("Avaritia", "Infinity_Pants", 1L); - addFullHazmatToGeneralItem("Avaritia", "Infinity_Shoes", 1L); + addFullHazmatToGeneralItem(Avaritia.ID, "Infinity_Helm", 1L); + addFullHazmatToGeneralItem(Avaritia.ID, "Infinity_Chest", 1L); + addFullHazmatToGeneralItem(Avaritia.ID, "Infinity_Pants", 1L); + addFullHazmatToGeneralItem(Avaritia.ID, "Infinity_Shoes", 1L); // EnderIO Hazmat - addFullHazmatToGeneralItem("EnderIO", "item.endSteel_helmet", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.endSteel_chestplate", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.endSteel_leggings", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.endSteel_boots", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.stellar_helmet", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.stellar_chestplate", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.stellar_leggings", 1L); - addFullHazmatToGeneralItem("EnderIO", "item.stellar_boots", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.endSteel_helmet", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.endSteel_chestplate", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.endSteel_leggings", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.endSteel_boots", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_helmet", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_chestplate", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_leggings", 1L); + addFullHazmatToGeneralItem(EnderIO.ID, "item.stellar_boots", 1L); GregTech_API.sLoadStarted = true; for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { @@ -1592,8 +1582,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG String aMod = tContainer == null ? "UNKNOWN" : tContainer.getModId(); String aOriginalMod = aMod; if (GT_OreDictUnificator.isRegisteringOres()) { - aMod = "gregtech"; - } else if (aMod.equals("gregtech")) { + aMod = GregTech.ID; + } else if (aMod.equals(GregTech.ID)) { aMod = "UNKNOWN"; } if ((aEvent == null) || (aEvent.Ore == null) @@ -1603,7 +1593,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG || (aEvent.Name.replaceAll("_", "") .length() - aEvent.Name.length() == 9)) { - if (aOriginalMod.equals("gregtech")) { + if (aOriginalMod.equals(GregTech.ID)) { aOriginalMod = "UNKNOWN"; } GT_Log.ore.println( @@ -1733,7 +1723,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } OrePrefixes aPrefix = OrePrefixes.getOrePrefix(aEvent.Name); Materials aMaterial = Materials._NULL; - if ((aPrefix == OrePrefixes.nugget) && (aMod.equals("Thaumcraft")) + if ((aPrefix == OrePrefixes.nugget) && (aMod.equals(Thaumcraft.ID)) && (aEvent.Ore.getItem() .getUnlocalizedName() .contains("ItemResource"))) { @@ -2702,7 +2692,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG int aState, int aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { return GT_FluidFactory.builder(aName) .withLocalizedName(aLocalized) - .withStillIconResourceLocation(new ResourceLocation(MOD_ID, "fluids/fluid." + aTexture)) + .withStillIconResourceLocation( + new ResourceLocation(GregTech.ID, "fluids/fluid." + aTexture)) .withColorRGBA(aRGBa) .withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK) .buildAndRegister() @@ -2733,26 +2724,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) && (tOre.mMaterial != null)) { - boolean chkmi = tOre.mModID != null; - if (chkmi) { - if (tOre.mModID.equalsIgnoreCase("enderio") && tOre.mPrefix == OrePrefixes.ingot - && tOre.mMaterial == Materials.DarkSteel) { - GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust - && tOre.mMaterial == Materials.Blizz) { + boolean checkModID = tOre.mModID != null; + + if (checkModID) { + switch (tOre.mModID) { + case Names.ENDER_I_O -> { + if (tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.DarkSteel) { GT_OreDictUnificator.addAssociation( tOre.mPrefix, tOre.mMaterial, @@ -2763,219 +2740,187 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), + ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true); continue; - } else - if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust - && tOre.mMaterial == Materials.Pyrotheum) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.dust - && tOre.mMaterial == Materials.Vinteum) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.BlueTopaz) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.Chimerite) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) - && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.Moonstone) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) - && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.Sunstone) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase("rotarycraft") - && tOre.mPrefix == OrePrefixes.ingot - && tOre.mMaterial == Materials.HSLA) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") - && tOre.mPrefix == OrePrefixes.gem - && tOre.mMaterial == Materials.CertusQuartz) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } else - if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") - && tOre.mPrefix == OrePrefixes.dust - && tOre.mMaterial == Materials.CertusQuartz) { - GT_OreDictUnificator.addAssociation( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - false); - GT_OreDictUnificator.set( - tOre.mPrefix, - tOre.mMaterial, - tOre.mEvent.Ore, - (GregTech_API.sUnification.get( - new StringBuilder().append( - ConfigCategories.specialunificationtargets) - .append(".") - .append( - tOre.mModID) - .toString(), - tOre.mEvent.Name, - true)), - true); - continue; - } + } + } + case Names.THERMAL_FONDATION -> { + if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Blizz) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Pyrotheum) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } + } + case Names.ARS_MAGICA2 -> { + if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Vinteum) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.BlueTopaz) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Chimerite) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Moonstone) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Sunstone) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } + } + case Names.ROTARY_CRAFT -> { + if (tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.HSLA) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } + } + case Names.APPLIED_ENERGISTICS2 -> { + if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.CertusQuartz) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } else if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.CertusQuartz) { + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); + GT_OreDictUnificator.set( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, + tOre.mEvent.Name, + true)), + true); + continue; + } + } + default -> {} + } } if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true); @@ -2985,17 +2930,15 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, - (chkmi) && (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), + (checkModID) && (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, false)), true); } } } + for (OreDictEventContainer tOre : this.mEvents) { if (((tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 3816973227..89d56baaef 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -1,8 +1,8 @@ package gregtech.common; import static gregtech.GT_Mod.GT_FML_LOGGER; -import static gregtech.api.enums.ModIDs.GTPlusPlus; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Railcraft; import java.util.ArrayList; import java.util.Arrays; @@ -678,7 +678,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe( true, new ItemStack[] { aInput1, aInput2, - GT_ModHandler.getModItem(GTPlusPlus.modID, "itemCactusCoke", (aCoalAmount * 2L)) }, + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemCactusCoke", (aCoalAmount * 2L)) }, new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, null, null, @@ -690,7 +690,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { GT_Recipe.GT_Recipe_Map.sPrimitiveBlastRecipes.addRecipe( true, new ItemStack[] { aInput1, aInput2, - GT_ModHandler.getModItem(GTPlusPlus.modID, "itemSugarCoke", (aCoalAmount * 2L)) }, + GT_ModHandler.getModItem(GTPlusPlus.ID, "itemSugarCoke", (aCoalAmount * 2L)) }, new ItemStack[] { aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2) }, null, null, diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java index 7f78fe0bda..e29e7963a8 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Metal.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Metal.java @@ -1,6 +1,6 @@ package gregtech.common.blocks; -import static gregtech.api.enums.ModIDs.NotEnoughItems; +import static gregtech.api.enums.Mods.NotEnoughItems; import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java index 098c2f3ebe..64f6b2e8ae 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java @@ -1,6 +1,6 @@ package gregtech.common.blocks; -import static gregtech.api.enums.ModIDs.NotEnoughItems; +import static gregtech.api.enums.Mods.NotEnoughItems; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java index 4b730ef0ff..2a27ee0cf9 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java @@ -1,5 +1,7 @@ package gregtech.common.blocks; +import static gregtech.api.enums.Mods.UndergroundBiomes; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -14,7 +16,7 @@ import gregtech.api.render.TextureFactory; public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract { - Block aUBBlock = GameRegistry.findBlock("UndergroundBiomes", "igneousStone"); + Block aUBBlock = GameRegistry.findBlock(UndergroundBiomes.ID, "igneousStone"); public GT_Block_Ores_UB1() { super("gt.blockores.ub1", 8, true, Material.rock); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java index 890aed5a2c..d7f08f2466 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java @@ -1,5 +1,7 @@ package gregtech.common.blocks; +import static gregtech.api.enums.Mods.UndergroundBiomes; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -14,7 +16,7 @@ import gregtech.api.render.TextureFactory; public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract { - Block aUBBlock = GameRegistry.findBlock("UndergroundBiomes", "metamorphicStone"); + Block aUBBlock = GameRegistry.findBlock(UndergroundBiomes.ID, "metamorphicStone"); public GT_Block_Ores_UB2() { super("gt.blockores.ub2", 8, true, Material.rock); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java index 873902a344..7315d81890 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java @@ -1,5 +1,7 @@ package gregtech.common.blocks; +import static gregtech.api.enums.Mods.UndergroundBiomes; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -14,7 +16,7 @@ import gregtech.api.render.TextureFactory; public class GT_Block_Ores_UB3 extends GT_Block_Ores_Abstract { - Block aUBBlock = GameRegistry.findBlock("UndergroundBiomes", "sedimentaryStone"); + Block aUBBlock = GameRegistry.findBlock(UndergroundBiomes.ID, "sedimentaryStone"); public GT_Block_Ores_UB3() { super("gt.blockores.ub3", 8, true, Material.rock); diff --git a/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java b/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java index f3effb0c99..13ee7f8c8d 100644 --- a/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java +++ b/src/main/java/gregtech/common/fluid/GT_FluidBuilder.java @@ -1,6 +1,6 @@ package gregtech.common.fluid; -import static gregtech.api.enums.GT_Values.MOD_ID; +import static gregtech.api.enums.Mods.GregTech; import java.util.Locale; @@ -85,7 +85,7 @@ public class GT_FluidBuilder implements IGT_FluidBuilder { */ @Override public IGT_FluidBuilder withTextureName(final String textureName) { - this.stillIconResourceLocation = new ResourceLocation(MOD_ID, "fluids/fluid." + textureName); + this.stillIconResourceLocation = new ResourceLocation(GregTech.ID, "fluids/fluid." + textureName); this.flowingIconResourceLocation = null; return this; } diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 66a6437e98..e970084691 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -1,7 +1,7 @@ package gregtech.common.items; import static gregtech.GT_Mod.GT_FML_LOGGER; -import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static gregtech.api.enums.Mods.GregTech; import java.util.ArrayList; import java.util.List; @@ -225,7 +225,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo super.registerIcons(aIconRegister); for (int i = 0; i < mIconDamage.length; i++) { mIconDamage[i] = aIconRegister.registerIcon( - RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); + GregTech.getResourcePath(GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); } if (GregTech_API.sPostloadFinished) { GT_Log.out.println("GT_Mod: Starting Item Icon Load Phase"); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 7165702f98..7b42dc60f2 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -1,6 +1,6 @@ package gregtech.common.items; -import static gregtech.api.enums.ModIDs.GalacticraftMars; +import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.client.GT_TooltipHandler.Tier.*; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 7300e59b14..164a5c4ca4 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -1,5 +1,6 @@ package gregtech.common.items; +import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Textures.BlockIcons.*; import net.minecraft.dispenser.IBlockSource; @@ -46,7 +47,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { public static GT_MetaGenerated_Item_02 INSTANCE; private static final String aTextCover = "Usable as Cover"; - private static final String aTextForestry = "Forestry"; public GT_MetaGenerated_Item_02() { super( @@ -1868,99 +1868,99 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_ModHandler.addCraftingRecipe( ItemList.Plank_Larch.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 0) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Teak.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 1) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Acacia_Green.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 2) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 2) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Lime.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 3) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 3) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Chestnut.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 4) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 4) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Wenge.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 5) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 5) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Baobab.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 6) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 6) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Sequoia.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 7) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs1", 1L, 7) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Kapok.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 0) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Ebony.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 1) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Mahagony.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 2) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 2) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Balsa.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 3) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 3) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Willow.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 4) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 4) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Walnut.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 5) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 5) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Greenheart.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 6) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 6) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Cherry.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 7) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs2", 1L, 7) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Mahoe.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 0) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 0) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Poplar.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 1) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Palm.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 2) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 2) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Papaya.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 3) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 3) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Pine.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 4) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 4) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Plum.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 5) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 5) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Maple.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 6) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 6) }); GT_ModHandler.addCraftingRecipe( ItemList.Plank_Citrus.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 7) }); + new Object[] { "s ", " P", 'P', GT_ModHandler.getModItem(Forestry.ID, "slabs3", 1L, 7) }); GregTech_API.registerCover(ItemList.Plank_Oak.get(1L), TextureFactory.of(Blocks.planks, 0), null); GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L), TextureFactory.of(Blocks.planks, 1), null); @@ -1973,7 +1973,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 0, @@ -1985,7 +1985,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 1, @@ -1997,7 +1997,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 2, @@ -2009,7 +2009,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 3, @@ -2021,7 +2021,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 4, @@ -2033,7 +2033,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 5, @@ -2045,7 +2045,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 6, @@ -2057,7 +2057,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 7, @@ -2069,7 +2069,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 8, @@ -2081,7 +2081,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 9, @@ -2093,7 +2093,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 10, @@ -2105,7 +2105,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 11, @@ -2117,7 +2117,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 12, @@ -2129,7 +2129,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 13, @@ -2141,7 +2141,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 14, @@ -2153,7 +2153,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 15, @@ -2165,7 +2165,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 16, @@ -2177,7 +2177,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 17, @@ -2189,7 +2189,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 18, @@ -2201,7 +2201,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 19, @@ -2213,7 +2213,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 20, @@ -2225,7 +2225,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 21, @@ -2237,7 +2237,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 22, @@ -2249,7 +2249,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { TextureFactory.of( GT_Utility.getBlockFromStack( GT_ModHandler.getModItem( - aTextForestry, + Forestry.ID, "planks", 1L, 23, diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java index 63fa279916..069d7acd5b 100644 --- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java +++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java @@ -1,6 +1,6 @@ package gregtech.common.items; -import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.util.GT_Utility.formatNumbers; import static ic2.core.util.LiquidUtil.drainContainerStack; import static ic2.core.util.LiquidUtil.fillContainerStack; @@ -142,7 +142,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister aIconRegister) { super.registerIcons(aIconRegister); - iconWindow = aIconRegister.registerIcon(RES_PATH_ITEM + "gt." + unlocalFlaskName + ".window"); + iconWindow = aIconRegister.registerIcon(GregTech.getResourcePath("gt." + unlocalFlaskName + ".window")); } public void setCapacity(ItemStack stack, int capacity) { diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 5d4d624513..c3000b9fc7 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -1,7 +1,7 @@ package gregtech.common.items; import static gregtech.api.enums.GT_Values.*; -import static gregtech.api.enums.ModIDs.*; +import static gregtech.api.enums.Mods.*; import java.util.Arrays; import java.util.List; @@ -44,7 +44,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gt.comb"); - GameRegistry.registerItem(this, "gt.comb", MOD_ID); + GameRegistry.registerItem(this, "gt.comb", GregTech.ID); } public ItemStack getStackForType(CombType type) { @@ -228,8 +228,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToItemStack( CombType.LAPOTRON, new ItemStack[] { GT_Bees.drop.getStackForType(DropType.LAPIS), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LapotronDust", 1, 0), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 2) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LapotronDust", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 2) }, new int[] { 20 * 100, 15 * 100, 40 * 100 }, Voltage.HV, 196); @@ -438,31 +438,31 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.THAUMIUMDUST, new Materials[] { Materials.Thaumium }, Voltage.MV); addCentrifugeToItemStack( CombType.THAUMIUMSHARD, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1, 1), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 2), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 3), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 4), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 5), - GT_ModHandler.getModItem("MagicBees", "propolis", 1, 6), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 1), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 2), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 3), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 4), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 5), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1, 6), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) }, new int[] { 20 * 100, 20 * 100, 20 * 100, 20 * 100, 20 * 100, 20 * 100, 50 * 100 }, Voltage.ULV); addProcessGT(CombType.AMBER, new Materials[] { Materials.Amber }, Voltage.LV); addProcessGT(CombType.QUICKSILVER, new Materials[] { Materials.Cinnabar }, Voltage.LV); addCentrifugeToItemStack( CombType.SALISMUNDUS, - new ItemStack[] { GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 14), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 14), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) }, new int[] { 100 * 100, 50 * 100 }, Voltage.MV); addCentrifugeToItemStack( CombType.TAINTED, - new ItemStack[] { GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 11), - GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1, 12), - GT_ModHandler.getModItem("Thaumcraft", "blockTaintFibres", 1, 0), - GT_ModHandler.getModItem("Thaumcraft", "blockTaintFibres", 1, 1), - GT_ModHandler.getModItem("Thaumcraft", "blockTaintFibres", 1, 2), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 11), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1, 12), + GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 0), + GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 1), + GT_ModHandler.getModItem(Thaumcraft.ID, "blockTaintFibres", 1, 2), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) }, new int[] { 15 * 100, 15 * 100, 15 * 100, 15 * 100, 15 * 100, 50 * 100 }, Voltage.ULV); addProcessGT(CombType.MITHRIL, new Materials[] { Materials.Mithril }, Voltage.HV); @@ -473,13 +473,13 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 20 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 75) * 100 }, new int[] {}, Voltage.HV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addCentrifugeToItemStack( CombType.THAUMINITE, - new ItemStack[] { GT_ModHandler.getModItem("thaumicbases", "resource", 1, 0), + new ItemStack[] { GT_ModHandler.getModItem(ThaumicBases.ID, "resource", 1, 0), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Thaumium, 1), - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0) }, + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0) }, new int[] { 20 * 100, 10 * 100, 50 * 100 }, Voltage.HV); addProcessGT(CombType.SHADOWMETAL, new Materials[] { Materials.Shadow }, Voltage.HV); @@ -489,13 +489,13 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { (GT_Mod.gregtechproxy.mNerfedCombs ? 20 : 75) * 100, 10 * 100 }, new int[] {}, Voltage.HV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addProcessGT(CombType.DIVIDED, new Materials[] { Materials.Diamond }, Voltage.HV); addCentrifugeToItemStack( CombType.DIVIDED, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), - GT_ModHandler.getModItem("ExtraUtilities", "unstableingot", 1, 1), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + GT_ModHandler.getModItem(ExtraUtilities.ID, "unstableingot", 1, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1) }, new int[] { 50 * 100, 20 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 75) * 100, @@ -504,8 +504,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.SPARKELING, new Materials[] { Materials.NetherStar }, Voltage.EV); addCentrifugeToItemStack( CombType.SPARKELING, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), - GT_ModHandler.getModItem("MagicBees", "miscResources", 2, 5), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "miscResources", 2, 5), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NetherStar, 1) }, new int[] { 50 * 100, 10 * 100, (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 50) * 100 }, Voltage.EV); @@ -516,12 +516,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 100 * 100 }, new int[] {}, Voltage.MV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addCentrifugeToItemStack( CombType.QUICKSILVER, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1, 5) }, + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5) }, new int[] { 50 * 100, 100 * 100 }, Voltage.ULV); } else { @@ -531,7 +531,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 100 * 100, 75 * 100 }, new int[] {}, Voltage.MV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addCentrifugeToMaterial( CombType.AMBER, @@ -539,12 +539,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 100 * 100 }, new int[] {}, Voltage.ULV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); addCentrifugeToItemStack( CombType.QUICKSILVER, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), - GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1, 5), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), + GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1, 5), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Cinnabar, 1) }, new int[] { 50 * 100, 100 * 100, 85 * 100 }, Voltage.ULV); @@ -554,7 +554,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 75 * 100, 55 * 100 }, new int[] {}, Voltage.HV, - GT_ModHandler.getModItem("MagicBees", "wax", 1, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1, 0), 50 * 100); } @@ -1161,39 +1161,39 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { // Twilight addCentrifugeToItemStack( CombType.NAGA, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 4), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NagaScaleChip", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NagaScaleFragment", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 4), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleChip", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NagaScaleFragment", 1L, 0), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.MV); addCentrifugeToItemStack( CombType.LICH, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 5), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LichBoneChip", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.LichBoneFragment", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 5), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneChip", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.LichBoneFragment", 1L, 0), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.HV); addCentrifugeToItemStack( CombType.HYDRA, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 1), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.FieryBloodDrop", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 1), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.FieryBloodDrop", 1L, 0), GT_Bees.drop.getStackForType(DropType.HYDRA), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.HV); addCentrifugeToItemStack( CombType.URGHAST, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CarminiteChip", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CarminiteFragment", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteChip", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CarminiteFragment", 1L, 0), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.EV); addCentrifugeToItemStack( CombType.SNOWQUEEN, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.SnowQueenBloodDrop", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SnowQueenBloodDrop", 1L, 0), GT_Bees.drop.getStackForType(DropType.SNOW_QUEEN), ItemList.FR_Wax.get(1) }, new int[] { 5 * 100, 33 * 100, 8 * 100, 30 * 100 }, Voltage.EV); @@ -1201,49 +1201,49 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { // HEE addCentrifugeToItemStack( CombType.ENDDUST, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.End), GT_Bees.drop.getStackForType(DropType.ENDERGOO), }, new int[] { 20 * 100, 15 * 100, 10 * 100 }, Voltage.HV); addCentrifugeToItemStack( CombType.STARDUST, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Stardust), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 20 * 100, 15 * 100, 10 * 100 }, Voltage.HV); addCentrifugeToItemStack( CombType.ECTOPLASMA, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Ectoplasma), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 25 * 100, 10 * 100, 15 * 100 }, Voltage.EV); addCentrifugeToItemStack( CombType.ARCANESHARD, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Arcaneshard), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 25 * 100, 10 * 100, 15 * 100 }, Voltage.EV); addCentrifugeToItemStack( CombType.DRAGONESSENCE, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Dragonessence), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 30 * 100, (int) (7.5 * 100), 20 * 100 }, Voltage.IV); addCentrifugeToItemStack( CombType.ENDERMAN, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Enderman), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 3000, 750, 2000 }, Voltage.IV); addCentrifugeToItemStack( CombType.SILVERFISH, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Silverfish), GT_Bees.drop.getStackForType(DropType.ENDERGOO), new ItemStack(Items.spawn_egg, 1, 60) }, new int[] { 25 * 100, 10 * 100, 20 * 100, 15 * 100 }, @@ -1256,28 +1256,28 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { new int[] { 50 * 100 }, new int[] {}, Voltage.HV, - GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), 20 * 100); } addCentrifugeToItemStack( CombType.RUNEI, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfPowerFragment", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfAgilityFragment", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfVigorFragment", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfDefenseFragment", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfMagicFragment", 1L, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfPowerFragment", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfAgilityFragment", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVigorFragment", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfDefenseFragment", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfMagicFragment", 1L, 0) }, new int[] { 25 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100, 5 * 100 }, Voltage.IV); addCentrifugeToItemStack( CombType.RUNEII, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.RuneOfVoidFragment", 1L, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RuneOfVoidFragment", 1L, 0) }, new int[] { 50 * 100, (int) (2.5 * 100) }, Voltage.IV); addCentrifugeToItemStack( CombType.FIREESSENSE, - new ItemStack[] { GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(MagicBees.ID, "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Fireessence), GT_Bees.drop.getStackForType(DropType.ENDERGOO) }, new int[] { 30 * 100, (int) (7.5 * 100), 20 * 100 }, @@ -1286,7 +1286,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { if (AE2FluidCraft.isModLoaded()) { addCentrifugeToItemStack( CombType.WALRUS, - new ItemStack[] { GT_ModHandler.getModItem("ae2fc", "walrus", 1L, 0) }, + new ItemStack[] { GT_ModHandler.getModItem(AE2FluidCraft.ID, "walrus", 1L, 0) }, new int[] { 100 * 100 }, Voltage.LV); } @@ -1295,7 +1295,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { CombType.SPACE, new ItemStack[] { ItemList.FR_Wax.get(1L), ItemList.FR_RefractoryWax.get(1L), GT_Bees.drop.getStackForType(DropType.OXYGEN), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CoinSpace", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CoinSpace", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 15 * 100, 5 * 100 }, Voltage.HV); addProcessGT(CombType.METEORICIRON, new Materials[] { Materials.MeteoricIron }, Voltage.HV); @@ -1397,24 +1397,24 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToItemStack( CombType.MOON, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MoonStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MoonStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.MV, 300); addCentrifugeToItemStack( CombType.MARS, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MarsStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MarsStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.HV, 300); addCentrifugeToItemStack( CombType.JUPITER, - new ItemStack[] { GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IoStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaIceDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.GanymedeStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoStoneDust", 1L, 0), + new ItemStack[] { GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IoStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaIceDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EuropaStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.GanymedeStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CallistoStoneDust", 1L, 0), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.CallistoIce, 1L), ItemList.FR_Wax.get(1L) }, new int[] { 30 * 100, 30 * 100, 30 * 100, 30 * 100, 30 * 100, 5 * 100, 50 * 100 }, @@ -1423,91 +1423,91 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToItemStack( CombType.MERCURY, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MercuryCoreDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MercuryStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryCoreDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MercuryStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.EV, 300); addCentrifugeToItemStack( CombType.VENUS, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VenusStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VenusStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.EV, 300); addCentrifugeToItemStack( CombType.SATURN, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitanStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EnceladusStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitanStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.IV, 300); addCentrifugeToItemStack( CombType.URANUS, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MirandaStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OberonStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.IV, 300); addCentrifugeToItemStack( CombType.NEPTUN, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ProteusStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TritonStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.IV, 300); addCentrifugeToItemStack( CombType.PLUTO, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PlutoIceDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PlutoIceDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.LuV, 300); addCentrifugeToItemStack( CombType.HAUMEA, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.HaumeaStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HaumeaStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.LuV, 300); addCentrifugeToItemStack( CombType.MAKEMAKE, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MakeMakeStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MakeMakeStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.LuV, 300); addCentrifugeToItemStack( CombType.CENTAURI, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriASurfaceDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CentauriAStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriASurfaceDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CentauriAStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.ZPM, 300); addCentrifugeToItemStack( CombType.TCETI, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TCetiEStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.ZPM, 300); addCentrifugeToItemStack( CombType.BARNARDA, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaEStoneDust", 1L, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.BarnardaFStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaEStoneDust", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.BarnardaFStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100, 30 * 100 }, Voltage.ZPM, 300); addCentrifugeToItemStack( CombType.VEGA, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VegaBStoneDust", 1L, 0) }, + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.VegaBStoneDust", 1L, 0) }, new int[] { 50 * 100, 30 * 100 }, Voltage.ZPM, 300); @@ -1515,7 +1515,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToItemStack( CombType.SEAWEED, new ItemStack[] { ItemList.FR_Wax.get(1L), - GT_ModHandler.getModItem("GalaxySpace", "tcetiedandelions", 1L, 0) }, + GT_ModHandler.getModItem(GalaxySpace.ID, "tcetiedandelions", 1L, 0) }, new int[] { 50 * 100, 100 * 100 }, Voltage.UV, 100); diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java index 2593945417..6604b887e6 100644 --- a/src/main/java/gregtech/common/items/ItemDrop.java +++ b/src/main/java/gregtech/common/items/ItemDrop.java @@ -1,8 +1,11 @@ package gregtech.common.items; -import static gregtech.api.enums.GT_Values.MOD_ID; -import static gregtech.api.enums.ModIDs.HardcoreEnderExpansion; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.ExtraBees; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.MagicBees; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import java.util.List; @@ -33,7 +36,7 @@ public class ItemDrop extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gt.drop"); - GameRegistry.registerItem(this, "gt.drop", MOD_ID); + GameRegistry.registerItem(this, "gt.drop", GregTech.ID); } public ItemStack getStackForType(DropType type) { @@ -102,53 +105,53 @@ public class ItemDrop extends Item { addProcessLV( tDrop, Materials.OilHeavy.getFluid(100L), - GT_ModHandler.getModItem("Forestry", "propolis", 1L, 0), + GT_ModHandler.getModItem(Forestry.ID, "propolis", 1L, 0), 3000, 8); RecipeManagers.squeezerManager.addRecipe( 40, new ItemStack[] { tDrop }, Materials.OilHeavy.getFluid(100L), - GT_ModHandler.getModItem("Forestry", "propolis", 1L, 0), + GT_ModHandler.getModItem(Forestry.ID, "propolis", 1L, 0), 30); tDrop = getStackForType(DropType.COOLANT); addProcessLV( tDrop, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 0), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 0), 3000, 8); RecipeManagers.squeezerManager.addRecipe( 40, new ItemStack[] { tDrop }, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 0), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 0), 30); tDrop = getStackForType(DropType.HOT_COOLANT); addProcessLV( tDrop, new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2), 3000, 8); RecipeManagers.squeezerManager.addRecipe( 40, new ItemStack[] { tDrop }, new FluidStack(FluidRegistry.getFluid("ic2hotcoolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2), 30); tDrop = getStackForType(DropType.SNOW_QUEEN); addProcessMV( tDrop, Materials.FierySteel.getFluid(200L), - GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "SnowQueenBloodDrop", 1L, 0), + GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "SnowQueenBloodDrop", 1L, 0), 1500, 48); tDrop = getStackForType(DropType.LAPIS); addProcessLV( tDrop, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 200), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3), 5000, 1200, 2); @@ -156,20 +159,20 @@ public class ItemDrop extends Item { 400, new ItemStack[] { tDrop }, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 3), 30); tDrop = getStackForType(DropType.HYDRA); addProcessMV( tDrop, Materials.FierySteel.getFluid(50L), - GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(MagicBees.ID, "propolis", 1L, 2), 3000, 8); tDrop = getStackForType(DropType.OXYGEN); addProcessLV( tDrop, new FluidStack(FluidRegistry.getFluid("liquidoxygen"), 100), - GT_ModHandler.getModItem("ExtraBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(ExtraBees.ID, "propolis", 1L, 2), 250, 1200, 8); @@ -177,7 +180,7 @@ public class ItemDrop extends Item { 400, new ItemStack[] { tDrop }, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), - GT_ModHandler.getModItem("ExtraBees", "propolis", 1L, 2), + GT_ModHandler.getModItem(ExtraBees.ID, "propolis", 1L, 2), 30); tDrop = getStackForType(DropType.ENDERGOO); if (HardcoreEnderExpansion.isModLoaded()) diff --git a/src/main/java/gregtech/common/items/ItemPollen.java b/src/main/java/gregtech/common/items/ItemPollen.java index 45557518ff..70e2d64514 100644 --- a/src/main/java/gregtech/common/items/ItemPollen.java +++ b/src/main/java/gregtech/common/items/ItemPollen.java @@ -1,6 +1,6 @@ package gregtech.common.items; -import static gregtech.api.enums.GT_Values.MOD_ID; +import static gregtech.api.enums.Mods.GregTech; import java.util.List; @@ -25,7 +25,7 @@ public class ItemPollen extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gt.pollen"); - GameRegistry.registerItem(this, "gt.pollen", MOD_ID); + GameRegistry.registerItem(this, "gt.pollen", GregTech.ID); } public ItemStack getStackForType(PollenType type) { diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index 00f2f4843a..20573dcdd7 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -1,7 +1,8 @@ package gregtech.common.items; -import static gregtech.api.enums.GT_Values.MOD_ID; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import java.util.List; @@ -32,7 +33,7 @@ public class ItemPropolis extends Item { this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); this.setUnlocalizedName("gt.propolis"); - GameRegistry.registerItem(this, "gt.propolis", MOD_ID); + GameRegistry.registerItem(this, "gt.propolis", GregTech.ID); } public ItemStack getStackForType(PropolisType type) { @@ -80,23 +81,23 @@ public class ItemPropolis extends Item { ItemStack tPropolis; tPropolis = getStackForType(PropolisType.End); - addProcessHV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "end_powder", 1, 0)); + addProcessHV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "end_powder", 1, 0)); tPropolis = getStackForType(PropolisType.Stardust); - addProcessHV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "stardust", 1, 0)); + addProcessHV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "stardust", 1, 0)); tPropolis = getStackForType(PropolisType.Ectoplasma); - addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EctoplasmaChip", 1, 0)); + addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EctoplasmaChip", 1, 0)); tPropolis = getStackForType(PropolisType.Arcaneshard); - addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ArcaneShardChip", 1, 0)); + addProcessEV(tPropolis, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArcaneShardChip", 1, 0)); tPropolis = getStackForType(PropolisType.Dragonessence); - addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "essence", 16, 0)); + addProcessIV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 16, 0)); tPropolis = getStackForType(PropolisType.Enderman); - addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "enderman_head", 1, 0)); + addProcessIV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "enderman_head", 1, 0)); tPropolis = getStackForType(PropolisType.Silverfish); - addProcessEV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "silverfish_blood", 1, 0)); + addProcessEV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "silverfish_blood", 1, 0)); tPropolis = getStackForType(PropolisType.Endium); addProcessHV(tPropolis, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.HeeEndium, 1)); tPropolis = getStackForType(PropolisType.Fireessence); - addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "essence", 16, 1)); + addProcessIV(tPropolis, GT_ModHandler.getModItem(HardcoreEnderExpansion.ID, "essence", 16, 1)); // addRecipe(tDrop, aOutput, aOutput2, aChance, aDuration, aEUt); } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java index 9a8231cf4c..4d8ecb2f41 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java @@ -1,5 +1,7 @@ package gregtech.common.items.behaviors; +import static gregtech.api.enums.Mods.Railcraft; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -27,7 +29,7 @@ public class Behaviour_Crowbar extends Behaviour_None { if (aWorld.isRemote) { return false; } - if (GT_ModHandler.getModItem("Railcraft", "fluid.creosote.bucket", 1L) != null) { + if (GT_ModHandler.getModItem(Railcraft.ID, "fluid.creosote.bucket", 1L) != null) { return false; } Block aBlock = aWorld.getBlock(aX, aY, aZ); diff --git a/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java b/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java index 7d0c4cee3e..34a71bfc84 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java @@ -1,5 +1,6 @@ package gregtech.common.misc.spaceprojects.enums; +import static gregtech.api.enums.Mods.GregTech; import static gregtech.common.misc.spaceprojects.enums.SpaceBodyType.*; import static gregtech.common.misc.spaceprojects.enums.StarType.*; @@ -10,7 +11,7 @@ import gregtech.common.misc.spaceprojects.interfaces.ISpaceBody; /** * An enum of all space bodies in the Sol Solar System. Or to be exact the more important ones - * + * * @author BlueWeabo */ public enum SolarSystem implements ISpaceBody { @@ -65,7 +66,7 @@ public enum SolarSystem implements ISpaceBody { SolarSystem(SpaceBodyType aType, StarType aStarType) { star = aStarType; spaceBody = aType; - texture = UITexture.fullImage("gregtech", "solarsystem/" + getName()); + texture = UITexture.fullImage(GregTech.ID, "solarsystem/" + getName()); SpaceProjectManager.addLocation(this); } diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java index 391a212115..dded37de09 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java @@ -2,7 +2,7 @@ package gregtech.common.tileentities.generators; import static gregtech.api.enums.ConfigCategories.machineconfig; import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.ModIDs.Thaumcraft; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; import static net.minecraft.util.EnumChatFormatting.GRAY; diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java index a0d22efd5d..d46d02a761 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java @@ -1,6 +1,7 @@ package gregtech.common.tileentities.machines.basic; -import static gregtech.api.enums.ModIDs.Railcraft; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import java.util.*; @@ -162,25 +163,25 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi addBlacklist(ItemList.Circuit_Parts_Vacuum_Tube.get(1L)); addBlacklist(ItemList.Schematic.get(1L)); if (Railcraft.isModLoaded()) { - addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 0)); - addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 736)); - addBlacklist(GT_ModHandler.getModItem(Railcraft.modID, "track", 1L, 816)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "track", 1L, 0)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "track", 1L, 736)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "track", 1L, 816)); } addBlacklist(IC2Items.getItem("mixedMetalIngot")); - addBlacklist(GT_ModHandler.getModItem("Railcraft", "machine.alpha", 1L, 14)); + addBlacklist(GT_ModHandler.getModItem(Railcraft.ID, "machine.alpha", 1L, 14)); // region transformer // Temporary solution for cable dupe // Maybe we can mark assembler recipes as "cannot disassemble" // and only disassemble crafting recipes in the future // Also `getIC2Item` doesn't work, maybe loading order? addBlacklist(ItemList.Transformer_MV_LV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 3)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 3)); addBlacklist(ItemList.Transformer_HV_MV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 4)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 4)); addBlacklist(ItemList.Transformer_EV_HV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 5)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 5)); addBlacklist(ItemList.Transformer_IV_EV.get(1L)); - addBlacklist(GT_ModHandler.getModItem("IC2", "blockElectric", 1L, 6)); + addBlacklist(GT_ModHandler.getModItem(IndustrialCraft2.ID, "blockElectric", 1L, 6)); // endregion transformer } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java index 27dea9bd00..8d605599e7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java @@ -2,6 +2,7 @@ package gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.V; import static gregtech.api.enums.GT_Values.debugBlockMiner; +import static gregtech.api.enums.Mods.GregTech; import java.util.ArrayList; @@ -460,7 +461,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine } private static final FallbackableUITexture progressBarTexture = new FallbackableUITexture( - UITexture.fullImage("gregtech", "gui/progressbar/miner"), + UITexture.fullImage(GregTech.ID, "gui/progressbar/miner"), GT_UITextures.PROGRESSBAR_CANNER); @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index dc3c4f7dc3..ca2182c0b8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -1,8 +1,8 @@ package gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.*; -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.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes; @@ -261,13 +261,13 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { int stackItemDamage = aStack.getItemDamage(); if (stackItemID == Item.getIdFromItem( Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 0)) + GT_ModHandler.getModItem(GalacticraftCore.ID, "item.schematic", 1L, 0)) .getItem())) { if (stackItemDamage == 0 && aStack.toString() .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftCore.modID, + GalacticraftCore.ID, "item.schematic", 1L, 0)) @@ -278,7 +278,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftCore.modID, + GalacticraftCore.ID, "item.schematic", 1L, 1)) @@ -288,13 +288,13 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { } else { if (stackItemID == Item.getIdFromItem( Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 0)) + GT_ModHandler.getModItem(GalacticraftMars.ID, "item.schematic", 1L, 0)) .getItem())) { if (stackItemDamage == 0 && aStack.toString() .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftMars.modID, + GalacticraftMars.ID, "item.schematic", 1L, 0)) @@ -305,7 +305,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftMars.modID, + GalacticraftMars.ID, "item.schematic", 1L, 1)) @@ -316,7 +316,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { .equals( Objects.requireNonNull( GT_ModHandler.getModItem( - GalacticraftMars.modID, + GalacticraftMars.ID, "item.schematic", 1L, 2)) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index dbd24fb012..519bed3ede 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -3,6 +3,9 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW; @@ -113,24 +116,24 @@ public class GT_MetaTileEntity_AssemblyLine extends 'g', ofChain( ofBlockUnlocalizedName( - "IC2", + IndustrialCraft2.ID, "blockAlloyGlass", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks2", 0, true), // warded // glass ofBlockUnlocalizedName( - "Thaumcraft", + Thaumcraft.ID, "blockCosmeticOpaque", 2, false))) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java index c3321931dd..e921369b05 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java @@ -2,6 +2,9 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_StructureUtility.ofFrame; @@ -145,24 +148,24 @@ public class GT_MetaTileEntity_IntegratedOreFactory 'g', ofChain( ofBlockUnlocalizedName( - "IC2", + IndustrialCraft2.ID, "blockAlloyGlass", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks2", 0, true), // warded // glass ofBlockUnlocalizedName( - "Thaumcraft", + Thaumcraft.ID, "blockCosmeticOpaque", 2, false))) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java index 21432394b4..8e6508b465 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java @@ -3,6 +3,9 @@ package gregtech.common.tileentities.machines.multi; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW; @@ -218,24 +221,24 @@ public class GT_MetaTileEntity_PCBFactory extends 'A', ofChain( ofBlockUnlocalizedName( - "IC2", + IndustrialCraft2.ID, "blockAlloyGlass", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks", 0, true), ofBlockUnlocalizedName( - "bartworks", + BartWorks.ID, "BW_GlasBlocks2", 0, true), // warded // glass ofBlockUnlocalizedName( - "Thaumcraft", + Thaumcraft.ID, "blockCosmeticOpaque", 2, false))) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index 2644f9f49e..b674560fa5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -5,7 +5,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockUn import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_HatchElement.*; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE_GLOW; @@ -50,7 +50,7 @@ public class GT_MetaTileEntity_PyrolyseOven extends private static IStructureDefinition<GT_MetaTileEntity_PyrolyseOven> createStructureDefinition() { IStructureElement<GT_MetaTileEntity_PyrolyseOven> tCasingElement = NewHorizonsCoreMod.isModLoaded() - ? ofBlockUnlocalizedName(NewHorizonsCoreMod.modID, "gt.blockcasingsNH", 2) + ? ofBlockUnlocalizedName(NewHorizonsCoreMod.ID, "gt.blockcasingsNH", 2) : ofBlock(GregTech_API.sBlockCasings1, 0); return StructureDefinition.<GT_MetaTileEntity_PyrolyseOven>builder() diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java index 5997520884..c2209cbe27 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java @@ -1,5 +1,6 @@ package gregtech.common.tileentities.machines.multiblock.logic; +import static gregtech.api.enums.Mods.Railcraft; import static net.minecraftforge.oredict.OreDictionary.getOreID; import static net.minecraftforge.oredict.OreDictionary.getOreIDs; @@ -46,7 +47,7 @@ public class CokeOvenProcessingLogic extends ProcessingLogic { return GT_OreDictUnificator.get("fuelCoke", null, 1); } else if (oreId == COAL_BLOCK_ORE_ID) { timeMultiplier = 9; - return GT_ModHandler.getModItem("Railcraft", "cube", 1, 0); + return GT_ModHandler.getModItem(Railcraft.ID, "cube", 1, 0); } else if (oreId == WOOD_ORE_ID) { return new ItemStack(Items.coal, 1, 1); } else if (oreId == SUGARCANE_ORE_ID) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java index df6a5ef668..3784fbc7bc 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import static gregtech.api.enums.ModIDs.Forestry; +import static gregtech.api.enums.Mods.Forestry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; |