bug fixes

2 files changed, 32 insertions, 15 deletions

diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index 2822a78c23..a054961b72 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -2,7 +2,6 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.auxiliary.TecTechConfig;
 import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap;
 import com.github.technus.tectech.elementalMatter.classes.tElementalException;
 import com.github.technus.tectech.elementalMatter.interfaces.iElementalInstanceContainer;
@@ -23,8 +22,9 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.FluidStack;
 
 import static com.github.technus.tectech.CommonValues.*;
-import static gregtech.api.enums.Dyes.MACHINE_METAL;
 import static com.github.technus.tectech.Util.V;
+import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE;
+import static gregtech.api.enums.Dyes.MACHINE_METAL;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity;
 
 /**
@@ -97,7 +97,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         try {
             content = cElementalInstanceStackMap.fromNBT(aNBT.getCompoundTag("eM_Stacks"));
         } catch (tElementalException e) {
-            if (TecTechConfig.DEBUG_MODE) e.printStackTrace();
+            if (DEBUG_MODE) e.printStackTrace();
             if (content == null) content = new cElementalInstanceStackMap();
         }
     }
@@ -212,19 +212,23 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
 
     @Override
     public String[] getInfoData() {
-        if (id > 0) {
-            if (content == null || content.size() == 0)
-                return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "No Stacks"};
-            else {
-                final String[] lines = content.getElementalInfo();
-                final String[] output = new String[lines.length + 1];
-                output[0] = "ID: " + EnumChatFormatting.AQUA + id;
-                System.arraycopy(lines, 0, output, 1, lines.length);
-                return output;
+        if(DEBUG_MODE) {
+            if (id > 0) {
+                if (content == null || content.size() == 0)
+                    return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "No Stacks"};
+                else {
+                    final String[] lines = content.getElementalInfo();
+                    final String[] output = new String[lines.length + 1];
+                    output[0] = "ID: " + EnumChatFormatting.AQUA + id;
+                    System.arraycopy(lines, 0, output, 1, lines.length);
+                    return output;
+                }
             }
+            if (content == null || content.size() == 0) return new String[]{"No Stacks"};
+            return content.getElementalInfo();
+        } else {
+            return new String[0];
         }
-        if (content == null || content.size() == 0) return new String[]{"No Stacks"};
-        return content.getElementalInfo();
     }
 
     public float updateSlots() {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index cb376c6ff4..989256d7d3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -85,7 +85,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     public boolean EM_checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
         if (!EM_StructureCheckAdvanced(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0))
             return false;
-        return eInputHatches.size() != 1 || eOutputHatches.size() != 1 && eOutputHatches.get(0).getBaseMetaTileEntity().getFrontFacing() == iGregTechTileEntity.getFrontFacing();
+        return eInputHatches.size() == 1 && eOutputHatches.size() == 1 && eOutputHatches.get(0).getBaseMetaTileEntity().getFrontFacing() == iGregTechTileEntity.getFrontFacing();
     }
 
     @Override
@@ -218,6 +218,19 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     }
 
     @Override
+    public boolean onRunningTick(ItemStack aStack) {
+        if(computationRemaining<=0) {
+            computationRemaining=0;
+            mProgresstime=mMaxProgresstime;
+            return true;
+        }else{
+            computationRemaining-=eAvailableData;
+            mProgresstime=1;
+            return super.onRunningTick(aStack);
+        }
+    }
+
+    @Override
     public void EM_outputFunction() {
         if (eRecipe != null && ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)){