diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ToolNBT.java b/1.11/src/main/java/nmd/primal/forgecraft/ToolNBT.java index 76b789a0..3f19cdf3 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ToolNBT.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ToolNBT.java @@ -9,8 +9,12 @@ import net.minecraft.nbt.NBTTagCompound; public interface ToolNBT { default boolean getHot(ItemStack stack){ - if(stack.hasTagCompound()){ - return stack.getSubCompound("tags").getBoolean("hot"); + if(!stack.isEmpty()) { + if (stack.hasTagCompound()) { + if (stack.getSubCompound("tags") != null) { + return stack.getSubCompound("tags").getBoolean("hot"); + } + } } return false; } @@ -19,8 +23,12 @@ public interface ToolNBT { } default int getModifiers(ItemStack stack) { - if(stack.hasTagCompound()) { - return stack.getSubCompound("tags").getInteger("modifiers"); + if(!stack.isEmpty()) { + if (stack.hasTagCompound()) { + if (stack.getSubCompound("tags") != null) { + return stack.getSubCompound("tags").getInteger("modifiers"); + } + } } return 0; } @@ -29,14 +37,28 @@ public interface ToolNBT { } default boolean getEmerald(ItemStack stack){ - return stack.getSubCompound("tags").getBoolean("emerald"); + if(!stack.isEmpty()) { + if (stack.hasTagCompound()) { + if (stack.getSubCompound("tags") != null) { + return stack.getSubCompound("tags").getBoolean("emerald"); + } + } + } + return false; } default void setEmerald(ItemStack stack, Boolean bool){ stack.getSubCompound("tags").setBoolean("emerald", bool); } default int getDiamondLevel(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("diamond"); + if(!stack.isEmpty()) { + if (stack.hasTagCompound()) { + if (stack.getSubCompound("tags") != null) { + return stack.getSubCompound("tags").getInteger("diamond"); + } + } + } + return 0; } default void setDiamondLevel(ItemStack stack, Integer level){ @@ -45,21 +67,42 @@ public interface ToolNBT { default int getRedstoneLevel(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("redstone"); + if(!stack.isEmpty()) { + if (stack.hasTagCompound()) { + if (stack.getSubCompound("tags") != null) { + return stack.getSubCompound("tags").getInteger("redstone"); + } + } + } + return 0; } default void setRedstoneLevel(ItemStack stack, Integer level){ stack.getSubCompound("tags").setInteger("redstone", level); } default int getLapisLevel(ItemStack stack) { - return stack.getSubCompound("tags").getInteger("lapis"); + if(!stack.isEmpty()) { + if (stack.hasTagCompound()) { + if (stack.getSubCompound("tags") != null) { + return stack.getSubCompound("tags").getInteger("lapis"); + } + } + } + return 0; } default void setLapisLevel(ItemStack stack, Integer level){ stack.getSubCompound("tags").setInteger("lapis", level); } default NBTTagCompound getTags(ItemStack stack){ - return stack.getSubCompound("tags"); + if(!stack.isEmpty()) { + if (stack.hasTagCompound()) { + if (stack.getSubCompound("tags") != null) { + return stack.getSubCompound("tags"); + } + } + } + return null; } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java index 73d4f877..8e302bca 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java @@ -312,7 +312,7 @@ public class ItemStoneTongs extends Item { //System.out.println(itemstack.getTagCompound().getInteger("type")); } //System.out.println(player.getHeldItem(hand).getTagCompound().getInteger("type")); - return EnumActionResult.SUCCESS; + return EnumActionResult.FAIL; } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java index d32cd5b3..314a0a1e 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomAxe.java @@ -48,166 +48,169 @@ public class CustomAxe extends ItemAxe implements ToolNBT { public float apply(ItemStack item, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { if (item.hasTagCompound()) { - if (getHot(item) == false) { - if (getModifiers(item) != 0) { - if ( (getEmerald(item) == true) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 0)) { - return 0.1F; - } - if ( (getEmerald(item) == true) && - (getDiamondLevel(item) == 1) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 0)) { - return 0.11F; - } - if ( (getEmerald(item) == true) && - (getDiamondLevel(item) == 2) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 0)) { - return 0.12F; - } + if (getHot(item) != true) { + if (getModifiers(item) != 0) { + if ((getEmerald(item) == true) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.1F; + } - if ( (getEmerald(item) == true) && - (getDiamondLevel(item) == 1) && - (getRedstoneLevel(item) == 1) && - (getLapisLevel(item) == 0)) { - return 0.111F; - } + if ((getEmerald(item) == true) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.11F; + } - if ( (getEmerald(item) == true) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 2) && - (getLapisLevel(item) == 0)) { - return 0.102F; - } + if ((getEmerald(item) == true) && + (getDiamondLevel(item) == 2) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.12F; + } - // ============ + if ((getEmerald(item) == true) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 0)) { + return 0.111F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 1) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 0)) { - return 0.01F; - } + if ((getEmerald(item) == true) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 0)) { + return 0.102F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 2) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 0)) { - return 0.02F; - } + // ============ - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 3) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 0)) { - return 0.03F; - } + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.01F; + } - //======= + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 2) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.02F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 1) && - (getLapisLevel(item) == 0)) { - return 0.001F; - } + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 3) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 0)) { + return 0.03F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 2) && - (getLapisLevel(item) == 0)) { - return 0.002F; - } + //======= - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 3) && - (getLapisLevel(item) == 0)) { - return 0.003F; - } + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 0)) { + return 0.001F; + } - //========= + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 0)) { + return 0.002F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 1)) { - return 0.0001F; - } + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 3) && + (getLapisLevel(item) == 0)) { + return 0.003F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 2)) { - return 0.0002F; - } + //========= - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 3)) { - return 0.0003F; - } + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 1)) { + return 0.0001F; + } - //======= + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 2)) { + return 0.0002F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 1) && - (getRedstoneLevel(item) == 1) && - (getLapisLevel(item) == 1)) { - return 0.0111F; - } + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 3)) { + return 0.0003F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 2) && - (getRedstoneLevel(item) == 1) && - (getLapisLevel(item) == 0)) { - return 0.021F; - } + //======= - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 1) && - (getRedstoneLevel(item) == 2) && - (getLapisLevel(item) == 0)) { - return 0.012F; - } + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 1)) { + return 0.0111F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 1) && - (getLapisLevel(item) == 2)) { - return 0.0012F; - } + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 2) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 0)) { + return 0.021F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 0) && - (getRedstoneLevel(item) == 2) && - (getLapisLevel(item) == 1)) { - return 0.0021F; - } + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 0)) { + return 0.012F; + } - if ( (getEmerald(item) == false) && - (getDiamondLevel(item) == 1) && - (getRedstoneLevel(item) == 0) && - (getLapisLevel(item) == 2) ) { - return 0.0102F; + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 1) && + (getLapisLevel(item) == 2)) { + return 0.0012F; + } + + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 0) && + (getRedstoneLevel(item) == 2) && + (getLapisLevel(item) == 1)) { + return 0.0021F; + } + + if ((getEmerald(item) == false) && + (getDiamondLevel(item) == 1) && + (getRedstoneLevel(item) == 0) && + (getLapisLevel(item) == 2)) { + return 0.0102F; + } } } - } - if (getHot(item) == true) { - return 1.0F; - } - - if (getHot(item) == false) { - if (item.getSubCompound("tags").getInteger("modifiers") == 0) { - return 0.0F; + if (getHot(item) == true) { + return 1.0F; } - } + + if (getHot(item) == false) { + if (getModifiers(item) == 0) { + return 0.0F; + } + } + } return 0.0F; } @@ -268,27 +271,27 @@ public class CustomAxe extends ItemAxe implements ToolNBT { @SideOnly(Side.CLIENT) public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean advanced) { - if(player.getEntityWorld().isRemote) { + if(!item.isEmpty()) { + if (player.getEntityWorld().isRemote) { - if(item.hasTagCompound()) { + if (item.hasTagCompound()) { - tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); - if (item.getSubCompound("tags").getBoolean("emerald") == true) { - tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); - } - if (item.getSubCompound("tags").getInteger("diamond") > 0) { - tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); - } - if (item.getSubCompound("tags").getInteger("redstone") > 0) { - tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); - } - if (item.getSubCompound("tags").getInteger("lapis") > 0) { - tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); + tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); + if (getEmerald(item) == true) { + tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); + } + if (getDiamondLevel(item) > 0) { + tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); + } + if (getRedstoneLevel(item) > 0) { + tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); + } + if (getLapisLevel(item) > 0) { + tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); + } } } } - - } @Override @@ -296,7 +299,7 @@ public class CustomAxe extends ItemAxe implements ToolNBT { { if(!player.world.isRemote){ World world = player.getEntityWorld(); - System.out.println(world.getBlockState(pos).getBlock()); + //System.out.println(world.getBlockState(pos).getBlock()); if(itemstack.getItem() instanceof CustomPickaxe){ if( getEmerald(itemstack)){ itemstack.addEnchantment(Enchantment.getEnchantmentByID(33), 1); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java index 4ed12f3c..ff6f6a2b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomHoe.java @@ -204,7 +204,7 @@ public class CustomHoe extends ItemHoe implements ToolNBT { } if (getHot(item) == false) { - if (item.getSubCompound("tags").getInteger("modifiers") == 0) { + if (getModifiers(item) == 0) { return 0.0F; } } @@ -273,16 +273,16 @@ public class CustomHoe extends ItemHoe implements ToolNBT { if(item.hasTagCompound()) { tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); - if (item.getSubCompound("tags").getBoolean("emerald") == true) { + if (getEmerald(item) == true) { tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } - if (item.getSubCompound("tags").getInteger("diamond") > 0) { + if (getDiamondLevel(item) > 0) { tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); } - if (item.getSubCompound("tags").getInteger("redstone") > 0) { + if (getRedstoneLevel(item) > 0) { tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); } - if (item.getSubCompound("tags").getInteger("lapis") > 0) { + if (getLapisLevel(item) > 0) { tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java index f53ddcb7..e71ab1c5 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomPickaxe.java @@ -211,7 +211,7 @@ public class CustomPickaxe extends ItemPickaxe implements ToolNBT{ } if (getHot(item) == false) { - if (item.getSubCompound("tags").getInteger("modifiers") == 0) { + if (getModifiers(item) == 0) { return 0.0F; } } @@ -280,16 +280,16 @@ public class CustomPickaxe extends ItemPickaxe implements ToolNBT{ if(item.hasTagCompound()) { tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); - if (item.getSubCompound("tags").getBoolean("emerald") == true) { + if (getEmerald(item) == true) { tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } - if (item.getSubCompound("tags").getInteger("diamond") > 0) { + if (getDiamondLevel(item) > 0) { tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); } - if (item.getSubCompound("tags").getInteger("redstone") > 0) { + if (getRedstoneLevel(item) > 0) { tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); } - if (item.getSubCompound("tags").getInteger("lapis") > 0) { + if (getLapisLevel(item) > 0) { tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); } } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java index 8168c10c..ea18ea35 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/items/tools/CustomShovel.java @@ -204,7 +204,7 @@ public class CustomShovel extends ItemSpade implements ToolNBT { } if (getHot(item) == false) { - if (item.getSubCompound("tags").getInteger("modifiers") == 0) { + if (getModifiers(item) == 0) { return 0.0F; } } @@ -273,16 +273,16 @@ public class CustomShovel extends ItemSpade implements ToolNBT { if(item.hasTagCompound()) { tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " + (3 - getModifiers(item)) ); - if (item.getSubCompound("tags").getBoolean("emerald") == true) { + if (getEmerald(item) == true) { tooltip.add(ChatFormatting.DARK_GREEN + "Emerald"); } - if (item.getSubCompound("tags").getInteger("diamond") > 0) { + if (getDiamondLevel(item) > 0) { tooltip.add(ChatFormatting.AQUA + "Diamond Level: " + getDiamondLevel(item)); } - if (item.getSubCompound("tags").getInteger("redstone") > 0) { + if (getRedstoneLevel(item) > 0) { tooltip.add(ChatFormatting.RED + "Redstone Level: " + getRedstoneLevel(item) ); } - if (item.getSubCompound("tags").getInteger("lapis") > 0) { + if (getLapisLevel(item) > 0) { tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); } } diff --git a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang index 7221774f..6b212beb 100644 --- a/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang +++ b/1.11/src/main/resources/assets/forgecraft/lang/en_us.lang @@ -3,6 +3,7 @@ itemGroup.forgecraft=ForgeCraft tile.firebox.name=Forge tile.bloomery.name=Bloomery +tile.stoneanvil.name=Stone Anvil tile.pistonbellows.name=Wooden Piston Bellows tile.emptycrucible.name=Empty Crucible tile.emptycruciblehit.name=Hot Empty Crucible