Fix swapped recipe times/voltages (#986)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
GTNewHorizons · Sep 9, 2024 · 0776892 · 0776892
1 parent 49bdb59
commit 0776892
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java
@@ -34,9 +34,8 @@ public class NeutroniumCompressorRecipes implements Runnable {
     public void run() {
 
         if (Avaritia.isModLoaded() && UniversalSingularities.isModLoaded()) {
-            GTValues.RA.stdBuilder()
-                    .itemInputsUnsafe(
-                            GTUtility.copyAmount(7296, GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1)))
+            GTValues.RA.stdBuilder().itemInputsUnsafe(
+                    GTUtility.copyAmountUnsafe(7296, GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1)))
                     .itemOutputs(getModItem(Avaritia.ID, "Singularity", 1L, 0)).duration(3 * SECONDS)
                     .eut(TierEU.RECIPE_HV).addTo(neutroniumCompressorRecipes);
             GTValues.RA.stdBuilder().itemInputsUnsafe(
@@ -393,13 +392,13 @@ public void run() {
 
             // Eternal Singularity
             GTValues.RA.stdBuilder().fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(72L))
-                    .itemOutputs(getModItem(EternalSingularity.ID, "eternal_singularity", 1)).duration(1 * TICKS)
-                    .eut(TierEU.RECIPE_UIV).metadata(COMPRESSION_TIER, 2).addTo(neutroniumCompressorRecipes);
+                    .itemOutputs(getModItem(EternalSingularity.ID, "eternal_singularity", 1)).duration(100 * SECONDS)
+                    .eut(TierEU.RECIPE_UMV).metadata(COMPRESSION_TIER, 2).addTo(neutroniumCompressorRecipes);
 
             // Iron Singularity
             GTValues.RA.stdBuilder().fluidInputs(Materials.Iron.getMolten(9455616L))
-                    .itemOutputs(getModItem(Avaritia.ID, "Singularity", 1L, 0)).duration(100 * SECONDS)
-                    .eut(TierEU.RECIPE_UMV).metadata(COMPRESSION_TIER, 2).addTo(neutroniumCompressorRecipes);
+                    .itemOutputs(getModItem(Avaritia.ID, "Singularity", 1L, 0)).duration(1 * TICKS)
+                    .eut(TierEU.RECIPE_UIV).metadata(COMPRESSION_TIER, 2).addTo(neutroniumCompressorRecipes);
 
             // Gangue Singularity
             GTValues.RA.stdBuilder()
@@ -412,22 +411,6 @@ public void run() {
             GTValues.RA.stdBuilder().fluidInputs(Materials.Copper.getMolten(3648 * 9 * 144L))
                     .itemOutputs(getModItem(Avaritia.ID, "Singularity", 1L, 5)).duration(1 * TICKS)
                     .eut(TierEU.RECIPE_UIV).metadata(COMPRESSION_TIER, 2).addTo(neutroniumCompressorRecipes);
-
-            // Spaghettic Singularity
-            GTValues.RA.stdBuilder().itemInputs(
-                    // fluxed electrum singularity
-                    getModItem(UniversalSingularities.ID, "universal.general.singularity", 1L, 20))
-                    .fluidInputs(MaterialsUEVplus.Mellion.getMolten(4 * 144L))
-                    .itemOutputs(getModItem(EternalSingularity.ID, "combined_singularity", 1L, 2)).duration(1 * SECONDS)
-                    .eut(TierEU.RECIPE_UMV).metadata(COMPRESSION_TIER, 2).addTo(neutroniumCompressorRecipes);
-
-            // Cryptic Singularity
-            GTValues.RA.stdBuilder().itemInputs(
-                    // iron singularity
-                    getModItem(Avaritia.ID, "Singularity", 1L, 0))
-                    .fluidInputs(MaterialsUEVplus.Creon.getMolten(4 * 144L))
-                    .itemOutputs(getModItem(EternalSingularity.ID, "combined_singularity", 1L, 4)).duration(1 * SECONDS)
-                    .eut(TierEU.RECIPE_UMV).metadata(COMPRESSION_TIER, 2).addTo(neutroniumCompressorRecipes);
         }
     }
 }
diff --git a/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java b/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java
@@ -6,12 +6,15 @@
 import static gregtech.api.enums.Mods.EternalSingularity;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.IronChests;
+import static gregtech.api.enums.Mods.UniversalSingularities;
 import static gregtech.api.enums.Mods.Witchery;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
+import static gregtech.api.recipe.RecipeMaps.neutroniumCompressorRecipes;
 import static gregtech.api.recipe.RecipeMaps.plasmaArcFurnaceRecipes;
 import static gregtech.api.util.GTModHandler.getModItem;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
+import static gregtech.api.util.GTRecipeConstants.COMPRESSION_TIER;
 
 import java.util.Arrays;
 import java.util.List;
@@ -171,6 +174,22 @@ public void loadRecipes() {
                     .fluidInputs(MaterialsUEVplus.Eternity.getMolten(144))
                     .fluidOutputs(Materials.Infinity.getMolten(576)).duration(5 * SECONDS).eut(TierEU.RECIPE_UXV)
                     .addTo(plasmaArcFurnaceRecipes);
+
+            // Spaghettic Singularity
+            GTValues.RA.stdBuilder().itemInputs(
+                    // fluxed electrum singularity
+                    getModItem(UniversalSingularities.ID, "universal.general.singularity", 1L, 20))
+                    .fluidInputs(MaterialsUEVplus.Mellion.getMolten(4 * 144L))
+                    .itemOutputs(getModItem(EternalSingularity.ID, "combined_singularity", 1L, 2)).duration(1 * SECONDS)
+                    .eut(TierEU.RECIPE_UMV).metadata(COMPRESSION_TIER, 2).addTo(neutroniumCompressorRecipes);
+
+            // Cryptic Singularity
+            GTValues.RA.stdBuilder().itemInputs(
+                    // iron singularity
+                    getModItem(Avaritia.ID, "Singularity", 1L, 0))
+                    .fluidInputs(MaterialsUEVplus.Creon.getMolten(4 * 144L))
+                    .itemOutputs(getModItem(EternalSingularity.ID, "combined_singularity", 1L, 4)).duration(1 * SECONDS)
+                    .eut(TierEU.RECIPE_UMV).metadata(COMPRESSION_TIER, 2).addTo(neutroniumCompressorRecipes);
         }
     }
 }