Merge pull request #4 from GTNewHorizons/structure

New Extreme Extermination Chamber structure

1 files changed, 15 insertions, 7 deletions

diff --git a/src/main/java/kubatech/loaders/MobRecipeLoader.java b/src/main/java/kubatech/loaders/MobRecipeLoader.java
index 283c75391a..d3b02083e9 100644
--- a/src/main/java/kubatech/loaders/MobRecipeLoader.java
+++ b/src/main/java/kubatech/loaders/MobRecipeLoader.java
@@ -21,7 +21,7 @@ package kubatech.loaders;
 
 import static kubatech.api.utils.ModUtils.isClientSided;
 import static kubatech.api.utils.ModUtils.isDeobfuscatedEnvironment;
-import static kubatech.common.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber.MobNameToRecipeMap;
+import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber.MobNameToRecipeMap;
 
 import atomicstryker.infernalmobs.common.InfernalMobsCore;
 import atomicstryker.infernalmobs.common.MobModifier;
@@ -45,12 +45,12 @@ import java.util.stream.Collectors;
 import kubatech.Config;
 import kubatech.Tags;
 import kubatech.api.LoaderReference;
+import kubatech.api.network.LoadConfigPacket;
+import kubatech.api.utils.InfernalHelper;
 import kubatech.api.utils.GSONUtils;
 import kubatech.api.utils.InfernalHelper;
 import kubatech.api.utils.ModUtils;
-import kubatech.common.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber;
 import kubatech.nei.Mob_Handler;
-import kubatech.network.LoadConfigPacket;
 import minetweaker.MineTweakerAPI;
 import minetweaker.api.entity.IEntityDefinition;
 import minetweaker.api.item.IItemStack;
@@ -110,6 +110,7 @@ public class MobRecipeLoader {
         public final boolean alwaysinfernal;
         public static droplist infernaldrops;
         public final boolean isPeacefulAllowed;
+        public final EntityLiving entity;
 
         @SuppressWarnings("unchecked")
         public MobRecipe copy() {
@@ -119,7 +120,8 @@ public class MobRecipeLoader {
                     mMaxDamageChance,
                     infernalityAllowed,
                     alwaysinfernal,
-                    isPeacefulAllowed);
+                    isPeacefulAllowed,
+                    entity);
         }
 
         private MobRecipe(
@@ -128,13 +130,15 @@ public class MobRecipeLoader {
                 int mMaxDamageChance,
                 boolean infernalityAllowed,
                 boolean alwaysinfernal,
-                boolean isPeacefulAllowed) {
+                boolean isPeacefulAllowed,
+                EntityLiving entity) {
             this.mOutputs = mOutputs;
             this.mDuration = mDuration;
             this.mMaxDamageChance = mMaxDamageChance;
             this.infernalityAllowed = infernalityAllowed;
             this.alwaysinfernal = alwaysinfernal;
             this.isPeacefulAllowed = isPeacefulAllowed;
+            this.entity = entity;
         }
 
         @SuppressWarnings("unchecked")
@@ -193,6 +197,7 @@ public class MobRecipeLoader {
             mMaxDamageChance = maxdamagechance;
             // Powered spawner with octadic capacitor spawns ~22/min ~= 0.366/sec ~= 2.72s/spawn ~= 54.54t/spawn
             mDuration = 55 + 10 + (((int) e.getMaxHealth() / 5) * 10);
+            entity = e;
         }
 
         public ItemStack[] generateOutputs(Random rnd, GT_MetaTileEntity_ExtremeExterminationChamber MTE) {
@@ -476,7 +481,7 @@ public class MobRecipeLoader {
     }
 
     private static class dropCollector {
-        HashMap<GT_Utility.ItemId, Integer> damagableChecker = new HashMap<>();
+        final HashMap<GT_Utility.ItemId, Integer> damagableChecker = new HashMap<>();
         private boolean booksAlwaysRandomlyEnchanted = false;
 
         public void addDrop(droplist fdrops, ArrayList<EntityItem> listToParse, double chance) {
@@ -573,6 +578,7 @@ public class MobRecipeLoader {
                 return false;
             }
 
+            @SuppressWarnings("rawtypes")
             @Override
             public List getEntitiesWithinAABB(Class p_72872_1_, AxisAlignedBB p_72872_2_) {
                 return new ArrayList();
@@ -790,7 +796,7 @@ public class MobRecipeLoader {
 
             try {
                 Class<?> cl = e.getClass();
-                boolean detectedException = false;
+                boolean detectedException;
                 do {
                     detectedException = false;
                     try {
@@ -978,6 +984,7 @@ public class MobRecipeLoader {
 
             MobRecipe recipe = v.recipe;
             if (recipe != null) recipe = recipe.copy();
+            @SuppressWarnings("unchecked")
             ArrayList<MobDrop> drops = (ArrayList<MobDrop>) v.drops.clone();
 
             // MT Scripts should already be loaded here
@@ -1006,6 +1013,7 @@ public class MobRecipeLoader {
             GeneralMappedMob v = GeneralMobList.get(k);
             MobRecipe recipe = v.recipe;
             if (recipe != null) recipe = recipe.copy();
+            @SuppressWarnings("unchecked")
             ArrayList<MobDrop> drops = (ArrayList<MobDrop>) v.drops.clone();
 
             // MT Scripts should already be loaded here