+ Added a Base Bauble class for Electrics.

% Updated some of the Baubles to use this new class.

3 files changed, 334 insertions, 114 deletions

diff --git a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
index cc7979825a..2d9b35ac63 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
@@ -3,20 +3,16 @@ package gtPlusPlus.core.item.bauble;
 import java.util.List;
 
 import baubles.api.BaubleType;
-import baubles.api.IBauble;
-import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.GT_Values;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
-import ic2.api.item.IElectricItemManager;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -28,23 +24,12 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
-@Optional.InterfaceList(value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
-		@Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") })
-public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem, IElectricItemManager, IBauble {
+public class BatteryPackBaseBauble extends ElectricBaseBauble {
 
-	final int mTier;
-	private final double maxValueEU;
 
 	public BatteryPackBaseBauble(int tier) {		
-		super(BaubleType.BELT, "GTPP.BattPack.0" + tier + ".name", 0);
-		mTier = tier;
-		maxValueEU = GT_Values.V[mTier] * 20 * 300;
-		String aUnlocalName = "GTPP.BattPack.0" + mTier + ".name";
-		this.setUnlocalizedName(aUnlocalName);
-		this.setTextureName(CORE.MODID + ":" + "chargepack/"+tier);
-		this.setMaxDamage(27);
-		this.setMaxStackSize(1);
-		this.setNoRepair();
+		super(BaubleType.BELT, tier, GT_Values.V[tier] * 20 * 300, "GTPP.BattPack.0" + tier + ".name");
+		String aUnlocalName = "GTPP.BattPack.0" + tier + ".name";
 		this.setCreativeTab(AddToCreativeTab.tabMachines);		
 		if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) {
 			GameRegistry.registerItem(this, aUnlocalName);			
@@ -82,46 +67,11 @@ public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem,
 	}
 
 	@Override
-	public Item getChargedItem(final ItemStack itemStack) {
-		final ItemStack x = itemStack.copy();
-		x.setItemDamage(27);
-		return x.getItem();
-	}
-
-	@Override
-	public Item getEmptyItem(final ItemStack itemStack) {
-		final ItemStack x = itemStack.copy();
-		x.setItemDamage(0);
-		return x.getItem();
-	}
-
-	@Override
-	public double getMaxCharge(final ItemStack itemStack) {
-		return maxValueEU;
-	}
-
-	@Override
-	public int getTier(final ItemStack itemStack) {
-		return mTier;
-	}
-
-	@Override
-	public double getTransferLimit(final ItemStack itemStack) {
-		return GT_Values.V[mTier];
-	}
-
-	@Override
 	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
 		return (EnumChatFormatting.BLUE + super.getItemStackDisplayName(p_77653_1_) + EnumChatFormatting.GRAY);
 	}
 
 	@Override
-	public double getDurabilityForDisplay(final ItemStack stack) {
-		// return 1.0D - getEnergyStored(stack) / this.capacity;
-		return 1.0D - (this.getCharge(stack) / this.getMaxCharge(stack));
-	}
-
-	@Override
 	public boolean showDurabilityBar(final ItemStack stack) {
 		return true;
 	}
@@ -140,71 +90,17 @@ public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem,
 		String aString2 = StatCollector.translateToLocal("GTPP.battpack.tooltip.2");
 		String aString3 = StatCollector.translateToLocal("GTPP.battpack.tooltip.3");
 		String aString4 = StatCollector.translateToLocal("GTPP.battpack.tooltip.4");
-
-		String aEuInfo = StatCollector.translateToLocal("GTPP.info.euInfo");
-		String aTier = StatCollector.translateToLocal("GTPP.machines.tier");
-		String aInputLimit = StatCollector.translateToLocal("GTPP.info.inputLimit");
-		String aCurrentPower = StatCollector.translateToLocal("GTPP.info.currentPower");
+		
 		String aEU = StatCollector.translateToLocal("GTPP.info.eu");	
 		String aEUT = aEU+"/t";
 
 		list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY);
 		list.add(EnumChatFormatting.GREEN + aString2+" " + (int) getTransferLimit(stack) + aEUT +" "+ aString3 + EnumChatFormatting.GRAY);
 		list.add(EnumChatFormatting.GREEN + aString4 + EnumChatFormatting.GRAY);
-		list.add("");
-		list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY);
-		list.add(EnumChatFormatting.GRAY + aTier+": [" + EnumChatFormatting.YELLOW + this.getTier(stack)
-		+ EnumChatFormatting.GRAY + "] "+aInputLimit+": [" + EnumChatFormatting.YELLOW
-		+ this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT);
-		list.add(EnumChatFormatting.GRAY + aCurrentPower +": [" + EnumChatFormatting.YELLOW + (long) this.getCharge(stack)
-		+ EnumChatFormatting.GRAY + aEU +"] [" + EnumChatFormatting.YELLOW
-		+ MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY
-		+ "%]");
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
 	@Override
-	public double charge(final ItemStack stack, final double amount, final int tier, final boolean ignoreTransferLimit,
-			final boolean simulate) {
-
-		if (!simulate) {
-			ElectricItem.manager.charge(stack, amount, tier, true, simulate);
-
-		}
-		return ElectricItem.manager.charge(stack, amount, tier, true, simulate);
-	}
-
-	@Override
-	public double discharge(final ItemStack stack, final double amount, final int tier,
-			final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) {
-		if (!simulate) {
-			ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
-		}
-
-		return ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
-	}
-
-	@Override
-	public double getCharge(final ItemStack stack) {
-		return ElectricItem.manager.getCharge(stack);
-	}
-
-	@Override
-	public boolean canUse(final ItemStack stack, final double amount) {
-		return ElectricItem.manager.canUse(stack, amount);
-	}
-
-	@Override
-	public boolean use(final ItemStack stack, final double amount, final EntityLivingBase entity) {
-		return ElectricItem.manager.use(stack, amount, entity);
-	}
-
-	@Override
-	public void chargeFromArmor(final ItemStack stack, final EntityLivingBase entity) {
-		ElectricItem.manager.chargeFromArmor(stack, entity);
-	}
-
-	@Override
 	public String getToolTip(final ItemStack stack) {
 		return ElectricItem.manager.getToolTip(stack);
 	}
@@ -219,11 +115,6 @@ public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem,
 		return true;
 	}
 
-	@Override
-	public BaubleType getBaubleType(final ItemStack arg0) {
-		return BaubleType.BELT;
-	}
-
 	@Override // TODO
 	public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) {
 
@@ -349,4 +240,10 @@ public class BatteryPackBaseBauble extends BaseBauble implements IElectricItem,
 		}
 	}
 
+	@Override
+	public String getTextureNameForBauble() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
new file mode 100644
index 0000000000..fb490285e9
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
@@ -0,0 +1,199 @@
+package gtPlusPlus.core.item.bauble;
+
+import java.util.List;
+
+import baubles.api.BaubleType;
+import baubles.api.IBauble;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
+import ic2.api.item.ElectricItem;
+import ic2.api.item.IElectricItem;
+import ic2.api.item.IElectricItemManager;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+@Optional.InterfaceList(value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"),
+@Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles") })
+public abstract class ElectricBaseBauble extends BaseBauble implements IElectricItem, IElectricItemManager, IBauble {
+
+	public final int mTier;
+	private final double maxValueEU;
+	private final BaubleType mType;
+
+	public ElectricBaseBauble(BaubleType aType, int aTier, double aMaxEU, String aUnlocalName) {		
+		super(aType, aUnlocalName, 0);
+		mType = aType;
+		mTier = aTier;
+		maxValueEU = aMaxEU;
+		this.setUnlocalizedName(aUnlocalName);
+		this.setTextureName(getTextureNameForBauble());
+		this.setMaxDamage(27);
+		this.setMaxStackSize(1);
+		this.setNoRepair();
+		this.setCreativeTab(AddToCreativeTab.tabMachines);		
+		if (GameRegistry.findItem(CORE.MODID, aUnlocalName) == null) {
+			GameRegistry.registerItem(this, aUnlocalName);			
+		}		
+	}
+	
+	public abstract String getTextureNameForBauble();
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
+		ItemStack itemStack = new ItemStack(this, 1);
+		ItemStack charged;
+		if (this.getEmptyItem(itemStack) == this) {
+			charged = new ItemStack(this, 1);
+			ElectricItem.manager.charge(charged, 0.0D, Integer.MAX_VALUE, true, false);
+			itemList.add(charged);
+		}
+		if (this.getChargedItem(itemStack) == this) {
+			charged = new ItemStack(this, 1);
+			ElectricItem.manager.charge(charged, Double.POSITIVE_INFINITY, Integer.MAX_VALUE, true, false);
+			itemList.add(charged);
+		}
+
+	}
+
+	@Override
+	public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
+			final boolean p_77663_5_) {
+		super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_);
+	}
+
+	@Override
+	public boolean canProvideEnergy(final ItemStack itemStack) {
+		double aItemCharge = ElectricItem.manager.getCharge(itemStack);		
+		return aItemCharge > 0;
+	}
+
+	@Override
+	public final Item getChargedItem(final ItemStack itemStack) {
+		final ItemStack x = itemStack.copy();
+		x.setItemDamage(27);
+		return x.getItem();
+	}
+
+	@Override
+	public final Item getEmptyItem(final ItemStack itemStack) {
+		final ItemStack x = itemStack.copy();
+		x.setItemDamage(0);
+		return x.getItem();
+	}
+
+	@Override
+	public final double getMaxCharge(final ItemStack itemStack) {
+		return maxValueEU;
+	}
+
+	@Override
+	public final int getTier(final ItemStack itemStack) {
+		return mTier;
+	}
+
+	@Override
+	public final double getTransferLimit(final ItemStack itemStack) {
+		return GT_Values.V[mTier];
+	}
+
+	@Override
+	public final double getDurabilityForDisplay(final ItemStack stack) {
+		return 1.0D - (this.getCharge(stack) / this.getMaxCharge(stack));
+	}
+
+	@Override
+	public boolean showDurabilityBar(final ItemStack stack) {
+		return true;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		list.add("");
+		String aEuInfo = StatCollector.translateToLocal("GTPP.info.euInfo");
+		String aTier = StatCollector.translateToLocal("GTPP.machines.tier");
+		String aInputLimit = StatCollector.translateToLocal("GTPP.info.inputLimit");
+		String aCurrentPower = StatCollector.translateToLocal("GTPP.info.currentPower");
+		String aEU = StatCollector.translateToLocal("GTPP.info.eu");	
+		String aEUT = aEU+"/t";
+
+		list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY);
+		list.add(EnumChatFormatting.GRAY + aTier+": [" + EnumChatFormatting.YELLOW + this.getTier(stack)
+		+ EnumChatFormatting.GRAY + "] "+aInputLimit+": [" + EnumChatFormatting.YELLOW
+		+ this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT);
+		list.add(EnumChatFormatting.GRAY + aCurrentPower +": [" + EnumChatFormatting.YELLOW + (long) this.getCharge(stack)
+		+ EnumChatFormatting.GRAY + aEU +"] [" + EnumChatFormatting.YELLOW
+		+ MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY
+		+ "%]");
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public final double charge(final ItemStack stack, final double amount, final int tier, final boolean ignoreTransferLimit,
+			final boolean simulate) {
+		/*if (!simulate) {
+			ElectricItem.manager.charge(stack, amount, tier, true, simulate);
+		}*/
+		
+		return ElectricItem.manager.charge(stack, amount, tier, true, simulate);
+	}
+
+	@Override
+	public final double discharge(final ItemStack stack, final double amount, final int tier,
+			final boolean ignoreTransferLimit, final boolean externally, final boolean simulate) {
+		/*if (!simulate) {
+			ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
+		}*/
+
+		return ElectricItem.manager.discharge(stack, amount, tier, ignoreTransferLimit, externally, simulate);
+	}
+
+	@Override
+	public final double getCharge(final ItemStack stack) {
+		return ElectricItem.manager.getCharge(stack);
+	}
+
+	@Override
+	public final boolean canUse(final ItemStack stack, final double amount) {
+		return ElectricItem.manager.canUse(stack, amount);
+	}
+
+	@Override
+	public final boolean use(final ItemStack stack, final double amount, final EntityLivingBase entity) {
+		return ElectricItem.manager.use(stack, amount, entity);
+	}
+
+	@Override
+	public final void chargeFromArmor(final ItemStack stack, final EntityLivingBase entity) {
+		ElectricItem.manager.chargeFromArmor(stack, entity);
+	}
+
+	@Override
+	public String getToolTip(final ItemStack stack) {
+		//return ElectricItem.manager.getToolTip(stack);
+		return null;
+	}
+
+	@Override
+	public final BaubleType getBaubleType(final ItemStack arg0) {
+		return mType;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
index 213a3f5b7c..024f6aa907 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
@@ -1,5 +1,129 @@
 package gtPlusPlus.core.item.bauble;
 
-public class MonsterKillerBaseBauble {
+import java.util.List;
+
+import baubles.api.BaubleType;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.core.lib.CORE;
+import ic2.api.item.ElectricItem;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+
+public class MonsterKillerBaseBauble extends ElectricBaseBauble {
+	
+	private final int mTier;
+	private final Class[] mTargets;
+
+	public MonsterKillerBaseBauble(Class[] aMonsterBaseClassArray, String aMonsterTypeName, int aPowerTier) {	
+		super(BaubleType.AMULET, aPowerTier, GT_Values.V[aPowerTier] * 20 * 300, "GTPP.MonsterKiller."+aMonsterTypeName+".name");
+		mTier = aPowerTier;
+		mTargets = aMonsterBaseClassArray;				
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
+		ItemStack itemStack = new ItemStack(this, 1);
+		ItemStack charged;
+		if (this.getEmptyItem(itemStack) == this) {
+			charged = new ItemStack(this, 1);
+			ElectricItem.manager.charge(charged, 0.0D, Integer.MAX_VALUE, true, false);
+			itemList.add(charged);
+		}
+		if (this.getChargedItem(itemStack) == this) {
+			charged = new ItemStack(this, 1);
+			ElectricItem.manager.charge(charged, Double.POSITIVE_INFINITY, Integer.MAX_VALUE, true, false);
+			itemList.add(charged);
+		}
+
+	}
+
+	@Override
+	public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_,
+			final boolean p_77663_5_) {
+		super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_);
+	}
+
+	@Override
+	public boolean canProvideEnergy(final ItemStack itemStack) {
+		double aItemCharge = ElectricItem.manager.getCharge(itemStack);		
+		return aItemCharge > 0;
+	}
+
+	@Override
+	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
+		return (EnumChatFormatting.WHITE + super.getItemStackDisplayName(p_77653_1_) + EnumChatFormatting.GRAY);
+	}
+
+	@Override
+	public boolean showDurabilityBar(final ItemStack stack) {
+		return true;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		list.add("");
+		String aString1 = StatCollector.translateToLocal("GTPP.monsterkiller.tooltip.1");
+		String aString2 = StatCollector.translateToLocal("GTPP.monsterkiller.tooltip.2");
+		String aString3 = StatCollector.translateToLocal("GTPP.monsterkiller.tooltip.3");
+		String aString4 = StatCollector.translateToLocal("GTPP.monsterkiller.tooltip.4");
+		String aEU = StatCollector.translateToLocal("GTPP.info.eu");	
+		String aEUT = aEU+"/t";
+
+		list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY);
+		list.add(EnumChatFormatting.GREEN + aString2+" " + (int) getTransferLimit(stack) + aEUT + aString3 + EnumChatFormatting.GRAY);
+		list.add("");
+		list.add(""+EnumChatFormatting.GREEN + aString4 + " " + EnumChatFormatting.GRAY);
+		for (Class cz : mTargets) {
+			list.add("- "+EnumChatFormatting.DARK_GREEN + cz.getSimpleName() + EnumChatFormatting.GRAY);			
+		}
+		
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public boolean canEquip(final ItemStack arg0, final EntityLivingBase arg1) {
+		return true;
+	}
+
+	@Override
+	public boolean canUnequip(final ItemStack arg0, final EntityLivingBase arg1) {
+		return true;
+	}
+
+	@Override
+	public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) {
+
+	}
+
+	@Override
+	public void onUnequipped(final ItemStack arg0, final EntityLivingBase arg1) {
+
+	}
+
+	@Override // TODO
+	public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase aPlayer) {
+		if (!aPlayer.worldObj.isRemote) {
+			if (this.getCharge(aBaubleStack) >= getTransferLimit(aBaubleStack)) {
+				
+			}
+		}
+	}
+
+	@Override
+	public String getTextureNameForBauble() {
+		return CORE.MODID+":"+"";
+	}
 
 }