From e8d9aac5d4cf6ee46eafc3299658eaae16defa44 Mon Sep 17 00:00:00 2001 From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Date: Sun, 22 Dec 2024 03:43:23 +0100 Subject: [PATCH] Nerf glass loop (#1113) --- .../gthandler/recipes/FluidExtractorRecipes.java | 9 +++++++++ .../com/dreammaster/scripts/ScriptMinecraft.java | 13 ------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java index 107df0976..3d8f9c82d 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java @@ -15,6 +15,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; +import gregtech.api.recipe.RecipeCategories; import gregtech.api.util.GTModHandler; public class FluidExtractorRecipes implements Runnable { @@ -68,6 +69,14 @@ public void run() { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("glue"), 144)).duration(5 * SECONDS).eut(16) .addTo(fluidExtractionRecipes); + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "GlassBlock", 1L, 0)) + .fluidOutputs(Materials.Glass.getMolten(144L)).duration(24 * TICKS).eut(54) + .recipeCategory(RecipeCategories.fluidExtractorRecycling).addTo(fluidExtractionRecipes); + + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "GlassPane", 1L, 0)) + .fluidOutputs(Materials.Glass.getMolten(54L)).duration(9 * TICKS).eut(54) + .recipeCategory(RecipeCategories.fluidExtractorRecycling).addTo(fluidExtractionRecipes); + } } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java index 2c4f1aaca..6f6704c49 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java @@ -29,7 +29,6 @@ import static gregtech.api.enums.Mods.Witchery; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; @@ -2167,18 +2166,6 @@ public void loadRecipes() { GTUtility.getIntegratedCircuit(1)) .itemOutputs(getModItem(Minecraft.ID, "saddle", 1, 0, missing)).duration(5 * SECONDS).eut(24) .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - getModItem(TinkerConstruct.ID, "GlassBlock", 1, 0, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Minecraft.ID, "glass", 1, 0, missing)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_MV).specialValue(1000).addTo(blastFurnaceRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - getModItem(TinkerConstruct.ID, "GlassPane", 1, 0, missing), - GTUtility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Minecraft.ID, "glass_pane", 1, 0, missing)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_MV).specialValue(1000).addTo(blastFurnaceRecipes); GTValues.RA.stdBuilder().itemInputs(getModItem(Minecraft.ID, "wooden_pressure_plate", 1, 0, missing)) .itemOutputs(getModItem(Minecraft.ID, "wooden_button", 2, 0, missing)) .fluidInputs(Materials.Water.getFluid(4)).duration(2 * SECONDS + 10 * TICKS).eut(4)