From ff8d6f4a933b59ea884db300f22f0218d0d3630b Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Sat, 16 Dec 2017 00:50:36 +0100
Subject: Remove cycle, fix some more stuff.

---
 src/main/java/com/github/technus/tectech/TecTech.java              | 2 +-
 .../elementalMatter/core/templates/iElementalDefinition.java       | 2 +-
 .../tectech/thing/item/ElementalDefinitionScanStorage_EM.java      | 7 +++----
 .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java   | 6 ++----
 4 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 952e57ac14..df45b6585a 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -28,7 +28,7 @@ import java.util.HashSet;
 import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE;
 
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);"
-        + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore;" + "after:Thaumcraft;" + "after:dreamcraft;" + "after:miscutils;")
+        + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore;" + "after:Thaumcraft;" + "after:dreamcraft;")
 public class TecTech {
     @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE)
     public static CommonProxy proxy;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java
index bbdd90589d..c34bca652e 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java
@@ -68,7 +68,7 @@ public abstract class iElementalDefinition implements Comparable<iElementalDefin
 
     public abstract iElementalDefinition clone();
 
-    public final int compareClassID(iElementalDefinition obj) {
+    final int compareClassID(iElementalDefinition obj) {
         return ((int) getClassType()) - obj.getClassType();
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index 2991330564..b650e4a564 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -45,7 +45,7 @@ public class ElementalDefinitionScanStorage_EM extends Item {
     public static void clearContent(ItemStack containerItem){
         if(containerItem.getItem() instanceof ElementalDefinitionScanStorage_EM){
             if (containerItem.stackTagCompound == null) return;
-            containerItem.stackTagCompound.removeTag("elementalInfo");
+            containerItem.stackTagCompound=null;
             return;
         }
         return;
@@ -56,7 +56,7 @@ public class ElementalDefinitionScanStorage_EM extends Item {
         aList.add(CommonValues.TEC_MARK_EM);
         try {
             if  (aStack.stackTagCompound != null &&  aStack.stackTagCompound.hasKey("elementalInfo")) {
-                aList.add("Scan result:");
+                aList.add("Contains scan result");
                 if(DEBUG_MODE)
                     Collections.addAll(aList, Util.infoFromNBT(aStack.stackTagCompound.getCompoundTag("elementalInfo")));
             } else {
@@ -82,7 +82,7 @@ public class ElementalDefinitionScanStorage_EM extends Item {
     @Override
     public IIcon getIconIndex(ItemStack itemStack) {
         NBTTagCompound tagCompound=itemStack.stackTagCompound;
-        if(tagCompound!=null && tagCompound.hasKey("info"))
+        if(tagCompound!=null && tagCompound.hasKey("elementalInfo"))
             return online;
         return offline;
     }
@@ -90,7 +90,6 @@ public class ElementalDefinitionScanStorage_EM extends Item {
     @Override
     public void getSubItems(Item item, CreativeTabs tab, List list) {
         ItemStack that = new ItemStack(this, 1);
-        that.setTagCompound(new NBTTagCompound());
         list.add(that);
     }
 }
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 6a7dcf9dda..60af83bdd7 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
@@ -37,11 +37,9 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileE
  */
 public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     public static final int SCAN_DO_NOTHING=0,
-            SCAN_GET_MASS=1, SCAN_GET_CHARGE=2, SCAN_GET_CLASS_TYPE=4, SCAN_GET_NOMENCLATURE=8,
-            SCAN_GET_TIMESPAN_INFO=16, SCAN_GET_DECAY_INFO=32,
+            SCAN_GET_MASS=1, SCAN_GET_CHARGE=2, SCAN_GET_CLASS_TYPE=4, SCAN_GET_NOMENCLATURE=8, SCAN_GET_TIMESPAN_INFO=16,
             SCAN_GET_AMOUNT=256, SCAN_GET_COLOR=512, SCAN_GET_ENERGY_LEVEL=1024, SCAN_GET_AGE=2048, SCAN_GET_TIMESPAN_MULT =4096,
-            SCAN_GET_ENERGY_STATES=32768, SCAN_GET_ENERGY_STATES_DECAYS=65536,
-            SCAN_GET_DEPTH_LEVEL=-2147483648;
+            SCAN_GET_DEPTH_LEVEL= 8192, SCAN_GET_ENERGY_STATES=16384;
 
     private TT_recipe.TT_EMRecipe.TT_EMRecipe eRecipe;
     private cElementalDefinitionStack objectResearched;
-- 
cgit