diff --git a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 6775770..5032361 100644 --- a/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -2,6 +2,8 @@ package net.p455w0rd.wirelesscraftingterminal.items; import java.util.List; +import baubles.api.BaubleType; +import baubles.api.expanded.IBaubleExpanded; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -24,6 +26,7 @@ import org.lwjgl.input.Keyboard; import com.google.common.base.Optional; +import appeng.core.AppEng; import appeng.api.config.AccessRestriction; import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerUnits; @@ -37,16 +40,13 @@ import appeng.items.tools.powered.powersink.AERootPoweredItem; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; -import baubles.api.BaubleType; -import baubles.api.IBauble; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@Interface(iface = "baubles.api.IBauble", modid = "Baubles") +@cpw.mods.fml.common.Optional.Interface(iface = "baubles.api.expanded.IBaubleExpanded", modid = "Baubles|Expanded") public class ItemWirelessCraftingTerminal extends AERootPoweredItem - implements IWirelessCraftingTerminalItem, IWirelessTermHandler, IBauble { + implements IWirelessCraftingTerminalItem, IWirelessTermHandler, IBaubleExpanded { public static final String LINK_KEY_STRING = "key"; public static double GLOBAL_POWER_MULTIPLIER = PowerMultiplier.CONFIG.multiplier; @@ -91,61 +91,37 @@ public class ItemWirelessCraftingTerminal extends AERootPoweredItem return false; } - /** - * This method return the type of bauble this is. Type is used to determine the slots it can go into. - * - * @param itemstack - */ @Override - public BaubleType getBaubleType(ItemStack itemstack) { + public String[] getBaubleTypes(ItemStack itemstack) { + return new String[] { AppEng.BAUBLESLOT }; + } + + @Override + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public BaubleType getBaubleType(ItemStack itemStack) { return BaubleType.RING; } - /** - * This method is called once per tick if the bauble is being worn by a player - * - * @param itemstack - * @param player - */ @Override - public void onWornTick(ItemStack itemstack, EntityLivingBase player) {} + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public void onWornTick(ItemStack itemstack, EntityLivingBase player) { /**/ } - /** - * This method is called when the bauble is equipped by a player - * - * @param itemstack - * @param player - */ @Override - public void onEquipped(ItemStack itemstack, EntityLivingBase player) {} + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public void onEquipped(ItemStack itemstack, EntityLivingBase player) { /**/ } - /** - * This method is called when the bauble is unequipped by a player - * - * @param itemstack - * @param player - */ @Override - public void onUnequipped(ItemStack itemstack, EntityLivingBase player) {} + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") + public void onUnequipped(ItemStack itemstack, EntityLivingBase player) { /**/ } - /** - * can this bauble be placed in a bauble slot - * - * @param itemstack - * @param player - */ @Override + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") public boolean canEquip(ItemStack itemstack, EntityLivingBase player) { return true; } - /** - * Can this bauble be removed from a bauble slot - * - * @param itemstack - * @param player - */ @Override + @cpw.mods.fml.common.Optional.Method(modid = "Baubles") public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) { return true; }