From 483a816616d86f5ff36e1fc150afa1527042efce Mon Sep 17 00:00:00 2001 From: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Date: Thu, 21 Jun 2018 18:50:14 -0700 Subject: [PATCH] Elementium Tools now repair with Elementium (#2656) * Elementium Tools now repair with Elementium * Add proper parameter names * Revert changes to armor, as I did not change it in the first place --- .../item/equipment/tool/elementium/ItemElementiumAxe.java | 6 ++++++ .../equipment/tool/elementium/ItemElementiumPick.java | 7 +++++++ .../equipment/tool/elementium/ItemElementiumShears.java | 6 ++++++ .../equipment/tool/elementium/ItemElementiumShovel.java | 7 +++++++ .../equipment/tool/elementium/ItemElementiumSword.java | 8 ++++++++ 5 files changed, 34 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index 9b8138f89..c72ff6da8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -21,6 +21,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Random; public class ItemElementiumAxe extends ItemManasteelAxe { @@ -63,4 +64,9 @@ public class ItemElementiumAxe extends ItemManasteelAxe { event.getDrops().add(entityitem); } + @Override + public boolean getIsRepairable(ItemStack toRepair, @Nonnull ItemStack repairBy) { + return repairBy.getItem() == ModItems.manaResource && repairBy.getItemDamage() == 7 ? true : super.getIsRepairable(toRepair, repairBy); + } + } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 2fa8abd38..a6d3eef35 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -12,6 +12,8 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemElementiumPick extends ItemManasteelPick { public ItemElementiumPick() { @@ -54,4 +56,9 @@ public class ItemElementiumPick extends ItemManasteelPick { } return false; } + + @Override + public boolean getIsRepairable(ItemStack toRepair, @Nonnull ItemStack repairBy) { + return repairBy.getItem() == ModItems.manaResource && repairBy.getItemDamage() == 7 ? true : super.getIsRepairable(toRepair, repairBy); + } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index 8df4d6ae7..9ed569b90 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -16,6 +16,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; @@ -76,4 +77,9 @@ public class ItemElementiumShears extends ItemManasteelShears { } } + @Override + public boolean getIsRepairable(ItemStack toRepair, @Nonnull ItemStack repairBy) { + return repairBy.getItem() == ModItems.manaResource && repairBy.getItemDamage() == 7 ? true : super.getIsRepairable(toRepair, repairBy); + } + } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java index bf81148c0..66f405994 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java @@ -12,10 +12,12 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShovel; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Arrays; import java.util.List; @@ -48,4 +50,9 @@ public class ItemElementiumShovel extends ItemManasteelShovel { return false; } + @Override + public boolean getIsRepairable(ItemStack toRepair, @Nonnull ItemStack repairBy) { + return repairBy.getItem() == ModItems.manaResource && repairBy.getItemDamage() == 7 ? true : super.getIsRepairable(toRepair, repairBy); + } + } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java index 6e089c34b..22b46914d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java @@ -3,9 +3,12 @@ package vazkii.botania.common.item.equipment.tool.elementium; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPixieSpawner; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemElementiumSword extends ItemManasteelSword implements IPixieSpawner { public ItemElementiumSword() { @@ -17,4 +20,9 @@ public class ItemElementiumSword extends ItemManasteelSword implements IPixieSpa return 0.05F; } + @Override + public boolean getIsRepairable(ItemStack toRepair, @Nonnull ItemStack repairBy) { + return repairBy.getItem() == ModItems.manaResource && repairBy.getItemDamage() == 7 ? true : super.getIsRepairable(toRepair, repairBy); + } + }