diff options
Diffstat (limited to 'src/main/java/goodgenerator')
4 files changed, 5 insertions, 22 deletions
diff --git a/src/main/java/goodgenerator/items/GGMaterial.java b/src/main/java/goodgenerator/items/GGMaterial.java index f61aad5876..ca26cfe986 100644 --- a/src/main/java/goodgenerator/items/GGMaterial.java +++ b/src/main/java/goodgenerator/items/GGMaterial.java @@ -305,7 +305,9 @@ public class GGMaterial implements Runnable { .setRadioactive(true) .setDurOverride(180224) .setSpeedOverride(100f) - .setQualityOverride((byte) 11), + .setQualityOverride((byte) 11) + .disableAutoGeneratedBlastFurnaceRecipes() + .disableAutoGeneratedVacuumFreezerRecipes(), Werkstoff.Types.ELEMENT, new Werkstoff.GenerationFeatures().onlyDust() .addMolten() diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index c43ffb58c6..2b4d79c3f0 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1272,16 +1272,6 @@ public class RecipeLoader { .addTo(blastFurnaceRecipes); GTValues.RA.stdBuilder() - .itemInputs( - GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 1), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot)) - .duration(6 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_ZPM) - .metadata(COIL_HEAT, 7000) - .addTo(blastFurnaceRecipes); - - GTValues.RA.stdBuilder() .itemInputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot, 1)) .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot, 1)) .duration(20 * SECONDS) diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java index 707c6fc11a..1301ac97f5 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader2.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader2.java @@ -104,14 +104,12 @@ public class RecipeLoader2 { .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.extremelyUnstableNaquadah, 8000, 122880, 7000, false); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 500, 480, 2800, true); - CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 513, 480, 2800, false); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 500, 480, 2800, true); - CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 513, 480, 2800, false); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.incoloy903, 1200, 1920, 3700, true); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.adamantiumAlloy, 2500, 1920, 5500, true); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 200, 7680, 5000, true); - CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 220, 7680, 5000, false); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.signalium, 1600, 30720, 4000, true); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.lumiium, 1600, 30720, 4000, true); CrackRecipeAdder.reAddBlastRecipe(GGMaterial.artheriumSn, 500, 122880, 6500, true); @@ -1334,6 +1332,7 @@ public class RecipeLoader2 { GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.Osmiridium, 2), GGMaterial.marM200.get(OrePrefixes.plateDouble, 2), GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1), + MaterialsElements.getInstance().RUTHENIUM.getBolt(32), GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 8)) .fluidInputs(GGMaterial.zircaloy4.getMolten(576)) diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index 25c945f9fe..065a01b223 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -3,7 +3,6 @@ package goodgenerator.util; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; -import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; @@ -317,12 +316,5 @@ public class MaterialFix { .addTo(benderRecipes); } } - Materials tUHV = Materials.Longasssuperconductornameforuhvwire; - GTValues.RA.stdBuilder() - .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, tUHV, 2)) - .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1)) - .duration(Math.max(tUHV.getMass(), 1L) * TICKS) - .eut(TierEU.RECIPE_LV / 2) - .addTo(hammerRecipes); } } |