From 684776a09d76d84fd11c7d7df7b34d8d09a5edef Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Sat, 16 Dec 2017 01:23:56 +0100
Subject: change some strings

---
 .../thaumcraft/definitions/dComplexAspectDefinition.java      |  4 +---
 .../elementalMatter/core/templates/cElementalPrimitive.java   |  4 +---
 .../definitions/complex/atom/dAtomDefinition.java             | 11 +++++++----
 .../definitions/complex/hadron/dHadronDefinition.java         |  4 +---
 4 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src')

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 ec83d93870..7eed0b309e 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
@@ -249,10 +249,8 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
             lines.add(getColor()<0?"NOT COLORED":"CARRIES COLOR");
         if(Util.areBitsSet(SCAN_GET_MASS,capabilities))
             lines.add("MASS = "+getMass()+" eV/c\u00b2");
-        //TODO decay info - no energy states info here
         if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add(isTimeSpanHalfLife()?"TIME SPAN IS HALF LIFE":"TIME SPAN IS LIFE TIME");
-            lines.add("TIME SPAN = "+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("LIFE TIME = "+getRawTimeSpan(energyLevel)+ " s");
             lines.add("    "+"At current energy level");
         }
     }
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 6032adc355..b44332d5c8 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
@@ -192,10 +192,8 @@ public abstract class cElementalPrimitive extends cElementalDefinition {
             lines.add(getColor()<0?"NOT COLORED":"CARRIES COLOR");
         if(Util.areBitsSet(SCAN_GET_MASS,capabilities))
             lines.add("MASS = "+getMass()+" eV/c\u00b2");
-        //TODO decay info - no energy states info here
         if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add(isTimeSpanHalfLife()?"TIME SPAN IS HALF LIFE":"TIME SPAN IS LIFE TIME");
-            lines.add("TIME SPAN = "+getRawTimeSpan(energyLevel)+ " s");
+            lines.add((isTimeSpanHalfLife()?"HALF LIFE = ":"LIFE TIME = ")+getRawTimeSpan(energyLevel)+ " s");
             lines.add("    "+"At current energy level");
         }
     }
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 0c55f2540b..75aabe9af3 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
@@ -1431,11 +1431,14 @@ public final class dAtomDefinition extends cElementalDefinition {
             lines.add(getColor()<0?"NOT COLORED":"CARRIES COLOR");
         if(Util.areBitsSet(SCAN_GET_MASS,capabilities))
             lines.add("MASS = "+getMass()+" eV/c\u00b2");
-        //TODO decay info - no energy states info here
+        if(iaeaDefinitionExistsAndHasEnergyLevels){
+            for(int i=1;i<iaea.energeticStatesArray.length;i++){
+                lines.add("ENERGY LEVEL "+i+" = "+iaea.energeticStatesArray[i].energy+" eV");
+            }
+        }
         if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add(isTimeSpanHalfLife()?"TIME SPAN IS HALF LIFE":"TIME SPAN IS LIFE TIME");
-            lines.add("TIME SPAN = "+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    "+"At current energy level");
+            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("    At current energy level");
         }
     }
 }
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 63d7d9ff75..902f79b3f4 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
@@ -408,10 +408,8 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
             lines.add(getColor()<0?"NOT COLORED":"CARRIES COLOR");
         if(Util.areBitsSet(SCAN_GET_MASS,capabilities))
             lines.add("MASS = "+getMass()+" eV/c\u00b2");
-        //TODO decay info - no energy states info here
         if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add(isTimeSpanHalfLife()?"TIME SPAN IS HALF LIFE":"TIME SPAN IS LIFE TIME");
-            lines.add("TIME SPAN = "+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
             lines.add("    "+"At current energy level");
         }
     }
-- 
cgit