From 614b1538f85731f7598dc9f527739f3203f29af7 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 19 Jul 2020 12:00:45 +0200
Subject: Cleanup DEBUG scanning of EM

---
 .../elementalMatter/core/cElementalInstanceStackMap.java      | 11 +++++------
 .../elementalMatter/core/stacks/cElementalInstanceStack.java  |  3 ++-
 .../hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
index 9ecbf5374e..96fd686ef8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
@@ -330,15 +330,14 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
     }
 
     public String[] getElementalInfo() {
-        String[] info = new String[map.size() * 4];
+        String[] info = new String[map.size()];
         int i = 0;
         for (cElementalInstanceStack instance : map.values()) {
-            info[i++] = EnumChatFormatting.BLUE + instance.definition.getName();
-            info[i++] = EnumChatFormatting.AQUA + instance.definition.getSymbol();
-            info[i++] = "Amount " + EnumChatFormatting.GREEN + instance.amount/ AVOGADRO_CONSTANT +" mol";
-            info[i++] = "LifeTime " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":instance.getLifeTime());
+            info[i++] = EnumChatFormatting.BLUE + instance.definition.getName()+
+                    " "+ EnumChatFormatting.AQUA + instance.definition.getSymbol()+ EnumChatFormatting.RESET+
+                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E",instance.amount/ AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
+                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
         }
-
         return info;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
index dfe67024dd..9d38e283db 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
@@ -18,6 +18,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.DoubleCount.*;
 import static java.lang.Math.min;
+import static java.lang.Math.ulp;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -249,7 +250,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         //    }
         //}
         if(newAmount==amount) {
-            return null;//nothing decayed
+            newAmount-=ulp(newAmount);
         } else if(newAmount<1) {
             return decayCompute(decays, lifeTimeMult, newProductsAge, newEnergyLevel);
         }
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 10bd099366..5b09e05fe5 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
@@ -244,7 +244,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
 
     @Override
     public String[] getInfoData() {
-        if (TecTech.configTecTech.EASY_SCAN) {
+        if (TecTech.configTecTech.EASY_SCAN || DEBUG_MODE) {
             if (id > 0) {
                 if (content == null || content.size() == 0) {
                     return new String[]{translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.AQUA + id, translateToLocalFormatted("tt.keyphrase.No_Stacks", clientLocale)};
-- 
cgit