Refactors initial apect support

12 files changed, 228 insertions, 43 deletions

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 492de1b71e..0a840a20d8 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
@@ -14,7 +14,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
     public final iElementalDefinition definition;
     //energy - if positive then particle should try to decay
     public int energy;
-    //byte color; 0=Red 1=Green 2=Blue 3=Order 4=Earth 5=Water 0=Cyan 1=Magenta 2=Yellow 3=Entropy 4=Air 5=Fire, else ignored (-1 - uncolorable)
+    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
     private byte color;
     public long age;
     public int amount;
@@ -36,7 +36,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
     public cElementalInstanceStack(iElementalDefinition defSafe, int amount, float lifeTimeMult, long age, int energy) {
         this.definition = defSafe == null ? null__ : defSafe;
         byte color = definition.getColor();
-        if (color < 0 || color >= 3) {//transforms colorable??? into proper color
+        if (color < 0 || color > 2) {//transforms colorable??? into proper color
             this.color = color;
         } else {
             this.color = (byte) (TecTech.Rnd.nextInt(3));
@@ -70,17 +70,17 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         return definition;
     }
 
-    public final byte getColor() {
+    public byte getColor() {
         return color;
     }
 
-    public final byte setColor(byte color) {//does not allow changing magic element
-        if (this.color < 0 || this.color >= 3 || color<0 || color>=3) return this.color;
+    public byte setColor(byte color) {//does not allow changing magic element
+        if (this.color < 0 || this.color > 2 || color<0 || color>=3) return this.color;
         return this.color = color;
     }
 
-    public final byte nextColor() {//does not allow changing magic element
-        if (this.color < 0 || this.color >= 3 ) return this.color;
+    public byte nextColor() {//does not allow changing magic element
+        if (this.color < 0 || this.color > 2 ) return this.color;
         return this.color = (byte) (TecTech.Rnd.nextInt(3));
     }
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java
index bada3f4799..2e489835e2 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java
@@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -21,7 +22,7 @@ public abstract class cElementalPrimitive extends cElementalDefinition {
 
     private static final byte nbtType = (byte) 'p';
 
-    public static final Map<Integer, iElementalDefinition> bindsBO = new TreeMap<>();
+    public static final Map<Integer, iElementalDefinition> bindsBO = new HashMap<>();
 
     public final String name;
     public final String symbol;
@@ -29,7 +30,7 @@ public abstract class cElementalPrimitive extends cElementalDefinition {
     public final float mass;
     //int -electric charge in 1/3rds of electron charge for optimization
     public final byte charge;
-    //byte color; 0=Red 1=Green 2=Blue 3=Order 4=Earth 5=Water 0=Cyan 1=Magenta 2=Yellow 3=Entropy 4=Air 5=Fire, else ignored (-1 - uncolorable)
+    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
     public final byte color;
     //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
     public final byte type;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/cPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/cPrimitiveDefinition.java
index c64f987d0f..941b5c27fa 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/cPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/cPrimitiveDefinition.java
@@ -11,12 +11,13 @@ import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay
  * Created by danie_000 on 22.10.2016.
  */
 public final class cPrimitiveDefinition extends cElementalPrimitive {
-    public static final cPrimitiveDefinition debug__ = new cPrimitiveDefinition("Fallback of a bug", "!", 0, 0f, 0, Integer.MIN_VALUE, Integer.MIN_VALUE);
-    public static final cPrimitiveDefinition null__ = new cPrimitiveDefinition("This is a bug", ".", 0, 0F, 0, -3, Integer.MAX_VALUE);
-    //Never create null__ particle - if u need fallback use debug__
-    public static final cPrimitiveDefinition space__ = new cPrimitiveDefinition("Space", "_", 0, 0F, 0, -4, 0);
-    public static final cPrimitiveDefinition magic = new cPrimitiveDefinition("Magic", "Ma", 4, -1F, 0, 0, 1);
-    public static final cPrimitiveDefinition magic_ = new cPrimitiveDefinition("Antimagic", "~Ma", -4, -1F, 0, 0, 2);
+    public static final cPrimitiveDefinition
+            debug__ = new cPrimitiveDefinition("Fallback of a bug", "!", 0, 0f, 0, Integer.MIN_VALUE, Integer.MIN_VALUE),
+        //Never create null__ particle - if u need fallback use debug__
+            null__ = new cPrimitiveDefinition("This is a bug", ".", 0, 0F, 0, -3, Integer.MAX_VALUE),
+            space__ = new cPrimitiveDefinition("Space", "_", 0, 0F, 0, -4, 0),
+            magic = new cPrimitiveDefinition("Magic", "Ma", 4, -1F, 0, 0, 1),
+            magic_ = new cPrimitiveDefinition("Antimagic", "~Ma", -4, -1F, 0, 0, 2);
 
     protected cPrimitiveDefinition(String name, String symbol, int type, float mass, int charge, int color, int ID) {
         super(name, symbol, type, mass, charge, color, ID);
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
index e6f37373cc..5b392dc820 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
@@ -47,7 +47,7 @@ public final class dAtomDefinition extends cElementalDefinition {
     //private final ItemStack itemThing;
     public final int isotope;
     public final int element;
-    private cElementalDefinitionStackMap elementalStacks;
+    private final cElementalDefinitionStackMap elementalStacks;
 
     //stable is rawLifeTime>=10^9
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dComplexAspectDefinition.java
new file mode 100644
index 0000000000..17cec96169
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dComplexAspectDefinition.java
@@ -0,0 +1,135 @@
+package com.github.technus.tectech.elementalMatter.definitions;
+
+import com.github.technus.tectech.auxiliary.TecTechConfig;
+import com.github.technus.tectech.elementalMatter.classes.*;
+import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
+import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay.noDecay;
+
+/**
+ * Created by Tec on 06.05.2017.
+ */
+public class dComplexAspectDefinition extends cElementalDefinition {
+    //TODO aspect binding
+
+    private static final byte nbtType = (byte) 'c';
+
+    private final cElementalDefinitionStackMap aspectStacks;
+
+    public dComplexAspectDefinition(cElementalDefinitionStack[] tree) throws tElementalException{//todo constructors
+        aspectStacks=new cElementalDefinitionStackMap();
+    }
+
+    @Override
+    public String getName() {//todo name
+        return "Aspect: ";
+    }
+
+    @Override
+    public String getSymbol() {
+        String symbol = "";
+        for (cElementalDefinitionStack quark : aspectStacks.values())
+            for (int i = 0; i < quark.amount; i++)
+                symbol += quark.definition.getSymbol();
+        return symbol;
+    }
+
+    @Override
+    public NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setByte("t", nbtType);
+        cElementalDefinitionStack[] quarkStacksValues = aspectStacks.values();
+        nbt.setInteger("i", quarkStacksValues.length);
+        for (int i = 0; i < quarkStacksValues.length; i++)
+            nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT());
+        return nbt;
+    }
+
+    public static iElementalDefinition fromNBT(NBTTagCompound nbt) {
+        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < stacks.length; i++)
+            stacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+        try {
+            return new dComplexAspectDefinition(stacks);
+        } catch (tElementalException e) {
+            if (TecTechConfig.DEBUG_MODE) e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    public float getRawLifeTime() {
+        return -1;
+    }
+
+    @Override
+    public int getCharge() {
+        return 0;
+    }
+
+    @Override
+    public byte getType() {
+        return 0;
+    }
+
+    @Override
+    public byte getColor() {
+        return -1;
+    }
+
+    @Override
+    public cElementalDefinitionStackMap getSubParticles() {
+        return aspectStacks;
+    }
+
+    @Override
+    public cElementalDecay[] getEnergeticDecayInstant() {
+        return new cElementalDecay[]{new cElementalDecay(0.75F, aspectStacks), eBosonDefinition.deadEnd};
+    }
+
+    @Override
+    public cElementalDecay[] getNaturalDecayInstant() {
+        return noDecay;
+    }
+
+    @Override
+    public cElementalDecay[] getDecayArray() {
+        return noDecay;
+    }
+
+    @Override
+    public float getMass() {
+        return 0;
+    }
+
+    @Override
+    public FluidStack materializesIntoFluid() {
+        return null;
+    }
+
+    @Override
+    public ItemStack materializesIntoItem() {
+        return null;
+    }
+
+    @Override
+    public iElementalDefinition getAnti() {
+        return null;
+    }
+
+    public static void run() {
+        try {
+            cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class));
+        } catch (Exception e) {
+            if (TecTechConfig.DEBUG_MODE) e.printStackTrace();
+        }
+    }
+
+    @Override
+    public byte getClassType() {
+        return -96;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
index 3cc109aa27..ed91c43d32 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java
@@ -37,7 +37,7 @@ public final class dHadronDefinition extends cElementalDefinition {
     public final byte type;
     //private final FluidStack fluidThing;
     //private final ItemStack itemThing;
-    private cElementalDefinitionStackMap quarkStacks;
+    private final cElementalDefinitionStackMap quarkStacks;
 
     @Deprecated
     public dHadronDefinition(eQuarkDefinition... quarks) throws tElementalException {
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java
index a8778a09be..1e2ff66d85 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java
@@ -8,8 +8,9 @@ import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive;
  * Created by danie_000 on 22.10.2016.
  */
 public final class eBosonDefinition extends cElementalPrimitive {
-    public static final eBosonDefinition boson_Y__ = new eBosonDefinition("Photon", "\u03b3", 0, 1e-18F, 0, -1, 27);
-    public static final eBosonDefinition boson_H__ = new eBosonDefinition("Higgs", "\u0397", 0, 126.09e9F, 0, -2, 28);
+    public static final eBosonDefinition
+            boson_Y__ = new eBosonDefinition("Photon", "\u03b3", 0, 1e-18F, 0, -1, 27),
+            boson_H__ = new eBosonDefinition("Higgs", "\u0397", 0, 126.09e9F, 0, -2, 28);
     //deadEnd
     public static final cElementalDecay deadEnd = new cElementalDecay(boson_Y__, boson_Y__);
     public static final cElementalDecay deadEndHalf = new cElementalDecay(boson_Y__);
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java
index 42c82b5232..b54f0a536d 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java
@@ -10,12 +10,14 @@ import static com.github.technus.tectech.elementalMatter.definitions.eNeutrinoDe
  * Created by danie_000 on 22.10.2016.
  */
 public final class eLeptonDefinition extends cElementalPrimitive {
-    public static final eLeptonDefinition lepton_e = new eLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6F, -3, -1, 15);
-    public static final eLeptonDefinition lepton_m = new eLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6F, -3, -1, 17);
-    public static final eLeptonDefinition lepton_t = new eLeptonDefinition("Tauon", "\u03c4-", 3, 1776.83e6F, -3, -1, 19);
-    public static final eLeptonDefinition lepton_e_ = new eLeptonDefinition("Positron", "\u03b2+", -1, 0.511e6F, 3, -1, 16);
-    public static final eLeptonDefinition lepton_m_ = new eLeptonDefinition("Antimuon", "\u03bc+", -2, 105.658e6F, 3, -1, 18);
-    public static final eLeptonDefinition lepton_t_ = new eLeptonDefinition("Antitauon", "\u03c4+", -3, 1776.83e6F, 3, -1, 20);
+    public static final eLeptonDefinition
+            lepton_e = new eLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6F, -3, -1, 15),
+            lepton_m = new eLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6F, -3, -1, 17),
+            lepton_t = new eLeptonDefinition("Tauon", "\u03c4-", 3, 1776.83e6F, -3, -1, 19),
+            lepton_e_ = new eLeptonDefinition("Positron", "\u03b2+", -1, 0.511e6F, 3, -1, 16),
+            lepton_m_ = new eLeptonDefinition("Antimuon", "\u03bc+", -2, 105.658e6F, 3, -1, 18),
+            lepton_t_ = new eLeptonDefinition("Antitauon", "\u03c4+", -3, 1776.83e6F, 3, -1, 20);
+
     public static final cElementalDefinitionStack lepton_e1 = new cElementalDefinitionStack(lepton_e, 1);
     public static final cElementalDefinitionStack lepton_e_1 = new cElementalDefinitionStack(lepton_e_, 1);
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eNeutrinoDefinition.java
index 19c5d36a5a..947cc7c823 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/eNeutrinoDefinition.java
@@ -8,12 +8,14 @@ import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive;
  * Created by danie_000 on 22.10.2016.
  */
 public final class eNeutrinoDefinition extends cElementalPrimitive {
-    public static final eNeutrinoDefinition lepton_Ve = new eNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0F, 0, -1, 21);
-    public static final eNeutrinoDefinition lepton_Vm = new eNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6F, 0, -1, 23);
-    public static final eNeutrinoDefinition lepton_Vt = new eNeutrinoDefinition("Tauon neutrino", "\u03bd\u03c4", 3, 15e6F, 0, -1, 25);
-    public static final eNeutrinoDefinition lepton_Ve_ = new eNeutrinoDefinition("Positron neutrino", "~\u03bd\u03b2", -1, 2e0F, 0, -1, 22);
-    public static final eNeutrinoDefinition lepton_Vm_ = new eNeutrinoDefinition("Antimuon neutrino", "~\u03bd\u03bc", -2, 0.15e6F, 0, -1, 24);
-    public static final eNeutrinoDefinition lepton_Vt_ = new eNeutrinoDefinition("Antitauon neutrino", "~\u03bd\u03c4", -3, 15e6F, 0, -1, 26);
+    public static final eNeutrinoDefinition
+            lepton_Ve = new eNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0F, 0, -1, 21),
+            lepton_Vm = new eNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6F, 0, -1, 23),
+            lepton_Vt = new eNeutrinoDefinition("Tauon neutrino", "\u03bd\u03c4", 3, 15e6F, 0, -1, 25),
+            lepton_Ve_ = new eNeutrinoDefinition("Positron neutrino", "~\u03bd\u03b2", -1, 2e0F, 0, -1, 22),
+            lepton_Vm_ = new eNeutrinoDefinition("Antimuon neutrino", "~\u03bd\u03bc", -2, 0.15e6F, 0, -1, 24),
+            lepton_Vt_ = new eNeutrinoDefinition("Antitauon neutrino", "~\u03bd\u03c4", -3, 15e6F, 0, -1, 26);
+
     public static final cElementalDefinitionStack lepton_Ve1 = new cElementalDefinitionStack(lepton_Ve, 1);
     public static final cElementalDefinitionStack lepton_Ve_1 = new cElementalDefinitionStack(lepton_Ve_, 1);
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/ePrimalAspectDefinition.java
new file mode 100644
index 0000000000..72ceccf412
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/ePrimalAspectDefinition.java
@@ -0,0 +1,38 @@
+package com.github.technus.tectech.elementalMatter.definitions;
+
+import static com.github.technus.tectech.elementalMatter.classes.cElementalDecay.noDecay;
+import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive;
+
+/**
+ * Created by Tec on 06.05.2017.
+ */
+public class ePrimalAspectDefinition extends cElementalPrimitive {
+    public static final ePrimalAspectDefinition
+            magic_order = new ePrimalAspectDefinition("Order", "o`", 0, 0F, 0, -1, 30),
+            magic_entropy_ = new ePrimalAspectDefinition("Entropy", "e`", 0, 0F, 0, -1, 31),
+            magic_water = new ePrimalAspectDefinition("Water", "w`", 0, 0F, 0, -1, 32),
+            magic_fire_ = new ePrimalAspectDefinition("Fire", "f`", 0, 0F, 0, -1, 33),
+            magic_earth = new ePrimalAspectDefinition("Earth", "e`", 0, 0F, 0, -1, 34),
+            magic_air_ = new ePrimalAspectDefinition("Air", "a`", 0, 0F, 0, -1, 35);
+
+    private ePrimalAspectDefinition(String name, String symbol, int type, float mass, int charge, int color, int ID) {
+        super(name, symbol, type, mass, charge, color, ID);
+    }
+
+    public static void run() {
+        magic_order.init(magic_entropy_, -1F, -1, -1, noDecay);
+        magic_entropy_.init(magic_order, -1F, -1, -1, noDecay);
+        magic_water.init(magic_fire_, -1F, -1, -1, noDecay);
+        magic_fire_.init(magic_water, -1F, -1, -1, noDecay);
+        magic_earth.init(magic_air_, -1F, -1, -1, noDecay);
+        magic_air_.init(magic_earth, -1F, -1, -1, noDecay);
+    }
+
+    @Override
+    public String getName() {
+        return "Primal: " + name;
+    }
+
+    //TODO aspect binding
+}
+
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 f7b311c201..3b5d60cf20 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
@@ -7,18 +7,19 @@ import com.github.technus.tectech.elementalMatter.classes.cElementalPrimitive;
  * Created by danie_000 on 22.10.2016.
  */
 public final class eQuarkDefinition extends cElementalPrimitive {
-    public static final eQuarkDefinition quark_u = new eQuarkDefinition("Up", "u", 1, 2.3e6F, 2, 0, 3);
-    public static final eQuarkDefinition quark_c = new eQuarkDefinition("Charm", "c", 2, 1.29e9F, 2, 0, 9);
-    public static final eQuarkDefinition quark_t = new eQuarkDefinition("Top", "t", 3, 172.44e9F, 2, 0, 13);
-    public static final eQuarkDefinition quark_d = new eQuarkDefinition("Down", "d", 1, 4.8e6F, -1, 0, 5);
-    public static final eQuarkDefinition quark_s = new eQuarkDefinition("Strange", "s", 2, 95e6F, -1, 0, 7);
-    public static final eQuarkDefinition quark_b = new eQuarkDefinition("Bottom", "b", 3, 4.65e9F, -1, 0, 11);
-    public static final eQuarkDefinition quark_u_ = new eQuarkDefinition("AntiUp", "~u", -1, 2.3e6F, -2, 0, 4);
-    public static final eQuarkDefinition quark_c_ = new eQuarkDefinition("AntiCharm", "~c", -2, 1.29e9F, -2, 0, 10);
-    public static final eQuarkDefinition quark_t_ = new eQuarkDefinition("AntiTop", "~t", -3, 172.44e9F, -2, 0, 14);
-    public static final eQuarkDefinition quark_d_ = new eQuarkDefinition("AntiDown", "~d", -1, 4.8e6F, 1, 0, 6);
-    public static final eQuarkDefinition quark_s_ = new eQuarkDefinition("AntiStrange", "~s", -2, 95e6F, 1, 0, 8);
-    public static final eQuarkDefinition quark_b_ = new eQuarkDefinition("AntiBottom", "~b", -3, 4.65e9F, 1, 0, 12);
+    public static final eQuarkDefinition
+            quark_u = new eQuarkDefinition("Up", "u", 1, 2.3e6F, 2, 0, 3),
+            quark_c = new eQuarkDefinition("Charm", "c", 2, 1.29e9F, 2, 0, 9),
+            quark_t = new eQuarkDefinition("Top", "t", 3, 172.44e9F, 2, 0, 13),
+            quark_d = new eQuarkDefinition("Down", "d", 1, 4.8e6F, -1, 0, 5),
+            quark_s = new eQuarkDefinition("Strange", "s", 2, 95e6F, -1, 0, 7),
+            quark_b = new eQuarkDefinition("Bottom", "b", 3, 4.65e9F, -1, 0, 11),
+            quark_u_ = new eQuarkDefinition("AntiUp", "~u", -1, 2.3e6F, -2, 0, 4),
+            quark_c_ = new eQuarkDefinition("AntiCharm", "~c", -2, 1.29e9F, -2, 0, 10),
+            quark_t_ = new eQuarkDefinition("AntiTop", "~t", -3, 172.44e9F, -2, 0, 14),
+            quark_d_ = new eQuarkDefinition("AntiDown", "~d", -1, 4.8e6F, 1, 0, 6),
+            quark_s_ = new eQuarkDefinition("AntiStrange", "~s", -2, 95e6F, 1, 0, 8),
+            quark_b_ = new eQuarkDefinition("AntiBottom", "~b", -3, 4.65e9F, 1, 0, 12);
 
     private eQuarkDefinition(String name, String symbol, int type, float mass, int charge, int color, int ID) {
         super(name, symbol, type, mass, charge, color, ID);
diff --git a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
index 8e97115c01..ef1837e328 100644
--- a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
@@ -29,6 +29,10 @@ public class RecipeLoader implements Runnable {
 
         dAtomDefinition.run();
 
+        ePrimalAspectDefinition.run();
+
+        dComplexAspectDefinition.run();
+
         // ===================================================================================================
         // Recipe init
         // ===================================================================================================