Delete more reflection (#3233)

3 files changed, 32 insertions, 57 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index 67ff8034dc..014b399044 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.item;
 
+import static gregtech.api.enums.Mods.Baubles;
 import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GregTech;
@@ -80,7 +81,6 @@ import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.GTPPEverglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
@@ -784,19 +784,9 @@ public final class ModItems {
         // Milled Ore Processing
         new MilledOreProcessing();
 
-        // IC2 Exp
-        Logger.INFO("IndustrialCraft2 Found - Loading Resources.");
-
-        // Baubles Mod Test
-        try {
-            final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble");
-            if (baublesTest != null) {
-                CompatBaubles.run();
-            } else {
-                Logger.INFO("Baubles Not Found - Skipping Resources.");
-            }
-        } catch (final Throwable T) {
-            Logger.INFO("Baubles Not Found - Skipping Resources.");
+        // Baubles
+        if (Baubles.isModLoaded()) {
+            CompatBaubles.run();
         }
 
         // Buffer Cores!
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
index 35adc35e96..89ddb241ed 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
@@ -22,7 +22,7 @@ import gtPlusPlus.preloader.PreloaderCore;
 
 public class FireProtectionBauble extends BaseBauble {
 
-    private static Field isImmuneToFire;
+    private static final Field isImmuneToFire;
 
     static {
         isImmuneToFire = ReflectionUtils
diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java
index 7df52a176a..94b33a270e 100644
--- a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java
+++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ItemArmourTinFoilHat.java
@@ -28,7 +28,6 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.item.wearable.armour.ArmourLoader;
 import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm;
 
@@ -120,55 +119,41 @@ public class ItemArmourTinFoilHat extends BaseArmourHelm {
     public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
         if (itemStack != null && player != null && world != null && !world.isRemote) {
             if (player instanceof EntityPlayer) {
-
                 // Apply Slow
-                if (!GTUtility.getPotion(player, Potion.moveSlowdown.id)) {
+                if (!player.isPotionActive(Potion.moveSlowdown.id)) {
                     player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 1, true));
                 }
-
                 // Move Xp orbs away
-                try {
-                    AxisAlignedBB box = player.boundingBox;
-                    box.maxX = player.posX + 5;
-                    box.maxY = player.posY + 5;
-                    box.maxZ = player.posZ + 5;
-                    box.minX = player.posX - 5;
-                    box.minY = player.posY - 5;
-                    box.minZ = player.posZ - 5;
-                    @SuppressWarnings("unchecked")
-                    List<Entity> g = world.getEntitiesWithinAABBExcludingEntity(player, box);
-                    if (g.size() > 0) {
-                        for (Entity e : g) {
-                            if (e != null) {
-                                if (!EntityXPOrb.class.isInstance(e) && !EntityBoat.class.isInstance(e)
-                                    && !EntitySnowball.class.isInstance(e)
-                                    && !EntityFireball.class.isInstance(e)
-                                    && !EntityEgg.class.isInstance(e)
-                                    && !EntityExpBottle.class.isInstance(e)
-                                    && !EntityEnderEye.class.isInstance(e)
-                                    && !EntityEnderPearl.class.isInstance(e)) {
-                                    continue;
-                                } else {
-                                    // Logger.INFO("Found "+e.getClass().getName());
-                                    double distX = player.posX - e.posX;
-                                    double distZ = player.posZ - e.posZ;
-                                    double distY = e.posY + 1.5D - player.posY;
-                                    double dir = Math.atan2(distZ, distX);
-                                    double speed = 1F / e.getDistanceToEntity(player) * 0.5;
-                                    speed = -speed;
-                                    if (distY < 0) {
-                                        e.motionY += speed;
-                                    }
-                                    e.motionX = Math.cos(dir) * speed;
-                                    e.motionZ = Math.sin(dir) * speed;
-                                }
-                            }
+                final AxisAlignedBB box = player.getBoundingBox();
+                if (box != null) {
+                    List<Entity> list = world.getEntitiesWithinAABBExcludingEntity(
+                        player,
+                        box.expand(5, 5, 5),
+                        e -> e instanceof EntityXPOrb || e instanceof EntityBoat
+                            || e instanceof EntitySnowball
+                            || e instanceof EntityFireball
+                            || e instanceof EntityEgg
+                            || e instanceof EntityExpBottle
+                            || e instanceof EntityEnderEye
+                            || e instanceof EntityEnderPearl);
+                    for (Entity e : list) {
+                        final float dist = e.getDistanceToEntity(player);
+                        if (dist == 0) continue;
+                        double distX = player.posX - e.posX;
+                        double distZ = player.posZ - e.posZ;
+                        double distY = e.posY + 1.5D - player.posY;
+                        double dir = Math.atan2(distZ, distX);
+                        double speed = 1F / dist * 0.5;
+                        speed = -speed;
+                        if (distY < 0) {
+                            e.motionY += speed;
                         }
+                        e.motionX = Math.cos(dir) * speed;
+                        e.motionZ = Math.sin(dir) * speed;
                     }
-                } catch (Throwable t) {}
+                }
             }
         }
-
         super.onArmorTick(world, player, itemStack);
     }