From 76719d65a90d98e228a914774d3b11ed9f01ac8e Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Mon, 4 Sep 2023 03:05:22 +0100 Subject: Clean-up v2 (#729) * Remove test items from NEI with no texture * Add number formatting to hand pumps * Remove heavy plates (no recipes & completely unused). * Remove helium generator (no texture, no recipe) * Remove fire pit and fire starter (no use, no recipe, no textures) * Remove giant chicken and associated unused stuff, has no texture and is unobtainable. Used to be relevant but isn't anymore. * Remove villagers with silly trades like 1 motor + 1 hull = 1 hull. Why? * Remove trade bench, no recipe, missing textures. Unused. * Remove farm processors, no texture, no recipe. Unused. * Remove MAX tier components, these exist in GT now, have no recipe here and are unused. * Hide untextured light block from NEI * Update buildscript * Remove unused backpacks, no recipe and contains dupe bugs. Bad. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. part 2 * Remove dragon catcher (what?), no texture, no recipe, unused. * Remove empty item, does nothing, has no recipe, no idea why it is here. * Empty item v2 removal * Revert "Empty item v2 removal" This reverts commit 75bcd3ccfaf55bbfe2c12b2e4167d5c37636030d. * Revert "Remove empty item, does nothing, has no recipe, no idea why it is here." This reverts commit e41a9f484392776331c58530ab1faa5ef978ef36. * Remove debug square. No recipe, unused. * Number formatting overflow covers * Remove JVM garbage collection block. Unused, no recipe. * Remove nanotubes, no recipe for them. Unused. * Remove "git" item, doesn't seem to work. Has no recipe. * Remove uncraftable food with awful textures. * Remove "bat king" mob, unused content. Does not spawn. * Remove uncraftable doors with bad textures. Unused content. * Remove uncraftable, unlocalised redstone stuff that crashes game when placed. * Remove weird spawner item. No recipe, does not exist in world. * Remove sunnarium bit, no recipe, no usage. * Remove unused modularity table and some misc uncraftable, unused items. * Remove Interconnecting Storage Crate, no recipe, unused. * Delete worse debug power gen, this already exists as part of GT. Unneeded duplication. * Delete unused placeholder circuit * Delete uncraftable generator hatches. * Spotless * Remove XP tank thing, unused and uncraftable. * Remove null item, this fluid registry only seemed to register one null fluid. All others exist? * Remove EU -> RF battery. Unused in GTNH. * Remove some shelf nonsense, why is this in this mod? * Remove some weird random tools. These have no realistic usage in GTNH. * Remove firemaker. Useless in GTNH. * Removed helium blob. Deprecated item, not used anymore, uncraftable. * spotlessApply (#730) Co-authored-by: GitHub GTNH Actions <> * Stop modulators generating unused blocks with no textures * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove some weird methods and uncraftable mining parts, probably part of deprecated multiblock. * spotlessApply (#732) Co-authored-by: GitHub GTNH Actions <> * Remove gem shards, unused. * Remove unused atoms * Remove unused gum * Remove unused elements/materials * Bye bye * Remove some unused reflection stuff * Remove control cores, obsolete now. * Remove mob killing thing with no texture and no recipe. * Remove uncraftable covers * Remove pizza gloves * Net and rope removal, unused * Remove force crop * Removal of some old event stuff * Remove unused nuclear chem items * Remove player safe, mostly because of the horrible event code that was intercepting every block break. I can't see any real usage of this via discord. * Remove Force material and associated other nonsense. Also remove some nuclear chem stuff. * Remove force for realsies * Skookum Chooker purge. * Remove some enderio compat, these plates/dusts are added via GT5 anyway now. This is obsolete. * spotlessApply (#733) Co-authored-by: GitHub GTNH Actions <> * Unused textures * Bump dep * Revert "Remove force for realsies" This reverts commit 0d288912a99f9dabce56d2a2623d4d3510f4804e. * Revert "Remove Force material and associated other nonsense. Also remove some nuclear chem stuff." This reverts commit 3455e6e916defe1f2aef923be6f9696a6cf3095b. * Remove nuclear items that are unused * spotlessApply (#734) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Connor Colenso Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/main/java/gtPlusPlus/core/item/ModItems.java | 500 +-------------------- .../core/item/base/BaseItemBackpack.java | 75 ---- .../core/item/base/BaseItemComponent.java | 2 - .../item/base/itemblock/ItemBlockEntityBase.java | 42 -- .../core/item/base/itemblock/ItemBlockSpawner.java | 39 -- .../core/item/base/plates/BaseItemPlateHeavy.java | 47 -- .../core/item/bauble/FireProtectionBauble.java | 137 ------ .../core/item/bauble/HealthBoostBauble.java | 40 -- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 495 -------------------- .../core/item/bauble/MonsterKillerBaseBauble.java | 181 -------- .../core/item/chemistry/NuclearChem.java | 44 +- .../chemistry/general/ItemNuclearChemBase.java | 145 ------ .../core/item/general/BaseItemGrindle.java | 76 ---- .../core/item/general/ItemAreaClear.java | 205 --------- .../core/item/general/ItemBasicFirestarter.java | 98 ---- .../core/item/general/ItemControlCore.java | 82 ---- .../core/item/general/ItemGemShards.java | 67 --- .../gtPlusPlus/core/item/general/ItemGiantEgg.java | 297 ------------ .../core/item/general/ItemSunnariumBit.java | 27 -- .../core/item/general/RF2EU_Battery.java | 307 ------------- .../item/general/capture/ItemEntityCatcher.java | 250 ----------- .../item/general/throwables/ItemThrowableBomb.java | 2 - .../java/gtPlusPlus/core/item/init/ItemsFoods.java | 70 --- .../core/item/tool/misc/GregtechPump.java | 9 +- .../core/item/tool/misc/SandstoneHammer.java | 75 ---- .../core/item/tool/misc/box/AutoLunchBox.java | 15 - .../core/item/tool/misc/box/MagicToolBag.java | 14 - .../core/item/tool/misc/box/UniversalToolBox.java | 16 - .../core/item/tool/staballoy/MultiPickaxeBase.java | 287 ------------ .../core/item/tool/staballoy/StaballoyAxe.java | 372 --------------- .../core/item/tool/staballoy/StaballoyPickaxe.java | 458 ------------------- 31 files changed, 8 insertions(+), 4466 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java delete mode 100644 src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java delete mode 100644 src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java delete mode 100644 src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java delete mode 100644 src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java delete mode 100644 src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java (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 558353ddb3..45dc15b3f2 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -1,22 +1,15 @@ package gtPlusPlus.core.item; -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.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.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -31,55 +24,37 @@ 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.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.BaseItemFood; -import gtPlusPlus.core.item.base.foods.BaseItemHotFood; import gtPlusPlus.core.item.base.gears.BaseItemSmallGear; 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.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.food.BaseItemMetaFood; -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.ItemBoilerChassis; import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil; import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire; @@ -91,14 +66,6 @@ import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.materials.DustDecayable; 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.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; @@ -118,112 +85,34 @@ 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.xmod.cofh.HANDLER_COFH; -import gtPlusPlus.xmod.eio.material.MaterialEIO; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; public final class ModItems { - public static ToolMaterial STABALLOY = EnumHelper.addToolMaterial("Staballoy", 3, 2500, 7, 1.0F, 18); - public static Item ZZZ_Empty; public static Item AAA_Broken; public static Item itemAlkalusDisk; - public static Item itemDebugShapeSpawner; public static ItemCustomSpawnEgg itemCustomSpawnEgg; - // EnderIO - public static Item itemPlateSoularium; - public static Item itemPlateRedstoneAlloy; - public static Item itemPlateElectricalSteel; - public static Item itemPlatePulsatingIron; - public static Item itemPlateEnergeticAlloy; - public static Item itemPlateVibrantAlloy; - public static Item itemPlateConductiveIron; - public static Item itemPlateDarkSteel; - public static Item itemDustSoularium; - public static Item itemDustRedstoneAlloy; - public static Item itemDustElectricalSteel; - public static Item itemDustPulsatingIron; - public static Item itemDustEnergeticAlloy; - public static Item itemDustVibrantAlloy; - public static Item itemDustConductiveIron; - - // Staballoy - public static Item itemStaballoyPickaxe; - public static Item itemStaballoyAxe; - // Tools - public static Item itemSandstoneHammer; - // Machine Related - public static Item itemBufferCore0; - // Material related - public static Item itemStickyRubber; public static Item itemIngotBatteryAlloy; public static Item itemPlateBatteryAlloy; - public static Item itemHeliumBlob; public static Item itemHydrogenBlob; - public static Item itemPLACEHOLDER_Circuit; - - public static Item FuelRod_Empty; - public static Item FuelRod_Thorium; - public static Item FuelRod_Uranium; - public static Item FuelRod_Plutonium; public static Item itemBedLocator_Base; public static Item itemBaseItemWithCharge; - public static Item itemIngotRaisinBread; - public static Item itemHotIngotRaisinBread; - - public static ItemFood itemFoodRaisinToast; - public static BaseItemHotFood itemHotFoodRaisinToast; - public static BaseItemFood itemFoodCurriedSausages; - public static BaseItemHotFood itemHotFoodCurriedSausages; - - public static Item RfEuBattery; public static Item itemPersonalCloakingDevice; - public static Item itemPersonalCloakingDeviceCharged; public static Item itemPersonalHealingDevice; - public static Item itemPersonalFireProofDevice; public static Item itemSlowBuildingRing; - public static MultiPickaxeBase MP_GTMATERIAL; - public static MultiSpadeBase MS_GTMATERIAL; - - public static ItemStack FluidCell; - - public static BaseItemBackpack backpack_Red; - public static BaseItemBackpack backpack_Green; - public static BaseItemBackpack backpack_Blue; - public static BaseItemBackpack backpack_Yellow; - public static BaseItemBackpack backpack_Purple; - public static BaseItemBackpack backpack_Cyan; - public static BaseItemBackpack backpack_Maroon; - public static BaseItemBackpack backpack_Olive; - public static BaseItemBackpack backpack_DarkGreen; - public static BaseItemBackpack backpack_DarkPurple; - public static BaseItemBackpack backpack_Teal; - public static BaseItemBackpack backpack_Navy; - public static BaseItemBackpack backpack_Silver; - public static BaseItemBackpack backpack_Gray; - public static BaseItemBackpack backpack_Black; - public static BaseItemBackpack backpack_White; - public static ItemBlueprint itemBlueprintBase; public static Item dustLithiumCarbonate; public static Item dustLithiumHydroxide; public static Item dustLithiumPeroxide; - public static Item dustLithiumFluoride; - - public static Item dustUranium232; - public static Item dustUraniumTetraFluoride; - public static Item dustUraniumHexaFluoride; - - public static Item dustBerylliumFluoride; public static Item dustQuicklime; public static Item dustCalciumHydroxide; @@ -240,45 +129,20 @@ public final class ModItems { public static Item cellHydrogenChlorideMix; - public static BaseEuItem metaItem2; - public static Item shardAer; public static Item shardIgnis; public static Item shardTerra; public static Item shardAqua; - // Tc Compat for energy crystal recipes - public static Item shardDull; - - // Lighter - public static Item itemBasicFireMaker; - // Zirconium public static Item itemZirconiumChlorideCinterPellet; public static Item dustZrCl4; public static Item dustCookedZrCl4; - public static Item dustZrF4; - - public static Item dustNaBF4NaF; - public static Item dustLiFBeF2ZrF4UF4; - public static Item dustLiFBeF2ZrF4U235; - public static Item dustLiFBeF2ThF4UF4; public static Item dustCalciumSulfate; public static Item dustFertUN18; public static Item dustFertUN32; - - // public static Fluid fluidFLiBeSalt; - // public static Fluid fluidFLiBeSaltBurnt; - - public static Fluid fluidLftrCore1; - public static Fluid fluidLftrCore2; - public static Fluid fluidLftrCore3; - public static Fluid fluidLftrCore4; - public static Fluid fluidLftrBlanket1; - public static Fluid fluidLftrBlanket2; - public static Fluid fluidLftrBlanket3; public static Fluid fluidNuclearWaste; // Possibly missing base items that GT may be missing. @@ -311,38 +175,23 @@ public final class ModItems { public static Item itemCircuitLFTR; public static Item itemBasicTurbine; - public static Item itemDebugAreaClear; - - public static Item itemGemShards; public static Item itemHalfCompleteCasings; public static Item itemSulfuricPotion; public static Item itemHydrofluoricPotion; - public static Item itemModularBauble; public static Item itemCustomBook; - public static Item itemGrindleTablet; - public static Item itemRope; - public static Item itemFiber; - public static Item itemDragonJar; - // Unstable Elements & Related Content public static Item dustNeptunium238; public static Item dustDecayedRadium226; public static Item dustRadium226; public static Item dustProtactinium233; - public static ItemGiantEgg itemBigEgg; - public static GregtechPump toolGregtechPump; public static ItemGenericToken itemGenericToken; - public static Item itemControlCore; - - public static Item itemSunnariumBit; - public static ItemStack itemHotTitaniumIngot; public static Fluid fluidZrF4; @@ -350,10 +199,6 @@ public final class ModItems { public static Fluid fluidFertUN32; public static Fluid fluidFertUN18; - public static Item boxTools; - public static Item boxFood; - public static Item boxMagic; - public static DustDecayable dustMolybdenum99; public static DustDecayable dustTechnetium99; public static DustDecayable dustTechnetium99M; @@ -380,17 +225,6 @@ public final class ModItems { public static CoreItem itemDetCable; public static ItemThrowableBomb itemBomb; - public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Zombie; - public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Skeleton; - public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Spider; - public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Creeper; - public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Enderman; - - public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Nether; - public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Infernal; - - public static CoreItem itemExquisiteIndustrialDiamond; - public static BaseItemMetaFood itemMetaFood; public static ItemMagicFeather itemMagicFeather; @@ -407,7 +241,7 @@ public final class ModItems { ZZZ_Empty = new ItemEmpty(); } - public static final void init() { + public static void init() { itemDebugScanner = new DebugScanner(); itemMagicFeather = new ItemMagicFeather(); @@ -422,80 +256,24 @@ public final class ModItems { EnumChatFormatting.AQUA, false, null); - itemBigEgg = new ItemGiantEgg(); + itemGenericToken = new ItemGenericToken(); itemDummyResearch = new ItemDummyResearch(); itemCustomSpawnEgg = new ItemCustomSpawnEgg(); - itemDebugAreaClear = new ItemAreaClear(); - // Register meta item, because we need them for everything. MetaGeneratedGregtechItems.INSTANCE.generateMetaItems(); - // Some Simple forms of materials - itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines) - .setTextureName(GTPlusPlus.ID + ":itemStickyRubber"); - GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber"); - GT_OreDictUnificator - .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(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(GTPlusPlus.ID + ":itemHydrogenBlob"); - - // Register this neato device, for making some fires. - itemBasicFireMaker = new ItemBasicFirestarter(); - - // Register Rope - itemFiber = new CoreItem("itemFiber", "Plant Fiber", tabMisc); - itemRope = new CoreItem("itemRope", "Rope", tabMisc); // Load Wearable Items WearableLoader.run(); - // Make some backpacks - // Primary colours - backpack_Red = new BaseItemBackpack("backpackRed", Utils.rgbtoHexValue(200, 0, 0)); - backpack_Green = new BaseItemBackpack("backpackGreen", Utils.rgbtoHexValue(0, 200, 0)); - backpack_Blue = new BaseItemBackpack("backpackBlue", Utils.rgbtoHexValue(0, 0, 200)); - // Secondary Colours - backpack_Yellow = new BaseItemBackpack("backpackYellow", Utils.rgbtoHexValue(200, 200, 0)); - backpack_Purple = new BaseItemBackpack("backpackPurple", Utils.rgbtoHexValue(200, 0, 200)); - backpack_Cyan = new BaseItemBackpack("backpackCyan", Utils.rgbtoHexValue(0, 200, 200)); - // Tertiary Colours - backpack_Maroon = new BaseItemBackpack("backpackMaroon", Utils.rgbtoHexValue(128, 0, 0)); - backpack_Olive = new BaseItemBackpack("backpackOlive", Utils.rgbtoHexValue(128, 128, 0)); - backpack_DarkGreen = new BaseItemBackpack("backpackDarkGreen", Utils.rgbtoHexValue(0, 128, 0)); - backpack_DarkPurple = new BaseItemBackpack("backpackDarkPurple", Utils.rgbtoHexValue(128, 0, 128)); - backpack_Teal = new BaseItemBackpack("backpackTeal", Utils.rgbtoHexValue(0, 128, 128)); - backpack_Navy = new BaseItemBackpack("backpackNavy", Utils.rgbtoHexValue(0, 0, 128)); - // Shades - backpack_Silver = new BaseItemBackpack("backpackSilver", Utils.rgbtoHexValue(192, 192, 192)); - backpack_Gray = new BaseItemBackpack("backpackGray", Utils.rgbtoHexValue(128, 128, 128)); - backpack_Black = new BaseItemBackpack("backpackBlack", Utils.rgbtoHexValue(20, 20, 20)); - backpack_White = new BaseItemBackpack("backpackWhite", Utils.rgbtoHexValue(240, 240, 240)); - - // Load Custom Box/bags - boxTools = new UniversalToolBox("Tool Box"); - boxFood = new AutoLunchBox("Eatotron-9000"); - boxMagic = new MagicToolBag("Mystic Bag"); - itemBlueprintBase = new ItemBlueprint("itemBlueprint"); - itemGemShards = new ItemGemShards( - "itemGemShards", - "Gem Shards", - AddToCreativeTab.tabMisc, - 32, - 0, - "They glitter in the light", - EnumRarity.rare, - EnumChatFormatting.GRAY, - false, - Utils.rgbtoHexValue(182, 114, 18)).setTextureName(GTPlusPlus.ID + ":itemHeliumBlob"); itemHalfCompleteCasings = new ItemHalfCompleteCasings( "itemHalfCompleteCasings", AddToCreativeTab.tabMisc, @@ -540,20 +318,13 @@ public final class ModItems { MaterialGenerator.generate(ELEMENT.getInstance().THALLIUM); // RADIOACTIVE ELEMENTS - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().TECHNETIUM, false); // LFTR byproduct MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().ASTATINE, false); // MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADON, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FRANCIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROMETHIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().ACTINIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROTACTINIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().NEPTUNIUM, false); // LFTR byproduct MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CURIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().BERKELIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CALIFORNIUM, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().EINSTEINIUM, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FERMIUM, false); // Nuclear Isotopes @@ -580,18 +351,12 @@ public final class ModItems { // and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power. MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false); - // RTG Fuel Materials - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().STRONTIUM90, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false); - MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false); - // Custom Materials that will have standalone refinery processes MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false); MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM); MaterialGenerator.generate(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); MaterialGenerator.generate(ELEMENT.STANDALONE.HYPOGEN); MaterialGenerator.generate(ELEMENT.STANDALONE.CHRONOMATIC_GLASS); - MaterialGenerator.generate(ELEMENT.STANDALONE.FORCE); // Custom Materials that are from Runescape MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL); @@ -739,21 +504,9 @@ public final class ModItems { } catch (final Throwable r) { Logger.INFO("Failed to Generated a Material. " + r.getMessage()); - // Utils.LOG_INFO("Failed to Generated a Material. "+r.getCause().getMessage()); - // Utils.LOG_INFO("Failed to Generated a Material. "+r.getStackTrace()[0].getMethodName()); - // Utils.LOG_INFO("Failed to Generated a Material. "+r.getStackTrace()[1].getMethodName()); r.printStackTrace(); - // System.exit(1); } - // TC Style Shards, for use in making energy crystal mix. - // A dull shard, able to be infused with an element. - shardDull = new BaseItemTCShard( - "Drained", - Utils.rgbtoHexValue(75, 75, 75), - new String[] { "Can be infused to create a magical shard.", - "Obtained from Mining Stone/SandStone, Chopping Logs or Shovelling Dirt." }); - // Generates four elemental shards when TC is not installed. if (!Thaumcraft.isModLoaded()) { shardAer = new BaseItemTCShard("Aer", Utils.rgbtoHexValue(225, 225, 5)); @@ -985,30 +738,6 @@ public final class ModItems { true); // Test items - metaItem2 = new BaseEuItem(); - metaItem2.registerItem(0, EnumChatFormatting.BLACK + "Test Item 0", 0, 0, "I am 0."); - metaItem2.registerItem(1, EnumChatFormatting.GREEN + "Test Item 1", 1006346000, 1, "I Hold EU 1.", 500); - metaItem2.registerItem(2, EnumChatFormatting.GOLD + "Test Item 2", 1004630000, 2, "I Hold EU 2.", 8000); - metaItem2.registerItem(3, "Test Item 3", 1000765000, 4, "I Hold EU 3.", 32000); - metaItem2.registerItem( - 4, - "Whirlygig", - 1043644000, - (short) 5, - "Spin me right round.", - EnumRarity.rare, - EnumChatFormatting.DARK_GREEN, - true); - metaItem2.registerItem( - 5, - "Whirlygig 2", - 2124867000, - (short) 7, - "Spin me right round.", - EnumRarity.uncommon, - EnumChatFormatting.RED, - true); - toolGregtechPump = new GregtechPump(); toolGregtechPump.registerPumpType(0, "Simple Hand Pump", 0, 0); toolGregtechPump.registerPumpType(1, "Advanced Hand Pump", 32000, 1); @@ -1023,21 +752,6 @@ public final class ModItems { FluidUtils.generateFluidNoPrefix("xpjuice", "xpjuice", 0, new short[] { 50, 150, 50, 100 }); } - // Industrial Diamonds - itemExquisiteIndustrialDiamond = new CoreItem( - "IndustrialDiamondExquisite", - "High Quality Industrial Diamond", - tabMisc); - ItemStack tempStack = itemExquisiteIndustrialDiamond.getStack(); - ItemUtils.addItemToOreDictionary(tempStack, "gemDiamond"); - ItemUtils.addItemToOreDictionary(tempStack, "craftingIndustrialDiamond"); - ItemUtils.addItemToOreDictionary(tempStack, "gemExquisiteDiamond"); - ItemUtils.addItemToOreDictionary(tempStack, "craftingExquisiteIndustrialDiamond"); - - /* - * Decayable Materials - */ - dustNeptunium238 = new DustDecayable( "dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), @@ -1067,22 +781,6 @@ public final class ModItems { "Result: Uranium 233(" + StringUtils.superscript("233U") + ")" }, ELEMENT.getInstance().URANIUM233.getDust(1).getItem(), 6); - dustTechnetium99 = new DustDecayable( - "dustTechnetium99", - ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(), - 164500, - new String[] { "" + StringUtils.superscript("99Tc"), - "Result: Ruthenium 99(" + StringUtils.superscript("99Ru") + ")" }, - ELEMENT.getInstance().RUTHENIUM.getDust(1).getItem(), - 4); - dustTechnetium99M = new DustDecayable( - "dustTechnetium99M", - ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(), - 8570, - new String[] { "" + StringUtils.superscript("99ᵐTc"), - "Result: Technicium 99 (" + StringUtils.superscript("99Tc") + ")" }, - dustTechnetium99, - 4); dustMolybdenum99 = new DustDecayable( "dustMolybdenum99", ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), @@ -1108,20 +806,10 @@ public final class ModItems { itemAirFilter = new ItemAirFilter(); itemLavaFilter = new ItemLavaFilter(); - itemGrindleTablet = new BaseItemGrindle(); - itemDragonJar = new ItemEntityCatcher(); - - itemControlCore = new ItemControlCore(); - - itemSunnariumBit = new ItemSunnariumBit(); - // Chemistry new CoalTar(); new RocketFuels(); - // Nuclear Processing - new NuclearChem(); - // Farm Animal Fun new AgriculturalChem(); @@ -1140,135 +828,6 @@ public final class ModItems { itemDetCable.setTextureName("string"); itemBomb = new ItemThrowableBomb(); - // Misc Items - @SuppressWarnings("unused") - Item tI; - tI = new BaseItemMisc("Chilly", new short[] { 0, 64, 196 }, 32, MiscTypes.POTION, new String[] { "It's Blue" }); - tI = new BaseItemMisc( - "4000DC's", - new short[] { 180, 100, 30 }, - 1, - MiscTypes.BIGKEY, - new String[] { "It opens things." }); - tI = new BaseItemMisc("Dull", new short[] { 64, 64, 64 }, 64, MiscTypes.GEM, null); - tI = new BaseItemMisc( - "Forest", - new short[] { 130, 164, 96 }, - 64, - MiscTypes.MUSHROOM, - new String[] { "You Found this on the ground.", "Definitely not sure if it's worth eating." }); - - // Baubles - if (Baubles.isModLoaded()) { - tI = new HealthBoostBauble(); - itemModularBauble = new ModularBauble(); - } - - // EnderIO Resources - if ((EnderIO.isModLoaded() || LOAD_ALL_CONTENT)) { - Logger.INFO("EnderIO Found - Loading Resources."); - // Enderio Dusts - itemDustSoularium = ItemUtils.generateSpecialUseDusts( - "Soularium", - "Soularium", - MaterialEIO.SOULARIUM.vChemicalFormula, - MaterialEIO.SOULARIUM.getRgbAsHex())[0]; - itemDustRedstoneAlloy = ItemUtils.generateSpecialUseDusts( - "RedstoneAlloy", - "Redstone Alloy", - MaterialEIO.REDSTONE_ALLOY.vChemicalFormula, - MaterialEIO.REDSTONE_ALLOY.getRgbAsHex())[0]; - itemDustElectricalSteel = ItemUtils.generateSpecialUseDusts( - "ElectricalSteel", - "Electrical Steel", - MaterialEIO.ELECTRICAL_STEEL.vChemicalFormula, - MaterialEIO.ELECTRICAL_STEEL.getRgbAsHex())[0]; - itemDustPulsatingIron = ItemUtils.generateSpecialUseDusts( - "PulsatingIron", - "Pulsating Iron", - MaterialEIO.PULSATING_IRON.vChemicalFormula, - MaterialEIO.PULSATING_IRON.getRgbAsHex())[0]; - itemDustEnergeticAlloy = ItemUtils.generateSpecialUseDusts( - "EnergeticAlloy", - "Energetic Alloy", - MaterialEIO.ENERGETIC_ALLOY.vChemicalFormula, - MaterialEIO.ENERGETIC_ALLOY.getRgbAsHex())[0]; - itemDustVibrantAlloy = ItemUtils.generateSpecialUseDusts( - "VibrantAlloy", - "Vibrant Alloy", - MaterialEIO.VIBRANT_ALLOY.vChemicalFormula, - MaterialEIO.VIBRANT_ALLOY.getRgbAsHex())[0]; - itemDustConductiveIron = ItemUtils.generateSpecialUseDusts( - "ConductiveIron", - "Conductive Iron", - MaterialEIO.CONDUCTIVE_IRON.vChemicalFormula, - MaterialEIO.CONDUCTIVE_IRON.getRgbAsHex())[0]; - - // EnderIO Plates - itemPlateSoularium = ItemUtils.generateSpecialUsePlate( - "Soularium", - "Soularium", - MaterialEIO.SOULARIUM.vChemicalFormula, - MaterialEIO.SOULARIUM.getRgbAsHex(), - 0); - itemPlateRedstoneAlloy = ItemUtils.generateSpecialUsePlate( - "RedstoneAlloy", - "Redstone Alloy", - MaterialEIO.REDSTONE_ALLOY.vChemicalFormula, - MaterialEIO.REDSTONE_ALLOY.getRgbAsHex(), - 0); - itemPlateElectricalSteel = ItemUtils.generateSpecialUsePlate( - "ElectricalSteel", - "Electrical Steel", - MaterialEIO.ELECTRICAL_STEEL.vChemicalFormula, - MaterialEIO.ELECTRICAL_STEEL.getRgbAsHex(), - 0); - itemPlatePulsatingIron = ItemUtils.generateSpecialUsePlate( - "PhasedIron", - "Phased Iron", - MaterialEIO.PULSATING_IRON.vChemicalFormula, - MaterialEIO.PULSATING_IRON.getRgbAsHex(), - 0); - itemPlateEnergeticAlloy = ItemUtils.generateSpecialUsePlate( - "EnergeticAlloy", - "Energetic Alloy", - MaterialEIO.ENERGETIC_ALLOY.vChemicalFormula, - MaterialEIO.ENERGETIC_ALLOY.getRgbAsHex(), - 0); - itemPlateVibrantAlloy = ItemUtils.generateSpecialUsePlate( - "VibrantAlloy", - "Vibrant Alloy", - MaterialEIO.VIBRANT_ALLOY.vChemicalFormula, - MaterialEIO.VIBRANT_ALLOY.getRgbAsHex(), - 0); - itemPlateConductiveIron = ItemUtils.generateSpecialUsePlate( - "ConductiveIron", - "Conductive Iron", - MaterialEIO.CONDUCTIVE_IRON.vChemicalFormula, - MaterialEIO.CONDUCTIVE_IRON.getRgbAsHex(), - 0); - - // Register odd naming conventions. - GT_OreDictUnificator.registerOre("dustPhasedGold", ItemUtils.getSimpleStack(itemDustVibrantAlloy)); - GT_OreDictUnificator.registerOre("platePhasedGold", ItemUtils.getSimpleStack(itemPlateVibrantAlloy)); - GT_OreDictUnificator.registerOre("dustPhasedIron", ItemUtils.getSimpleStack(itemDustPulsatingIron)); - GT_OreDictUnificator.registerOre("platePhasedIron", ItemUtils.getSimpleStack(itemPlatePulsatingIron)); - GT_OreDictUnificator - .registerOre("blockVibrantAlloy", ItemUtils.getItemStackOfAmountFromOreDict("blockPhasedGold", 1)); - - } else { - /* - * Logger.WARNING("EnderIO not Found - Generating our own Resources."); - * MaterialGenerator.generate(MaterialEIO.CONDUCTIVE_IRON); - * MaterialGenerator.generate(MaterialEIO.PULSATING_IRON); - * MaterialGenerator.generate(MaterialEIO.REDSTONE_ALLOY); - * MaterialGenerator.generate(MaterialEIO.SOULARIUM); - * MaterialGenerator.generate(MaterialEIO.ELECTRICAL_STEEL); - * MaterialGenerator.generate(MaterialEIO.ENERGETIC_ALLOY); - * MaterialGenerator.generate(MaterialEIO.VIBRANT_ALLOY); - */ - } - // IC2 Exp Logger.INFO("IndustrialCraft2 Found - Loading Resources."); @@ -1286,48 +845,17 @@ public final class ModItems { // Special Item Handling Case if (ConfigSwitches.enableAlternativeBatteryAlloy) { - // ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", new - // short[]{35, 228, 141}, 0); TODO ModItems.itemPlateBatteryAlloy = ItemUtils .generateSpecialUsePlate("BatteryAlloy", "Battery Alloy", new short[] { 35, 228, 141 }, 0); } - // UtilsItems.generateSpawnEgg("ic2", "boatcarbon", Utils.generateSingularRandomHexValue(), - // Utils.generateSingularRandomHexValue()); - - HANDLER_COFH.initItems(); - - /* - * Misc Items - */ - - // Staballoy Equipment - itemStaballoyPickaxe = new StaballoyPickaxe("itemStaballoyPickaxe", STABALLOY) - .setCreativeTab(AddToCreativeTab.tabTools); - GameRegistry.registerItem(itemStaballoyPickaxe, itemStaballoyPickaxe.getUnlocalizedName()); - itemStaballoyAxe = new StaballoyAxe("itemStaballoyAxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools); - GameRegistry.registerItem(itemStaballoyAxe, itemStaballoyAxe.getUnlocalizedName()); - - // Sandstone Hammer - itemSandstoneHammer = new SandstoneHammer("itemSandstoneHammer").setCreativeTab(AddToCreativeTab.tabTools); - GameRegistry.registerItem(itemSandstoneHammer, itemSandstoneHammer.getUnlocalizedName()); - // Buffer Cores! Item itemBufferCore; for (int i = 1; i <= 10; i++) { - // Utils.LOG_INFO(""+i); itemBufferCore = new BufferCore("itemBufferCore", i).setCreativeTab(AddToCreativeTab.tabMachines); GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()); - // System.out.println("Buffer Core registration count is: "+i); } - itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit") - .setTextureName(GTPlusPlus.ID + ":itemPLACEHOLDER_Circuit"); - GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); - - // ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1); - // GameRegistry.registerItem(ItemBlockGtFrameBox, "itemGtFrameBoxSet1"); - itemCustomBook = new ItemBaseBook(); registerCustomTokens(); } @@ -1462,30 +990,6 @@ public final class ModItems { MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ALLOY.TRINIUM_REINFORCED_STEEL); MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FOIL, ELEMENT.STANDALONE.CHRONOMATIC_GLASS); - // Dense Plates - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.POTIN); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.AQUATIC_STEEL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.BRONZE); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.OSMIRIDIUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.QUANTUM); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.STEEL_BLACK); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.STAINLESS_STEEL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.EGLIN_STEEL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.MARAGING300); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ALLOY.TALONITE); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.HYPOGEN); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.RHUGNOR); - MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.ADVANCED_NITINOL); - MaterialUtils - .generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.ASTRAL_TITANIUM); - MaterialUtils.generateComponentAndAssignToAMaterial( - ComponentTypes.PLATEHEAVY, - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.WHITE_METAL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.BLACK_METAL); - MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.PLATEHEAVY, ELEMENT.STANDALONE.GRANITE); - // Special Sillyness if (true) { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java deleted file mode 100644 index b724687c1a..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java +++ /dev/null @@ -1,75 +0,0 @@ -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; -import net.minecraft.item.ItemStack; -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 gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class BaseItemBackpack extends Item { - - protected final int colourValue; - protected final String unlocalName; - - public BaseItemBackpack(final String unlocalizedName, final int colour) { - this.unlocalName = unlocalizedName; - this.setUnlocalizedName(unlocalizedName); - this.setTextureName(GTPlusPlus.ID + ":" + "itemBackpack"); - this.colourValue = colour; - GameRegistry.registerItem(this, unlocalizedName); - GT_OreDictUnificator.registerOre("storageBackpack", ItemUtils.getSimpleStack(this)); - this.setMaxStackSize(1); - this.setCreativeTab(AddToCreativeTab.tabOther); - } - - // Without this method, your inventory will NOT work!!! - @Override - public int getMaxItemUseDuration(final ItemStack stack) { - return 1; // return any value greater than zero - } - - @Override - public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) { - if (!world.isRemote) { - // If player not sneaking, open the inventory gui - if (!player.isSneaking()) { - player.openGui(GTplusplus.instance, GuiHandler.GUI3, world, 0, 0, 0); - } - - // Otherwise, stealthily place some diamonds in there for a nice surprise next time you open it up :) - else { - // Utils.LOG_INFO("Player is Sneaking, giving them sneaky diamonds."); - // new BaseInventoryBackpack(player.getHeldItem()).setInventorySlotContents(0, new - // ItemStack(Items.diamond,4)); - } - } - - return itemstack; - } - - @Override - public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) { - if (this.colourValue == 0) { - return MathUtils.generateSingularRandomHexValue(); - } - return this.colourValue; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(GTPlusPlus.ID + ":" + "itemBackpack"); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index dd4cd24366..7b6be7ddfe 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -338,7 +338,6 @@ public class BaseItemComponent extends Item { return Utils.rgbtoHexValue(255, 255, 255); } } - if (this.componentType == ComponentTypes.PLATEHEAVY) {} try { if (this.componentMaterial == null) { @@ -422,7 +421,6 @@ public class BaseItemComponent extends Item { PLASMACELL("CellPlasma", "@ Plasma Cell", "cellPlasma", OrePrefixes.cellPlasma), CELL("Cell", "@ Cell", "cell", OrePrefixes.cell), NUGGET("Nugget", "@ Nugget", "nugget", OrePrefixes.nugget), - PLATEHEAVY("HeavyPlate", "Heavy @ Plate", "plateHeavy", OrePrefixes.plateQuadruple), SPRING("Spring", "@ Spring", "spring", OrePrefixes.spring), SMALLSPRING("SmallSpring", "Small @ Spring", "springSmall", OrePrefixes.springSmall), FINEWIRE("FineWire", "Fine @ Wire", "wireFine", OrePrefixes.wireFine), diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java deleted file mode 100644 index c730deb436..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java +++ /dev/null @@ -1,42 +0,0 @@ -package gtPlusPlus.core.item.base.itemblock; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import gtPlusPlus.core.block.general.BlockTankXpConverter; -import gtPlusPlus.core.creative.AddToCreativeTab; - -public class ItemBlockEntityBase extends ItemBlock { - - public ItemBlockEntityBase(final Block block) { - super(block); - this.setMaxDamage(0); - // this.setHasSubtypes(true); - this.setCreativeTab(AddToCreativeTab.tabMachines); - } - - @Override - public int getColorFromItemStack(final ItemStack p_82790_1_, final int p_82790_2_) { - return super.getColorFromItemStack(p_82790_1_, p_82790_2_); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, - final boolean bool) { - if (Block.getBlockFromItem(stack.getItem()) instanceof BlockTankXpConverter) { - /* - * list.add(EnumChatFormatting.GRAY+"Can convert Liquid Xp to Mob Essence and back."); - * list.add(EnumChatFormatting.GRAY+"Right click with a Screwdriver to change mode."); - * list.add(EnumChatFormatting.GRAY+"Shift+Right click to view tank information."); - */ - list.add(EnumChatFormatting.GRAY + "Currently disabled, Use a GT Brewery instead. (New Recipes Added!)"); - } - super.addInformation(stack, aPlayer, list, bool); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java deleted file mode 100644 index b4c2d1c244..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java +++ /dev/null @@ -1,39 +0,0 @@ -package gtPlusPlus.core.item.base.itemblock; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; -import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner; - -public class ItemBlockSpawner extends ItemBlockMeta { - - private final Block mBlock; - - public ItemBlockSpawner(Block aBlock) { - super(aBlock); - mBlock = aBlock; - } - - @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aBool) { - if (mBlock != null) { - int x = this.getMetadata(aStack.getItemDamage()); - if (x >= 0) { - try { - EntityRegistration x1 = EntityRegistry.instance() - .lookupModSpawn(TileEntityGenericSpawner.mSpawners.get(x), false); - if (x1 != null) { - aList.add(EnumChatFormatting.RED + x1.getEntityName()); - } - } catch (Throwable t) {} - } - } - super.addInformation(aStack, aPlayer, aList, aBool); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java deleted file mode 100644 index a3a8eb6153..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java +++ /dev/null @@ -1,47 +0,0 @@ -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.material.Material; - -public class BaseItemPlateHeavy extends BaseItemComponent { - - static final ComponentTypes HEAVY = ComponentTypes.PLATEHEAVY; - - public BaseItemPlateHeavy(final Material material) { - super(material, HEAVY); - } - - @Override - public String getCorrectTextures() { - return GTPlusPlus.ID + ":" + "itemHeavyPlate"; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - public void registerIcons(final IIconRegister i) { - this.base = i.registerIcon(GTPlusPlus.ID + ":" + "itemHeavyPlate"); - this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "itemHeavyPlate_Overlay"); - } - - @Override - public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { - - if (pass == 0) { - return this.base; - } else { - return this.overlay; - } - } -} diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java deleted file mode 100644 index b5d7b8fdbb..0000000000 --- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ /dev/null @@ -1,137 +0,0 @@ -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; -import java.util.List; -import java.util.UUID; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - -import baubles.api.BaubleType; -import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.DevHelper; - -public class FireProtectionBauble extends BaseBauble { - - public static HashMap mDataMap = new HashMap(); - public static HashSet mPlayerMap = new HashSet(); - - private static Field isImmuneToFire; - - static { - isImmuneToFire = ReflectionUtils - .getField(Entity.class, DevHelper.isObfuscatedEnvironment() ? "func_70045_F" : "isImmuneToFire"); - } - - public static boolean fireImmune(Entity aEntity) { - return aEntity.isImmuneToFire(); - } - - public static boolean setEntityImmuneToFire(Entity aEntity, boolean aImmune) { - try { - return ReflectionUtils.setField(aEntity, isImmuneToFire, aImmune); - } catch (Throwable t) {} - return false; - } - - public FireProtectionBauble() { - super(BaubleType.RING, "GTPP.bauble.fireprotection.0" + ".name", 0); - String aUnlocalName = "GTPP.bauble.fireprotection.0" + ".name"; - this.setUnlocalizedName(aUnlocalName); - this.setTextureName(GTPlusPlus.ID + ":" + getTextureNameForBauble()); - this.setMaxDamage(100); - this.setMaxStackSize(1); - this.setNoRepair(); - this.setCreativeTab(AddToCreativeTab.tabMachines); - if (GameRegistry.findItem(GTPlusPlus.ID, aUnlocalName) == null) { - GameRegistry.registerItem(this, aUnlocalName); - } - } - - @Override - public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_, - final boolean p_77663_5_) { - super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_); - } - - @Override - public String getItemStackDisplayName(final ItemStack p_77653_1_) { - return (EnumChatFormatting.DARK_RED + super.getItemStackDisplayName(p_77653_1_) + EnumChatFormatting.GRAY); - } - - @Override - public boolean showDurabilityBar(final ItemStack stack) { - return false; - } - - @SuppressWarnings("unchecked") - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - super.addInformation(stack, aPlayer, list, bool); - } - - @Override - public boolean canEquip(final ItemStack arg0, final EntityLivingBase arg1) { - return true; - } - - @Override - public boolean canUnequip(final ItemStack arg0, final EntityLivingBase arg1) { - return true; - } - - @Override - public void onEquipped(final ItemStack arg0, final EntityLivingBase aPlayer) { - if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer bPlayer = (EntityPlayer) aPlayer; - mPlayerMap.add(bPlayer.getUniqueID()); - } - } - } - - @Override - public void onUnequipped(final ItemStack arg0, final EntityLivingBase aPlayer) { - if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer bPlayer = (EntityPlayer) aPlayer; - if (bPlayer.isPotionActive(Potion.fireResistance)) { - bPlayer.removePotionEffect(Potion.fireResistance.id); - } - mPlayerMap.remove(bPlayer.getUniqueID()); - setEntityImmuneToFire(bPlayer, false); - } - } - } - - @Override - public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase aPlayer) { - if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer bPlayer = (EntityPlayer) aPlayer; - if (!fireImmune(bPlayer)) { - setEntityImmuneToFire(bPlayer, true); - } - if (!bPlayer.isPotionActive(Potion.fireResistance)) { - bPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 100, 4)); - } - } - } - } - - public String getTextureNameForBauble() { - return "baubles/itemFireProtectGlovesBetter"; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java deleted file mode 100644 index 703fb7c5bb..0000000000 --- a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java +++ /dev/null @@ -1,40 +0,0 @@ -package gtPlusPlus.core.item.bauble; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; - -import com.google.common.collect.Multimap; - -import baubles.api.BaubleType; - -public class HealthBoostBauble extends BaseBauble { - - public HealthBoostBauble() { - super(BaubleType.AMULET, "The Key to the City"); - addDamageNegation(DamageSource.wither); - this.setTextureName(GTPlusPlus.ID + ":" + "itemKeyGold"); - } - - @Override - void fillModifiers(Multimap attributes, ItemStack stack) { - attributes.put( - SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), - new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 40, 0)); - } - - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { - list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.thekeytothecity.tooltip.0")); - list.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("item.thekeytothecity.tooltip.1")); - super.addInformation(stack, player, list, bool); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java deleted file mode 100644 index 63a812e8ca..0000000000 --- a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java +++ /dev/null @@ -1,495 +0,0 @@ -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; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.uti