diff --git a/src/main/java/techreborn/items/ItemUpgrades.java b/src/main/java/techreborn/items/ItemUpgrades.java index 1578a721f..a3aa3ab21 100644 --- a/src/main/java/techreborn/items/ItemUpgrades.java +++ b/src/main/java/techreborn/items/ItemUpgrades.java @@ -217,6 +217,7 @@ public class ItemUpgrades extends ItemTR implements IUpgrade { } } + @SuppressWarnings("deprecation") @SideOnly(Side.CLIENT) public BuiltContainer getContainer(EntityPlayer player) { return new ContainerBuilder("sides").create(); diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 4ace2b160..cfa34211c 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -226,5 +226,16 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, IEnergyInt NBTTagCompound nbt) { return new PoweredItemContainerProvider(stack); } - + + /** + * Called when the player is mining a block and the item in his hand changes. + * Allows to not reset blockbreaking if only NBT or similar changes. + * @param oldStack The old stack that was used for mining. Item in players main hand + * @param newStack The new stack + * @return True to reset block break progress + */ + @Override + public boolean shouldCauseBlockBreakReset(ItemStack oldStack, ItemStack newStack) { + return !(newStack.isItemEqual(oldStack)); + } } diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 490a1ad29..424d06a67 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -214,5 +214,17 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, IEnergyIn NBTTagCompound nbt) { return new PoweredItemContainerProvider(stack); } + + /** + * Called when the player is mining a block and the item in his hand changes. + * Allows to not reset blockbreaking if only NBT or similar changes. + * @param oldStack The old stack that was used for mining. Item in players main hand + * @param newStack The new stack + * @return True to reset block break progress + */ + @Override + public boolean shouldCauseBlockBreakReset(ItemStack oldStack, ItemStack newStack) { + return !(newStack.isItemEqual(oldStack)); + } } diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 7e52a402b..211b26a24 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -234,4 +234,16 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, IEne NBTTagCompound nbt) { return new PoweredItemContainerProvider(stack); } + + /** + * Called when the player is mining a block and the item in his hand changes. + * Allows to not reset blockbreaking if only NBT or similar changes. + * @param oldStack The old stack that was used for mining. Item in players main hand + * @param newStack The new stack + * @return True to reset block break progress + */ + @Override + public boolean shouldCauseBlockBreakReset(ItemStack oldStack, ItemStack newStack) { + return !(newStack.isItemEqual(oldStack)); + } } diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 16469232e..1721faf36 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -249,5 +249,17 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IEne NBTTagCompound nbt) { return new PoweredItemContainerProvider(stack); } + + /** + * Called when the player is mining a block and the item in his hand changes. + * Allows to not reset blockbreaking if only NBT or similar changes. + * @param oldStack The old stack that was used for mining. Item in players main hand + * @param newStack The new stack + * @return True to reset block break progress + */ + @Override + public boolean shouldCauseBlockBreakReset(ItemStack oldStack, ItemStack newStack) { + return !(newStack.isItemEqual(oldStack)); + } } diff --git a/src/main/java/techreborn/items/tools/ItemTRAxe.java b/src/main/java/techreborn/items/tools/ItemTRAxe.java index d77dcbf19..a8f1966d6 100644 --- a/src/main/java/techreborn/items/tools/ItemTRAxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRAxe.java @@ -29,13 +29,10 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.events.TRRecipeHandler; public class ItemTRAxe extends ItemAxe { - private ToolMaterial material = ToolMaterial.WOOD; - public ItemTRAxe(ToolMaterial material) { super(material, material.getDamageVsEntity() + 5.75F, (material.getDamageVsEntity() + 6.75F) * -0.344444F); setUnlocalizedName(material.name().toLowerCase() + "Axe"); setCreativeTab(TechRebornCreativeTabMisc.instance); - this.material = material; TRRecipeHandler.hideEntry(this); } } diff --git a/src/main/java/techreborn/items/tools/ItemTRHoe.java b/src/main/java/techreborn/items/tools/ItemTRHoe.java index 539929e4b..7989a038d 100644 --- a/src/main/java/techreborn/items/tools/ItemTRHoe.java +++ b/src/main/java/techreborn/items/tools/ItemTRHoe.java @@ -31,13 +31,10 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.events.TRRecipeHandler; public class ItemTRHoe extends ItemHoe { - private ToolMaterial material = ToolMaterial.WOOD; - public ItemTRHoe(ToolMaterial material) { super(material); setUnlocalizedName(material.name().toLowerCase() + "Hoe"); setCreativeTab(TechRebornCreativeTabMisc.instance); - this.material = material; TRRecipeHandler.hideEntry(this); } diff --git a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java index 7dd91d9c8..111d5518f 100644 --- a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java @@ -29,13 +29,10 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.events.TRRecipeHandler; public class ItemTRPickaxe extends ItemPickaxe { - private ToolMaterial material = ToolMaterial.WOOD; - public ItemTRPickaxe(ToolMaterial material) { super(material); setUnlocalizedName(material.name().toLowerCase() + "Pickaxe"); setCreativeTab(TechRebornCreativeTabMisc.instance); - this.material = material; TRRecipeHandler.hideEntry(this); } } diff --git a/src/main/java/techreborn/items/tools/ItemTRSpade.java b/src/main/java/techreborn/items/tools/ItemTRSpade.java index 47c03b0b2..a2a00cfa8 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSpade.java +++ b/src/main/java/techreborn/items/tools/ItemTRSpade.java @@ -29,13 +29,10 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.events.TRRecipeHandler; public class ItemTRSpade extends ItemSpade { - private ToolMaterial material = ToolMaterial.WOOD; - public ItemTRSpade(ToolMaterial material) { super(material); setUnlocalizedName(material.name().toLowerCase() + "Spade"); setCreativeTab(TechRebornCreativeTabMisc.instance); - this.material = material; TRRecipeHandler.hideEntry(this); } } diff --git a/src/main/java/techreborn/items/tools/ItemTRSword.java b/src/main/java/techreborn/items/tools/ItemTRSword.java index 527464033..db8e1e7bc 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSword.java +++ b/src/main/java/techreborn/items/tools/ItemTRSword.java @@ -29,13 +29,10 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.events.TRRecipeHandler; public class ItemTRSword extends ItemSword { - private ToolMaterial material = ToolMaterial.WOOD; - public ItemTRSword(ToolMaterial material) { super(material); setUnlocalizedName(material.name().toLowerCase() + "Sword"); setCreativeTab(TechRebornCreativeTabMisc.instance); - this.material = material; TRRecipeHandler.hideEntry(this); } }