From 3b7cff8412af5afbf99bfd40fee1193a6cd8c400 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 11 Apr 2019 02:59:02 +1000
Subject: + 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.

---
 src/Java/gtPlusPlus/api/objects/data/AutoMap.java  | 40 +++++++++++++
 .../gtPlusPlus/api/objects/minecraft/AABB.java     | 65 ++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 src/Java/gtPlusPlus/api/objects/minecraft/AABB.java

(limited to 'src/Java/gtPlusPlus/api')

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;
+	}
+	
+}
-- 
cgit