Fix serverside file loading issues.

6 files changed, 14 insertions, 15 deletions

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
index 0a43ec6790..ec83d93870 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java
@@ -239,7 +239,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities))
             lines.add("CLASS = "+nbtType+" "+getClassType());
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE+SCAN_GET_COLOR+SCAN_GET_CHARGE+SCAN_GET_MASS, capabilities)) {
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS, capabilities)) {
             lines.add("NAME = "+getName());
             //lines.add("SYMBOL = "+getSymbol());
         }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java
index 2f8ae329c2..6032adc355 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java
@@ -182,7 +182,7 @@ public abstract class cElementalPrimitive extends cElementalDefinition {
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities))
             lines.add("CLASS = "+nbtType+" "+getClassType());
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE+SCAN_GET_COLOR+SCAN_GET_CHARGE+SCAN_GET_MASS, capabilities)) {
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = "+getName());
             lines.add("SYMBOL = "+getSymbol());
         }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java
index 199931793b..0c55f2540b 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java
@@ -1421,7 +1421,7 @@ public final class dAtomDefinition extends cElementalDefinition {
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities))
             lines.add("CLASS = "+nbtType+" "+getClassType());
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE+SCAN_GET_AMOUNT+SCAN_GET_COLOR+SCAN_GET_CHARGE+SCAN_GET_MASS, capabilities)) {
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = "+getName());
             lines.add("SYMBOL = "+getSymbol());
         }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java
index a5fbbe33fd..5c4c10f86d 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java
@@ -1,9 +1,6 @@
 package com.github.technus.tectech.elementalMatter.definitions.complex.atom;
 
 import com.github.technus.tectech.Util;
-import com.github.technus.tectech.auxiliary.Reference;
-import net.minecraft.client.Minecraft;
-import net.minecraft.util.ResourceLocation;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -28,8 +25,7 @@ public final class iaeaNuclide {
         String line="";
 
         try {
-            ResourceLocation loc = new ResourceLocation(Reference.MODID+":nuclides.csv");
-            BufferedReader reader = new BufferedReader(new InputStreamReader(Minecraft.getMinecraft().getResourceManager().getResource(loc).getInputStream()));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(iaeaNuclide.class.getResourceAsStream("nuclides.csv")));
             ArrayList<String[]> blockOfData=new ArrayList<>(4);
             while((line=reader.readLine())!=null) {
                 String[] split= Util.splitButDifferent(line,",");
@@ -44,32 +40,33 @@ public final class iaeaNuclide {
                 new iaeaNuclide(blockOfData.toArray(new String[0][]));
                 blockOfData.clear();
             }
+            reader.close();
         }catch (Exception e){
             System.out.println(line);
             e.printStackTrace();
         }
 
         try {
-            ResourceLocation loc = new ResourceLocation(Reference.MODID+":nuclidesTable.csv");
-            BufferedReader reader = new BufferedReader(new InputStreamReader(Minecraft.getMinecraft().getResourceManager().getResource(loc).getInputStream()));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(iaeaNuclide.class.getResourceAsStream("nuclidesTable.csv")));
             while((line=reader.readLine())!=null) {
                 String[] split= Util.splitButDifferent(line,",");
                 if(split.length!=47) throw new Error("Invalid count ("+split.length+") of separators in IAEA nuvlidesTable database " + line);
                 get(Integer.parseInt(split[0]),Integer.parseInt(split[1])).getMoreData(split);
             }
+            reader.close();
         }catch (Exception e){
             System.out.println(line);
             e.printStackTrace();
         }
 
         try {
-            ResourceLocation loc = new ResourceLocation(Reference.MODID+":energyLevels.csv");
-            BufferedReader reader = new BufferedReader(new InputStreamReader(Minecraft.getMinecraft().getResourceManager().getResource(loc).getInputStream()));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(iaeaNuclide.class.getResourceAsStream("energyLevels.csv")));
             while((line=reader.readLine())!=null) {
                 String[] split= Util.splitButDifferent(line,",");
                 if(split.length!=27) throw new Error("Invalid count ("+split.length+") of separators in IAEA energyLevels database " + line);
                 new energeticState(split);
             }
+            reader.close();
         }catch (Exception e){
             System.out.println(line);
             e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/hadron/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/hadron/dHadronDefinition.java
index 01c974ce7c..63d7d9ff75 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/hadron/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/hadron/dHadronDefinition.java
@@ -124,14 +124,14 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     @Override
     public String getName() {
         StringBuilder name= new StringBuilder(getSimpleName());
+        name.append(':');
         for (cElementalDefinitionStack quark : quarkStacks.values()) {
-            name.append(" ").append(quark.definition.getSymbol()).append(quark.amount);
+            name.append(' ').append(quark.definition.getSymbol()).append(quark.amount);
         }
         return name.toString();
     }
 
     private String getSimpleName() {
-        String name;
         switch (amount) {
             case 2:
                 return "Meson";
@@ -398,7 +398,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities))
             lines.add("CLASS = "+nbtType+" "+getClassType());
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE+SCAN_GET_AMOUNT, capabilities)) {
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = "+getSimpleName());
             //lines.add("SYMBOL = "+getSymbol());
         }
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index bcff2ddfaa..1fc1ddda22 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -10,6 +10,7 @@ import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
+import com.github.technus.tectech.thing.item.ElementalDefinitionScanStorage_EM;
 import com.github.technus.tectech.thing.item.ParametrizerMemoryCard;
 import cpw.mods.fml.common.ProgressManager;
 import cpw.mods.fml.relauncher.Side;
@@ -120,6 +121,7 @@ public final class MainLoader {
         DebugElementalInstanceContainer_EM.INSTANCE.setCreativeTab(mainTab);
         ConstructableTriggerItem.INSTANCE.setCreativeTab(mainTab);
         ParametrizerMemoryCard.INSTANCE.setCreativeTab(mainTab);
+        ElementalDefinitionScanStorage_EM.INSTANCE.setCreativeTab(mainTab);
     }
 
     private void registerExtraHazmats() {