Delete IRunicArmor interface as it no longer exists. Should now run with TC6 beta. Closes #2608, closes #2612

This commit is contained in:
Vincent Lee committed 2018-04-24 10:24:48 -05:00
1 parent ed72ff3d5f
commit e6e756815d
3 files changed
+2 -42

No files matched your search

@@ -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() {
@@ -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;
}
}