From 26caa265b7eae49767947e1ff4e6cfc8166b07f5 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sun, 9 Apr 2023 01:08:26 +0200 Subject: 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 Co-authored-by: Martin Robertz --- src/main/java/gtPlusPlus/core/item/ModItems.java | 209 +++++++++++---------- .../java/gtPlusPlus/core/item/base/BaseEuItem.java | 24 ++- .../core/item/base/BaseItemBackpack.java | 7 +- .../core/item/base/BaseItemColourable.java | 7 +- .../core/item/base/BaseItemComponent.java | 21 ++- .../core/item/base/BaseItemDamageable.java | 5 +- .../gtPlusPlus/core/item/base/BaseItemGeneric.java | 8 +- .../gtPlusPlus/core/item/base/BaseItemLoot.java | 5 +- .../gtPlusPlus/core/item/base/BaseItemTCShard.java | 5 +- .../core/item/base/BaseItemTickable.java | 9 +- .../core/item/base/BaseItemWithCharge.java | 5 +- .../core/item/base/BaseItemWithDamageValue.java | 6 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 11 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 7 +- .../core/item/base/cell/BaseItemCell.java | 11 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 7 +- .../core/item/base/dusts/BaseItemDustAbstract.java | 7 +- .../core/item/base/dusts/BaseItemDustEx.java | 11 +- .../core/item/base/dusts/BaseItemDustUnique.java | 12 +- .../item/base/dusts/decimal/BaseItemCentidust.java | 5 +- .../item/base/dusts/decimal/BaseItemDecidust.java | 5 +- .../core/item/base/foods/BaseItemFood.java | 5 +- .../core/item/base/ingots/BaseItemIngotHot.java | 15 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 5 +- .../core/item/base/misc/BaseItemMisc.java | 9 +- .../core/item/base/misc/BaseItemParticle.java | 5 +- .../core/item/base/ore/BaseOreComponent.java | 29 ++- .../core/item/base/plates/BaseItemPlateHeavy.java | 9 +- .../core/item/base/plates/BaseItemPlate_OLD.java | 4 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 5 +- .../core/item/bauble/BatteryPackBaseBauble.java | 5 +- .../core/item/bauble/ElectricBaseBauble.java | 12 +- .../core/item/bauble/FireProtectionBauble.java | 7 +- .../core/item/bauble/HealthBoostBauble.java | 5 +- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 14 +- .../core/item/chemistry/AgriculturalChem.java | 11 +- .../core/item/chemistry/GenericChem.java | 19 +- .../core/item/chemistry/IonParticles.java | 7 +- .../core/item/chemistry/MilledOreProcessing.java | 13 +- .../core/item/chemistry/StandardBaseParticles.java | 5 +- .../chemistry/general/ItemGenericChemBase.java | 5 +- .../chemistry/general/ItemNuclearChemBase.java | 5 +- .../item/circuit/GTPP_IntegratedCircuit_Item.java | 5 +- .../core/item/crafting/ItemDummyResearch.java | 5 +- .../core/item/food/BaseItemMetaFood.java | 5 +- .../core/item/general/BaseItemGrindle.java | 7 +- .../core/item/general/BedLocator_Base.java | 5 +- .../gtPlusPlus/core/item/general/BufferCore.java | 5 +- .../core/item/general/ItemAirFilter.java | 5 +- .../core/item/general/ItemAreaClear.java | 5 +- .../core/item/general/ItemBasicFirestarter.java | 5 +- .../item/general/ItemBasicScrubberTurbine.java | 5 +- .../core/item/general/ItemBlueprint.java | 5 +- .../core/item/general/ItemCloakingDevice.java | 10 +- .../core/item/general/ItemControlCore.java | 23 +-- .../core/item/general/ItemCreativeTab.java | 23 +-- .../core/item/general/ItemGenericToken.java | 5 +- .../gtPlusPlus/core/item/general/ItemGiantEgg.java | 5 +- .../core/item/general/ItemHealingDevice.java | 18 +- .../core/item/general/ItemLavaFilter.java | 5 +- .../core/item/general/ItemMagicFeather.java | 15 +- .../core/item/general/ItemSlowBuildingRing.java | 10 +- .../core/item/general/ItemSunnariumBit.java | 5 +- .../core/item/general/RF2EU_Battery.java | 6 +- .../core/item/general/books/ItemBaseBook.java | 4 +- .../item/general/capture/ItemEntityCatcher.java | 10 +- .../item/general/chassis/ItemBoilerChassis.java | 5 +- .../item/general/chassis/ItemDehydratorCoil.java | 11 +- .../general/chassis/ItemDehydratorCoilWire.java | 11 +- .../core/item/general/fuelrods/FuelRod_Base.java | 5 +- .../item/general/spawn/ItemCustomSpawnEgg.java | 26 ++- .../item/general/throwables/ItemThrowableBomb.java | 7 +- .../java/gtPlusPlus/core/item/init/ItemsFoods.java | 18 +- .../core/item/materials/DustDecayable.java | 5 +- .../core/item/tool/misc/DebugScanner.java | 5 +- .../core/item/tool/misc/FakeGregtechTool.java | 26 +-- .../core/item/tool/misc/GregtechPump.java | 6 +- .../core/item/tool/misc/SandstoneHammer.java | 5 +- .../core/item/tool/misc/box/BaseBoxItem.java | 5 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 10 +- .../core/item/tool/staballoy/MultiSpadeBase.java | 10 +- .../core/item/tool/staballoy/StaballoyAxe.java | 22 ++- .../core/item/tool/staballoy/StaballoyPickaxe.java | 5 +- .../core/item/tool/staballoy/StaballoySpade.java | 5 +- .../core/item/wearable/armour/ArmourLoader.java | 10 +- .../item/wearable/armour/hazmat/ArmourHazmat.java | 7 +- .../wearable/armour/tinfoil/ArmourTinFoilHat.java | 7 +- 87 files changed, 583 insertions(+), 405 deletions(-) (limited to 'src/main/java/gtPlusPlus/core/item') 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/