Make magic massive.

3 files changed, 15 insertions, 10 deletions

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 d5e5a87bfd..35a3cfa524 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
@@ -13,8 +13,8 @@ public final class cPrimitiveDefinition extends cElementalPrimitive {
             nbtE__ = new cPrimitiveDefinition("NBT ERROR", "!", 0, 0f, 0, Integer.MIN_VALUE, Integer.MIN_VALUE),
             null__ = new cPrimitiveDefinition("NULL POINTER", ".", 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);
+            magic = new cPrimitiveDefinition("Magic", "Ma", 4, 1e5F, 0, 0, 1),
+            magic_ = new cPrimitiveDefinition("Antimagic", "~Ma", -4, 1e5F, 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/magicAddon/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
index bd382a3888..14dac06776 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/definitions/dComplexAspectDefinition.java
@@ -17,6 +17,7 @@ import static com.github.technus.tectech.magicAddon.definitions.AspectDefinition
  */
 public final class dComplexAspectDefinition extends cElementalDefinition implements iElementalAspect {
     private final int hash;
+    public final float mass;
 
     private static final byte nbtType = (byte) 'c';
 
@@ -47,7 +48,11 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
     private dComplexAspectDefinition(boolean check, cElementalDefinitionStackMap aspects) throws tElementalException {
         if (check && !canTheyBeTogether(aspects)) throw new tElementalException("Hadron Definition error");
         this.aspectStacks = aspects;
-
+        float mass=0;
+        for(cElementalDefinitionStack stack:aspects.values()){
+            mass+=stack.getMass();
+        }
+        this.mass=mass;
         hash=super.hashCode();
     }
 
@@ -157,7 +162,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
 
     @Override
     public float getMass() {
-        return 0;
+        return mass;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java
index 64e8f4ac69..eafc57b756 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/definitions/ePrimalAspectDefinition.java
@@ -10,12 +10,12 @@ import static com.github.technus.tectech.magicAddon.definitions.AspectDefinition
  */
 public final class ePrimalAspectDefinition extends cElementalPrimitive implements iElementalAspect {
     public static final ePrimalAspectDefinition
-            magic_air = new ePrimalAspectDefinition("Air", "a`", 0, 0F, 0, -1, 35),
-            magic_earth = new ePrimalAspectDefinition("Earth", "e`", 0, 0F, 0, -1, 34),
-            magic_fire = new ePrimalAspectDefinition("Fire", "f`", 0, 0F, 0, -1, 33),
-            magic_water = new ePrimalAspectDefinition("Water", "w`", 0, 0F, 0, -1, 32),
-            magic_order = new ePrimalAspectDefinition("Order", "o`", 0, 0F, 0, -1, 30),
-            magic_entropy = new ePrimalAspectDefinition("Entropy", "e`", 0, 0F, 0, -1, 31);
+            magic_air = new ePrimalAspectDefinition("Air", "a`", 0, 1e1F, 0, -1, 35),
+            magic_earth = new ePrimalAspectDefinition("Earth", "e`", 0, 1e9F, 0, -1, 34),
+            magic_fire = new ePrimalAspectDefinition("Fire", "f`", 0, 1e3F, 0, -1, 33),
+            magic_water = new ePrimalAspectDefinition("Water", "w`", 0, 1e7F, 0, -1, 32),
+            magic_order = new ePrimalAspectDefinition("Order", "o`", 0, 1e5F, 0, -1, 30),
+            magic_entropy = new ePrimalAspectDefinition("Entropy", "e`", 0, 1e5F, 0, -1, 31);
 
     private ePrimalAspectDefinition(String name, String symbol, int type, float mass, int charge, int color, int ID) {
         super(name, symbol, type, mass, charge, color, ID);