From 1a35e6df71560e26bfe9e71b737c2719ca7cff20 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Mon, 19 Jan 2015 22:44:30 +0100 Subject: [PATCH 1/2] #1703 added Forestry upgrades to the Dark Steel Armor --- build.gradle | 2 + gradle.properties | 1 + resources/assets/enderio/lang/en_US.lang | 15 +++ src/main/java/crazypants/enderio/EnderIO.java | 2 +- .../crazypants/enderio/config/Config.java | 5 + .../item/darksteel/ApiaristArmorUpgrade.java | 92 +++++++++++++++++++ .../darksteel/DarkSteelRecipeManager.java | 7 ++ .../item/darksteel/ItemDarkSteelArmor.java | 24 ++++- .../item/darksteel/NaturalistEyeUpgrade.java | 81 ++++++++++++++++ 9 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 src/main/java/crazypants/enderio/item/darksteel/ApiaristArmorUpgrade.java create mode 100644 src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java diff --git a/build.gradle b/build.gradle index 170f9a2d..313a82da 100644 --- a/build.gradle +++ b/build.gradle @@ -42,6 +42,7 @@ repositories { maven { url = "http://chickenbones.net/maven/" } maven { url = "http://dl.tsr.me/artifactory/libs-release-local" } maven { url = "http://maven.tterrag.com" } + maven { url = "http://maven.ic2.player.to" } } dependencies { @@ -50,6 +51,7 @@ dependencies { compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api" compile "mcp.mobius.waila:Waila:${waila_version}" compile "tterrag.core:ttCore:${ttCore_version}" + compile "net.sengir.forestry:${forestry_version}:api" } sourceSets { diff --git a/gradle.properties b/gradle.properties index b6c240b4..5a88ad65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,6 @@ buildcraft_version=6.1.5 waila_version=1.5.8a_1.7.10 ae2_version=rv1-stable-1 ttCore_version=MC1.7.10-0.1.0-55 +forestry_version=forestry_1.7.10:3.3.0.423-unstable curse_projectId=64578 \ No newline at end of file diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index ba13566f..10ac6012 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -621,6 +621,21 @@ enderio.darksteel.upgrade.sound.disabled=Sound Locator Disabled enderio.darksteel.upgrade.gogglesOfRevealing.name=Revealing enderio.darksteel.upgrade.gogglesOfRevealing.tooltip.detailed.line1=Vis Discount: 5% +enderio.darksteel.upgrade.naturalistEye.name=Naturalist's Eye +enderio.darksteel.upgrade.naturalistEye.tooltip.detailed.line1=Shows pollinated tree leaves + +enderio.darksteel.upgrade.apiaristArmor.helmet.name=Apiarist's Hat +enderio.darksteel.upgrade.apiaristArmor.helmet.tooltip.detailed.line1=Protection against bees + +enderio.darksteel.upgrade.apiaristArmor.chestplate.name=Apiarist's Shirt +enderio.darksteel.upgrade.apiaristArmor.chestplate.tooltip.detailed.line1=Protection against bees + +enderio.darksteel.upgrade.apiaristArmor.leggings.name=Apiarist's Pants +enderio.darksteel.upgrade.apiaristArmor.leggings.tooltip.detailed.line1=Protection against bees + +enderio.darksteel.upgrade.apiaristArmor.boots.name=Apiarist's Shoes +enderio.darksteel.upgrade.apiaristArmor.boots.tooltip.detailed.line1=Protection against bees + item.itemGliderWing.name=Glider Wing item.itemGliderWings.name=Glider Wings item.itemGliderWings.tooltip.detailed.line1=Upgrade for Dark Steel diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 7c6dc0df..92e013a0 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -157,7 +157,7 @@ import static crazypants.enderio.EnderIO.MODID; import static crazypants.enderio.EnderIO.MOD_NAME; import static crazypants.enderio.EnderIO.VERSION; -@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") +@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Forestry", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") public class EnderIO { public static final String MODID = "EnderIO"; diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 112c2798..0271f103 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -211,6 +211,8 @@ public final class Config { public static int darkSteelGogglesOfRevealingCost = 10; + public static int darkSteelApiaristArmorCost = 10; + public static int darkSteelSwimCost = 10; public static int darkSteelNightVisionCost = 10; @@ -788,6 +790,9 @@ public final class Config { darkSteelGogglesOfRevealingCost= config.get(sectionDarkSteel.name, "darkSteelGogglesOfRevealingCost", darkSteelGogglesOfRevealingCost, "Number of levels required for the Goggles of Revealing upgrade.").getInt(darkSteelGogglesOfRevealingCost); + darkSteelApiaristArmorCost= config.get(sectionDarkSteel.name, "darkSteelApiaristArmorCost", darkSteelApiaristArmorCost, + "Number of levels required for the Apiarist Armor upgrade.").getInt(darkSteelApiaristArmorCost); + darkSteelTravelCost = config.get(sectionDarkSteel.name, "darkSteelTravelCost", darkSteelTravelCost, "Number of levels required for the 'Travel' upgrade.").getInt(darkSteelTravelCost); diff --git a/src/main/java/crazypants/enderio/item/darksteel/ApiaristArmorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/ApiaristArmorUpgrade.java new file mode 100644 index 00000000..d5165d0d --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/ApiaristArmorUpgrade.java @@ -0,0 +1,92 @@ +package crazypants.enderio.item.darksteel; + +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.config.Config; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public class ApiaristArmorUpgrade extends AbstractUpgrade { + + private static String UPGRADE_NAME = "apiaristArmor"; + + private static final String forestryItemNames[] = { + "apiaristHelmet", "apiaristChest", "apiaristLegs", "apiaristBoots"}; + + public static final ApiaristArmorUpgrade HELMET = new ApiaristArmorUpgrade(0); + public static final ApiaristArmorUpgrade CHEST = new ApiaristArmorUpgrade(1); + public static final ApiaristArmorUpgrade LEGS = new ApiaristArmorUpgrade(2); + public static final ApiaristArmorUpgrade BOOTS = new ApiaristArmorUpgrade(3); + + public static ItemStack getApiaristArmor(int slot) { + Item i = GameRegistry.findItem("Forestry", forestryItemNames[slot]); + if(i != null) { + return new ItemStack(i); + } + return null; + } + + public static ApiaristArmorUpgrade loadFromItem(ItemStack stack) { + if(stack == null) { + return null; + } + if(stack.stackTagCompound == null) { + return null; + } + if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new ApiaristArmorUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); + } + + private final int slot; + + public ApiaristArmorUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); + this.slot = tag.getInteger("slot"); + } + + public ApiaristArmorUpgrade(int slot) { + super(UPGRADE_NAME, + "enderio.darksteel.upgrade.apiaristArmor.".concat(ItemDarkSteelArmor.NAMES[slot]), + getApiaristArmor(slot), Config.darkSteelApiaristArmorCost); + this.slot = slot; + } + + @Override + public boolean canAddToItem(ItemStack stack) { + if(stack == null || stack.getItem() != ItemDarkSteelArmor.forArmorType(slot) || getUpgradeItem() == null) { + return false; + } + ApiaristArmorUpgrade up = loadFromItem(stack); + return up == null; + } + + @Override + public boolean hasUpgrade(ItemStack stack) { + return super.hasUpgrade(stack) && stack.getItem() == ItemDarkSteelArmor.forArmorType(slot); + } + + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + upgradeRoot.setByte("slot", (byte)slot); + } + + @Override + public ItemStack getUpgradeItem() { + if(upgradeItem != null) { + return upgradeItem; + } + upgradeItem = getApiaristArmor(slot); + return upgradeItem; + } + + @Override + public String getUpgradeItemName() { + if(getUpgradeItem() == null) { + return "Apiarist Armor"; + } + return super.getUpgradeItemName(); + } +} diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index 0216a46e..e71c0a9a 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -49,6 +49,13 @@ public class DarkSteelRecipeManager { if(Loader.isModLoaded("Thaumcraft")) { upgrades.add(GogglesOfRevealingUpgrade.INSTANCE); } + if(Loader.isModLoaded("Forestry")) { + upgrades.add(NaturalistEyeUpgrade.INSTANCE); + upgrades.add(ApiaristArmorUpgrade.HELMET); + upgrades.add(ApiaristArmorUpgrade.CHEST); + upgrades.add(ApiaristArmorUpgrade.LEGS); + upgrades.add(ApiaristArmorUpgrade.BOOTS); + } } @SubscribeEvent diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index be982cd5..56d5976d 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -33,14 +33,18 @@ import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.util.ItemUtil; import crazypants.util.Lang; +import forestry.api.apiculture.IArmorApiarist; +import forestry.api.core.IArmorNaturalist; @InterfaceList({ @Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"), @Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"), - @Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft") + @Interface(iface = "thaumcraft.api.nodes.IRevealer", modid = "Thaumcraft"), + @Interface(iface = "forestry.api.apiculture.IArmorApiarist", modid = "Forestry"), + @Interface(iface = "forestry.api.core.IArmorNaturalist", modid = "Forestry") }) public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerItem, ISpecialArmor, IAdvancedTooltipProvider, IDarkSteelItem, IGoggles, - IRevealer, IVisDiscountGear { + IRevealer, IVisDiscountGear, IArmorApiarist, IArmorNaturalist { public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("darkSteel", 35, new int[] { 2, 6, 5, 2 }, 15); @@ -294,4 +298,20 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte this.gogglesUgradeActive = gogglesUgradeActive; } + // Forestry + + @Override + @Method(modid = "Forestry") + public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause, boolean doProtect) { + return ApiaristArmorUpgrade.loadFromItem(armor) != null; + } + + @Override + @Method(modid = "Forestry") + public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) { + if(armor == null || armor.getItem() != EnderIO.itemDarkSteelHelmet) { + return false; + } + return NaturalistEyeUpgrade.isUpgradeEquipped(player); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java new file mode 100644 index 00000000..9f44a03f --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java @@ -0,0 +1,81 @@ +package crazypants.enderio.item.darksteel; + +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import static crazypants.enderio.item.darksteel.AbstractUpgrade.KEY_UPGRADE_PREFIX; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public class NaturalistEyeUpgrade extends AbstractUpgrade { + + private static String UPGRADE_NAME = "naturalistEye"; + + public static final NaturalistEyeUpgrade INSTANCE = new NaturalistEyeUpgrade(); + + public static ItemStack getNaturalistEye() { + Item i = GameRegistry.findItem("Forestry", "naturalistHelmet"); + if(i != null) { + return new ItemStack(i); + } + return null; + } + + public static NaturalistEyeUpgrade loadFromItem(ItemStack stack) { + if(stack == null) { + return null; + } + if(stack.stackTagCompound == null) { + return null; + } + if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new NaturalistEyeUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); + } + + public static boolean isUpgradeEquipped(EntityPlayer player) { + ItemStack helmet = player.getEquipmentInSlot(4); + return NaturalistEyeUpgrade.loadFromItem(helmet) != null; + } + + public NaturalistEyeUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); + } + + public NaturalistEyeUpgrade() { + super(UPGRADE_NAME, "enderio.darksteel.upgrade.naturalistEye",getNaturalistEye(), Config.darkSteelApiaristArmorCost); + } + + @Override + public boolean canAddToItem(ItemStack stack) { + if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet || getUpgradeItem() == null) { + return false; + } + NaturalistEyeUpgrade up = loadFromItem(stack); + return up == null; + } + + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + } + + @Override + public ItemStack getUpgradeItem() { + if(upgradeItem != null) { + return upgradeItem; + } + upgradeItem = getNaturalistEye(); + return upgradeItem; + } + + @Override + public String getUpgradeItemName() { + if(getUpgradeItem() == null) { + return "Naturalist Helmet"; + } + return super.getUpgradeItemName(); + } +} From de2459696f88f6acaacf1827fa804738890d2fd1 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Tue, 20 Jan 2015 22:55:16 +0100 Subject: [PATCH 2/2] move dark steel item instances into it's own statis class to solve class loading order dependencies --- .../java/crazypants/enderio/ClientProxy.java | 16 ++--- src/main/java/crazypants/enderio/EnderIO.java | 40 ++--------- .../crazypants/enderio/item/ItemRecipes.java | 25 +++---- .../crazypants/enderio/item/KeyTracker.java | 5 +- .../item/darksteel/DarkSteelController.java | 36 +++++----- .../item/darksteel/DarkSteelItems.java | 67 +++++++++++++++++++ .../enderio/item/darksteel/GliderUpgrade.java | 4 +- .../darksteel/GogglesOfRevealingUpgrade.java | 3 +- .../item/darksteel/ItemDarkSteelArmor.java | 17 +++-- .../item/darksteel/ItemDarkSteelAxe.java | 22 +----- .../item/darksteel/ItemDarkSteelPickaxe.java | 4 +- .../item/darksteel/ItemDarkSteelSword.java | 12 ++-- .../enderio/item/darksteel/JumpUpgrade.java | 2 +- .../item/darksteel/NaturalistEyeUpgrade.java | 3 +- .../item/darksteel/NightVisionUpgrade.java | 2 +- .../enderio/item/darksteel/SolarUpgrade.java | 2 +- .../item/darksteel/SoundDetectorUpgrade.java | 2 +- .../enderio/item/darksteel/SpeedUpgrade.java | 2 +- .../enderio/item/darksteel/SpoonUpgrade.java | 2 +- .../enderio/item/darksteel/SwimUpgrade.java | 2 +- .../enderio/item/darksteel/TravelUpgrade.java | 4 +- 21 files changed, 141 insertions(+), 131 deletions(-) create mode 100644 src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index ca9d0051..51cf184c 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -54,7 +54,7 @@ import crazypants.enderio.item.ConduitProbeOverlayRenderer; import crazypants.enderio.item.KeyTracker; import crazypants.enderio.item.ToolTickHandler; import crazypants.enderio.item.YetaWrenchOverlayRenderer; -import crazypants.enderio.item.darksteel.PoweredItemRenderer; +import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.item.darksteel.SoundDetector; import crazypants.enderio.item.darksteel.SoundEntity; import crazypants.enderio.item.darksteel.SoundRenderer; @@ -154,9 +154,9 @@ public class ClientProxy extends CommonProxy { MEConduit.initIcons(); } - private List conduitRenderers = new ArrayList(); + private final List conduitRenderers = new ArrayList(); - private DefaultConduitRenderer dcr = new DefaultConduitRenderer(); + private final DefaultConduitRenderer dcr = new DefaultConduitRenderer(); private ConduitBundleRenderer cbr; @@ -385,14 +385,8 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(TravelController.instance); FMLCommonHandler.instance().bus().register(TravelController.instance); - PoweredItemRenderer dsr = new PoweredItemRenderer(); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelBoots, dsr); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelLeggings, dsr); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelChestplate, dsr); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelHelmet, dsr); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelSword, dsr); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelPickaxe, dsr); - MinecraftForgeClient.registerItemRenderer(EnderIO.itemDarkSteelAxe, dsr); + DarkSteelItems.registerItemRenderer(); + //Ensure it is loaded and registered KeyTracker.instance.isGlideActive(); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 92e013a0..a9fa0ab9 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -72,11 +72,7 @@ import crazypants.enderio.item.ItemMagnet; import crazypants.enderio.item.ItemRecipes; import crazypants.enderio.item.ItemSoulVessel; import crazypants.enderio.item.ItemYetaWrench; -import crazypants.enderio.item.darksteel.ItemDarkSteelArmor; -import crazypants.enderio.item.darksteel.ItemDarkSteelAxe; -import crazypants.enderio.item.darksteel.ItemDarkSteelPickaxe; -import crazypants.enderio.item.darksteel.ItemDarkSteelSword; -import crazypants.enderio.item.darksteel.ItemGliderWing; +import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.item.darksteel.SoundEntity; import crazypants.enderio.item.skull.BlockEndermanSkull; import crazypants.enderio.machine.MachineRecipes; @@ -157,7 +153,7 @@ import static crazypants.enderio.EnderIO.MODID; import static crazypants.enderio.EnderIO.MOD_NAME; import static crazypants.enderio.EnderIO.VERSION; -@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Forestry", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") +@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") public class EnderIO { public static final String MODID = "EnderIO"; @@ -293,15 +289,7 @@ public class EnderIO { public static ItemSoulVessel itemSoulVessel; public static ItemFrankenSkull itemFrankenSkull; - public static ItemDarkSteelArmor itemDarkSteelHelmet; - public static ItemDarkSteelArmor itemDarkSteelChestplate; - public static ItemDarkSteelArmor itemDarkSteelLeggings; - public static ItemDarkSteelArmor itemDarkSteelBoots; - public static ItemDarkSteelSword itemDarkSteelSword; - public static ItemDarkSteelPickaxe itemDarkSteelPickaxe; - public static ItemDarkSteelAxe itemDarkSteelAxe; public static BlockVacuumChest blockVacuumChest; - public static ItemGliderWing itemGliderWing; @EventHandler public void preInit(FMLPreInitializationEvent event) { @@ -416,16 +404,7 @@ public class EnderIO { blockDarkIronBars = BlockDarkIronBars.create(); - itemGliderWing = ItemGliderWing.create(); - - itemDarkSteelHelmet = ItemDarkSteelArmor.create(0); - itemDarkSteelChestplate = ItemDarkSteelArmor.create(1); - itemDarkSteelLeggings = ItemDarkSteelArmor.create(2); - itemDarkSteelBoots = ItemDarkSteelArmor.create(3); - - itemDarkSteelSword = ItemDarkSteelSword.create(); - itemDarkSteelPickaxe = ItemDarkSteelPickaxe.create(); - itemDarkSteelAxe = ItemDarkSteelAxe.create(); + DarkSteelItems.createDarkSteelArmorItems(); int entityID = EntityRegistry.findGlobalUniqueEntityId(); EntityRegistry.registerGlobalEntityID(SoundEntity.class, "soundEntity", entityID); @@ -549,19 +528,8 @@ public class EnderIO { ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 3)); } - if(Config.lootTheEnder) { - ItemStack sword = new ItemStack(EnderIO.itemDarkSteelSword, 1, 0); - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4)); - ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4)); - } + DarkSteelItems.addLoot(); - if(Config.lootDarkSteelBoots) { - ItemStack boots = new ItemStack(EnderIO.itemDarkSteelBoots, 1, 0); - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); - ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); - } if(Loader.isModLoaded("ComputerCraft")) { ConduitBundledRedstoneProvider.register(); } diff --git a/src/main/java/crazypants/enderio/item/ItemRecipes.java b/src/main/java/crazypants/enderio/item/ItemRecipes.java index 067bd5bc..340a3a8d 100644 --- a/src/main/java/crazypants/enderio/item/ItemRecipes.java +++ b/src/main/java/crazypants/enderio/item/ItemRecipes.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; +import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.material.Alloy; import crazypants.enderio.material.MachinePart; import crazypants.enderio.material.Material; @@ -32,14 +33,14 @@ public class ItemRecipes { GameRegistry.addShapedRecipe(magnet, "scc", " v", "scc", 's', electricalSteel, 'c', conductiveIron, 'v', vibCry); //Dark Steel - GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelHelmet.createItemStack(), "sss", "s s", 's', darkSteel); - GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelChestplate.createItemStack(), "s s", "sss", "sss", 's', darkSteel); - GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelLeggings.createItemStack(), "sss", "s s", "s s", 's', darkSteel); - GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), "s s", "s s", 's', darkSteel); + GameRegistry.addShapedRecipe(DarkSteelItems.itemDarkSteelHelmet.createItemStack(), "sss", "s s", 's', darkSteel); + GameRegistry.addShapedRecipe(DarkSteelItems.itemDarkSteelChestplate.createItemStack(), "s s", "sss", "sss", 's', darkSteel); + GameRegistry.addShapedRecipe(DarkSteelItems.itemDarkSteelLeggings.createItemStack(), "sss", "s s", "s s", 's', darkSteel); + GameRegistry.addShapedRecipe(DarkSteelItems.itemDarkSteelBoots.createItemStack(), "s s", "s s", 's', darkSteel); - ItemStack wing = new ItemStack(EnderIO.itemGliderWing,1,0); + ItemStack wing = new ItemStack(DarkSteelItems.itemGliderWing,1,0); GameRegistry.addShapedRecipe(wing, " s", " sl", "sll", 's', darkSteel, 'l', Items.leather); - GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemGliderWing,1,1), " s ", "wsw", " ", 's', darkSteel, 'w', wing); + GameRegistry.addShapedRecipe(new ItemStack(DarkSteelItems.itemGliderWing,1,1), " s ", "wsw", " ", 's', darkSteel, 'w', wing); ItemStack dspp = new ItemStack(EnderIO.blockDarkSteelPressurePlate); @@ -58,11 +59,11 @@ public class ItemRecipes { public static void addOreDictionaryRecipes() { ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "stickWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "woodStick")); - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "stickWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "woodStick")); - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "woodStick")); - GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelSword.createItemStack(), " s ", " s ", " w ", 's', darkSteel, 'w', "woodStick")); + GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelPickaxe.createItemStack(), "sss", " w ", " w ", 's', darkSteel, 'w', "woodStick")); + GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "woodStick")); + GameRegistry.addRecipe(new ShapedOreRecipe(DarkSteelItems.itemDarkSteelAxe.createItemStack(), "ss ", "sw ", " w ", 's', darkSteel, 'w', "stickWood")); } } diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index da58f2eb..799a32c6 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -14,6 +14,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; import crazypants.enderio.EnderIO; +import crazypants.enderio.item.darksteel.DarkSteelItems; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.item.darksteel.DarkSteelController; import crazypants.enderio.item.darksteel.GogglesOfRevealingUpgrade; @@ -27,7 +28,7 @@ import crazypants.util.Lang; public class KeyTracker { - public static KeyTracker instance = new KeyTracker(); + public static final KeyTracker instance = new KeyTracker(); static { FMLCommonHandler.instance().bus().register(instance); @@ -128,7 +129,7 @@ public class KeyTracker { return; } if(gogglesKey.getIsKeyPressed()) { - EnderIO.itemDarkSteelHelmet.setGogglesUgradeActive(!EnderIO.itemDarkSteelHelmet.isGogglesUgradeActive()); + DarkSteelItems.itemDarkSteelHelmet.setGogglesUgradeActive(!DarkSteelItems.itemDarkSteelHelmet.isGogglesUgradeActive()); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 6eddf818..2c5b76f7 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -34,28 +34,28 @@ public class DarkSteelController { public static final DarkSteelController instance = new DarkSteelController(); - private AttributeModifier[] walkModifiers = new AttributeModifier[] { + private final AttributeModifier[] walkModifiers = new AttributeModifier[] { new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[0], 1), new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[1], 1), new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.WALK_MULTIPLIERS[2], 1), }; - private AttributeModifier[] sprintModifiers = new AttributeModifier[] { + private final AttributeModifier[] sprintModifiers = new AttributeModifier[] { new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[0], 1), new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[1], 1), new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", SpeedUpgrade.SPRINT_MULTIPLIERS[2], 1), }; - private AttributeModifier swordDamageModifierPowered = new AttributeModifier(new UUID(63242325, 320981923), "Weapon modifier", + private final AttributeModifier swordDamageModifierPowered = new AttributeModifier(new UUID(63242325, 320981923), "Weapon modifier", 2, 0); private boolean wasJumping; private int jumpCount; private int ticksSinceLastJump; - private Map glideActiveMap = new HashMap(); - private Map speedActiveMap = new HashMap(); - private Map stepAssistActiveMap = new HashMap(); + private final Map glideActiveMap = new HashMap(); + private final Map speedActiveMap = new HashMap(); + private final Map stepAssistActiveMap = new HashMap(); private boolean nightVisionActive = false; private boolean removeNightvision = false; @@ -239,7 +239,7 @@ public class DarkSteelController { attackInst.removeModifier(swordDamageModifierPowered); ItemStack sword = player.getCurrentEquippedItem(); - if(Config.darkSteelSwordPowerUsePerHit <= 0 || EnderIO.itemDarkSteelSword.getEnergyStored(sword) >= Config.darkSteelSwordPowerUsePerHit) { + if(Config.darkSteelSwordPowerUsePerHit <= 0 || EnergyUpgrade.getEnergyStored(sword) >= Config.darkSteelSwordPowerUsePerHit) { attackInst.applyModifier(swordDamageModifierPowered); } } @@ -259,16 +259,16 @@ public class DarkSteelController { ItemStack leggings = player.getEquipmentInSlot(2); SpeedUpgrade speedUpgrade = SpeedUpgrade.loadFromItem(leggings); - if(leggings != null && leggings.getItem() == EnderIO.itemDarkSteelLeggings && speedUpgrade != null && isSpeedActive(player)) { + if(leggings != null && leggings.getItem() == DarkSteelItems.itemDarkSteelLeggings && speedUpgrade != null && isSpeedActive(player)) { double horzMovement = Math.abs(player.distanceWalkedModified - player.prevDistanceWalkedModified); double costModifier = player.isSprinting() ? Config.darkSteelSprintPowerCost : Config.darkSteelWalkPowerCost; costModifier = costModifier + (costModifier * speedUpgrade.walkMultiplier); int cost = (int) (horzMovement * costModifier); - int totalEnergy = getPlayerEnergy(player, EnderIO.itemDarkSteelLeggings); + int totalEnergy = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelLeggings); if(totalEnergy > 0) { - usePlayerEnergy(player, EnderIO.itemDarkSteelLeggings, cost); + usePlayerEnergy(player, DarkSteelItems.itemDarkSteelLeggings, cost); if(player.isSprinting()) { moveInst.applyModifier(sprintModifiers[speedUpgrade.level - 1]); } else { @@ -281,20 +281,20 @@ public class DarkSteelController { private void updateStepHeightAndFallDistance(EntityPlayer player) { ItemStack boots = player.getEquipmentInSlot(1); - if(boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots) { + if(boots != null && boots.getItem() == DarkSteelItems.itemDarkSteelBoots) { int costedDistance = (int) player.fallDistance; if(costedDistance > 0) { int energyCost = costedDistance * Config.darkSteelFallDistanceCost; - int totalEnergy = getPlayerEnergy(player, EnderIO.itemDarkSteelBoots); + int totalEnergy = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots); if(totalEnergy > 0 && totalEnergy >= energyCost) { - usePlayerEnergy(player, EnderIO.itemDarkSteelBoots, energyCost); + usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, energyCost); player.fallDistance -= costedDistance; } } } JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); - if(jumpUpgrade != null && boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots && isStepAssistActive(player)) { + if(jumpUpgrade != null && boots != null && boots.getItem() == DarkSteelItems.itemDarkSteelBoots && isStepAssistActive(player)) { player.stepHeight = 1.0023F; } else if(player.stepHeight == 1.0023F) { player.stepHeight = 0.5001F; @@ -380,19 +380,19 @@ public class DarkSteelController { ItemStack boots = player.getEquipmentInSlot(1); JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); - if(jumpUpgrade == null || boots == null || boots.getItem() != EnderIO.itemDarkSteelBoots) { + if(jumpUpgrade == null || boots == null || boots.getItem() != DarkSteelItems.itemDarkSteelBoots) { return; } int requiredPower = Config.darkSteelBootsJumpPowerCost * (int) Math.pow(jumpCount + 1, 2.5); - int availablePower = getPlayerEnergy(player, EnderIO.itemDarkSteelBoots); + int availablePower = getPlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots); if(availablePower > 0 && requiredPower <= availablePower && jumpCount < jumpUpgrade.level) { jumpCount++; player.motionY += 0.15 * Config.darkSteelBootsJumpModifier * jumpCount; ticksSinceLastJump = 0; - usePlayerEnergy(player, EnderIO.itemDarkSteelBoots, requiredPower); + usePlayerEnergy(player, DarkSteelItems.itemDarkSteelBoots, requiredPower); player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.MODID + ":ds.jump", 1.0f, player.worldObj.rand.nextFloat() * 0.5f + 0.75f, false); - PacketHandler.INSTANCE.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, EnderIO.itemDarkSteelBoots.armorType)); + PacketHandler.INSTANCE.sendToServer(new PacketDarkSteelPowerPacket(requiredPower, DarkSteelItems.itemDarkSteelBoots.armorType)); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java new file mode 100644 index 00000000..827b0125 --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelItems.java @@ -0,0 +1,67 @@ +package crazypants.enderio.item.darksteel; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; + +import crazypants.enderio.config.Config; +import net.minecraftforge.client.MinecraftForgeClient; + +public class DarkSteelItems { + + public static ItemGliderWing itemGliderWing; + + public static ItemDarkSteelArmor itemDarkSteelHelmet; + public static ItemDarkSteelArmor itemDarkSteelChestplate; + public static ItemDarkSteelArmor itemDarkSteelLeggings; + public static ItemDarkSteelArmor itemDarkSteelBoots; + public static ItemDarkSteelSword itemDarkSteelSword; + public static ItemDarkSteelPickaxe itemDarkSteelPickaxe; + public static ItemDarkSteelAxe itemDarkSteelAxe; + + private DarkSteelItems() { + } + + public static void createDarkSteelArmorItems() { + itemGliderWing = ItemGliderWing.create(); + + itemDarkSteelHelmet = ItemDarkSteelArmor.create(0); + itemDarkSteelChestplate = ItemDarkSteelArmor.create(1); + itemDarkSteelLeggings = ItemDarkSteelArmor.create(2); + itemDarkSteelBoots = ItemDarkSteelArmor.create(3); + + itemDarkSteelSword = ItemDarkSteelSword.create(); + itemDarkSteelPickaxe = ItemDarkSteelPickaxe.create(); + itemDarkSteelAxe = ItemDarkSteelAxe.create(); + } + + public static void addLoot() { + if(Config.lootTheEnder) { + ItemStack sword = new ItemStack(itemDarkSteelSword, 1, 0); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(sword, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4)); + ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(sword, 1, 1, 4)); + } + + if(Config.lootDarkSteelBoots) { + ItemStack boots = new ItemStack(itemDarkSteelBoots, 1, 0); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); + ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(boots, 1, 1, 5)); + } + } + + @SideOnly(Side.CLIENT) + public static void registerItemRenderer() { + PoweredItemRenderer dsr = new PoweredItemRenderer(); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelBoots, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelLeggings, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelChestplate, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelHelmet, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelSword, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelPickaxe, dsr); + MinecraftForgeClient.registerItemRenderer(itemDarkSteelAxe, dsr); + } +} diff --git a/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java index 9d339c29..83382a67 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/GliderUpgrade.java @@ -30,12 +30,12 @@ public class GliderUpgrade extends AbstractUpgrade { } public GliderUpgrade() { - super(UPGRADE_NAME, "enderio.darksteel.upgrade.glider", new ItemStack(EnderIO.itemGliderWing,1,1), Config.darkSteelGliderCost); + super(UPGRADE_NAME, "enderio.darksteel.upgrade.glider", new ItemStack(DarkSteelItems.itemGliderWing,1,1), Config.darkSteelGliderCost); } @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelChestplate) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelChestplate) { return false; } GliderUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/GogglesOfRevealingUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/GogglesOfRevealingUpgrade.java index 4886086b..b989b420 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/GogglesOfRevealingUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/GogglesOfRevealingUpgrade.java @@ -5,7 +5,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; public class GogglesOfRevealingUpgrade extends AbstractUpgrade { @@ -50,7 +49,7 @@ public class GogglesOfRevealingUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet || getGoggles() == null) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || getGoggles() == null) { return false; } GogglesOfRevealingUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 56d5976d..1c9bdcb3 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -27,7 +27,6 @@ import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; @@ -67,13 +66,13 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte public static ItemDarkSteelArmor forArmorType(int armorType) { switch (armorType) { case 0: - return EnderIO.itemDarkSteelHelmet; + return DarkSteelItems.itemDarkSteelHelmet; case 1: - return EnderIO.itemDarkSteelChestplate; + return DarkSteelItems.itemDarkSteelChestplate; case 2: - return EnderIO.itemDarkSteelLeggings; + return DarkSteelItems.itemDarkSteelLeggings; case 3: - return EnderIO.itemDarkSteelBoots; + return DarkSteelItems.itemDarkSteelBoots; } return null; } @@ -97,7 +96,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte return res; } - private int powerPerDamagePoint; + private final int powerPerDamagePoint; protected ItemDarkSteelArmor(int armorType) { super(MATERIAL, 0, armorType); @@ -173,7 +172,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line1")); list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line2")); - if(itemstack.getItem() == EnderIO.itemDarkSteelBoots) { + if(itemstack.getItem() == DarkSteelItems.itemDarkSteelBoots) { list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line1")); list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line2")); } @@ -284,7 +283,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte @Override @Method(modid = "Thaumcraft") public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) { return 0; } return GogglesOfRevealingUpgrade.isUpgradeEquipped(player) ? 5 : 0; @@ -309,7 +308,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte @Override @Method(modid = "Forestry") public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) { - if(armor == null || armor.getItem() != EnderIO.itemDarkSteelHelmet) { + if(armor == null || armor.getItem() != DarkSteelItems.itemDarkSteelHelmet) { return false; } return NaturalistEyeUpgrade.isUpgradeEquipped(player); diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index be523e6c..bfb104ef 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -1,16 +1,11 @@ package crazypants.enderio.item.darksteel; -import java.awt.Point; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.HashSet; import java.util.List; -import java.util.Set; import net.minecraft.block.Block; -import net.minecraft.block.BlockNewLeaf; -import net.minecraft.block.BlockOldLeaf; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -20,12 +15,10 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.oredict.OreDictionary; @@ -34,26 +27,17 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.farm.farmers.HarvestResult; import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil; -import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.util.ItemUtil; import crazypants.util.Lang; public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { - private static Point[] DIAGINALS = new Point[] { - new Point(1,1), - new Point(1,-1), - new Point(-1,1), - new Point(-1,-1) - }; - public static boolean isEquipped(EntityPlayer player) { if(player == null) { return false; @@ -62,7 +46,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I if(equipped == null) { return false; } - return equipped.getItem() == EnderIO.itemDarkSteelAxe; + return equipped.getItem() == DarkSteelItems.itemDarkSteelAxe; } public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { @@ -73,7 +57,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I if(!isEquipped(player)) { return 0; } - return EnderIO.itemDarkSteelAxe.getEnergyStored(player.getCurrentEquippedItem()); + return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()); } public static ItemDarkSteelAxe create() { @@ -84,7 +68,7 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I } private int logOreId = -1; - private MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); + private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator(); protected ItemDarkSteelAxe() { super(ItemDarkSteelSword.MATERIAL); diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 70d0391f..271b1fb9 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -48,14 +48,14 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine if(equipped == null) { return false; } - return equipped.getItem() == EnderIO.itemDarkSteelPickaxe; + return equipped.getItem() == DarkSteelItems.itemDarkSteelPickaxe; } public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { if(!isEquipped(player)) { return false; } - return EnderIO.itemDarkSteelPickaxe.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower; + return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower; } public static ItemDarkSteelPickaxe create() { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index 664e6e26..63d2df03 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -54,14 +54,14 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte if(equipped == null) { return false; } - return equipped.getItem() == EnderIO.itemDarkSteelSword; + return equipped.getItem() == DarkSteelItems.itemDarkSteelSword; } public static boolean isEquippedAndPowered(EntityPlayer player, int requiredPower) { if(!isEquipped(player)) { return false; } - return EnderIO.itemDarkSteelSword.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower; + return EnergyUpgrade.getEnergyStored(player.getCurrentEquippedItem()) >= requiredPower; } public static ItemDarkSteelSword create() { @@ -71,7 +71,7 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte return res; } - private int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses(); + private final int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses(); private long lastBlickTick = -1; public ItemDarkSteelSword() { @@ -198,7 +198,7 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte return true; } - float fromWeapon = 0; + float fromWeapon; if(isCleaver) { fromWeapon = Config.ticCleaverSkullDropChance; } else { @@ -223,8 +223,8 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte return 0.01; } } - float fromWeapon = 0; - float fromLooting = 0; + float fromWeapon; + float fromLooting; if(isEquippedAndPowered(player, Config.darkSteelSwordPowerUsePerHit)) { fromWeapon = Config.darkSteelSwordSkullChance; fromLooting = Config.darkSteelSwordSkullLootingModifier * evt.lootingLevel; diff --git a/src/main/java/crazypants/enderio/item/darksteel/JumpUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/JumpUpgrade.java index fb9005a9..ca59c00c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/JumpUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/JumpUpgrade.java @@ -50,7 +50,7 @@ public class JumpUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelBoots || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelBoots || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } JumpUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java index 9f44a03f..ae37ba90 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/NaturalistEyeUpgrade.java @@ -1,7 +1,6 @@ package crazypants.enderio.item.darksteel; import cpw.mods.fml.common.registry.GameRegistry; -import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import static crazypants.enderio.item.darksteel.AbstractUpgrade.KEY_UPGRADE_PREFIX; import net.minecraft.entity.player.EntityPlayer; @@ -51,7 +50,7 @@ public class NaturalistEyeUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet || getUpgradeItem() == null) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || getUpgradeItem() == null) { return false; } NaturalistEyeUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/NightVisionUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/NightVisionUpgrade.java index 06bfae1b..650927f3 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/NightVisionUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/NightVisionUpgrade.java @@ -46,7 +46,7 @@ public class NightVisionUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) { return false; } NightVisionUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SolarUpgrade.java index a4c647ce..835e94ec 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SolarUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SolarUpgrade.java @@ -51,7 +51,7 @@ public class SolarUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } SolarUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundDetectorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SoundDetectorUpgrade.java index c2b92f9f..64b6d8cf 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundDetectorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundDetectorUpgrade.java @@ -36,7 +36,7 @@ public class SoundDetectorUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) { return false; } SoundDetectorUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java index 5ed0cc32..687cc614 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java @@ -77,7 +77,7 @@ public class SpeedUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelLeggings || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelLeggings || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } SpeedUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/SpoonUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SpoonUpgrade.java index 0524a134..faede685 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SpoonUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SpoonUpgrade.java @@ -37,7 +37,7 @@ public class SpoonUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelPickaxe || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } SpoonUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java index d255b15c..ed7c1f7b 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java @@ -36,7 +36,7 @@ public class SwimUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelBoots) { + if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelBoots) { return false; } SwimUpgrade up = loadFromItem(stack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/TravelUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/TravelUpgrade.java index 428809a3..5f8fe607 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/TravelUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/TravelUpgrade.java @@ -1,9 +1,7 @@ package crazypants.enderio.item.darksteel; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionHelper; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.material.Material; @@ -38,7 +36,7 @@ public class TravelUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || (stack.getItem() != EnderIO.itemDarkSteelSword && stack.getItem() != EnderIO.itemDarkSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || (stack.getItem() != DarkSteelItems.itemDarkSteelSword && stack.getItem() != DarkSteelItems.itemDarkSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } TravelUpgrade up = loadFromItem(stack);