diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-04-09 01:08:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-09 01:08:26 +0200 |
| commit | 26caa265b7eae49767947e1ff4e6cfc8166b07f5 (patch) | |
| tree | 0fc0332da7a843cf153bf75fcc2e20601bbf18ee /src/main/java/gtPlusPlus/core/item | |
| parent | c33b3ba66194c7441fbd437530d21a51aa4395d5 (diff) | |
| download | GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.gz GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.bz2 GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.zip | |
clean up GT++ code (#589)
* yeet big reactor support
* yeet IC2 classic support
* yeet pneumaticraft support
* yeet More Planets support
* yeet Immersive Engineering support
* yeet Psychedilicraft support
* yeet Beyond Reality Core support
* sort mods to see what must be purged
* yeet simply jetpacks
* yeet RFTools
* yeet xReliquary
* yeet RedTech
* yeet Mekanism
* yeet GrowthCraft
* yeet ihl
* leftover cleaning
* yeet thermal fondation support
* yeet compact windmills support
* spotless
* remove constants from LoadedMods (part 1 / 2)
* spotless
* remove constants from LoadedMods (part 2 / 2)
* use mod id enum instead of strings + optimize imports
* Loaded.isModLoaded -> enum
* restore RA init
* missing !
* start organizing recipes stuff
* fix crash on world load in dev
* remove unused class
* remove HazmatUtils.java
* move all the removals
* remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack)
* move some pyrolyse oven recipes to its own file
* sa
* bump GT version
* bump GT5U version
* spotless apply
* use Everglades entry from the mod enum
---------
Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
87 files changed, 583 insertions, 405 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 3b9a1b48c6..dd07d2b138 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -1,58 +1,122 @@ package gtPlusPlus.core.item; -import static gtPlusPlus.core.creative.AddToCreativeTab.*; +import static gregtech.api.enums.Mods.Baubles; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gtPlusPlus.core.creative.AddToCreativeTab.tabMachines; +import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT; -import net.minecraft.item.*; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseModular; import gtPlusPlus.core.common.compat.COMPAT_Baubles; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.*; +import gtPlusPlus.core.item.base.BaseEuItem; +import gtPlusPlus.core.item.base.BaseItemBackpack; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; +import gtPlusPlus.core.item.base.BaseItemDamageable; +import gtPlusPlus.core.item.base.BaseItemTCShard; +import gtPlusPlus.core.item.base.CoreItem; import gtPlusPlus.core.item.base.dusts.BaseItemDust; import gtPlusPlus.core.item.base.foil.BaseItemFoil; -import gtPlusPlus.core.item.base.foods.*; +import gtPlusPlus.core.item.base.foods.BaseItemFood; +import gtPlusPlus.core.item.base.foods.BaseItemHotFood; import gtPlusPlus.core.item.base.gears.BaseItemSmallGear; -import gtPlusPlus.core.item.base.ingots.*; +import gtPlusPlus.core.item.base.ingots.BaseItemIngot; +import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD; import gtPlusPlus.core.item.base.misc.BaseItemMisc; import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes; -import gtPlusPlus.core.item.base.plates.*; -import gtPlusPlus.core.item.bauble.*; -import gtPlusPlus.core.item.chemistry.*; +import gtPlusPlus.core.item.base.plates.BaseItemPlate; +import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble; +import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble; +import gtPlusPlus.core.item.bauble.HealthBoostBauble; +import gtPlusPlus.core.item.bauble.ModularBauble; +import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble; +import gtPlusPlus.core.item.chemistry.AgriculturalChem; +import gtPlusPlus.core.item.chemistry.CoalTar; +import gtPlusPlus.core.item.chemistry.GenericChem; +import gtPlusPlus.core.item.chemistry.IonParticles; +import gtPlusPlus.core.item.chemistry.MilledOreProcessing; +import gtPlusPlus.core.item.chemistry.NuclearChem; +import gtPlusPlus.core.item.chemistry.RocketFuels; +import gtPlusPlus.core.item.chemistry.StandardBaseParticles; import gtPlusPlus.core.item.crafting.ItemDummyResearch; -import gtPlusPlus.core.item.effects.RarityUncommon; import gtPlusPlus.core.item.food.BaseItemMetaFood; -import gtPlusPlus.core.item.general.*; +import gtPlusPlus.core.item.general.BaseItemGrindle; +import gtPlusPlus.core.item.general.BufferCore; +import gtPlusPlus.core.item.general.ItemAirFilter; +import gtPlusPlus.core.item.general.ItemAreaClear; +import gtPlusPlus.core.item.general.ItemBasicFirestarter; +import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine; +import gtPlusPlus.core.item.general.ItemBlueprint; +import gtPlusPlus.core.item.general.ItemControlCore; +import gtPlusPlus.core.item.general.ItemEmpty; +import gtPlusPlus.core.item.general.ItemGemShards; +import gtPlusPlus.core.item.general.ItemGenericToken; +import gtPlusPlus.core.item.general.ItemGiantEgg; +import gtPlusPlus.core.item.general.ItemHalfCompleteCasings; +import gtPlusPlus.core.item.general.ItemLavaFilter; +import gtPlusPlus.core.item.general.ItemMagicFeather; +import gtPlusPlus.core.item.general.ItemSunnariumBit; import gtPlusPlus.core.item.general.books.ItemBaseBook; import gtPlusPlus.core.item.general.capture.ItemEntityCatcher; -import gtPlusPlus.core.item.general.chassis.*; +import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis; +import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil; +import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire; import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg; -import gtPlusPlus.core.item.general.throwables.*; +import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion; +import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion; +import gtPlusPlus.core.item.general.throwables.ItemThrowableBomb; import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.materials.DustDecayable; -import gtPlusPlus.core.item.tool.misc.*; -import gtPlusPlus.core.item.tool.misc.box.*; -import gtPlusPlus.core.item.tool.staballoy.*; +import gtPlusPlus.core.item.tool.misc.DebugScanner; +import gtPlusPlus.core.item.tool.misc.GregtechPump; +import gtPlusPlus.core.item.tool.misc.SandstoneHammer; +import gtPlusPlus.core.item.tool.misc.box.AutoLunchBox; +import gtPlusPlus.core.item.tool.misc.box.MagicToolBag; +import gtPlusPlus.core.item.tool.misc.box.UniversalToolBox; +import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase; +import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase; +import gtPlusPlus.core.item.tool.staballoy.StaballoyAxe; +import gtPlusPlus.core.item.tool.staballoy.StaballoyPickaxe; import gtPlusPlus.core.item.wearable.WearableLoader; -import gtPlusPlus.core.lib.*; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.material.*; -import gtPlusPlus.core.material.nuclear.*; +import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.NONMATERIAL; +import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.debug.DEBUG_INIT; -import gtPlusPlus.core.util.minecraft.*; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.everglades.GTplusplus_Everglades; import gtPlusPlus.preloader.CORE_Preloader; @@ -89,16 +153,7 @@ public final class ModItems { public static Item itemDustEnergeticAlloy; public static Item itemDustVibrantAlloy; public static Item itemDustConductiveIron; - // Big Reactors - public static Item itemPlateBlutonium; - public static Item itemPlateCyanite; - public static Item itemPlateLudicrite; - // Pneumaticraft - public static Item itemPlateCompressedIron; - // SimplyJetpacks - public static Item itemPlateEnrichedSoularium; - // rfTools - public static Item itemPlateDimensionShard; + // Staballoy public static Item itemStaballoyPickaxe; public static Item itemStaballoyAxe; @@ -386,17 +441,17 @@ public final class ModItems { // Some Simple forms of materials itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines) - .setTextureName(CORE.MODID + ":itemStickyRubber"); + .setTextureName(GTPlusPlus.ID + ":itemStickyRubber"); GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber"); GT_OreDictUnificator - .registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemStickyRubber", 1)); + .registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemStickyRubber", 1)); // Register Hydrogen Blobs first, so we can replace old helium blobs. itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc) - .setTextureName(CORE.MODID + ":itemHeliumBlob"); + .setTextureName(GTPlusPlus.ID + ":itemHeliumBlob"); // Register Old Helium Blob, this will be replaced when held by a player. itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc, ItemUtils.getSimpleStack(itemHydrogenBlob)) - .setTextureName(CORE.MODID + ":itemHydrogenBlob"); + .setTextureName(GTPlusPlus.ID + ":itemHydrogenBlob"); // Register this neato device, for making some fires. itemBasicFireMaker = new ItemBasicFirestarter(); @@ -447,7 +502,7 @@ public final class ModItems { EnumRarity.rare, EnumChatFormatting.GRAY, false, - Utils.rgbtoHexValue(182, 114, 18)).setTextureName(CORE.MODID + ":itemHeliumBlob"); + Utils.rgbtoHexValue(182, 114, 18)).setTextureName(GTPlusPlus.ID + ":itemHeliumBlob"); itemHalfCompleteCasings = new ItemHalfCompleteCasings( "itemHalfCompleteCasings", AddToCreativeTab.tabMisc, @@ -457,15 +512,15 @@ public final class ModItems { EnumRarity.common, EnumChatFormatting.GRAY, false, - Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01/" + "761"); + Utils.rgbtoHexValue(255, 255, 255)).setTextureName(GregTech.ID + ":" + "gt.metaitem.01/" + "761"); itemSulfuricPotion = new ItemSulfuricAcidPotion( "itemSulfuricPotion", "Throwable Vial of Sulfuric Acid", - "Burn your foes alive!").setTextureName(CORE.MODID + ":itemSulfuricAcidPotion"); + "Burn your foes alive!").setTextureName(GTPlusPlus.ID + ":itemSulfuricAcidPotion"); itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion( "itemHydrofluoricPotion", "Throwable Vial of Hydrofluoric Acid", - "They won't see this coming, nor anything after!").setTextureName(CORE.MODID + ":itemPotion"); + "They won't see this coming, nor anything after!").setTextureName(GTPlusPlus.ID + ":itemPotion"); // Start meta Item Generation ItemsFoods.load(); @@ -710,20 +765,24 @@ public final class ModItems { "Obtained from Mining Stone/SandStone, Chopping Logs or Shovelling Dirt." }); // Generates four elemental shards when TC is not installed. - if (!LoadedMods.Thaumcraft) { + if (!Thaumcraft.isModLoaded()) { shardAer = new BaseItemTCShard("Aer", Utils.rgbtoHexValue(225, 225, 5)); shardIgnis = new BaseItemTCShard("Ignis", Utils.rgbtoHexValue(255, 5, 5)); shardTerra = new BaseItemTCShard("Terra", Utils.rgbtoHexValue(5, 255, 5)); shardAqua = new BaseItemTCShard("Aqua", Utils.rgbtoHexValue(5, 5, 255)); } else { - shardAer = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Air Shard", 0, 1) + shardAer = ItemUtils + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Air Shard", 0, 1) .getItem(); shardIgnis = ItemUtils - .getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Fire Shard", 1, 1).getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Fire Shard", 1, 1) + .getItem(); shardAqua = ItemUtils - .getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Warer Shard", 2, 1).getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Warer Shard", 2, 1) + .getItem(); shardTerra = ItemUtils - .getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Earth Shard", 3, 1).getItem(); + .getItemStackWithMeta(Thaumcraft.isModLoaded(), "Thaumcraft:ItemShard", "Earth Shard", 3, 1) + .getItem(); } // Generates a set of four special dusts to be used in my recipes. dustAer = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AER, true)[0]; @@ -751,8 +810,7 @@ public final class ModItems { "LiOH", Utils.rgbtoHexValue(250, 250, 250))[0]; // https://en.wikipedia.org/wiki/Lithium_hydroxide - if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1)) - && !LoadedMods.IHL) { + if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { dustQuicklime = ItemUtils .generateSpecialUseDusts("Quicklime", "Quicklime", "CaO", Utils.rgbtoHexValue(255, 255, 175))[0]; // https://en.wikipedia.org/wiki/Calcium_oxide } @@ -847,7 +905,7 @@ public final class ModItems { itemZirconiumChlorideCinterPellet = new CoreItem( "itemZirconiumPellet", "Zirconium Pellet [" + StringUtils.subscript("ZrCl4") + "]", - tabMisc).setTextureName(CORE.MODID + ":itemShard"); + tabMisc).setTextureName(GTPlusPlus.ID + ":itemShard"); GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet)); // Zirconium Chloride dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; // http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf @@ -887,7 +945,7 @@ public final class ModItems { ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1); ItemStack temp2 = null; - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1); } if (temp1 != null) { @@ -1088,9 +1146,9 @@ public final class ModItems { // Bombs itemBombCasing = new CoreItem("itemBombCasing", "Bomb Casing", tabMisc); - itemBombCasing.setTextureName(CORE.MODID + ":bomb_casing"); + itemBombCasing.setTextureName(GTPlusPlus.ID + ":bomb_casing"); itemBombUnf = new CoreItem("itemBombUnf", "Bomb (unf)", tabMisc); - itemBombUnf.setTextureName(CORE.MODID + ":bomb_casing"); + itemBombUnf.setTextureName(GTPlusPlus.ID + ":bomb_casing"); itemDetCable = new CoreItem("itemDetCable", "Det. Cable", tabMisc); itemDetCable.setTextureName("string"); itemBomb = new ItemThrowableBomb(); @@ -1119,13 +1177,13 @@ public final class ModItems { new String[] { "You Found this on the ground.", "Definitely not sure if it's worth eating." }); // Baubles - if (LoadedMods.Baubles) { + if (Baubles.isModLoaded()) { tI = new HealthBoostBauble(); itemModularBauble = new ModularBauble(); } // EnderIO Resources - if ((LoadedMods.EnderIO || LOAD_ALL_CONTENT)) { + if ((EnderIO.isModLoaded() || LOAD_ALL_CONTENT)) { Logger.INFO("EnderIO Found - Loading Resources."); // Enderio Dusts itemDustSoularium = ItemUtils.generateSpecialUseDusts( @@ -1229,51 +1287,6 @@ public final class ModItems { */ } - // Big Reactors - if (LoadedMods.Big_Reactors || LOAD_ALL_CONTENT) { - Logger.INFO("BigReactors Found - Loading Resources."); - // Item Init - itemPlateBlutonium = ItemUtils - .generateSpecialUsePlate("Blutonium", "Blutonium", new short[] { 0, 0, 255 }, 0); - itemPlateCyanite = ItemUtils.generateSpecialUsePlate("Cyanite", "Cyanite", new short[] { 0, 191, 255 }, 0); - itemPlateLudicrite = ItemUtils - .generateSpecialUsePlate("Ludicrite", "Ludicrite", new short[] { 167, 5, 179 }, 0); - } else { - Logger.WARNING("BigReactors not Found - Skipping Resources."); - } - - // Pneumaticraft - if (LoadedMods.PneumaticCraft || LOAD_ALL_CONTENT) { - Logger.INFO("PneumaticCraft Found - Loading Resources."); - // Item Init - itemPlateCompressedIron = ItemUtils - .generateSpecialUsePlate("CompressedIron", "Compressed Iron", new short[] { 128, 128, 128 }, 0); - } else { - Logger.WARNING("PneumaticCraft not Found - Skipping Resources."); - } - - // Simply Jetpacks - if (LoadedMods.Simply_Jetpacks || LOAD_ALL_CONTENT) { - Logger.INFO("SimplyJetpacks Found - Loading Resources."); - // Item Init - itemPlateEnrichedSoularium = new RarityUncommon().setUnlocalizedName("itemPlateEnrichedSoularium") - .setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemPlateSoularium"); - // Registry - GameRegistry.registerItem(itemPlateEnrichedSoularium, "itemPlateEnrichedSoularium"); - } else { - Logger.WARNING("SimplyJetpacks not Found - Skipping Resources."); - } - - // rfTools - if (LoadedMods.RFTools || LOAD_ALL_CONTENT) { - Logger.INFO("rfTools Found - Loading Resources."); - // Item Init - itemPlateDimensionShard = ItemUtils - .generateSpecialUsePlate("DimensionShard", "Dimensional Shard", new short[] { 170, 230, 230 }, 0); - } else { - Logger.WARNING("rfTools not Found - Skipping Resources."); - } - // IC2 Exp Logger.INFO("IndustrialCraft2 Found - Loading Resources."); @@ -1327,7 +1340,7 @@ public final class ModItems { } itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit") - .setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); + .setTextureName(GTPlusPlus.ID + ":itemPLACEHOLDER_Circuit"); GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); // ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java index 2b057ae416..a4040e14b2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java @@ -1,8 +1,13 @@ package gtPlusPlus.core.item.base; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.Mods.GTPlusPlus; -import java.util.*; +import java.util.ArrayList; +import java.util.BitSet; +import java.util.HashMap; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -27,11 +32,16 @@ import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.IItemBehaviour; import gregtech.api.interfaces.IItemContainer; import gregtech.api.objects.ItemData; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import ic2.api.item.*; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricItemManager { @@ -459,10 +469,10 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI if (this.mEnabledItems.get(i)) { for (byte k = 1; k < this.mIconList[i].length; k++) { this.mIconList[i][k] = aIconRegister - .registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i + "/" + k)); + .registerIcon(GTPlusPlus.ID + ":" + (this.getUnlocalizedName() + "/" + i + "/" + k)); } this.mIconList[i][0] = aIconRegister - .registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i)); + .registerIcon(GTPlusPlus.ID + ":" + (this.getUnlocalizedName() + "/" + i)); } } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java index ef27a4fa02..b724687c1a 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -13,7 +15,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -25,7 +26,7 @@ public class BaseItemBackpack extends Item { public BaseItemBackpack(final String unlocalizedName, final int colour) { this.unlocalName = unlocalizedName; this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + "itemBackpack"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemBackpack"); this.colourValue = colour; GameRegistry.registerItem(this, unlocalizedName); GT_OreDictUnificator.registerOre("storageBackpack", ItemUtils.getSimpleStack(this)); @@ -69,6 +70,6 @@ public class BaseItemBackpack extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + "itemBackpack"); + this.itemIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "itemBackpack"); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java index 5b935d8234..8c3fdeb0f9 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -13,7 +15,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_LanguageManager; -import gtPlusPlus.core.lib.CORE; public class BaseItemColourable extends Item { @@ -35,7 +36,7 @@ public class BaseItemColourable extends Item { final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, int rgb) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); @@ -57,7 +58,7 @@ public class BaseItemColourable extends Item { final EnumChatFormatting colour, final boolean Effect, int rgb) { this.setUnlocalizedName(unlocalizedName); GT_LanguageManager.addStringLocalization("gtplusplus." + this.getUnlocalizedName() + ".name", displayName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index d78395057f..dd4cd24366 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -1,7 +1,13 @@ package gtPlusPlus.core.item.base; -import java.awt.Color; -import java.util.*; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.Thaumcraft; + +import java.awt.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -24,7 +30,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; @@ -73,7 +78,7 @@ public class BaseItemComponent extends Item { if (componentType == ComponentTypes.GEAR) { GT_OreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); } - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), // TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1); if (componentMaterial.isRadioactive) { @@ -109,7 +114,7 @@ public class BaseItemComponent extends Item { this.componentColour = MathUtils.getRgbAsHex(RGBA); this.extraData = RGBA; - this.setTextureName(CORE.MODID + ":" + "item" + ComponentTypes.CELL.COMPONENT_NAME); + this.setTextureName(GTPlusPlus.ID + ":" + "item" + ComponentTypes.CELL.COMPONENT_NAME); GameRegistry.registerItem(this, aFormattedNameForFluids); GT_OreDictUnificator.registerOre( ComponentTypes.CELL.getOreDictName() + Utils.sanitizeStringKeepBrackets(localName), @@ -170,7 +175,7 @@ public class BaseItemComponent extends Item { public String getCorrectTextures() { if (!CORE.ConfigSwitches.useGregtechTextures) { - return CORE.MODID + ":" + "item" + this.componentType.COMPONENT_NAME; + return GTPlusPlus.ID + ":" + "item" + this.componentType.COMPONENT_NAME; } String metType = "9j4852jyo3rjmh3owlhw9oe"; if (this.componentMaterial != null) { @@ -180,9 +185,9 @@ public class BaseItemComponent extends Item { } } metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType); - return "gregtech" + ":" + "materialicons/" + metType + "/" + this.componentType.getOreDictName(); + return GregTech.ID + ":" + "materialicons/" + metType + "/" + this.componentType.getOreDictName(); - // return "gregtech" + ":" + "materialicons/"+metType+"/" + this.componentType.COMPONENT_NAME.toLowerCase(); + // return GregTech.ID + ":" + "materialicons/"+metType+"/" + this.componentType.COMPONENT_NAME.toLowerCase(); } /* diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java index 3ea7c93102..9f026e0192 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -14,7 +16,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; public class BaseItemDamageable extends Item { @@ -27,7 +28,7 @@ public class BaseItemDamageable extends Item { final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(1); this.setMaxDamage(251); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java index e7afbab4fb..eb75c1fe5d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -7,13 +9,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.CORE; - public class BaseItemGeneric extends Item { public BaseItemGeneric(final String unlocalizedName, final CreativeTabs c, final int stackSize, final int maxDmg) { - this.setUnlocalizedName(CORE.MODID + "_" + unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setUnlocalizedName(GTPlusPlus.ID + "_" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(c); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java index 56d7aa2d6f..5f4795689d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -10,7 +12,6 @@ import net.minecraft.world.World; import gregtech.api.enums.Materials; import gtPlusPlus.api.enums.Quality; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -29,7 +30,7 @@ public class BaseItemLoot extends Item { this.unlocalName = "item" + lootType.LOOT_TYPE + this.materialName; this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "item" + lootType.LOOT_TYPE); + this.setTextureName(GTPlusPlus.ID + ":" + "item" + lootType.LOOT_TYPE); } public ItemStack generateLootStack() { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java index 1714278cd1..40163e29ec 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -12,7 +14,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -39,7 +40,7 @@ public class BaseItemTCShard extends Item { } } this.setMaxStackSize(64); - this.setTextureName(CORE.MODID + ":" + "itemShard"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemShard"); GameRegistry.registerItem(this, this.unlocalName); GT_OreDictUnificator.registerOre("shard" + DisplayName, ItemUtils.getSimpleStack(this)); GT_OreDictUnificator.registerOre("gemInfused" + DisplayName, ItemUtils.getSimpleStack(this)); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java index 6e1b86eec0..77af625213 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,7 +18,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BaseItemTickable extends CoreItem { @@ -114,10 +115,10 @@ public class BaseItemTickable extends CoreItem { public void registerIcons(final IIconRegister i) { if (this.twoRenderPasses) { - this.mIcon[0] = i.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName()); - this.mIcon[1] = i.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName() + "_OVERLAY"); + this.mIcon[0] = i.registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName()); + this.mIcon[1] = i.registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName() + "_OVERLAY"); } else { - this.mIcon[0] = i.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName()); + this.mIcon[0] = i.registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName()); // this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY"); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java index f42b13924d..a056b57852 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -11,7 +13,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BaseItemWithCharge extends Item { @@ -21,7 +22,7 @@ public class BaseItemWithCharge extends Item { public BaseItemWithCharge(final String unlocalizedName, final int constructor_Charge, final int constructor_Max_Charge) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabMachines); this.int_Charge = constructor_Charge; diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java index a5b71e5958..0e1b0ab0f2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java @@ -1,18 +1,18 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gtPlusPlus.core.lib.CORE; - public class BaseItemWithDamageValue extends Item { public BaseItemWithDamageValue(final String unlocalizedName) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(100); } diff --git a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java index e6acd5dd63..80284495b9 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java @@ -6,12 +6,19 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemMonsterPlacer; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.Facing; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index 516fdea294..1e2ddb4aea 100644 --- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -16,7 +18,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class CoreItem extends Item { @@ -177,7 +178,7 @@ public class CoreItem extends Item { final String[] description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); @@ -198,7 +199,7 @@ public class CoreItem extends Item { final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); this.itemName = displayName; - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(stackSize); this.setMaxDamage(maxDmg); diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index a260323da6..cd1331be55 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base.cell; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -47,11 +50,11 @@ public class BaseItemCell extends BaseItemComponent { public void registerIcons(final IIconRegister i) { if (CORE.ConfigSwitches.useGregtechTextures) { - this.base = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "cell"); - this.overlay = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "cell_OVERLAY"); + this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell"); + this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell_OVERLAY"); } else { - this.base = i.registerIcon(CORE.MODID + ":" + "item" + this.Cell.getComponent()); - this.overlay = i.registerIcon(CORE.MODID + ":" + "item" + this.Cell.getComponent() + "_Overlay"); + this.base = i.registerIcon(GTPlusPlus.ID + ":" + "item" + this.Cell.getComponent()); + this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "item" + this.Cell.getComponent() + "_Overlay"); } // this.overlay = cellMaterial.getFluid(1000).getFluid().get } diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java index 8e9c00143a..cca8113e91 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.cell; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; @@ -10,7 +12,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; @@ -36,8 +37,8 @@ public class BaseItemPlasmaCell extends BaseItemComponent { @Override public void registerIcons(final IIconRegister i) { - this.base = i.registerIcon(CORE.MODID + ":" + "item" + this.PlasmaCell.getComponent()); - this.overlay = i.registerIcon(CORE.MODID + ":" + "item" + this.PlasmaCell.getComponent() + "_Overlay"); + this.base = i.registerIcon(GTPlusPlus.ID + ":" + "item" + this.PlasmaCell.getComponent()); + this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "item" + this.PlasmaCell.getComponent() + "_Overlay"); // this.overlay = cellMaterial.getFluid(1000).getFluid().get } diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java index af5fc9abfd..c89bbb1d7d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.dusts; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -7,7 +9,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; public abstract class BaseItemDustAbstract extends Item { @@ -20,9 +21,9 @@ public abstract class BaseItemDustAbstract extends Item { this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); if (pileSize.equalsIgnoreCase("dust")) { - this.setTextureName(CORE.MODID + ":" + "dust"); + this.setTextureName(GTPlusPlus.ID + ":" + "dust"); } else { - this.setTextureName(CORE.MODID + ":" + "dust" + pileSize); + this.setTextureName(GTPlusPlus.ID + ":" + "dust" + pileSize); } this.setMaxStackSize(64); this.colour = colour; diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java index b3be8fb9c3..13dacd065d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java @@ -1,6 +1,11 @@ package gtPlusPlus.core.item.base.dusts; -import java.util.*; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -107,7 +112,7 @@ public class BaseItemDustEx extends BaseItemComponent { @Override public String getCorrectTextures() { if (!CORE.ConfigSwitches.useGregtechTextures) { - return CORE.MODID + ":" + "item" + this.componentType.getComponent(); + return GTPlusPlus.ID + ":" + "item" + this.componentType.getComponent(); } String metType = "9j4852jyo3rjmh3owlhw9oe"; if (this.componentMaterial != null) { @@ -117,6 +122,6 @@ public class BaseItemDustEx extends BaseItemComponent { } } metType = (metType.equals("9j4852jyo3rjmh3owlhw9oe") ? "METALLIC" : metType); - return "gregtech" + ":" + "materialicons/" + metType + "/" + this.componentType.getOreDictName(); + return GregTech.ID + ":" + "materialicons/" + metType + "/" + this.componentType.getOreDictName(); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index e4de7b038c..ba2b48b363 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.dusts; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; import java.util.HashMap; @@ -116,17 +118,17 @@ public class BaseItemDustUnique extends Item { private String getCorrectTexture(final String pileSize) { if (!CORE.ConfigSwitches.useGregtechTextures) { if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))) { - this.setTextureName(CORE.MODID + ":" + "dust"); + this.setTextureName(GTPlusPlus.ID + ":" + "dust"); } else { - this.setTextureName(CORE.MODID + ":" + "dust" + pileSize); + this.setTextureName(GTPlusPlus.ID + ":" + "dust" + pileSize); } } if (pileSize.toLowerCase().contains("small")) { - return "gregtech" + ":" + "materialicons/SHINY/dustSmall"; + return GregTech.ID + ":" + "materialicons/SHINY/dustSmall"; } else if (pileSize.toLowerCase().contains("tiny")) { - return "gregtech" + ":" + "materialicons/SHINY/dustTiny"; + return GregTech.ID + ":" + "materialicons/SHINY/dustTiny"; } - return "gregtech" + ":" + "materialicons/SHINY/dust"; + return GregTech.ID + ":" + "materialicons/SHINY/dust"; } @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java index 1a2e58f7f6..78af2155b1 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.dusts.decimal; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -9,7 +11,6 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; public class BaseItemCentidust extends Item { @@ -25,7 +26,7 @@ public class BaseItemCentidust extends Item { this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(10); - this.setTextureName(CORE.MODID + ":" + "itemCentidust"); // TODO + this.setTextureName(GTPlusPlus.ID + ":" + "itemCentidust"); // TODO GameRegistry.registerItem(this, this.unlocalName); // GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); //TODO } diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java index 826d6d13c9..de1b63794e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.dusts.decimal; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -9,7 +11,6 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; public class BaseItemDecidust extends Item { @@ -25,7 +26,7 @@ public class BaseItemDecidust extends Item { this.setCreativeTab(AddToCreativeTab.tabMisc); this.setUnlocalizedName(this.unlocalName); this.setMaxStackSize(10); - this.setTextureName(CORE.MODID + ":" + "itemDecidust"); // TODO + this.setTextureName(GTPlusPlus.ID + ":" + "itemDecidust"); // TODO GameRegistry.registerItem(this, this.unlocalName); // GT_OreDictUnificator.registerOre(unlocalName.replace("itemR", "r"), UtilsItems.getSimpleStack(this)); //TODO } diff --git a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java index 95f2a1d41d..f101bb969b 100644 --- a/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java +++ b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.foods; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -8,7 +10,6 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BaseItemFood extends ItemFood { @@ -19,7 +20,7 @@ public class BaseItemFood extends ItemFood { final float saturationModifier, final boolean wolvesFavorite, final PotionEffect... effects) { super(healAmount, saturationModifier, wolvesFavorite); this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName.replace("Hot", "")); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName.replace("Hot", "")); this.setCreativeTab(AddToCreativeTab.tabMisc); this.effects = effects; this.localName = localizedName; diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 84d00ec66d..b180a80f2b 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base.ingots; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +32,7 @@ public class BaseItemIngotHot extends BaseItemIngot { public BaseItemIngotHot(final Material material) { super(material, ComponentTypes.HOTINGOT); - this.setTextureName(CORE.MODID + ":" + "itemIngotHot"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemIngotHot"); this.outputIngot = material.getIngot(1); this.mTier = material.vTier; this.generateRecipe(); @@ -82,12 +85,12 @@ public class BaseItemIngotHot extends BaseItemIngot { public void registerIcons(final IIconRegister i) { if (CORE.ConfigSwitches.useGregtechTextures) { - this.base = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot"); - this.overlay = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY"); + this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot"); + this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY"); } else { - this.base = i - .registerIcon(CORE.MODID + ":" + "item" + BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()); - // this.overlay = i.registerIcon(CORE.MODID + ":" + + this.base = i.registerIcon( + GTPlusPlus.ID + ":" + "item" + BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()); + // this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + // "item"+BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()+"_Overlay"); } // this.overlay = cellMaterial.getFluid(1000).getFluid().get diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java index c9cc305a3d..222f6e9c1a 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.ingots; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -10,7 +12,6 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -27,7 +28,7 @@ public class BaseItemIngot_OLD extends Item { this.setCreativeTab(AddToCreativeTab.tabMisc); this.unlocalName = unlocalizedName; this.setMaxStackSize(64); - this.setTextureName(CORE.MODID + ":" + "itemIngot"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemIngot"); this.colour = colour; this.materialName = materialName; this.sRadiation = sRadioactivity; diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java index a2b8f15b2c..64c5f76109 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base.misc; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,8 +19,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -57,7 +58,7 @@ public class BaseItemMisc extends Item { } private String getCorrectTextures() { - return CORE.MODID + ":" + "item" + this.miscType.TYPE; + return GTPlusPlus.ID + ":" + "item" + this.miscType.TYPE; } @Override @@ -77,7 +78,7 @@ public class BaseItemMisc extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - if (this.miscType == MiscTypes.DROP && LoadedMods.Forestry) { + if (this.miscType == MiscTypes.DROP && Forestry.isModLoaded()) { this.itemIcon = par1IconRegister.registerIcon("forestry:honeyDrop.0"); this.secondIcon = par1IconRegister.registerIcon("forestry:honeyDrop.1"); } else { diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java index fdcb8a8b7f..56ecf59274 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.misc; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -12,7 +14,6 @@ import net.minecraft.util.EnumChatFormatting; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public abstract class BaseItemParticle extends CoreItem { @@ -31,7 +32,7 @@ public abstract class BaseItemParticle extends CoreItem { EnumChatFormatting.DARK_AQUA, false, null); - this.setTextureName(CORE.MODID + ":" + "science/Atom"); + this.setTextureName(GTPlusPlus.ID + ":" + "science/Atom"); aMaxCount = aCount; this.setHasSubtypes(true); } diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 48725e951c..6b4d3ab4a3 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.base.ore; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,7 +23,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -55,14 +57,6 @@ public class BaseOreComponent extends Item { GT_OreDictUnificator.registerOre( componentType.getComponent() + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); - if (LoadedMods.Thaumcraft) { - // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), - // TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1); - if (componentMaterial.isRadioactive) { - // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), - // TC_Aspect_Wrapper.generate(TC_Aspects.RADIO.mAspect), componentMaterial.vRadiationLevel); - } - } } public boolean registerComponent() { @@ -186,28 +180,29 @@ public class BaseOreComponent extends Item { @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister par1IconRegister) { if (this.componentType == ComponentTypes.MILLED) { - this.base = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/milled"); + this.base = par1IconRegister.registerIcon(GTPlusPlus.ID + ":" + "processing/MilledOre/milled"); if (this.componentType.hasOverlay()) { - this.overlay = par1IconRegister.registerIcon(CORE.MODID + ":" + "processing/MilledOre/milled_OVERLAY"); + this.overlay = par1IconRegister + .registerIcon(GTPlusPlus.ID + ":" + "processing/MilledOre/milled_OVERLAY"); } } else if (CORE.ConfigSwitches.useGregtechTextures) { // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" - // is using `"+"gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the + // is using `"+GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the // layer 0 texture path."); this.base = par1IconRegister - .registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME); + .registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME); if (this.componentType.hasOverlay()) { // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+" - // is using `"+"gregtech" + ":" + "materialicons/METALLIC/" + + // is using `"+GregTech.ID + ":" + "materialicons/METALLIC/" + // this.componentType.COMPONENT_NAME+"_OVERLAY"+"' as the layer 1 texture path."); this.overlay = par1IconRegister.registerIcon( - "gregtech" + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME + "_OVERLAY"); + GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME + "_OVERLAY"); } } else { - this.base = par1IconRegister.registerIcon(CORE.MODID + ":" + "item" + this.componentType.getComponent()); + this.base = par1IconRegister.registerIcon(GTPlusPlus.ID + ":" + "item" + this.componentType.getComponent()); if (this.componentType.hasOverlay()) { this.overlay = par1IconRegister - .registerIcon(CORE.MODID + ":" + "item" + this.componentType.getComponent() + "_Overlay"); + .registerIcon(GTPlusPlus.ID + ":" + "item" + this.componentType.getComponent() + "_Overlay"); } } } diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java index dcb133782a..a3a8eb6153 100644 --- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.item.base.plates; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; public class BaseItemPlateHeavy extends BaseItemComponent { @@ -19,7 +20,7 @@ public class BaseItemPlateHeavy extends BaseItemComponent { @Override public String getCorrectTextures() { - return CORE.MODID + ":" + "itemHeavyPlate"; + return GTPlusPlus.ID + ":" + "itemHeavyPlate"; } @Override @@ -30,8 +31,8 @@ public class BaseItemPlateHeavy extends BaseItemComponent { @Override public void registerIcons(final IIconRegister i) { - this.base = i.registerIcon(CORE.MODID + ":" + "itemHeavyPlate"); - this.overlay = i.registerIcon(CORE.MODID + ":" + "itemHeavyPlate_Overlay"); + this.base = i.registerIcon(GTPlusPlus.ID + ":" + "itemHeavyPlate"); + this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "itemHeavyPlate_Overlay"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java index a66510fc73..6f46752c2f 100644 --- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.base.plates; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -36,7 +38,7 @@ public class BaseItemPlate_OLD extends Item { this.setCreativeTab(AddToCreativeTab.tabMisc); this.unlocalName = "itemPlate" + unlocalizedName; this.setMaxStackSize(64); - this.setTextureName(CORE.MODID + ":" + "itemPlate"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemPlate"); this.setMaxStackSize(64); this.colour = colour; this.materialName = materialName; diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 14133ff837..0060d370b0 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -24,6 +24,7 @@ import com.google.common.collect.Multimap; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Mods; import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.Utils; @@ -31,8 +32,8 @@ import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT; import gtPlusPlus.core.util.minecraft.NBTUtils; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Mods.Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Mods.Names.BAUBLES) }) public class BaseBauble extends Item implements IBauble { /** diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java index bc2757a24a..463dd1608a 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -19,7 +21,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GT_Values; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; import ic2.api.item.ElectricItem; @@ -31,7 +32,7 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble { super(BaubleType.BELT, tier, GT_Values.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name"); String aUnlocalName = "GTPP.BattPack.0" + tier + ".name"; this.setCreativeTab(AddToCreativeTab.tabMachines); - if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) { GameRegistry.registerItem(this, aUnlocalName); } } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java index 14b38d3f7e..4dcca46145 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -19,16 +21,16 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Mods; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Mods.Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Mods.Names.BAUBLES) }) public abstract class ElectricBaseBauble extends BaseBauble implements IElectricItem, IElectricItemManager, IBauble { public final int mTier; @@ -41,12 +43,12 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric mTier = aTier; maxValueEU = aMaxEU; this.setUnlocalizedName(aUnlocalName); - this.setTextureName(CORE.MODID + ":" + getTextureNameForBauble()); + this.setTextureName(GTPlusPlus.ID + ":" + getTextureNameForBauble()); this.setMaxDamage(27); this.setMaxStackSize(1); this.setNoRepair(); this.setCreativeTab(AddToCreativeTab.tabMachines); - if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) { GameRegistry.registerItem(this, aUnlocalName); } } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java index 5886717522..b5d7b8fdbb 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.reflect.Field; import java.util.HashMap; import java.util.HashSet; @@ -18,7 +20,6 @@ import net.minecraft.world.World; import baubles.api.BaubleType; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.DevHelper; @@ -49,12 +50,12 @@ public class FireProtectionBauble extends BaseBauble { super(BaubleType.RING, "GTPP.bauble.fireprotection.0" + ".name", 0); String aUnlocalName = "GTPP.bauble.fireprotection.0" + ".name"; this.setUnlocalizedName(aUnlocalName); - this.setTextureName(CORE.MODID + ":" + getTextureNameForBauble()); + this.setTextureName(GTPlusPlus.ID + ":" + getTextureNameForBauble()); this.setMaxDamage(100); this.setMaxStackSize(1); this.setNoRepair(); this.setCreativeTab(AddToCreativeTab.tabMachines); - if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) { GameRegistry.registerItem(this, aUnlocalName); } } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java index bd58824687..db422692e7 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.SharedMonsterAttributes; @@ -13,14 +15,13 @@ import net.minecraft.util.StatCollector; import baubles.api.BaubleType; import com.google.common.collect.Multimap; -import gtPlusPlus.core.lib.CORE; public class HealthBoostBauble extends BaseBauble { public HealthBoostBauble() { super(BaubleType.AMULET, "The Key to the City"); addDamageNegation(DamageSource.wither); - this.setTextureName(CORE.MODID + ":" + "itemKeyGold"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemKeyGold"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java index ec4d9de11c..51dcb4ea29 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.bauble; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Thaumcraft; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,7 +25,6 @@ import com.google.common.collect.Multimap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ModularArmourUtils; import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT; import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers; @@ -448,17 +450,17 @@ public class ModularBauble extends BaseBauble { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { - this.mfallback = register.registerIcon("miscutils" + ":" + "itemAmulet"); + this.mfallback = register.registerIcon(GTPlusPlus.ID + ":" + "itemAmulet"); // you cannot initialize iconArray when declared nor in the constructor, // as it is client-side only, so do it here: - if (LoadedMods.Thaumcraft) { + if (Thaumcraft.isModLoaded()) { iconArray[0] = register.registerIcon("thaumcraft" + ":" + "bauble_amulet"); iconArray[1] = register.registerIcon("thaumcraft" + ":" + "bauble_ring"); iconArray[2] = register.registerIcon("thaumcraft" + ":" + "bauble_belt"); } else { - iconArray[0] = register.registerIcon("miscutils" + ":" + "itemAmulet"); - iconArray[1] = register.registerIcon("miscutils" + ":" + "itemRingWearable"); - iconArray[2] = register.registerIcon("miscutils" + ":" + "itemBelt"); + iconArray[0] = register.registerIcon(GTPlusPlus.ID + ":" + "itemAmulet"); + iconArray[1] = register.registerIcon(GTPlusPlus.ID + ":" + "itemRingWearable"); + iconArray[2] = register.registerIcon(GTPlusPlus.ID + ":" + "itemBelt"); } mTextureAmulet = iconArray[0]; diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index ca0adc9676..effb10268a 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -1,5 +1,9 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.TinkerConstruct; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; @@ -19,7 +23,6 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; @@ -281,8 +284,8 @@ public class AgriculturalChem extends ItemPackage { public AgriculturalChem() { super(); - aBOP = LoadedMods.BiomesOPlenty; - aTiCon = LoadedMods.TiCon; + aBOP = BiomesOPlenty.isModLoaded(); + aTiCon = TinkerConstruct.isModLoaded(); Logger.INFO("Adding Agrochemical content"); @@ -527,7 +530,7 @@ public class AgriculturalChem extends ItemPackage { /** * Forestry Support */ - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { Field aItemField = ReflectionUtils .getField(ReflectionUtils.getClass("forestry.plugins.PluginCore"), "items"); try { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index ff49e11645..01c4f068d2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -3,16 +3,27 @@ package gtPlusPlus.core.item.chemistry; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.*; - -import gregtech.api.enums.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TextureSet; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; import gtPlusPlus.core.item.circuit.GTPP_IntegratedCircuit_Item; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.*; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.MaterialStack; +import gtPlusPlus.core.material.NONMATERIAL; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java index 78fe9aa9e2..db495f3955 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.HashMap; import java.util.List; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import gregtech.api.enums.Materials; import gtPlusPlus.core.item.base.misc.BaseItemParticle; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.util.Utils; @@ -139,9 +140,9 @@ public class IonParticles extends BaseItemParticle { @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i < IonParticles.overlays.length; i++) { - IonParticles.overlays[i] = reg.registerIcon(CORE.MODID + ":" + "ion/" + i); + IonParticles.overlays[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/" + i); } - IonParticles.baseTexture = reg.registerIcon(CORE.MODID + ":" + "ion/IonBase"); + IonParticles.baseTexture = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/IonBase"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index 55bd54a3a1..b3b40f339c 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.enums.Mods.BiomesOPlenty; +import static gregtech.api.enums.Mods.Forestry; + import java.util.HashMap; import net.minecraft.item.Item; @@ -17,12 +20,14 @@ import gtPlusPlus.api.objects.data.Quad; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.base.ore.BaseItemMilledOre; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.NONMATERIAL; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.*; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; @@ -558,13 +563,13 @@ public class MilledOreProcessing extends ItemPackage { aSaplings.add(ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Pine)); aPinecones.add(ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, 1)); - if (LoadedMods.BiomesOPlenty) { + if (BiomesOPlenty.isModLoaded()) { aLogs.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.logs4, 0, 1)); aLeaves.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedLeaves2, 1, 1)); aSaplings.add(HANDLER_BiomesOPlenty.getStack(HANDLER_BiomesOPlenty.colorizedSaplings, 5, 1)); aPinecones.add(ItemUtils.simpleMetaStack(HANDLER_BiomesOPlenty.mPineCone, 13, 1)); } - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { ItemStack aForestryLog = ItemUtils.getItemStackFromFQRN("Forestry:logs", 1); if (aForestryLog != null) { aForestryLog.setItemDamage(20); // Set to Pine diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java index f67b37d9b9..9212c995e2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.HashMap; import java.util.List; @@ -12,7 +14,6 @@ import net.minecraft.util.IIcon; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.misc.BaseItemParticle; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Particle; import gtPlusPlus.core.material.Particle.ElementaryGroup; import gtPlusPlus.core.util.Utils; @@ -137,7 +138,7 @@ public class StandardBaseParticles extends BaseItemParticle { @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i < this.icons.length; i++) { - this.icons[i] = reg.registerIcon(CORE.MODID + ":" + "particle/new/" + i); + this.icons[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "particle/new/" + i); } } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 76d66f9e41..0430b5fd3e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.chemistry.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,7 +19,6 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemGenericChemBase extends Item { @@ -131,7 +132,7 @@ public class ItemGenericChemBase extends Item { @Override public void registerIcons(final IIconRegister u) { for (int i = 0; i < this.aMetaSize; i++) { - String aPath = CORE.MODID + ":" + "science/general/MetaItem1/" + i; + String aPath = GTPlusPlus.ID + ":" + "science/general/MetaItem1/" + i; this.base[i] = u.registerIcon(aPath); } } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java index 07ca7e02a7..e176dc603a 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.chemistry.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemNuclearChemBase extends Item { @@ -112,7 +113,7 @@ public class ItemNuclearChemBase extends Item { @Override public void registerIcons(final IIconRegister u) { for (int i = 0; i < this.aMetaSize; i++) { - String aPath = CORE.MODID + ":" + "science/nuclear/MetaItem1/" + i; + String aPath = GTPlusPlus.ID + ":" + "science/nuclear/MetaItem1/" + i; this.base[i] = u.registerIcon(aPath); } } diff --git a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java b/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java index 3c70981ff5..9db4d7b97c 100644 --- a/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java +++ b/src/main/java/gtPlusPlus/core/item/circuit/GTPP_IntegratedCircuit_Item.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.circuit; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -35,7 +37,6 @@ import gregtech.api.objects.XSTR; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Utility; import gregtech.common.gui.modularui.uifactory.SelectItemUIFactory; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatableItem { @@ -110,7 +111,7 @@ public class GTPP_IntegratedCircuit_Item extends Item implements INetworkUpdatab @Override public void registerIcons(final IIconRegister u) { - this.base = u.registerIcon(CORE.MODID + ":" + iconLocation); + this.base = u.registerIcon(GTPlusPlus.ID + ":" + iconLocation); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java index 13da48410a..cce12371b0 100644 --- a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java +++ b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.crafting; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.LinkedHashMap; import java.util.Map; @@ -12,7 +14,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.general.ItemGenericToken; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -85,7 +86,7 @@ public class ItemDummyResearch extends ItemGenericToken { @SideOnly(Side.CLIENT) public final void registerIcons(final IIconRegister aIconRegister) { for (int i = 0, j = mLocalNames.size(); i < j; i++) { - mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + "research" + "/" + "note")); + mIcons.put(i, aIconRegister.registerIcon(GTPlusPlus.ID + ":" + "research" + "/" + "note")); } } } diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index fa27b760ac..e67ff32d85 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.food; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -21,7 +23,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -367,7 +368,7 @@ public class BaseItemMetaFood extends ItemFood { @Override public void registerIcons(final IIconRegister u) { for (int i = 0; i < mTotalMetaItems; i++) { - String aPath = CORE.MODID + ":" + "food/MetaItem1/" + i; + String aPath = GTPlusPlus.ID + ":" + "food/MetaItem1/" + i; mIconMap.put(i, u.registerIcon(aPath)); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java index 8c5530f242..1ed6e1d32c 100644 --- a/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java +++ b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,7 +18,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.lib.CORE; public class BaseItemGrindle extends Item { @@ -25,7 +26,7 @@ public class BaseItemGrindle extends Item { public BaseItemGrindle() { this.unlocalName = "itemGrindleTablet"; this.setUnlocalizedName("itemGrindleTablet"); - this.setTextureName(CORE.MODID + ":" + "itemTablet"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemTablet"); GameRegistry.registerItem(this, "itemGrindleTablet"); this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabOther); @@ -49,7 +50,7 @@ public class BaseItemGrindle extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + "itemTablet"); + this.itemIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "itemTablet"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java index d23c825131..099347eb76 100644 --- a/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java +++ b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -11,7 +13,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BedLocator_Base extends Item { @@ -21,7 +22,7 @@ public class BedLocator_Base extends Item { public BedLocator_Base(final String unlocalizedName) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabMachines); } diff --git a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java b/src/main/java/gtPlusPlus/core/item/general/BufferCore.java index 9648801b25..653b7bdcb6 100644 --- a/src/main/java/gtPlusPlus/core/item/general/BufferCore.java +++ b/src/main/java/gtPlusPlus/core/item/general/BufferCore.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +12,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GT_Values; import gtPlusPlus.core.item.base.BaseItemWithDamageValue; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; @@ -20,7 +21,7 @@ public class BufferCore extends BaseItemWithDamageValue { public BufferCore(final String unlocalizedName, final int i) { super(unlocalizedName + i); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(32); this.coreTier = i; } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java index ddd88f7169..7989187a7e 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class ItemAirFilter extends Item { @@ -32,7 +33,7 @@ public class ItemAirFilter extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemAirFilter"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemAirFilter"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java index 573325ddd7..3db9672630 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,7 +24,6 @@ import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; @@ -45,7 +46,7 @@ public class ItemAreaClear extends CoreItem { @Override public void registerIcons(IIconRegister reg) { - this.mIcon[0] = reg.registerIcon(CORE.MODID + ":" + "itemLavaFilter"); + this.mIcon[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemLavaFilter"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java index 435195c105..d473723bf8 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -9,7 +11,6 @@ import net.minecraft.world.World; import gtPlusPlus.core.block.general.FirePit; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -17,7 +18,7 @@ public class ItemBasicFirestarter extends CoreItem { public ItemBasicFirestarter() { super("itemSimpleFiremaker", AddToCreativeTab.tabTools, 1, 5, "Can probably make you a fire"); - this.setTextureName(CORE.MODID + ":" + "itemFireStarter"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemFireStarter"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java index 6ffd22e6b8..ee1afdb6bf 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class ItemBasicScrubberTurbine extends Item { @@ -32,7 +33,7 @@ public class ItemBasicScrubberTurbine extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemBasicTurbine"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemBasicTurbine"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java index e918e4d917..9407f5c5ad 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -17,7 +19,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.interfaces.IItemBlueprint; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -26,7 +27,7 @@ public class ItemBlueprint extends Item implements IItemBlueprint { public ItemBlueprint(final String unlocalizedName) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setCreativeTab(AddToCreativeTab.tabMachines); // this.bpID = MathUtils.randInt(0, 1000); diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java index 6843cedd46..e0949f830a 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Names; + import java.util.List; import net.minecraft.entity.Entity; @@ -17,7 +20,6 @@ import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import ic2.api.item.ElectricItem; @@ -25,8 +27,8 @@ import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Names.BAUBLES) }) public class ItemCloakingDevice extends Item implements IElectricItem, IElectricItemManager, IBauble { private final String unlocalizedName = "personalCloakingDevice"; @@ -39,7 +41,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice"); + this.setTextureName(GTPlusPlus.ID + ":" + "personalCloakingDevice"); this.thisStack = ItemUtils.getSimpleStack(this); this.charge(this.thisStack, charge, 3, true, false); if (charge == (10000 * 20 * 500)) { diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java index 3ce0490468..0618d451fe 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,7 +16,6 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; -import gtPlusPlus.core.lib.CORE; public class ItemControlCore extends Item { @@ -32,16 +33,16 @@ public class ItemControlCore extends Item { @Override public void registerIcons(IIconRegister reg) { - icons[0] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_0"); - icons[1] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_1"); - icons[2] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_2"); - icons[3] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_3"); - icons[4] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_4"); - icons[5] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_5"); - icons[6] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_6"); - icons[7] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_7"); - icons[8] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_8"); - icons[9] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_9"); + icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_0"); + icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_1"); + icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_2"); + icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_3"); + icons[4] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_4"); + icons[5] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_5"); + icons[6] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_6"); + icons[7] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_7"); + icons[8] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_8"); + icons[9] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_9"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java index 19adddfd42..6decd29b06 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,7 +12,6 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; -import gtPlusPlus.core.lib.CORE; public class ItemCreativeTab extends Item { @@ -27,16 +28,16 @@ public class ItemCreativeTab extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_0"); - this.icons[1] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_1"); - this.icons[2] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_2"); - this.icons[3] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_3"); - this.icons[4] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_4"); - this.icons[5] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_5"); - this.icons[6] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_6"); - this.icons[7] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_7"); - this.icons[8] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_8"); - this.icons[9] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_9"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_0"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_1"); + this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_2"); + this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_3"); + this.icons[4] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_4"); + this.icons[5] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_5"); + this.icons[6] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_6"); + this.icons[7] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_7"); + this.icons[8] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_8"); + this.icons[9] = reg.registerIcon(GTPlusPlus.ID + ":" + "controlcore/Core_9"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index 3fc1cccb23..c48a54bc67 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.HashMap; import java.util.List; @@ -17,7 +19,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_LanguageManager; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public class ItemGenericToken extends CoreItem { @@ -186,7 +187,7 @@ public class ItemGenericToken extends CoreItem { @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister aIconRegister) { for (int i = 0, j = mLocalNames.size(); i < j; i++) { - mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + mTextureDir + "/" + i)); + mIcons.put(i, aIconRegister.registerIcon(GTPlusPlus.ID + ":" + mTextureDir + "/" + i)); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java index 6876edf840..e7c38d043d 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gtPlusPlus.core.lib.CORE.RANDOM; import java.util.List; @@ -49,7 +50,7 @@ public class ItemGiantEgg extends BaseItemTickable { private ItemGiantEgg(int colour, int maxTicks, String[] desc1) { super(true, false, "itemBigEgg", colour, maxTicks, desc1); - setTextureName(CORE.MODID + ":itemBigEgg"); + setTextureName(GTPlusPlus.ID + ":itemBigEgg"); this.setMaxStackSize(1); registerFuel(5000); registerOrdictionary("fuelLargeChickenEgg"); @@ -95,7 +96,7 @@ public class ItemGiantEgg extends BaseItemTickable { @Override public void registerIcons(final IIconRegister i) { - this.mIcon[0] = i.registerIcon(CORE.MODID + ":" + "itemBigEgg"); + this.mIcon[0] = i.registerIcon(GTPlusPlus.ID + ":" + "itemBigEgg"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java index c4f90247c2..9467730cce 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -8,7 +10,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.FoodStats; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import baubles.api.BaubleType; @@ -16,19 +20,21 @@ import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; -import ic2.api.item.*; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IElectricItemManager; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Mods.Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Mods.Names.BAUBLES) }) public class ItemHealingDevice extends Item implements IElectricItem, IElectricItemManager, IBauble { private final String unlocalizedName = "personalHealingDevice"; @@ -39,7 +45,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "personalCloakingDevice"); + this.setTextureName(GTPlusPlus.ID + ":" + "personalCloakingDevice"); GameRegistry.registerItem(this, this.unlocalizedName); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java index 931e464dd2..e760039d68 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,7 +16,6 @@ import net.minecraft.util.StatCollector; import gregtech.api.enums.ItemList; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public class ItemLavaFilter extends CoreItem { @@ -41,7 +42,7 @@ public class ItemLavaFilter extends CoreItem { @Override public void registerIcons(IIconRegister reg) { - this.mIcon[0] = reg.registerIcon(CORE.MODID + ":" + "itemLavaFilter"); + this.mIcon[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemLavaFilter"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java index e9a971b16e..9889bdbd06 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java @@ -1,11 +1,19 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.ref.WeakReference; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.WeakHashMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.world.World; @@ -22,7 +30,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public class ItemMagicFeather extends CoreItem { @@ -42,7 +49,7 @@ public class ItemMagicFeather extends CoreItem { false, null); setMaxStackSize(1); - setUnlocalizedName(CORE.MODID + ":" + NAME); + setUnlocalizedName(GTPlusPlus.ID + ":" + NAME); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java index c26cbdac71..a182c4bdb9 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -14,15 +16,15 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Mods; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.events.CustomMovementHandler; import gtPlusPlus.core.handler.events.SneakManager; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; @Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") }) + value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Mods.Names.BAUBLES), + @Optional.Interface(iface = "baubles.api.BaubleType", modid = Mods.Names.BAUBLES) }) public class ItemSlowBuildingRing extends Item implements IBauble { private final String unlocalizedName = "SlowBuildingRing"; @@ -32,7 +34,7 @@ public class ItemSlowBuildingRing extends Item implements IBauble { this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "itemSlowBuildersRing"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemSlowBuildersRing"); ItemUtils.getSimpleStack(this); GameRegistry.registerItem(this, this.unlocalizedName); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java index b6b5d24d3c..3dd1abe58f 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.item.EnumRarity; import net.minecraft.util.EnumChatFormatting; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; public class ItemSunnariumBit extends CoreItem { @@ -21,6 +22,6 @@ public class ItemSunnariumBit extends CoreItem { EnumChatFormatting.GOLD, false, null); - this.setTextureName(CORE.MODID + ":" + "itemSunnariumBit"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemSunnariumBit"); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java index ec1f98a8f3..671a1ec344 100644 --- a/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java +++ b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.Minecraft; @@ -38,12 +40,10 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, public RF2EU_Battery() { super(maxValueRF); GameRegistry.registerFuelHandler(this); - // this.setMaxDamage(Integer.MAX_VALUE); - // this.setDamage(UtilsItems.getSimpleStack(this), 0); this.setCreativeTab(AddToCreativeTab.tabMachines); this.setUnlocalizedName(this.unlocalizedName); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "itemIngot"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemIngot"); this.thisStack = ItemUtils.getSimpleStack(this); GameRegistry.registerItem(this, this.unlocalizedName); } diff --git a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java index 7ed538faa0..9e642c41a7 100644 --- a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java +++ b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.general.books; +import static gregtech.api.enums.Mods.GTPlusPlus; import static gtPlusPlus.core.handler.BookHandler.mBookMap; import static gtPlusPlus.core.util.Utils.addBookTitleLocalization; @@ -22,7 +23,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.BookHandler; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -32,7 +32,7 @@ public class ItemBaseBook extends ItemWritableBook { public ItemBaseBook() { this.setCreativeTab(AddToCreativeTab.tabMisc); this.setMaxStackSize(1); - this.setTextureName(CORE.MODID + ":" + "itemBook"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemBook"); this.setUnlocalizedName("itembookgt"); GameRegistry.registerItem(this, "bookGT"); } diff --git a/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java index 014e6ed5c0..38e34a9a01 100644 --- a/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java +++ b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java @@ -1,9 +1,14 @@ package gtPlusPlus.core.item.general.capture; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import java.util.UUID; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -17,7 +22,6 @@ import gtPlusPlus.api.interfaces.IEntityCatcher; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -31,7 +35,7 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher { // Probably won't ever need this event handler. // Utils.registerEvent(this); this.setUnlocalizedName("itemDragonJar"); - this.setTextureName(CORE.MODID + ":" + getUnlocalizedName()); + this.setTextureName(GTPlusPlus.ID + ":" + getUnlocalizedName()); this.setCreativeTab(AddToCreativeTab.tabMisc); this.setMaxStackSize(16); this.setMaxDamage(0); diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java index 565d6dd632..8efcfe6912 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.chassis; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,7 +13,6 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class ItemBoilerChassis extends Item { @@ -29,7 +30,7 @@ public class ItemBoilerChassis extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemBoilerChassis"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemBoilerChassis"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java index 0bd1e1d2e0..86f92f4572 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.chassis; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,7 +14,6 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class ItemDehydratorCoil extends Item { @@ -29,10 +30,10 @@ public class ItemDehydratorCoil extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoil_0"); - this.icons[1] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoil_1"); - this.icons[2] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoil_2"); - this.icons[3] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoil_3"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_0"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_1"); + this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_2"); + this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_3"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java index 59d7b7e8e8..3f7de078ca 100644 --- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.chassis; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,7 +14,6 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class ItemDehydratorCoilWire extends Item { @@ -29,10 +30,10 @@ public class ItemDehydratorCoilWire extends Item { @Override public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoilWire_0"); - this.icons[1] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoilWire_1"); - this.icons[2] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoilWire_2"); - this.icons[3] = reg.registerIcon(CORE.MODID + ":" + "dehydrator/itemDehydratorCoilWire_3"); + this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_0"); + this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_1"); + this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_2"); + this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_3"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java index 687e697028..ff0b923ca4 100644 --- a/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java +++ b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.fuelrods; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.Entity; @@ -11,7 +13,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class FuelRod_Base extends Item { @@ -23,7 +24,7 @@ public class FuelRod_Base extends Item { public FuelRod_Base(final String unlocalizedName, final String type, final int fuelLeft, final int maxFuel) { this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(maxFuel); this.maximumFuel = maxFuel; diff --git a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java index 8daf1fc8c7..1b287cbfb0 100644 --- a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.spawn; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -8,17 +10,27 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.util.*; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemMonsterPlacer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Facing; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemCustomSpawnEgg extends ItemMonsterPlacer { @@ -248,8 +260,8 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer { @Override public void registerIcons(final IIconRegister u) { - mIconMap.put(0, u.registerIcon(CORE.MODID + ":" + "spawn_egg")); - mIconMap.put(1, u.registerIcon(CORE.MODID + ":" + "spawn_egg_overlay")); + mIconMap.put(0, u.registerIcon(GTPlusPlus.ID + ":" + "spawn_egg")); + mIconMap.put(1, u.registerIcon(GTPlusPlus.ID + ":" + "spawn_egg_overlay")); } @Override @@ -279,6 +291,6 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer { public static void setEntityToSpawnName(int aMetaID, String parEntityToSpawnName) { mEntityNameMap.put(aMetaID, parEntityToSpawnName); - mEntityFullNameMap.put(aMetaID, CORE.MODID + "." + parEntityToSpawnName); + mEntityFullNameMap.put(aMetaID, GTPlusPlus.ID + "." + parEntityToSpawnName); } } diff --git a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java index 62e0a6aa17..475707e950 100644 --- a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java +++ b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.general.throwables; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,7 +22,6 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.projectile.EntityThrowableBomb; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; @@ -93,8 +94,8 @@ public class ItemThrowableBomb extends CoreItem { @Override public void registerIcons(IIconRegister reg) { - icons[0] = reg.registerIcon(CORE.MODID + ":" + "bomb"); - icons[1] = reg.registerIcon(CORE.MODID + ":" + "bomb_lit"); + icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "bomb"); + icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "bomb_lit"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java index 1eefb4c4ab..aa44b467ce 100644 --- a/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java +++ b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.init; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityOcelot; @@ -14,7 +16,6 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.foods.BaseItemFood; import gtPlusPlus.core.item.base.foods.BaseItemHotFood; import gtPlusPlus.core.item.food.BaseItemMetaFood; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -37,7 +38,7 @@ public class ItemsFoods { new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible(); GT_OreDictUnificator.registerOre( "foodRaisinBread", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemIngotRaisinBread", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemIngotRaisinBread", 1)); // Hot Raisin Bread ModItems.itemHotIngotRaisinBread = new BaseItemHotFood( "itemHotIngotRaisinBread", @@ -48,13 +49,14 @@ public class ItemsFoods { ModItems.itemIngotRaisinBread); GT_OreDictUnificator.registerOre( "foodHotRaisinBread", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotIngotRaisinBread", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemHotIngotRaisinBread", 1)); // Raisin Bread ModItems.itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", "Raisin Toast", 1, 0.5f, false) .setAlwaysEdible(); - GT_OreDictUnificator - .registerOre("foodRaisinToast", ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemFoodRaisinToast", 1)); + GT_OreDictUnificator.registerOre( + "foodRaisinToast", + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemFoodRaisinToast", 1)); // Hot Raisin Bread ModItems.itemHotFoodRaisinToast = new BaseItemHotFood( "itemHotFoodRaisinToast", @@ -65,7 +67,7 @@ public class ItemsFoods { ModItems.itemFoodRaisinToast); GT_OreDictUnificator.registerOre( "foodHotRaisinToast", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotFoodRaisinToast", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemHotFoodRaisinToast", 1)); // Raisin Bread ModItems.itemFoodCurriedSausages = new BaseItemFood( @@ -76,7 +78,7 @@ public class ItemsFoods { false); GT_OreDictUnificator.registerOre( "foodCurriedSausages", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemFoodCurriedSausages", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemFoodCurriedSausages", 1)); // Hot Raisin Bread ModItems.itemHotFoodCurriedSausages = new BaseItemHotFood( "itemHotFoodCurriedSausages", @@ -87,7 +89,7 @@ public class ItemsFoods { ModItems.itemFoodCurriedSausages); GT_OreDictUnificator.registerOre( "foodHotCurriedSausages", - ItemUtils.getItemStackFromFQRN(CORE.MODID + ":itemHotFoodCurriedSausages", 1)); + ItemUtils.getItemStackFromFQRN(GTPlusPlus.ID + ":itemHotFoodCurriedSausages", 1)); ModItems.itemMetaFood = new BaseItemMetaFood(); BaseItemMetaFood.registerFoodsToOreDict(); diff --git a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java index 4644fdc8d2..638a43ecb5 100644 --- a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java +++ b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.materials; +import static gregtech.api.enums.Mods.GregTech; import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack; import java.util.List; @@ -33,9 +34,9 @@ public class DustDecayable extends BaseItemTickable { @Override public void registerIcons(IIconRegister reg) { - String gt = "gregtech" + ":" + "materialicons/" + "NUCLEAR" + "/" + "dust"; + String gt = GregTech.ID + ":" + "materialicons/" + "NUCLEAR" + "/" + "dust"; this.mIcon[0] = reg.registerIcon(gt); - String gt2 = "gregtech" + ":" + "materialicons/" + "NUCLEAR" + "/" + "dust" + "_OVERLAY"; + String gt2 = GregTech.ID + ":" + "materialicons/" + "NUCLEAR" + "/" + "dust" + "_OVERLAY"; this.mIcon[1] = reg.registerIcon(gt2); } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java index c0ccd66fae..f563d532a0 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.misc; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -11,7 +13,6 @@ import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.PlayerUtils; public class DebugScanner extends CoreItem { @@ -24,7 +25,7 @@ public class DebugScanner extends CoreItem { 0, new String[] { "Used to obtain information from GT/GT++ content", "Right Click to use", }, EnumRarity.epic); - setTextureName(CORE.MODID + ":itemStickyRubber"); + setTextureName(GTPlusPlus.ID + ":itemStickyRubber"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java index be0b4d43e1..3c7a131a1e 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.misc; +import static gregtech.api.enums.Mods.GregTech; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -30,23 +32,23 @@ public class FakeGregtechTool extends CoreItem { @Override public void registerIcons(final IIconRegister i) { // ScrewDriver - this.base[0] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "toolHeadScrewdriver"); - this.overlay[0] = i.registerIcon("gregtech" + ":" + "iconsets/" + "HANDLE_SCREWDRIVER"); + this.base[0] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadScrewdriver"); + this.overlay[0] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "HANDLE_SCREWDRIVER"); // Soldering iron - this.base[1] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "toolHeadSoldering"); - this.overlay[1] = i.registerIcon("gregtech" + ":" + "iconsets/" + "HANDLE_SOLDERING"); + this.base[1] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadSoldering"); + this.overlay[1] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "HANDLE_SOLDERING"); // Mallet - this.base[2] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "handleMallet"); - this.overlay[2] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "toolHeadMallet"); + this.base[2] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "handleMallet"); + this.overlay[2] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadMallet"); // Hammer - this.base[3] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "stick"); - this.overlay[3] = i.registerIcon("gregtech" + ":" + "materialicons/METALLIC/" + "toolHeadHammer"); + this.base[3] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "stick"); + this.overlay[3] = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "toolHeadHammer"); // Wrench - this.base[4] = i.registerIcon("gregtech" + ":" + "iconsets/" + "WRENCH"); - this.overlay[4] = i.registerIcon("gregtech" + ":" + "iconsets/" + "WRENCH_OVERLAY"); + this.base[4] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "WRENCH"); + this.overlay[4] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "WRENCH_OVERLAY"); // Crowbar - this.base[5] = i.registerIcon("gregtech" + ":" + "iconsets/" + "CROWBAR"); - this.overlay[5] = i.registerIcon("gregtech" + ":" + "iconsets/" + "CROWBAR_OVERLAY"); + this.base[5] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "CROWBAR"); + this.overlay[5] = i.registerIcon(GregTech.ID + ":" + "iconsets/" + "CROWBAR_OVERLAY"); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java index 9fb570d86c..a8a279299b 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.item.tool.misc; import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.ArrayList; import java.util.BitSet; @@ -52,7 +53,6 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -134,7 +134,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri this.setUnlocalizedName(unlocalizedName); this.setCreativeTab(creativeTab); this.setMaxStackSize(1); - if (GameRegistry.findItem(CORE.MODID, unlocalizedName) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, unlocalizedName) == null) { GameRegistry.registerItem(this, unlocalizedName); } } @@ -531,7 +531,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri if (this.mEnabledItems.get(i)) { mIconMap.put( (int) i, - aIconRegister.registerIcon(CORE.MODID + ":" + (this.getUnlocalizedName() + "/" + i))); + aIconRegister.registerIcon(GTPlusPlus.ID + ":" + (this.getUnlocalizedName() + "/" + i))); } } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java index bb9cdb595c..044519028d 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.misc; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +12,6 @@ import net.minecraft.util.EnumChatFormatting; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.base.BaseItemWithDamageValue; -import gtPlusPlus.core.lib.CORE; public class SandstoneHammer extends BaseItemWithDamageValue { @@ -27,7 +28,7 @@ public class SandstoneHammer extends BaseItemWithDamageValue { public SandstoneHammer(final String unlocalizedName) { super(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(2500); } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java index e8988c62ac..2679441d76 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.misc.box; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -12,7 +14,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; public class BaseBoxItem extends CoreItem { @@ -69,6 +70,6 @@ public class BaseBoxItem extends CoreItem { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(CORE.MODID + ":" + this.getUnlocalizedName().substring(5)); + this.itemIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName().substring(5)); } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index 30ab292c5f..8df0ca1e55 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Minecraft; + import java.util.List; import net.minecraft.block.Block; @@ -17,7 +20,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -48,8 +50,8 @@ public class MultiPickaxeBase extends StaballoyPickaxe { final int colour, final Object enchant) { super(Utils.sanitizeString(unlocalizedName), material); this.setUnlocalizedName(Utils.sanitizeString(unlocalizedName)); - // this.setTextureName(CORE.MODID + ":" + "itemPickaxe"); - this.setTextureName("minecraft" + ":" + "iron_pickaxe"); + // this.setTextureName(GTPlusPlus.ID + ":" + "itemPickaxe"); + this.setTextureName(Minecraft.ID + ":" + "iron_pickaxe"); this.setMaxStackSize(1); if ((materialDurability * 3) <= Integer.MAX_VALUE) { this.setMaxDamage((int) (materialDurability * 3)); @@ -77,7 +79,7 @@ public class MultiPickaxeBase extends StaballoyPickaxe { this.isValid = this.addRecipe(); } catch (final Throwable e) {} if ((colour != 0) && this.isValid && (materialDurability > 10000)) { - if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, Utils.sanitizeString(unlocalizedName)) == null) { GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index c0d7f08bea..6dd6973749 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Minecraft; + import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -7,7 +10,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -36,8 +38,8 @@ public class MultiSpadeBase extends StaballoySpade { final int colour) { super(Utils.sanitizeString(unlocalizedName), material); this.setUnlocalizedName(Utils.sanitizeString(unlocalizedName)); - // this.setTextureName(CORE.MODID + ":" + "itemShovel"); - this.setTextureName("minecraft" + ":" + "iron_shovel"); + // this.setTextureName(GTPlusPlus.ID + ":" + "itemShovel"); + this.setTextureName(Minecraft.ID + ":" + "iron_shovel"); this.setMaxStackSize(1); this.setMaxDamage(materialDurability * 3); this.colour = colour; @@ -48,7 +50,7 @@ public class MultiSpadeBase extends StaballoySpade { this.isValid = this.addRecipe(); } catch (final Throwable e) {} if ((colour != 0) && this.isValid) { - if (GameRegistry.findItem(CORE.MODID, Utils.sanitizeString(unlocalizedName)) == null) { + if (GameRegistry.findItem(GTPlusPlus.ID, Utils.sanitizeString(unlocalizedName)) == null) { GameRegistry.registerItem(this, Utils.sanitizeString(unlocalizedName)); } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java index c146dba547..7ec3be72ca 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java @@ -1,8 +1,25 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockAir; +import net.minecraft.block.BlockCocoa; +import net.minecraft.block.BlockDirt; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.BlockGrass; +import net.minecraft.block.BlockHugeMushroom; +import net.minecraft.block.BlockLeavesBase; +import net.minecraft.block.BlockLog; +import net.minecraft.block.BlockMushroom; +import net.minecraft.block.BlockSand; +import net.minecraft.block.BlockSnow; +import net.minecraft.block.BlockSnowBlock; +import net.minecraft.block.BlockTallGrass; +import net.minecraft.block.BlockVine; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -15,7 +32,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.lib.CORE; public class StaballoyAxe extends ItemAxe { @@ -24,7 +40,7 @@ public class StaballoyAxe extends ItemAxe { public StaballoyAxe(final String unlocalizedName, final ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); } // EXPLODE TREE diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index d9c4aaa18b..4fa76cc288 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.Block; @@ -18,7 +20,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.MiningUtils; public class StaballoyPickaxe extends ItemPickaxe { @@ -449,7 +450,7 @@ public class StaballoyPickaxe extends ItemPickaxe { public StaballoyPickaxe(final String unlocalizedName, final ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(3200); this.miningLevel = 5; diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java index 0fb3291f8f..3be95912fe 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.tool.staballoy; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.Block; @@ -18,7 +20,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.MiningUtils; public class StaballoySpade extends ItemSpade { @@ -396,7 +397,7 @@ public class StaballoySpade extends ItemSpade { public StaballoySpade(final String unlocalizedName, final ToolMaterial material) { super(material); this.setUnlocalizedName(unlocalizedName); - this.setTextureName(CORE.MODID + ":" + unlocalizedName); + this.setTextureName(GTPlusPlus.ID + ":" + unlocalizedName); this.setMaxStackSize(1); this.setMaxDamage(3200); } diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java index d26cdedf4b..8caf65c88d 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.item.wearable.armour; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.item.Item; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.util.EnumHelper; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.item.wearable.armour.tinfoil.ArmourTinFoilHat; -import gtPlusPlus.core.lib.CORE; public class ArmourLoader { @@ -28,13 +29,10 @@ public class ArmourLoader { tinfoilArmour(); } - private static void glassArmour() { - // RenderingRegistry.addNewArmourRendererPrefix("ClearGlassArmor"); This needs to be client side only TODO - // ClearGlassHelmet = new ClearGlassArmor(2055, ClearGlassArmor, 5, 0).setUnlocalizedName("amethyst_helmet"); - } + private static void glassArmour() {} private static void tinfoilArmour() { TinFoilHat = new ArmourTinFoilHat().setUnlocalizedName("itemHatTinFoil"); - GameRegistry.registerItem(TinFoilHat, "itemHatTinFoil", CORE.MODID); + GameRegistry.registerItem(TinFoilHat, "itemHatTinFoil", GTPlusPlus.ID); } } diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java index 47c71a34a3..6a9cb7c3dc 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.wearable.armour.hazmat; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,7 +19,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.item.wearable.armour.ArmourLoader; import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm; -import gtPlusPlus.core.lib.CORE; public class ArmourHazmat extends BaseArmourHelm { @@ -29,7 +30,7 @@ public class ArmourHazmat extends BaseArmourHelm { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ir) { - this.iconHelm = ir.registerIcon(CORE.MODID + ":itemHatTinFoil"); + this.iconHelm = ir.registerIcon(GTPlusPlus.ID + ":itemHatTinFoil"); } @Override @@ -43,7 +44,7 @@ public class ArmourHazmat extends BaseArmourHelm { } public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return CORE.MODID + ":textures/models/TinFoil.png"; + return GTPlusPlus.ID + ":textures/models/TinFoil.png"; } public EnumRarity getRarity(ItemStack itemstack) { diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java index ad3272bccf..e703efebc2 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.wearable.armour.tinfoil; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -29,7 +31,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.item.wearable.armour.ArmourLoader; import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm; -import gtPlusPlus.core.lib.CORE; public class ArmourTinFoilHat extends BaseArmourHelm { @@ -41,7 +42,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ir) { - this.iconHelm = ir.registerIcon(CORE.MODID + ":itemHatTinFoil"); + this.iconHelm = ir.registerIcon(GTPlusPlus.ID + ":itemHatTinFoil"); } @Override @@ -55,7 +56,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm { } public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return CORE.MODID + ":textures/models/TinFoil.png"; + return GTPlusPlus.ID + ":textures/models/TinFoil.png"; } public EnumRarity getRarity(ItemStack itemstack) { |