+ Added some new Monster Killer Baubles. Kill nearby mobs for power, power cost scales with HP total, left and other EntityLiving stats.

+ Added new constructors for AutoMaps.
+ Added a Wrapper (AABB) for AxisAlignedBB.
$ Fixed Hot Titanium Ingot recipe.

6 files changed, 227 insertions, 28 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
index fe2caa466d..3583a04a74 100644
--- a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
+++ b/src/Java/gtPlusPlus/api/objects/data/AutoMap.java
@@ -31,6 +31,46 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect
 		mInternalNameMap = new LinkedHashMap<String, Integer>();
 	}
 	
+	/**
+	 * Generates an AutoMap from the List.
+	 * @param aList - Data to be inserted into the AutoMap.
+	 */
+	public AutoMap(List<V> aList) {
+		mInternalMap = new LinkedHashMap<Integer, V>();
+		mInternalNameMap = new LinkedHashMap<String, Integer>();	
+		if (aList != null && aList.size() > 0) {
+			for (V obj : aList) {
+				add(obj);
+			}
+		}		
+	}
+	/**
+	 * Generates an AutoMap from a Set.
+	 * @param aList - Data to be inserted into the AutoMap.
+	 */
+	public AutoMap(Set<V> aList) {
+		mInternalMap = new LinkedHashMap<Integer, V>();
+		mInternalNameMap = new LinkedHashMap<String, Integer>();	
+		if (aList != null && aList.size() > 0) {
+			for (V obj : aList) {
+				add(obj);
+			}
+		}		
+	}
+	/**
+	 * Generates an AutoMap from a Collection.
+	 * @param aList - Data to be inserted into the AutoMap.
+	 */
+	public AutoMap(Collection<V> aList) {
+		mInternalMap = new LinkedHashMap<Integer, V>();
+		mInternalNameMap = new LinkedHashMap<String, Integer>();	
+		if (aList != null && aList.size() > 0) {
+			for (V obj : aList) {
+				add(obj);
+			}
+		}		
+	}
+
 	@Override
 	public Iterator<V> iterator() {		
 		return values().iterator();
diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/AABB.java b/src/Java/gtPlusPlus/api/objects/minecraft/AABB.java
new file mode 100644
index 0000000000..722ac00b64
--- /dev/null
+++ b/src/Java/gtPlusPlus/api/objects/minecraft/AABB.java
@@ -0,0 +1,65 @@
+package gtPlusPlus.api.objects.minecraft;
+
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+
+/**
+ * Generates an AABB around an entity.
+ * @author Alkalus
+ *
+ */
+public class AABB {
+	
+	private final AxisAlignedBB mAabb;
+	private final World mWorld;
+	
+	/**
+	 * Creates a AxisAlignedBB based around an Entity.
+	 * @param aEntity - The Entity to work with.
+	 * @param x - Maximum X from origin.
+	 * @param y - Maximum Y from origin.
+	 * @param z - Maximum Z from origin.
+	 */
+	public AABB(Entity aEntity, int x, int y, int z) {	
+		if (aEntity == null) {
+			mAabb = null;
+			mWorld = null;
+		}
+		else {
+			mWorld = aEntity.worldObj;
+			BlockPos aEntityLocation = EntityUtils.findBlockPosUnderEntity(aEntity);		
+			int xMin, xMax, yMin, yMax, zMin, zMax;
+			xMin = aEntityLocation.xPos;
+			yMin = aEntityLocation.yPos;
+			zMin = aEntityLocation.zPos;		
+			xMax = aEntityLocation.xPos + x;
+			yMax = aEntityLocation.yPos + y;
+			zMax = aEntityLocation.zPos + z;
+			mAabb = AxisAlignedBB.getBoundingBox(xMin, yMin, zMin, xMax, yMax, zMax);
+		}	
+
+	}
+	
+	/**
+	 * Used to get the AxisAlignedBB from this class.
+	 * @return
+	 */
+	public AxisAlignedBB get() {
+		return mAabb;
+	}
+	
+	/**
+	 * Used to determine if this object is valid or not.
+	 * @return
+	 */
+	public boolean valid() {
+		return mAabb != null && mWorld != null;
+	}
+	
+	public World world() {
+		return mWorld;
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
index f57c09b62d..d779e60975 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
@@ -3,10 +3,16 @@ package gtPlusPlus.core.common.compat;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
+import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble;
 import gtPlusPlus.core.item.general.ItemCloakingDevice;
 import gtPlusPlus.core.item.general.ItemHealingDevice;
 import gtPlusPlus.core.item.general.ItemSlowBuildingRing;
 import gtPlusPlus.core.lib.LoadedMods;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.monster.EntitySkeleton;
+import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.monster.EntityZombie;
 
 public class COMPAT_Baubles {
 
@@ -34,6 +40,12 @@ public class COMPAT_Baubles {
 		catch (Throwable t) {
 			t.printStackTrace();
 		}
+
+		ModItems.itemAmuletMonsterKiller_Zombie = new MonsterKillerBaseBauble(new Class[] {EntityZombie.class}, "Zombie", 6);
+		ModItems.itemAmuletMonsterKiller_Skeleton = new MonsterKillerBaseBauble(new Class[] {EntitySkeleton.class}, "Skeleton", 6);
+		ModItems.itemAmuletMonsterKiller_Spider = new MonsterKillerBaseBauble(new Class[] {EntitySpider.class}, "Spider", 6);
+		ModItems.itemAmuletMonsterKiller_Creeper = new MonsterKillerBaseBauble(new Class[] {EntityCreeper.class}, "Creeper", 6);
+		ModItems.itemAmuletMonsterKiller_Enderman = new MonsterKillerBaseBauble(new Class[] {EntityEnderman.class}, "Enderman", 6);
 		
 		if (LoadedMods.PlayerAPI){
 			ModItems.itemSlowBuildingRing = new ItemSlowBuildingRing();
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index e3c01b7ea5..68aacd6943 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -32,6 +32,7 @@ import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
 import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
 import gtPlusPlus.core.item.bauble.HealthBoostBauble;
 import gtPlusPlus.core.item.bauble.ModularBauble;
+import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.CoalTar;
 import gtPlusPlus.core.item.chemistry.GenericChem;
@@ -345,6 +346,15 @@ public final class ModItems {
 	public static CoreItem itemDetCable;
 	public static ItemThrowableBomb itemBomb;
 
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Zombie;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Skeleton;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Spider;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Creeper;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Enderman;
+	
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Nether;
+	public static MonsterKillerBaseBauble itemAmuletMonsterKiller_Infernal;
+
 	static {
 		Logger.INFO("Items!");
 		//Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is called upon.
@@ -829,7 +839,7 @@ public final class ModItems {
 		else {
 			itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1);
 		}
-		GT_Values.RA.addBlastRecipe(ELEMENT.getInstance().TITANIUM.getIngot(1), null, itemHotTitaniumIngot, null, 10 * 20, 512, Materials.Titanium.mBlastFurnaceTemp);
+		GT_Values.RA.addBlastRecipe(ELEMENT.getInstance().TITANIUM.getIngot(1), CI.getNumberedCircuit(16), itemHotTitaniumIngot, null, 10 * 20, 500, Materials.Titanium.mBlastFurnaceTemp);
 
 		//Special Sillyness
 		if (true) {
diff --git a/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
index 024f6aa907..2cffb8737f 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java
@@ -3,14 +3,18 @@ package gtPlusPlus.core.item.bauble;
 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.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.AABB;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
 import ic2.api.item.ElectricItem;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -20,14 +24,13 @@ 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;				
+	public MonsterKillerBaseBauble(Class[] aMonsterBaseClassArray, String aMonsterTypeName, int aPowerTier) {
+		super(BaubleType.AMULET, aPowerTier, GT_Values.V[aPowerTier] * 20 * 300,
+				"GTPP.MonsterKiller." + aMonsterTypeName + ".name");
+		mTargets = aMonsterBaseClassArray;
 	}
 
 	@SideOnly(Side.CLIENT)
@@ -56,7 +59,7 @@ public class MonsterKillerBaseBauble extends ElectricBaseBauble {
 
 	@Override
 	public boolean canProvideEnergy(final ItemStack itemStack) {
-		double aItemCharge = ElectricItem.manager.getCharge(itemStack);		
+		double aItemCharge = ElectricItem.manager.getCharge(itemStack);
 		return aItemCharge > 0;
 	}
 
@@ -78,17 +81,18 @@ public class MonsterKillerBaseBauble extends ElectricBaseBauble {
 		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";
+		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 + aString2 + " " + (int) getTransferLimit(stack) + aEUT + aString3
+				+ EnumChatFormatting.GRAY);
 		list.add("");
-		list.add(""+EnumChatFormatting.GREEN + aString4 + " " + EnumChatFormatting.GRAY);
+		list.add("" + EnumChatFormatting.GREEN + aString4 + " " + EnumChatFormatting.GRAY);
 		for (Class cz : mTargets) {
-			list.add("- "+EnumChatFormatting.DARK_GREEN + cz.getSimpleName() + EnumChatFormatting.GRAY);			
+			list.add("- " + EnumChatFormatting.DARK_GREEN + cz.getSimpleName() + EnumChatFormatting.GRAY);
 		}
-		
+
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
@@ -113,17 +117,57 @@ public class MonsterKillerBaseBauble extends ElectricBaseBauble {
 	}
 
 	@Override // TODO
-	public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase aPlayer) {
+	public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase aPlayerEntity) {
+		if (aPlayerEntity == null) {
+			return;
+		}
+		EntityPlayer aPlayer = (EntityPlayer) aPlayerEntity;
 		if (!aPlayer.worldObj.isRemote) {
 			if (this.getCharge(aBaubleStack) >= getTransferLimit(aBaubleStack)) {
-				
+				AABB aPlayerBox = new AABB(aPlayerEntity, 5, 5, 5);
+				if (this.mTargets != null && this.mTargets.length > 0) {
+					for (Class clazz : mTargets) {
+						AutoMap<?> aEnts = EntityUtils.getEntitiesWithinBoundingBox(clazz, aPlayerBox);
+						if (aEnts.isEmpty()) {
+							continue;
+						} else {
+							EntityLiving aClosest = null;
+							double aEntityDistance = Short.MIN_VALUE;
+							for (Object ent : aEnts) {
+								if (!EntityLiving.class.isInstance(ent)) {
+									continue;
+								} else {
+									double aCurEntDis = EntityUtils.getDistance(aPlayerEntity, (Entity) ent);
+									if (aEntityDistance == Short.MIN_VALUE || aCurEntDis < aEntityDistance) {
+										aEntityDistance = aCurEntDis;
+										aClosest = (EntityLiving) ent;
+									}
+								}
+							}
+							if (aClosest != null) {
+								float aEntHealth = aClosest.getHealth();
+								float aEntMaxHealth = aClosest.getMaxHealth();
+								double aEntHealthPerc = MathUtils.findPercentage(aEntHealth, aEntMaxHealth);
+								long aEuUsage = (long) (aEntHealthPerc * 50 * aEntMaxHealth);
+								if (this.discharge(aBaubleStack, aEuUsage, mTier, true, false, false) > 0) {
+									aClosest.setDead();
+									break;
+								}
+							} else {
+								continue;
+							}
+						}
+					}
+				}
+			} else {
+				return;
 			}
 		}
 	}
 
 	@Override
 	public String getTextureNameForBauble() {
-		return CORE.MODID+":"+"";
+		return CORE.MODID + ":" + "baubles/itemAmulet";
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
index 844bb0bcaf..8c5a9f6581 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
@@ -3,26 +3,28 @@ package gtPlusPlus.core.util.minecraft;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.AABB;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import ic2.core.IC2Potion;
+import ic2.core.item.armor.ItemArmorHazmat;
 import net.minecraft.block.Block;
-import net.minecraft.entity.*;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 
-import gregtech.api.util.GT_Utility;
-
-import gtPlusPlus.api.objects.minecraft.BlockPos;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import ic2.core.IC2Potion;
-import ic2.core.item.armor.ItemArmorHazmat;
-
 public class EntityUtils {
 
 	public static void setEntityOnFire(final Entity entity, final int length){
@@ -158,5 +160,31 @@ public class EntityUtils {
 		}
 		return false;
 	}
+	
+	public static double getDistance(Entity p1, Entity p2) {
+	    return Math.sqrt( Math.pow(p1.posX - p2.posX, 2) + Math.pow(p1.posY - p2.posY, 2) + Math.pow(p1.posZ - p2.posZ, 2));
+	}
+	
+	public static AutoMap<Entity> getEntitiesWithinBoundingBoxExcluding(Entity aExclusion, AABB aBoundingBox){
+		
+		if (aExclusion == null) {
+			return new AutoMap<Entity>();
+		}
+		else {
+			List<Entity> aEntities = aBoundingBox.world().getEntitiesWithinAABBExcludingEntity(aExclusion, aBoundingBox.get());			
+			return new AutoMap<Entity>(aEntities);			
+		}
+	}
+	
+	public static AutoMap<Entity> getEntitiesWithinBoundingBox(Class aEntityType, AABB aBoundingBox){
+		
+		if (aEntityType == null) {
+			return new AutoMap<Entity>();
+		}
+		else {
+			List<Entity> aEntities = aBoundingBox.world().getEntitiesWithinAABB(aEntityType, aBoundingBox.get());			
+			return new AutoMap<Entity>(aEntities);			
+		}
+	}
 
 }