From c0855df9894abc993eccc3b32e37169fc23d3f4a Mon Sep 17 00:00:00 2001 From: MachineMuse Date: Tue, 25 Aug 2015 06:20:56 -0600 Subject: [PATCH] Added maxdamage=0 so hopefully things stop breaking the armor unnecessarily. Closes #579 --- .../net/machinemuse/api/IModularItem.java | 48 ----------------- .../net/machinemuse/api/IModularItem.scala | 52 +++++++++++++++++++ 2 files changed, 52 insertions(+), 48 deletions(-) delete mode 100644 src/main/scala/net/machinemuse/api/IModularItem.java create mode 100644 src/main/scala/net/machinemuse/api/IModularItem.scala diff --git a/src/main/scala/net/machinemuse/api/IModularItem.java b/src/main/scala/net/machinemuse/api/IModularItem.java deleted file mode 100644 index da4fdf9..0000000 --- a/src/main/scala/net/machinemuse/api/IModularItem.java +++ /dev/null @@ -1,48 +0,0 @@ -package net.machinemuse.api; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -/** - * Interface for ItemPowerArmor and ItemPowerTool to share. - * - * @author MachineMuse - */ -public interface IModularItem -{ - - /** - * Gets the item's extended summary for displaying in the gui. - * - * @param stack - * @return - */ - public List getLongInfo(EntityPlayer player, ItemStack stack); - - /** - * Returns the amount of energy contained in the player's inventory. - * - * @param player - * @return - */ - public double getPlayerEnergy(EntityPlayer player); - - /** - * Drains the amount of energy from the player's inventory. - * - * @param player - * @return - */ - public void drainPlayerEnergy(EntityPlayer player, double drainAmount); - - /** - * Adds the amount of energy to the player's inventory. - * - * @param player - * @return - */ - public void givePlayerEnergy(EntityPlayer player, double joulesToGive); - -} diff --git a/src/main/scala/net/machinemuse/api/IModularItem.scala b/src/main/scala/net/machinemuse/api/IModularItem.scala new file mode 100644 index 0000000..b53f1f0 --- /dev/null +++ b/src/main/scala/net/machinemuse/api/IModularItem.scala @@ -0,0 +1,52 @@ +package net.machinemuse.api + +import java.util.List +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.item.ItemStack + +/** + * Interface for ItemPowerArmor and ItemPowerTool to share. + * + * @author MachineMuse + */ +trait IModularItem extends net.minecraft.item.Item { + /** + * Gets the item's extended summary for displaying in the gui. + * + * @param stack + * @return + */ + def getLongInfo(player: EntityPlayer, stack: ItemStack): List[String] + + /** + * Returns the amount of energy contained in the player's inventory. + * + * @param player + * @return + */ + def getPlayerEnergy(player: EntityPlayer): Double + + /** + * Drains the amount of energy from the player's inventory. + * + * @param player + * @return + */ + def drainPlayerEnergy(player: EntityPlayer, drainAmount: Double) + + /** + * Adds the amount of energy to the player's inventory. + * + * @param player + * @return + */ + def givePlayerEnergy(player: EntityPlayer, joulesToGive: Double) + + + /** Since this is the only mixin shared between the two, it's simplest to set it here. + * + * @param itemStack + * @return 0 + */ + override def getMaxDamage(itemStack:ItemStack) = 0 +} \ No newline at end of file