Removed EntityUtils and changed ElderGuardian entity getting

Removed EntityUtils which contained a method that looped through every entity in the world and compared how close it was to the point. Also updated ElderGuardians to use getNearbyEntities rather than looping for better performance and to help prevent ConcurrentModificationExceptions.

Author: RadBuilder

core/src/main/java/be/isach/ultracosmetics/cosmetics/gadgets/GadgetTrampoline.java

@@ -5,7 +5,6 @@
 import be.isach.ultracosmetics.cosmetics.type.GadgetType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.Cuboid;
-import be.isach.ultracosmetics.util.EntityUtils;
 import be.isach.ultracosmetics.util.MathUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

core/src/main/java/be/isach/ultracosmetics/util/EntityUtils.java

@@ -5,7 +5,6 @@
 import be.isach.ultracosmetics.cosmetics.type.MorphType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.EntitySpawningManager;
-import be.isach.ultracosmetics.util.EntityUtils;
 import be.isach.ultracosmetics.util.MathUtils;
 import be.isach.ultracosmetics.v1_10_R1.customentities.CustomEntityFirework;
 import be.isach.ultracosmetics.v1_10_R1.customentities.CustomGuardian;
@@ -91,7 +90,7 @@ private void shootLaser() {
 			Location current = FROM.clone();
 
 			for (int i = 0; i < 10; i++) {
-				for (Entity entity : EntityUtils.getEntitiesInRadius(current, 4.5))
+				for (Entity entity : current.getWorld().getNearbyEntities(current, 4.5, 4.5, 4.5))
 					if (entity instanceof LivingEntity
 					    && entity != getPlayer())
 						MathUtils.applyVelocity(entity, new Vector(0, 0.5d, 0));

v1_10_R1/src/main/java/be/isach/ultracosmetics/v1_10_R1/morphs/MorphElderGuardian.java

@@ -5,7 +5,6 @@
 import be.isach.ultracosmetics.cosmetics.type.MorphType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.EntitySpawningManager;
-import be.isach.ultracosmetics.util.EntityUtils;
 import be.isach.ultracosmetics.util.MathUtils;
 import be.isach.ultracosmetics.v1_11_R1.customentities.CustomEntityFirework;
 import be.isach.ultracosmetics.v1_11_R1.customentities.CustomGuardian;
@@ -68,8 +67,7 @@ private void shootLaser() {
 			return;
 
 		final Location FROM = customGuardian.getBukkitEntity().getLocation();
-		final Location TO = FROM.clone().add(getPlayer()
-				                                     .getLocation().getDirection().multiply(10));
+		final Location TO = FROM.clone().add(getPlayer().getLocation().getDirection().multiply(10));
 
 		final ArmorStand armorStand = getPlayer().getWorld().spawn(TO, ArmorStand.class);
 
@@ -91,7 +89,7 @@ private void shootLaser() {
 			Location current = FROM.clone();
 
 			for (int i = 0; i < 10; i++) {
-				for (Entity entity : EntityUtils.getEntitiesInRadius(current, 4.5))
+				for (Entity entity : current.getWorld().getNearbyEntities(current, 4.5, 4.5, 4.5))
 					if (entity instanceof LivingEntity
 					    && entity != getPlayer())
 						MathUtils.applyVelocity(entity, new Vector(0, 0.5d, 0));

v1_11_R1/src/main/java/be/isach/ultracosmetics/v1_11_R1/morphs/MorphElderGuardian.java

@@ -5,7 +5,6 @@
 import be.isach.ultracosmetics.cosmetics.type.MorphType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.EntitySpawningManager;
-import be.isach.ultracosmetics.util.EntityUtils;
 import be.isach.ultracosmetics.util.MathUtils;
 import be.isach.ultracosmetics.v1_12_R1.customentities.CustomEntityFirework;
 import be.isach.ultracosmetics.v1_12_R1.customentities.CustomGuardian;
@@ -68,8 +67,7 @@ private void shootLaser() {
 			return;
 
 		final Location FROM = customGuardian.getBukkitEntity().getLocation();
-		final Location TO = FROM.clone().add(getPlayer()
-				                                     .getLocation().getDirection().multiply(10));
+		final Location TO = FROM.clone().add(getPlayer().getLocation().getDirection().multiply(10));
 
 		final ArmorStand armorStand = getPlayer().getWorld().spawn(TO, ArmorStand.class);
 
@@ -91,7 +89,7 @@ private void shootLaser() {
 			Location current = FROM.clone();
 
 			for (int i = 0; i < 10; i++) {
-				for (Entity entity : EntityUtils.getEntitiesInRadius(current, 4.5))
+				for (Entity entity : current.getWorld().getNearbyEntities(current, 4.5, 4.5, 4.5))
 					if (entity instanceof LivingEntity
 					    && entity != getPlayer())
 						MathUtils.applyVelocity(entity, new Vector(0, 0.5d, 0));

v1_12_R1/src/main/java/be/isach/ultracosmetics/v1_12_R1/morphs/MorphElderGuardian.java

@@ -5,7 +5,6 @@
 import be.isach.ultracosmetics.cosmetics.type.MorphType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.EntitySpawningManager;
-import be.isach.ultracosmetics.util.EntityUtils;
 import be.isach.ultracosmetics.util.MathUtils;
 import be.isach.ultracosmetics.v1_8_R1.customentities.CustomEntityFirework;
 import be.isach.ultracosmetics.v1_8_R1.customentities.CustomGuardian;
@@ -68,8 +67,7 @@ private void shootLaser() {
 			return;
 
 		final Location FROM = customGuardian.getBukkitEntity().getLocation();
-		final Location TO = FROM.clone().add(getPlayer()
-				                                     .getLocation().getDirection().multiply(10));
+		final Location TO = FROM.clone().add(getPlayer().getLocation().getDirection().multiply(10));
 
 		final ArmorStand armorStand = getPlayer().getWorld().spawn(TO, ArmorStand.class);
 
@@ -91,7 +89,7 @@ private void shootLaser() {
 			Location current = FROM.clone();
 
 			for (int i = 0; i < 10; i++) {
-				for (Entity entity : EntityUtils.getEntitiesInRadius(current, 4.5))
+				for (Entity entity : armorStand.getNearbyEntities(4.5, 4.5, 4.5))
 					if (entity instanceof LivingEntity
 					    && entity != getPlayer())
 						MathUtils.applyVelocity(entity, new Vector(0, 0.5d, 0));

v1_8_R1/src/main/java/be/isach/ultracosmetics/v1_8_R1/morphs/MorphElderGuardian.java

@@ -5,7 +5,6 @@
 import be.isach.ultracosmetics.cosmetics.type.MorphType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.EntitySpawningManager;
-import be.isach.ultracosmetics.util.EntityUtils;
 import be.isach.ultracosmetics.util.MathUtils;
 import be.isach.ultracosmetics.v1_8_R2.customentities.CustomEntityFirework;
 import be.isach.ultracosmetics.v1_8_R2.customentities.CustomGuardian;
@@ -68,8 +67,7 @@ private void shootLaser() {
 			return;
 
 		final Location FROM = customGuardian.getBukkitEntity().getLocation();
-		final Location TO = FROM.clone().add(getPlayer()
-				                                     .getLocation().getDirection().multiply(10));
+		final Location TO = FROM.clone().add(getPlayer().getLocation().getDirection().multiply(10));
 
 		final ArmorStand armorStand = getPlayer().getWorld().spawn(TO, ArmorStand.class);
 
@@ -91,7 +89,7 @@ private void shootLaser() {
 			Location current = FROM.clone();
 
 			for (int i = 0; i < 10; i++) {
-				for (Entity entity : EntityUtils.getEntitiesInRadius(current, 4.5))
+				for (Entity entity : current.getWorld().getNearbyEntities(current, 4.5, 4.5, 4.5))
 					if (entity instanceof LivingEntity
 					    && entity != getPlayer())
 						MathUtils.applyVelocity(entity, new Vector(0, 0.5d, 0));

v1_8_R2/src/main/java/be/isach/ultracosmetics/v1_8_R2/morphs/MorphElderGuardian.java

@@ -5,7 +5,6 @@
 import be.isach.ultracosmetics.cosmetics.type.MorphType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.EntitySpawningManager;
-import be.isach.ultracosmetics.util.EntityUtils;
 import be.isach.ultracosmetics.util.MathUtils;
 import be.isach.ultracosmetics.v1_8_R3.customentities.CustomEntityFirework;
 import be.isach.ultracosmetics.v1_8_R3.customentities.CustomGuardian;
@@ -68,8 +67,7 @@ private void shootLaser() {
 			return;
 
 		final Location FROM = customGuardian.getBukkitEntity().getLocation();
-		final Location TO = FROM.clone().add(getPlayer()
-				                                     .getLocation().getDirection().multiply(10));
+		final Location TO = FROM.clone().add(getPlayer().getLocation().getDirection().multiply(10));
 
 		final ArmorStand armorStand = getPlayer().getWorld().spawn(TO, ArmorStand.class);
 
@@ -91,7 +89,7 @@ private void shootLaser() {
 			Location current = FROM.clone();
 
 			for (int i = 0; i < 10; i++) {
-				for (Entity entity : EntityUtils.getEntitiesInRadius(current, 4.5))
+				for (Entity entity : current.getWorld().getNearbyEntities(current, 4.5, 4.5, 4.5))
 					if (entity instanceof LivingEntity
 					    && entity != getPlayer())
 						MathUtils.applyVelocity(entity, new Vector(0, 0.5d, 0));

v1_8_R3/src/main/java/be/isach/ultracosmetics/v1_8_R3/morphs/MorphElderGuardian.java

@@ -5,7 +5,6 @@
 import be.isach.ultracosmetics.cosmetics.type.MorphType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.EntitySpawningManager;
-import be.isach.ultracosmetics.util.EntityUtils;
 import be.isach.ultracosmetics.util.MathUtils;
 import be.isach.ultracosmetics.v1_9_R1.customentities.CustomEntityFirework;
 import be.isach.ultracosmetics.v1_9_R1.customentities.CustomGuardian;
@@ -68,8 +67,7 @@ private void shootLaser() {
 			return;
 
 		final Location FROM = customGuardian.getBukkitEntity().getLocation();
-		final Location TO = FROM.clone().add(getPlayer()
-				                                     .getLocation().getDirection().multiply(10));
+		final Location TO = FROM.clone().add(getPlayer().getLocation().getDirection().multiply(10));
 
 		final ArmorStand armorStand = getPlayer().getWorld().spawn(TO, ArmorStand.class);
 
@@ -91,7 +89,7 @@ private void shootLaser() {
 			Location current = FROM.clone();
 
 			for (int i = 0; i < 10; i++) {
-				for (Entity entity : EntityUtils.getEntitiesInRadius(current, 4.5))
+				for (Entity entity : current.getWorld().getNearbyEntities(current, 4.5, 4.5, 4.5))
 					if (entity instanceof LivingEntity
 					    && entity != getPlayer())
 						MathUtils.applyVelocity(entity, new Vector(0, 0.5d, 0));

v1_9_R1/src/main/java/be/isach/ultracosmetics/v1_9_R1/morphs/MorphElderGuardian.java

@@ -5,7 +5,6 @@
 import be.isach.ultracosmetics.cosmetics.type.MorphType;
 import be.isach.ultracosmetics.player.UltraPlayer;
 import be.isach.ultracosmetics.util.EntitySpawningManager;
-import be.isach.ultracosmetics.util.EntityUtils;
 import be.isach.ultracosmetics.util.MathUtils;
 import be.isach.ultracosmetics.v1_9_R2.customentities.CustomEntityFirework;
 import be.isach.ultracosmetics.v1_9_R2.customentities.CustomGuardian;
@@ -69,8 +68,7 @@ private void shootLaser() {
 			return;
 
 		final Location FROM = customGuardian.getBukkitEntity().getLocation();
-		final Location TO = FROM.clone().add(getPlayer()
-				                                     .getLocation().getDirection().multiply(10));
+		final Location TO = FROM.clone().add(getPlayer().getLocation().getDirection().multiply(10));
 
 		final ArmorStand armorStand = getPlayer().getWorld().spawn(TO, ArmorStand.class);
 
@@ -92,7 +90,7 @@ private void shootLaser() {
 			Location current = FROM.clone();
 
 			for (int i = 0; i < 10; i++) {
-				for (Entity entity : EntityUtils.getEntitiesInRadius(current, 4.5))
+				for (Entity entity : current.getWorld().getNearbyEntities(current, 4.5, 4.5, 4.5))
 					if (entity instanceof LivingEntity
 					    && entity != getPlayer())
 						MathUtils.applyVelocity(entity, new Vector(0, 0.5d, 0));