From 4fa1e9f1b2060f5c8a6f9c5cce06c69e1ec2550f Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sun, 8 Sep 2024 21:56:41 -0400 Subject: [PATCH 1/4] Fix swapped recipe times/voltages --- .../gthandler/recipes/NeutroniumCompressorRecipes.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java index a94195749..643c621db 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java @@ -393,13 +393,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() From befcc8287a687e440adf59d63ee80c87860693a7 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sun, 8 Sep 2024 22:20:52 -0400 Subject: [PATCH 2/4] Move spaghettic and cryptic singularities to script so they actually load --- .../recipes/NeutroniumCompressorRecipes.java | 16 ---------------- .../scripts/ScriptAvaritiaAddons.java | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java index 643c621db..71bfbaea9 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java @@ -412,22 +412,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 index 430ced541..c89acc9e3 100644 --- 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); } } } From 4d9567ace4c9d92b8599a716d5fd00b37ba89254 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sun, 8 Sep 2024 22:26:55 -0400 Subject: [PATCH 3/4] Missing unsafe call --- .../gthandler/recipes/NeutroniumCompressorRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java index 71bfbaea9..90d7b392a 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java @@ -36,7 +36,7 @@ public void run() { if (Avaritia.isModLoaded() && UniversalSingularities.isModLoaded()) { GTValues.RA.stdBuilder() .itemInputsUnsafe( - GTUtility.copyAmount(7296, GTOreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1))) + 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( From 5d42681f4655ffc01ee5d49c3e4dda5c45c7086c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 07:16:38 +0200 Subject: [PATCH 4/4] Spotless apply for branch singularity-fix for #986 (#987) Co-authored-by: GitHub GTNH Actions <> --- .../gthandler/recipes/NeutroniumCompressorRecipes.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java index 90d7b392a..8cd95142c 100644 --- 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.copyAmountUnsafe(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(