Merge pull request #528 from Nxer/fix

fix Core Element consumption method

Author: Nxer

src/main/java/com/Nxer/TwistSpaceTechnology/loader/RecipeLoader.java

@@ -61,9 +61,9 @@ public static void loadRecipes() {
             new CokingFactoryRecipePool(), new StellarForgeRecipePool(), new LanthanidesRecipePool(),
             new HyperSpacetimeTransformerRecipePool(), new TSTBufferedEnergyHatchRecipe(), new CentrifugeRecipePool(),
             new ShapedCraftRecipePool(), new MixerRecipePool(), new QFTRecipePool(), new NanoForgeRecipePool(),
-            new FluidHeaterRecipePool(), new ParticleColliderRecipePool(), new IndustrialMagicMatrixRecipePool(),
-            new DragonBloodRecipe(), new FusionReactorRecipePool(), new ModularHatchesRecipePool(),
-            new MassFabricatorGenesisRecipePool(), new SpaceAssemblerRecipePool() };
+            new FluidHeaterRecipePool(), new ParticleColliderRecipePool(), new DragonBloodRecipe(),
+            new FusionReactorRecipePool(), new ModularHatchesRecipePool(), new MassFabricatorGenesisRecipePool(),
+            new SpaceAssemblerRecipePool() };
 
         new SimpleFurnaceFuelPool().loadRecipes();
         new TCResearches().loadResearches();
@@ -93,6 +93,7 @@ public static void loadRecipes() {
 
     public static void loadRecipesPostInit() {
         new IntensifyChemicalDistorterRecipePool().loadRecipePostInit();
+        new IndustrialMagicMatrixRecipePool().loadRecipes();
     }
 
     public static void loadRecipesServerStarted() {

src/main/java/com/Nxer/TwistSpaceTechnology/system/DysonSphereProgram/machines/TST_StrangeMatterAggregator.java

@@ -588,21 +588,10 @@ public CheckRecipeResult checkProcessingMM() {
             byproductAmount *= 2;
 
             // calculate Core Element
+            long toConsume = 0;
             if (coreElementAmount >= consumeAnnihilationConstrainer) {
                 // all output is advanced production
 
-                // consume Core Element items
-                long toConsume = consumeAnnihilationConstrainer;
-                for (ItemStack i : coreElementStacks) {
-                    if (i.stackSize >= toConsume) {
-                        i.stackSize -= (int) toConsume;
-                        break;
-                    } else {
-                        toConsume -= i.stackSize;
-                        i.stackSize = 0;
-                    }
-                }
-
                 // output strange annihilation fuel rods
                 if (outputRodAmount > Integer.MAX_VALUE) {
                     int stack = (int) (outputRodAmount / Integer.MAX_VALUE);
@@ -620,6 +609,8 @@ public CheckRecipeResult checkProcessingMM() {
                 long strangeRod = coreElementAmount * constrainerFactor;
                 long antiMatterRod = outputRodAmount - strangeRod;
 
+                toConsume = coreElementAmount;
+
                 // output strange annihilation fuel rods
                 if (strangeRod > Integer.MAX_VALUE) {
                     int stack = (int) (strangeRod / Integer.MAX_VALUE);
@@ -646,6 +637,19 @@ public CheckRecipeResult checkProcessingMM() {
 
             }
 
+            // consume Core Element items
+            if (0 < toConsume) {
+                for (ItemStack i : coreElementStacks) {
+                    if (i.stackSize >= toConsume) {
+                        i.stackSize -= (int) toConsume;
+                        break;
+                    } else {
+                        toConsume -= i.stackSize;
+                        i.stackSize = 0;
+                    }
+                }
+            }
+
         } else {
 
             // output anti matter fuel rods