From 05877d269c462e42fdebbdd518cf7a6f32b2d816 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Thu, 26 Sep 2024 00:53:27 -0400 Subject: Collisions (#3284) --- .../loader/NaquadahReworkRecipeLoader.java | 8 ----- .../java/goodgenerator/util/CrackRecipeAdder.java | 39 ---------------------- 2 files changed, 47 deletions(-) (limited to 'src/main/java/goodgenerator') diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 855f3b9bbe..56b21238fd 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -178,14 +178,6 @@ public class NaquadahReworkRecipeLoader { .noOptimize() .addTo(neutronActivatorRecipes); - // Fix shit - GTValues.RA.stdBuilder() - .itemInputs(lowQualityNaquadriaSolution.get(OrePrefixes.cell, 1)) - .itemOutputs(Materials.Tin.getDust(2)) - .duration(16 * SECONDS + 14 * TICKS) - .eut(4) - .addTo(maceratorRecipes); - // Naquadah Rework Line GTValues.RA.stdBuilder() .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GTUtility.getIntegratedCircuit(1)) diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index 489732e068..14ebd378d6 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -520,12 +520,6 @@ public class CrackRecipeAdder { true, false).getStackForm(1L)); } - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(material.get(OrePrefixes.wireGt01, 2)) - .duration(5 * SECONDS) - .eut(4) - .addTo(wiremillRecipes); GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(2)) .itemOutputs(material.get(OrePrefixes.wireGt02, 1)) @@ -556,12 +550,6 @@ public class CrackRecipeAdder { .duration(17 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(material.get(OrePrefixes.wireGt01, 1)) - .duration(2 * SECONDS + 10 * TICKS) - .eut(4) - .addTo(wiremillRecipes); GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stick, 2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(material.get(OrePrefixes.wireGt02, 1)) @@ -586,38 +574,11 @@ public class CrackRecipeAdder { .duration(12 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 16), GTUtility.getIntegratedCircuit(16)) - .itemOutputs(material.get(OrePrefixes.wireGt16, 1)) - .duration(15 * SECONDS) - .eut(4) - .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(3)) - .itemOutputs(material.get(OrePrefixes.wireFine, 8)) - .duration(5 * SECONDS) - .eut(4) - .addTo(wiremillRecipes); GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(material.get(OrePrefixes.wireFine, 4)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.wireGt01, 1), GTUtility.getIntegratedCircuit(1)) - .itemOutputs(material.get(OrePrefixes.wireFine, 4)) - .duration(10 * SECONDS) - .eut(8) - .addTo(wiremillRecipes); - GTValues.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Wire.get(0)) - .itemOutputs(material.get(OrePrefixes.wireGt01, 2)) - .duration( - material.getStats() - .getMass() * 8 - * TICKS) - .eut(TierEU.RECIPE_HV) - .addTo(extruderRecipes); } } -- cgit