Enlongate Age

3 files changed, 13 insertions, 10 deletions

diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDecay.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDecay.java
index 1098ac3a1f..086d7c164e 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDecay.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDecay.java
@@ -46,7 +46,7 @@ public final class cElementalDecay {
         this.probability=probability;
     }
 
-    public cElementalInstanceStackTree getResults(float lifeMult, int age, int energy, int amountDecaying) {
+    public cElementalInstanceStackTree getResults(float lifeMult, long age, int energy, int amountDecaying) {
         cElementalInstanceStackTree decayResult = new cElementalInstanceStackTree();
         if(outputStacks == null) return decayResult;//This is to prevent null pointer exceptions.
                 //Deny decay code is in instance!
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStack.java
index bcaae7ca03..2fbbf3a2fd 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStack.java
@@ -18,7 +18,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
     public int energy;
     //byte color; 0=R 1=G 2=B 0=C 1=M 2=Y, else ignored
     private byte color;
-    public int age;
+    public long age;
     public int amount;
     private float lifeTime;
     private float lifeTimeMult;
@@ -27,7 +27,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         this(stackSafe.definition, stackSafe.amount, 1F, 0, 0);
     }
 
-    public cElementalInstanceStack(cElementalDefinitionStack stackSafe, float lifeTimeMult, int age, int energy) {
+    public cElementalInstanceStack(cElementalDefinitionStack stackSafe, float lifeTimeMult, long age, int energy) {
         this(stackSafe.definition,stackSafe.amount,lifeTimeMult,age,energy);
     }
 
@@ -35,7 +35,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         this(defSafe, amount, 1F, 0, 0);
     }
 
-    public cElementalInstanceStack(iElementalDefinition defSafe, int amount, float lifeTimeMult, int age, int energy) {
+    public cElementalInstanceStack(iElementalDefinition defSafe, int amount, float lifeTimeMult, long age, int energy) {
         this.definition = defSafe==null?null__:defSafe;
         byte color = definition.getColor();
         if (color < (byte) 0) {//transforms colorable??? into proper color
@@ -106,7 +106,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         return decay(1F, age, 0);
     }
 
-    public cElementalInstanceStackTree decay(Float lifeTimeMult, int age, int postEnergize) {
+    public cElementalInstanceStackTree decay(Float lifeTimeMult, long age, int postEnergize) {
         if (this.energy > 0) {
             this.energy--;
             return decayCompute(definition.getEnergeticDecayInstant(), lifeTimeMult, age, postEnergize + this.energy);
@@ -120,7 +120,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         return null;//return null since decay cannot be achieved
     }
 
-    private cElementalInstanceStackTree decayCompute(cElementalDecay[] decays, float lifeTimeMult, int age, int energy) {
+    private cElementalInstanceStackTree decayCompute(cElementalDecay[] decays, float lifeTimeMult, long age, int energy) {
         if (decays == null) return null;//Can not decay so it wont
         else if (decays.length == 0) return new cElementalInstanceStackTree();//provide non null 0 length array for annihilation
         else if (decays.length == 1) {//only one type of decay :D, doesn't need dead end
@@ -229,7 +229,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         nbt.setInteger("q",amount);
         nbt.setInteger("e",energy);
         nbt.setByte("c",color);
-        nbt.setInteger("a",age);
+        nbt.setLong("a",age);
         nbt.setFloat("m",lifeTimeMult);
         return nbt;
     }
@@ -238,7 +238,10 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         NBTTagCompound definition=nbt.getCompoundTag("d");
         cElementalInstanceStack instance= new cElementalInstanceStack(
                 cElementalDefinition.fromNBT(definition),
-                nbt.getInteger("q"),nbt.getFloat("m"),nbt.getInteger("a"),nbt.getInteger("e"));
+                nbt.getInteger("q"),
+                nbt.getFloat("m"),
+                nbt.getLong("a"),
+                nbt.getInteger("e"));
         instance.setColor(nbt.getByte("c"));
         return instance;
     }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eQuarkDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eQuarkDefinition.java
index 275ebcef64..43514869c7 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eQuarkDefinition.java
@@ -25,7 +25,7 @@ public final class eQuarkDefinition extends cElementalPrimitive {
     }
 
     public static void run() {
-        quark_u.init(quark_u_, 90F, 3, -1,
+        quark_u.init(quark_u_, 1e35F, 3, -1,
                 new cElementalDecay(0.9F, quark_d, eLeptonDefinition.lepton_e_, eNeutrinoDefinition.lepton_Ve),
                 new cElementalDecay(0.050778116F, quark_s/*,lepton_m_,lepton_Vm*/),
                 new cElementalDecay(1.23201e-5F, quark_b/*,lepton_t_,lepton_Vt*/),
@@ -41,7 +41,7 @@ public final class eQuarkDefinition extends cElementalPrimitive {
                 new cElementalDecay(7.51689e-5F, quark_d, eLeptonDefinition.lepton_t_, eNeutrinoDefinition.lepton_Vt),
                 eBosonDefinition.deadEnd);//makes photons and don't care
 
-        quark_d.init(quark_d_, 46F, 3, -1,
+        quark_d.init(quark_d_, 1e35F, 3, -1,
                 new cElementalDecay(0.9F, quark_u, eLeptonDefinition.lepton_e, eNeutrinoDefinition.lepton_Ve_),
                 new cElementalDecay(0.05071504F, quark_c/*,lepton_m,lepton_Vm_*/),
                 new cElementalDecay(7.51689e-5F, quark_t/*,lepton_t,lepton_Vt_*/),