From e6e756815d341ed4c0f2321596ca8db3112cb112 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 24 Apr 2018 10:24:48 -0500 Subject: [PATCH] Delete IRunicArmor interface as it no longer exists. Should now run with TC6 beta. Closes #2608, closes #2612 --- .../thaumcraft/api/items/IRunicArmor.java | 22 ------------------- .../armor/manasteel/ItemManasteelArmor.java | 11 +--------- .../item/equipment/bauble/ItemBauble.java | 11 +--------- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 src/api/java/thaumcraft/api/items/IRunicArmor.java diff --git a/src/api/java/thaumcraft/api/items/IRunicArmor.java b/src/api/java/thaumcraft/api/items/IRunicArmor.java deleted file mode 100644 index 4e4cc6b4e..000000000 --- a/src/api/java/thaumcraft/api/items/IRunicArmor.java +++ /dev/null @@ -1,22 +0,0 @@ -package thaumcraft.api.items; - -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Armor or bauble slot items that implement this interface can provide runic shielding. - * Recharging, hardening, etc. is handled internally by thaumcraft. - * - */ - -public interface IRunicArmor { - - /** - * returns how much charge this item can provide. This is the base shielding value - any hardening is stored and calculated internally. - */ - public int getRunicCharge(ItemStack itemstack); - - -} diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 44fa68123..1236c6b39 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -31,10 +31,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.api.mana.IManaUsingItem; @@ -54,8 +52,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -@Optional.Interface(modid = "thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") -public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor, IModelRegister { +public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IModelRegister { private static final int MANA_PER_DAMAGE = 70; @@ -265,12 +262,6 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan ItemNBTHelper.setBoolean(stack, TAG_PHANTOM_INK, ink); } - @Override - @Optional.Method(modid = "Thaumcraft") - public int getRunicCharge(ItemStack itemstack) { - return 0; - } - @SideOnly(Side.CLIENT) @Override public void registerModels() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 15553cdc0..805a1f947 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -29,13 +29,11 @@ import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.core.handler.ModSounds; @@ -49,9 +47,8 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.UUID; -@Optional.Interface(modid = "thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) -public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable, IRunicArmor { +public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable { private static final String TAG_HASHCODE = "playerHashcode"; private static final String TAG_BAUBLE_UUID_MOST = "baubleUUIDMost"; @@ -253,10 +250,4 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public void setPhantomInk(ItemStack stack, boolean ink) { ItemNBTHelper.setBoolean(stack, TAG_PHANTOM_INK, ink); } - - @Override - @Optional.Method(modid = "Thaumcraft") - public int getRunicCharge(ItemStack itemstack) { - return 0; - } }