From f54574ddf97074d51b50b04905d87722a4c91480 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:19:29 +0100 Subject: [PATCH] More EFR recipe work (#1162) --- .../dreammaster/recipes/RecipeRemover.java | 7 ++++ .../com/dreammaster/scripts/ScriptEFR.java | 41 +++++++++++++++++++ .../scripts/ScriptExtraUtilities.java | 17 -------- 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index d05baedc3..e4913edc9 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -3257,6 +3257,13 @@ public static void run() { new Object[] { getModItem(Natura.ID, "barleyFood", 1, 6, missing), getModItem(Natura.ID, "barleyFood", 1, 6, missing) }, new Object[0]); + removeRecipeShapedDelayed( + getModItem(Minecraft.ID, "leather", 1, 0, missing), + new Object[] { getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing), + getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing) }, + new Object[] { getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing), + getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing) }, + new Object[0]); removeRecipeShapedDelayed(getModItem(OpenBlocks.ID, "paintBrush", 1, 0, missing)); removeRecipeShapedDelayed(getModItem(OpenBlocks.ID, "goldenEye", 1, wildcard, missing)); removeRecipeShapedDelayed(getModItem(Railcraft.ID, "cart.energy.batbox", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptEFR.java b/src/main/java/com/dreammaster/scripts/ScriptEFR.java index 0822740a5..8e5d34de0 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEFR.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEFR.java @@ -3,15 +3,23 @@ import static gregtech.api.enums.Mods.EtFuturumRequiem; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.Arrays; import java.util.List; import com.dreammaster.recipes.CustomItem; +import gregtech.api.enums.GTValues; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; public class ScriptEFR implements IScriptLoader { @@ -65,5 +73,38 @@ public void loadRecipes() { createItemStack(Thaumcraft.ID, "blockWoodenDevice", 1, 8, "{color:" + i + "b}", missing), GTModHandler.getModItem(EtFuturumRequiem.ID, "banner", 1L, i)); } + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "barrel", 1, 0, missing), + bits, + new Object[] { "hPs", "PCP", " P ", 'P', GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), + 'C', "chestWood" }); + GTValues.RA.stdBuilder() + .itemInputs( + getModItem(Minecraft.ID, "chest", 1L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 2L)) + .itemOutputs(getModItem(EtFuturumRequiem.ID, "barrel", 1L)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "lantern", 1, 0, missing), + bits, + new Object[] { "IGI", "PCP", "III", 'I', "plateIron", 'G', "dustGlowstone", 'P', "paneGlassColorless", + 'C', getModItem(PamsHarvestCraft.ID, "pamcandleDeco1", 1, 0, missing) }); + + GTModHandler.addSmeltingRecipe( + getModItem(Minecraft.ID, "stone", 1, 0, missing), + getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, 0, missing)); + + GTModHandler.addCraftingRecipe( + getModItem(EtFuturumRequiem.ID, "blast_furnace", 1, 0, missing), + bits, + new Object[] { "PPP", "PFP", "SSS", 'S', getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, 0, missing), + 'F', getModItem(Minecraft.ID, "furnace", 1, 0, missing), 'P', "plateIron" }); + GTModHandler.addCraftingRecipe( + getModItem(Minecraft.ID, "leather", 1, 0, missing), + bits, + new Object[] { "SSS", "HHH", "SSS", 'S', getModItem(Minecraft.ID, "string", 1, 0, missing), 'H', + getModItem(EtFuturumRequiem.ID, "rabbit_hide", 1, 0, missing) }); } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java index b0c9fecc8..359b02988 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java +++ b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java @@ -688,17 +688,6 @@ public void loadRecipes() { addShapelessRecipe( getModItem(ExtraUtilities.ID, "unstableingot", 1, 0, missing), getModItem(ExtraUtilities.ID, "unstableingot", 1, 2, missing)); - addShapedRecipe( - getModItem(ExtraUtilities.ID, "chestFull", 1, 0, missing), - "craftingToolHardHammer", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), - "craftingToolSaw", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), - "chestWood", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), - null, - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), - null); addShapedRecipe( getModItem(ExtraUtilities.ID, "chestMini", 1, 0, missing), "craftingToolHardHammer", @@ -1189,12 +1178,6 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 4L)) .itemOutputs(getModItem(ExtraUtilities.ID, "decorativeBlock2", 1, 11, missing)).duration(20 * SECONDS) .eut(30).addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - getModItem(Minecraft.ID, "chest", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 2L)) - .itemOutputs(getModItem(ExtraUtilities.ID, "chestFull", 1, 0, missing)).duration(5 * SECONDS).eut(30) - .addTo(assemblerRecipes); GTValues.RA.stdBuilder() .itemInputs( getModItem(Minecraft.ID, "flint", 1, 0, missing),