Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix swapped recipe times/voltages #986

Merged
merged 4 commits into from
Sep 9, 2024
Merged

Fix swapped recipe times/voltages #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fa1e9f
Fix swapped recipe times/voltages
FourIsTheNumber Sep 9, 2024
befcc82
Move spaghettic and cryptic singularities to script so they actually …
FourIsTheNumber Sep 9, 2024
4d9567a
Missing unsafe call
FourIsTheNumber Sep 9, 2024
5d42681
Spotless apply for branch singularity-fix for #986 (#987)
github-actions[bot] Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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()
Expand All @@ -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);
}
}
}
19 changes: 19 additions & 0 deletions src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
}