From a71d8047b47ff0b67e5a57e20a194b0f8e363db7 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Tue, 3 Jun 2014 08:39:46 -0500 Subject: [PATCH] Hide getManager(ItemStack itemStack) from non IC2 Code. --- items/tools/powered/powersink/IC2.java | 34 +++++++++++++++++--------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/items/tools/powered/powersink/IC2.java b/items/tools/powered/powersink/IC2.java index 562571a5..56d67586 100644 --- a/items/tools/powered/powersink/IC2.java +++ b/items/tools/powered/powersink/IC2.java @@ -8,8 +8,10 @@ import net.minecraft.item.ItemStack; import appeng.api.config.PowerUnits; import appeng.transformer.annotations.integration.Interface; import appeng.transformer.annotations.integration.InterfaceList; +import appeng.transformer.annotations.integration.Method; -@InterfaceList(value = { @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = "IC2"), @Interface( iface = "ic2.api.item.IElectricItemManager", iname = "IC2")} ) +@InterfaceList(value = { @Interface(iface = "ic2.api.item.ISpecialElectricItem", iname = "IC2"), + @Interface(iface = "ic2.api.item.IElectricItemManager", iname = "IC2") }) public class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpecialElectricItem { @@ -22,10 +24,10 @@ public class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpe { int addedAmt = amount; int limit = getTransferLimit( is ); - - if ( ! ignoreTransferLimit && amount > limit ) + + if ( !ignoreTransferLimit && amount > limit ) addedAmt = limit; - + return addedAmt - ((int) injectExternalPower( PowerUnits.EU, is, addedAmt, simulate )); } @@ -72,37 +74,45 @@ public class IC2 extends AERootPoweredItem implements IElectricItemManager, ISpe } @Override - public boolean canProvideEnergy(ItemStack itemStack) { + public boolean canProvideEnergy(ItemStack itemStack) + { return false; } @Override - public Item getChargedItem(ItemStack itemStack) { + public Item getChargedItem(ItemStack itemStack) + { return itemStack.getItem(); } @Override - public Item getEmptyItem(ItemStack itemStack) { + public Item getEmptyItem(ItemStack itemStack) + { return itemStack.getItem(); } @Override - public int getMaxCharge(ItemStack itemStack) { + public int getMaxCharge(ItemStack itemStack) + { return (int) PowerUnits.AE.convertTo( PowerUnits.EU, getAEMaxPower( itemStack ) ); } @Override - public int getTier(ItemStack itemStack) { + public int getTier(ItemStack itemStack) + { return 1; } @Override - public int getTransferLimit(ItemStack itemStack) { - return Math.max( 32, getMaxCharge(itemStack)/ 200 ); + public int getTransferLimit(ItemStack itemStack) + { + return Math.max( 32, getMaxCharge( itemStack ) / 200 ); } @Override - public IElectricItemManager getManager(ItemStack itemStack) { + @Method(iname = "IC2") + public IElectricItemManager getManager(ItemStack itemStack) + { return this; }