From 685fc0875f67c225724c06f7ddfca986384f8a00 Mon Sep 17 00:00:00 2001 From: cp Date: Tue, 25 Mar 2014 21:29:51 +0800 Subject: [PATCH] Finished off sword and pick. --- src/main/java/crazypants/enderio/Config.java | 3 +++ .../enderio/item/ItemDarkSteelPickaxe.java | 25 ++++++++++++++++--- .../enderio/item/ItemDarkSteelSword.java | 4 +++ .../crazypants/enderio/item/ItemRecipes.java | 11 +++++++- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/Config.java b/src/main/java/crazypants/enderio/Config.java index 289f21f2..52c4fb97 100644 --- a/src/main/java/crazypants/enderio/Config.java +++ b/src/main/java/crazypants/enderio/Config.java @@ -104,6 +104,7 @@ public final class Config { public static int darkSteelPickPowerUseObsidian = 2500; public static int darkSteelPickEffeciencyObsidian = 50; public static int darkSteelPickPowerUsePerDamagePoint = 250; + public static float darkSteelPickEffeciencyBoostWhenPowered = 2; public static void load(FMLPreInitializationEvent event) { configDirectory = new File(event.getModConfigurationDirectory(), "enderio"); @@ -302,6 +303,8 @@ public final class Config { "The efeciency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian); darkSteelPickPowerUsePerDamagePoint = config.get("Settings", "darkSteelPickPowerUsePerDamagePoint", darkSteelPickPowerUsePerDamagePoint, "Power use (RF) per damage/durability point avoided.").getInt(darkSteelPickPowerUsePerDamagePoint); + darkSteelPickEffeciencyBoostWhenPowered = (float) config.get("Settings", "darkSteelPickEffeciencyBoostWhenPowered", + darkSteelPickEffeciencyBoostWhenPowered, "The increase in effciency when powered.").getDouble(darkSteelPickEffeciencyBoostWhenPowered); //TODO: Debug renderCapBankGauge = config.get("Debug", "renderCapBankGauge", renderCapBankGauge, "If not true capacitor banks will not render the level gauge at all.") diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java index e8ca3f46..f8626fe2 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelPickaxe.java @@ -79,6 +79,18 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return true; } + @Override + public boolean onItemUse(ItemStack item, EntityPlayer player, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + + int slot = player.inventory.currentItem + 1; + if(slot < 9 && player.inventory.mainInventory[slot] != null) { + return player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, par3World, par4, par5, par6, par7, par8, + par9, par10); + } + + return super.onItemUse(item, player, par3World, par4, par5, par6, par7, par8, par9, par10); + } + private void applyDamage(EntityLivingBase entity, ItemStack item, int damage) { boolean absorbWithPower = energyCont.isAbsorbDamageWithPower(item); if(getEnergyStored(item) > 0 && absorbWithPower) { @@ -102,7 +114,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine public float getDigSpeed(ItemStack stack, Block block, int meta) { if(ForgeHooks.isToolEffective(stack, block, meta)) { if(Config.darkSteelPickPowerUsePerDamagePoint > 0 && energyCont.getEnergyStored(stack) > 0) { - return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + 3; + return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial() + Config.darkSteelPickEffeciencyBoostWhenPowered; } return ItemDarkSteelSword.MATERIAL.getEfficiencyOnProperMaterial(); } @@ -146,11 +158,16 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemstack) / 10) + " " + PowerDisplayUtil.abrevation(); list.add(str); list.add(""); - list.add(EnumChatFormatting.BLUE + "+3 Effeciency when Powered"); - list.add(EnumChatFormatting.BLUE + "" + Config.darkSteelPickEffeciencyObsidian + " Effeciency when Powered"); - list.add(EnumChatFormatting.BLUE + "and breaking obsidian (cost " + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian / 10) + " " + list.add(EnumChatFormatting.BLUE + "+" + Config.darkSteelPickEffeciencyBoostWhenPowered + " Effeciency when powered"); + list.add(EnumChatFormatting.BLUE + "+" + Config.darkSteelPickEffeciencyObsidian + " Effeciency breaking obsidian "); + list.add(EnumChatFormatting.BLUE + " (cost " + + PowerDisplayUtil.formatPower(Config.darkSteelPickPowerUseObsidian / 10) + " " + PowerDisplayUtil.abrevation() + ")"); } + public ItemStack createItemStack() { + return new ItemStack(this); + } + } diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java index 8cd022f9..1b7ad458 100644 --- a/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelSword.java @@ -232,4 +232,8 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte } + public ItemStack createItemStack() { + return new ItemStack(this); + } + } diff --git a/src/main/java/crazypants/enderio/item/ItemRecipes.java b/src/main/java/crazypants/enderio/item/ItemRecipes.java index 2aec5853..d06bc45b 100644 --- a/src/main/java/crazypants/enderio/item/ItemRecipes.java +++ b/src/main/java/crazypants/enderio/item/ItemRecipes.java @@ -1,6 +1,7 @@ package crazypants.enderio.item; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.material.Alloy; @@ -30,6 +31,14 @@ public class ItemRecipes { GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), "s s", "c c", " ", 's', darkSteel, 'c', vibCry); GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), " ", "s s", "c c", 's', darkSteel, 'c', vibCry); - } + GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelBoots.createItemStack(), " ", "s s", "c c", 's', darkSteel, 'c', vibCry); + GameRegistry.addShapedRecipe(EnderIO.itemDarkSteelSword.createItemStack(), " s ", " s ", " c ", 's', darkSteel, 'c', vibCry); + + GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "scs", " w ", " w ", 's', darkSteel, 'c', vibCry, 'w', + "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(EnderIO.itemDarkSteelPickaxe.createItemStack(), "scs", " w ", " w ", 's', darkSteel, 'c', vibCry, 'w', + "woodStick")); + + } }