From 074f93e1a2d057fbb486c455d8d88b9f92c40788 Mon Sep 17 00:00:00 2001 From: wmaxlees Date: Fri, 9 Aug 2024 14:59:47 -0600 Subject: [PATCH 01/11] Trying to use local GT5 build temporarily --- dependencies.gradle | 2 +- settings.gradle | 2 +- .../scripts/ScriptEtFuturumRequiem.java | 24 +++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java diff --git a/dependencies.gradle b/dependencies.gradle index 6667e6a77..9127ea802 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.142:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:bb8e42e") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.2:dev') { transitive = false } diff --git a/settings.gradle b/settings.gradle index 242692e5d..bdcf92c32 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,7 @@ pluginManagement { repositories { + mavenLocal() maven { // RetroFuturaGradle name "GTNH Maven" @@ -12,7 +13,6 @@ pluginManagement { } gradlePluginPortal() mavenCentral() - mavenLocal() } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java new file mode 100644 index 000000000..b98cbe5dc --- /dev/null +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -0,0 +1,24 @@ +package com.dreammaster.scripts; + +import static gregtech.api.enums.Mods.EtFuturumRequiem; + +import java.util.Arrays; +import java.util.List; + +public class ScriptEtFuturumRequiem implements IScriptLoader { + @Override + public String getScriptName() { + return "Et Futurum Requiem"; + } + + @Override + public List getDependencies() { + return Arrays.asList( + EtFuturumRequiem.ID); + } + + @Override + public void loadRecipes() { + addShapelessRecipe(getModItem(EtFuturumRequiem.ID, "stone_slab", 2, 0, missing), "craftingToolSaw", null, "stone", null); + } +}; \ No newline at end of file From 04c247ae11864ca27437b4266067b854fdc016bc Mon Sep 17 00:00:00 2001 From: wmaxlees Date: Sat, 10 Aug 2024 00:09:38 -0600 Subject: [PATCH 02/11] Getting basic recipes started. --- repositories.gradle | 1 + settings.gradle | 2 +- .../scripts/ScriptEtFuturumRequiem.java | 17 +++++++++++++++-- .../com/dreammaster/scripts/ScriptLoader.java | 1 + .../dreammaster/scripts/ScriptMinecraft.java | 4 +++- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/repositories.gradle b/repositories.gradle index 40118b167..f6e6039e8 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,6 +1,7 @@ // Add any additional repositories for your dependencies here repositories { + mavenLocal() ivy { url 'https://files.vexatos.com/' patternLayout { diff --git a/settings.gradle b/settings.gradle index bdcf92c32..242692e5d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,6 @@ pluginManagement { repositories { - mavenLocal() maven { // RetroFuturaGradle name "GTNH Maven" @@ -13,6 +12,7 @@ pluginManagement { } gradlePluginPortal() mavenCentral() + mavenLocal() } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java index b98cbe5dc..76247d6c7 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -1,10 +1,14 @@ package com.dreammaster.scripts; import static gregtech.api.enums.Mods.EtFuturumRequiem; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.util.GT_ModHandler.getModItem; import java.util.Arrays; import java.util.List; +import net.minecraft.item.ItemStack; + public class ScriptEtFuturumRequiem implements IScriptLoader { @Override public String getScriptName() { @@ -14,11 +18,20 @@ public String getScriptName() { @Override public List getDependencies() { return Arrays.asList( - EtFuturumRequiem.ID); + EtFuturumRequiem.ID, + GTPlusPlus.ID + ); } @Override public void loadRecipes() { - addShapelessRecipe(getModItem(EtFuturumRequiem.ID, "stone_slab", 2, 0, missing), "craftingToolSaw", null, "stone", null); + final ItemStack CHERRY_LOG = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 0, missing); + final ItemStack CHERRY_WOOD = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 1, missing); + final ItemStack STRIPPED_CHERRY_LOG = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 2, missing); + final ItemStack STRIPPED_CHERRY_WOOD = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 3, missing); + + addShapelessRecipe(getModItem(EtFuturumRequiem.ID, "wood_planks", 2, 3, missing), CHERRY_LOG); + + addShapelessRecipe(getModItem(EtFuturumRequiem.ID, "stone_slab", 2, missing), "craftingToolSaw", null, "stone", null); } }; \ No newline at end of file diff --git a/src/main/java/com/dreammaster/scripts/ScriptLoader.java b/src/main/java/com/dreammaster/scripts/ScriptLoader.java index e96d7deee..375e3d6d7 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptLoader.java +++ b/src/main/java/com/dreammaster/scripts/ScriptLoader.java @@ -56,6 +56,7 @@ public static void run() { new ScriptEnderIO(), new ScriptEnderZoo(), new ScriptEnhancedLootBags(), + new ScriptEtFuturumRequiem(), new ScriptExtraBees(), new ScriptExtraTrees(), new ScriptExtraUtilities(), diff --git a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java index e14099e0a..6b7ce1fea 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java @@ -5,6 +5,7 @@ import static gregtech.api.enums.Mods.BiomesOPlenty; import static gregtech.api.enums.Mods.BloodArsenal; import static gregtech.api.enums.Mods.CarpentersBlocks; +import static gregtech.api.enums.Mods.EtFuturumRequiem; import static gregtech.api.enums.Mods.ExtraTrees; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.ForbiddenMagic; @@ -74,6 +75,7 @@ public List getDependencies() { Backpack.ID, BiomesOPlenty.ID, CarpentersBlocks.ID, + EtFuturumRequiem.ID, ExtraTrees.ID, ExtraUtilities.ID, ForbiddenMagic.ID, @@ -4580,7 +4582,7 @@ private void craftingRecipes() { getModItem(Minecraft.ID, "flower_pot", 1, 0, missing), "craftingToolFile", getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1, 0, missing)); - addShapelessRecipe(getModItem(Minecraft.ID, "stone_slab", 1, 0, missing), "craftingToolSaw", "stone"); + addShapelessRecipe(getModItem(Minecraft.ID, "stone_slab", 1, 0, missing), "craftingToolSaw", getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, missing)); addShapelessRecipe(getModItem(Minecraft.ID, "stone_slab", 1, 1, missing), "craftingToolSaw", "sandstone"); addShapelessRecipe(getModItem(Minecraft.ID, "stone_slab", 1, 3, missing), "craftingToolSaw", "cobblestone"); addShapelessRecipe( From 9579a86d94239ec016bcc9e5207ae3976ead0be3 Mon Sep 17 00:00:00 2001 From: "max.lees" Date: Mon, 12 Aug 2024 03:49:30 +0000 Subject: [PATCH 03/11] Added a bunch of the wood recipes --- .../scripts/ScriptEtFuturumRequiem.java | 65 ++++++++++++++++++- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java index 76247d6c7..3bf0d0402 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -25,13 +25,74 @@ public List getDependencies() { @Override public void loadRecipes() { + final ItemStack CRIMSON_STEM = getModItem(EtFuturumRequiem.ID, "crimson_stem", 1, 0, missing); + final ItemStack CRIMSON_WOOD = getModItem(EtFuturumRequiem.ID, "crimson_stem", 1, 1, missing); + final ItemStack STRIPPED_CRIMSON_STEM = getModItem(EtFuturumRequiem.ID, "crimson_stem", 1, 2, missing); + final ItemStack STRIPPED_CRIMSON_WOOD = getModItem(EtFuturumRequiem.ID, "crimson_stem", 1, 3, missing); + + final ItemStack WARPED_STEM = getModItem(EtFuturumRequiem.ID, "warped_stem", 1, 0, missing); + final ItemStack WARPED_WOOD = getModItem(EtFuturumRequiem.ID, "warped_stem", 1, 1, missing); + final ItemStack STRIPPED_WARPED_STEM = getModItem(EtFuturumRequiem.ID, "warped_stem", 1, 2, missing); + final ItemStack STRIPPED_WARPED_WOOD = getModItem(EtFuturumRequiem.ID, "warped_stem", 1, 3, missing); + + final ItemStack MANGROVE_LOG = getModItem(EtFuturumRequiem.ID, "mangrove_log", 1, 0, missing); + final ItemStack MANGROVE_WOOD = getModItem(EtFuturumRequiem.ID, "mangrove_log", 1, 1, missing); + final ItemStack STRIPPED_MANGROVE_LOG = getModItem(EtFuturumRequiem.ID, "mangrove_log", 1, 2, missing); + final ItemStack STRIPPED_MANGROVE_WOOD = getModItem(EtFuturumRequiem.ID, "mangrove_log", 1, 3, missing); + final ItemStack CHERRY_LOG = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 0, missing); final ItemStack CHERRY_WOOD = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 1, missing); final ItemStack STRIPPED_CHERRY_LOG = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 2, missing); final ItemStack STRIPPED_CHERRY_WOOD = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 3, missing); - addShapelessRecipe(getModItem(EtFuturumRequiem.ID, "wood_planks", 2, 3, missing), CHERRY_LOG); + final ItemStack CRIMSON_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 0, missing); + final ItemStack CRIMSON_WOOD_SLAB = GetModItem(EtFuturumRequiem.ID, "wood_slab", 1, 0, missing); + + final ItemStack WARPED_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 1, missing); + final ItemStack WARPED_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 1, missing); + + final ItemStack MANGROVE_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 2, missing); + final ItemStack MANGROVE_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 2, missing); + + final ItemStack CHERRY_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 3, missing); + final ItemStack BAMBOO_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 4, missing); + + final ItemStack SMOOTH_STONE_SLAB = getModItem(EtFuturumRequiem.ID, "stone_slab", 1, 0, missing); + + ItemStack crimsonWoodPlanks = new ItemStack(CRIMSON_WOOD_PLANKS); + crimsonWoodPlanks.stackSize = 2; + addShapelessRecipe(crimsonWoodPlanks, CRIMSON_LOG); + + ItemStack warpedWoodPlanks = new ItemStack(WARPED_WOOD_PLANKS); + warpedWoodPlanks.stackSize = 2; + addShapelessRecipe(warpedWoodPlanks, WARPED_LOG); + + ItemStack mangroveWoodPlanks = new ItemStack(MANGROVE_WOOD_PLANKS); + mangroveWoodPlanks.stackSize = 2; + addShapelessRecipe(mangroveWoodPlanks, MANGROVE_LOG); + + ItemStack cherryWoodPlanks = new ItemStack(CHERRY_WOOD_PLANKS); + cherryWoodPlanks.stackSize = 2; + addShapelessRecipe(cherryWoodPlanks, CHERRY_LOG); + + ItemStack crimsonWoodSlab = new ItemStack(CRIMSON_WOOD_SLAB); + crimsonWoodSlab.stackSize = 2; + addShapelessRecipe(crimsonWoodSlab, "craftingToolSaw", null, CRIMSON_WOOD_PLANKS, null); + + ItemStack warpedWoodSlab = new ItemStack(WARPED_WOOD_SLAB); + warpedWoodSlab.stackSize = 2; + addShapelessRecipe(warpedWoodSlab, "craftingToolSaw", null, WARPED_WOOD_PLANKS, null); + + ItemStack mangroveWoodSlab = new ItemStack(MANGROVE_WOOD_SLAB); + mangroveWoodSlab.stackSize = 2; + addShapelessRecipe(mangroveWoodSlab, "craftingToolSaw", null, MANGROVE_WOOD_PLANKS, null); + + ItemStack cherryWoodSlab = new ItemStack(CHERRY_WOOD_SLAB); + cherryWoodSlab.stackSize = 2; + addShapelessRecipe(cherryWoodSlab, "craftingToolSaw", null, CHERRY_WOOD_PLANKS, null); - addShapelessRecipe(getModItem(EtFuturumRequiem.ID, "stone_slab", 2, missing), "craftingToolSaw", null, "stone", null); + ItemStack smoothStoneSlab = new ItemStack(SMOOTH_STONE_SLAB); + smoothStoneSlab.stackSize = 2; + addShapelessRecipe(getModItem(smoothStoneSlab, "craftingToolSaw", null, "stone", null); } }; \ No newline at end of file From bc27695fb1855161d5f107abb788a2e482c651fb Mon Sep 17 00:00:00 2001 From: wmaxlees Date: Sun, 11 Aug 2024 22:55:04 -0600 Subject: [PATCH 04/11] Added some more slab recipes --- .../scripts/ScriptEtFuturumRequiem.java | 65 +++++++++++++++---- 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java index 3bf0d0402..ea88a24a5 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -2,11 +2,13 @@ import static gregtech.api.enums.Mods.EtFuturumRequiem; import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.util.GT_ModHandler.getModItem; import java.util.Arrays; import java.util.List; +import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; public class ScriptEtFuturumRequiem implements IScriptLoader { @@ -45,8 +47,10 @@ public void loadRecipes() { final ItemStack STRIPPED_CHERRY_LOG = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 2, missing); final ItemStack STRIPPED_CHERRY_WOOD = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 3, missing); + final ItemStack BAMBOO_BLOCK = getModItem(EtFuturumRequiem.ID, "bamboo_block", 1, 0, missing); + final ItemStack CRIMSON_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 0, missing); - final ItemStack CRIMSON_WOOD_SLAB = GetModItem(EtFuturumRequiem.ID, "wood_slab", 1, 0, missing); + final ItemStack CRIMSON_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 0, missing); final ItemStack WARPED_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 1, missing); final ItemStack WARPED_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 1, missing); @@ -55,44 +59,79 @@ public void loadRecipes() { final ItemStack MANGROVE_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 2, missing); final ItemStack CHERRY_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 3, missing); + final ItemStack CHERRY_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 3, missing); + final ItemStack BAMBOO_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 4, missing); + final ItemStack BAMBOO_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 4, missing); + + final ItemStack RED_SANDSTONE = getModItem(EtFuturumRequiem.ID, "red_sandstone", 1, 0, missing); + final ItemStack RED_SANDSTONE_SLAB = getModItem(EtFuturumRequiem.ID, "red_sandstone_slab", 1, 0, missing); + + final ItemStack PURPUR_BLOCK = getModItem(EtFuturumRequiem.ID, "purpur_block", 1, 0, missing); + final ItemStack PURPUR_SLAB = getModItem(EtFuturumRequiem.ID, "purpur_slab", 1, 0, missing); final ItemStack SMOOTH_STONE_SLAB = getModItem(EtFuturumRequiem.ID, "stone_slab", 1, 0, missing); + final ItemStack MOSSY_COBBLESTONE_SLAB = getModItem(EtFuturumRequiem.ID, "stone_slab", 1, 1, missing); + final ItemStack MOSSY_STONE_BRICK_SLAB = getModItem(EtFuturumRequiem.ID, "stone_slab", 1, 2, missing); - ItemStack crimsonWoodPlanks = new ItemStack(CRIMSON_WOOD_PLANKS); + ItemStack crimsonWoodPlanks = CRIMSON_WOOD_PLANKS.copy(); crimsonWoodPlanks.stackSize = 2; - addShapelessRecipe(crimsonWoodPlanks, CRIMSON_LOG); + addShapelessRecipe(crimsonWoodPlanks, CRIMSON_STEM); - ItemStack warpedWoodPlanks = new ItemStack(WARPED_WOOD_PLANKS); + ItemStack warpedWoodPlanks = WARPED_WOOD_PLANKS.copy(); warpedWoodPlanks.stackSize = 2; - addShapelessRecipe(warpedWoodPlanks, WARPED_LOG); + addShapelessRecipe(warpedWoodPlanks, WARPED_STEM); - ItemStack mangroveWoodPlanks = new ItemStack(MANGROVE_WOOD_PLANKS); + ItemStack mangroveWoodPlanks = MANGROVE_WOOD_PLANKS.copy(); mangroveWoodPlanks.stackSize = 2; addShapelessRecipe(mangroveWoodPlanks, MANGROVE_LOG); - ItemStack cherryWoodPlanks = new ItemStack(CHERRY_WOOD_PLANKS); + ItemStack cherryWoodPlanks = CHERRY_WOOD_PLANKS.copy(); cherryWoodPlanks.stackSize = 2; addShapelessRecipe(cherryWoodPlanks, CHERRY_LOG); - ItemStack crimsonWoodSlab = new ItemStack(CRIMSON_WOOD_SLAB); + ItemStack bambooWoodPlanks = BAMBOO_WOOD_PLANKS.copy(); + bambooWoodPlanks.stackSize = 2; + addShapelessRecipe(bambooWoodPlanks, BAMBOO_BLOCK); + + ItemStack crimsonWoodSlab = CRIMSON_WOOD_SLAB.copy(); crimsonWoodSlab.stackSize = 2; addShapelessRecipe(crimsonWoodSlab, "craftingToolSaw", null, CRIMSON_WOOD_PLANKS, null); - ItemStack warpedWoodSlab = new ItemStack(WARPED_WOOD_SLAB); + ItemStack warpedWoodSlab = WARPED_WOOD_SLAB.copy(); warpedWoodSlab.stackSize = 2; addShapelessRecipe(warpedWoodSlab, "craftingToolSaw", null, WARPED_WOOD_PLANKS, null); - ItemStack mangroveWoodSlab = new ItemStack(MANGROVE_WOOD_SLAB); + ItemStack mangroveWoodSlab = MANGROVE_WOOD_SLAB.copy(); mangroveWoodSlab.stackSize = 2; addShapelessRecipe(mangroveWoodSlab, "craftingToolSaw", null, MANGROVE_WOOD_PLANKS, null); - ItemStack cherryWoodSlab = new ItemStack(CHERRY_WOOD_SLAB); + ItemStack cherryWoodSlab = CHERRY_WOOD_SLAB.copy(); cherryWoodSlab.stackSize = 2; addShapelessRecipe(cherryWoodSlab, "craftingToolSaw", null, CHERRY_WOOD_PLANKS, null); - ItemStack smoothStoneSlab = new ItemStack(SMOOTH_STONE_SLAB); + ItemStack bambooWoodSlab = BAMBOO_WOOD_SLAB.copy(); + bambooWoodSlab.stackSize = 2; + addShapelessRecipe(bambooWoodSlab, "craftingToolSaw", null, BAMBOO_WOOD_PLANKS, null); + + ItemStack redSandstoneSlab = RED_SANDSTONE_SLAB.copy(); + redSandstoneSlab.stackSize = 2; + addShapelessRecipe(redSandstoneSlab, "craftingToolSaw", null, RED_SANDSTONE, null); + + ItemStack purpurSlab = PURPUR_SLAB.copy(); + purpurSlab.stackSize = 2; + addShapelessRecipe(purpurSlab, "craftingToolSaw", null, PURPUR_BLOCK, null); + + ItemStack smoothStoneSlab = SMOOTH_STONE_SLAB.copy(); smoothStoneSlab.stackSize = 2; - addShapelessRecipe(getModItem(smoothStoneSlab, "craftingToolSaw", null, "stone", null); + addShapelessRecipe(smoothStoneSlab, "craftingToolSaw", null, "stone", null); + + ItemStack mossyCobblestoneSlab = MOSSY_COBBLESTONE_SLAB.copy(); + mossyCobblestoneSlab.stackSize = 2; + addShapelessRecipe(mossyCobblestoneSlab, "craftingToolSaw", null, getModItem(Minecraft.ID, "mossy_cobblestone", 1, 0, missing), null); + + ItemStack mossyStoneBrickSlab = MOSSY_STONE_BRICK_SLAB.copy(); + mossyStoneBrickSlab.stackSize = 2; + addShapelessRecipe(mossyStoneBrickSlab, "craftingToolSaw", null, getModItem(Minecraft.ID, "stonebrick", 1, 1, missing), null); } }; \ No newline at end of file From c41f52cc162919020c6d31cf8870c4a1f3321224 Mon Sep 17 00:00:00 2001 From: wmaxlees Date: Mon, 12 Aug 2024 10:57:40 -0600 Subject: [PATCH 05/11] Created a helper function for slabs and added up to Tuff --- .../scripts/ScriptEtFuturumRequiem.java | 91 +++++++++++-------- 1 file changed, 53 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java index ea88a24a5..5fde87aa6 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -66,6 +66,8 @@ public void loadRecipes() { final ItemStack RED_SANDSTONE = getModItem(EtFuturumRequiem.ID, "red_sandstone", 1, 0, missing); final ItemStack RED_SANDSTONE_SLAB = getModItem(EtFuturumRequiem.ID, "red_sandstone_slab", 1, 0, missing); + final ItemStack CUT_RED_SANDSTONE = getModItem(EtFuturumRequiem.ID, "red_sandstone", 1, 2, missing); + final ItemStack CUT_RED_SANDSTONE_SLAB = getModItem(EtFuturumRequiem.ID, "red_sandstone_slab", 1, 1, missing); final ItemStack PURPUR_BLOCK = getModItem(EtFuturumRequiem.ID, "purpur_block", 1, 0, missing); final ItemStack PURPUR_SLAB = getModItem(EtFuturumRequiem.ID, "purpur_slab", 1, 0, missing); @@ -74,6 +76,31 @@ public void loadRecipes() { final ItemStack MOSSY_COBBLESTONE_SLAB = getModItem(EtFuturumRequiem.ID, "stone_slab", 1, 1, missing); final ItemStack MOSSY_STONE_BRICK_SLAB = getModItem(EtFuturumRequiem.ID, "stone_slab", 1, 2, missing); + final ItemStack SMOOTH_QUARTZ = getModItem(EtFuturumRequiem.ID, "smooth_quartz", 1, 0, missing); + final ItemStack SMOOTH_QUARTZ_SLAB = getModItem(EtFuturumRequiem.ID, "smooth_quartz_slab", 1, 0, missing); + + final ItemStack RED_NETHERBRICK = getModItem(EtFuturumRequiem.ID, "red_netherbrick", 1, 0, missing); + final ItemStack RED_NETHERBRICK_SLAB = getModItem(EtFuturumRequiem.ID, "red_netherbrick_slab", 1, 0, missing); + + final ItemStack END_STONE_BRICK = getModItem(EtFuturumRequiem.ID, "end_bricks", 1, 0, missing); + final ItemStack END_STONE_BRICK_SLAB = getModItem(EtFuturumRequiem.ID, "end_brick_slab", 1, 0, missing); + + final ItemStack COBBLED_DEEPSLATE = getModItem(EtFuturumRequiem.ID, "cobbled_deepslate", 1, 0, missing); + final ItemStack POLISHED_DEEPSLATE = getModItem(EtFuturumRequiem.ID, "polished_deepslate", 1, 0, missing); + final ItemStack DEEPSLATE_BRICKS = getModItem(EtFuturumRequiem.ID, "deepslate_bricks", 1, 0, missing); + final ItemStack DEEPSLATE_TILES = getModItem(EtFuturumRequiem.ID, "deepslate_bricks", 1, 2, missing); + final ItemStack COBBLED_DEEPSLATE_SLAB = getModItem(EtFuturumRequiem.ID, "deepslate_slab", 1, 0, missing); + final ItemStack POLISHED_DEEPSLATE_SLAB = getModItem(EtFuturumRequiem.ID, "deepslate_slab", 1, 1, missing); + final ItemStack DEEPSLATE_BRICK_SLAB = getModItem(EtFuturumRequiem.ID, "deepslate_brick_slab", 1, 0, missing); + final ItemStack DEEPSLATE_TILE_SLAB = getModItem(EtFuturumRequiem.ID, "deepslate_brick_slab", 1, 1, missing); + + final ItemStack TUFF = getModItem(EtFuturumRequiem.ID, "tuff", 1, 0, missing); + final ItemStack POLISHED_TUFF = getModItem(EtFuturumRequiem.ID, "tuff", 1, 1, missing); + final ItemStack TUFF_BRICKS = getModItem(EtFuturumRequiem.ID, "tuff", 1, 2, missing); + final ItemStack TUFF_SLAB = getModItem(EtFuturumRequiem.ID, "tuff_slab", 1, 0, missing); + final ItemStack POLISHED_TUFF_SLAB = getModItem(EtFuturumRequiem.ID, "tuff_slab", 1, 1, missing); + final ItemStack TUFF_BRICK_SLAB = getModItem(EtFuturumRequiem.ID, "tuff_slab", 1, 2, missing); + ItemStack crimsonWoodPlanks = CRIMSON_WOOD_PLANKS.copy(); crimsonWoodPlanks.stackSize = 2; addShapelessRecipe(crimsonWoodPlanks, CRIMSON_STEM); @@ -94,44 +121,32 @@ public void loadRecipes() { bambooWoodPlanks.stackSize = 2; addShapelessRecipe(bambooWoodPlanks, BAMBOO_BLOCK); - ItemStack crimsonWoodSlab = CRIMSON_WOOD_SLAB.copy(); - crimsonWoodSlab.stackSize = 2; - addShapelessRecipe(crimsonWoodSlab, "craftingToolSaw", null, CRIMSON_WOOD_PLANKS, null); - - ItemStack warpedWoodSlab = WARPED_WOOD_SLAB.copy(); - warpedWoodSlab.stackSize = 2; - addShapelessRecipe(warpedWoodSlab, "craftingToolSaw", null, WARPED_WOOD_PLANKS, null); - - ItemStack mangroveWoodSlab = MANGROVE_WOOD_SLAB.copy(); - mangroveWoodSlab.stackSize = 2; - addShapelessRecipe(mangroveWoodSlab, "craftingToolSaw", null, MANGROVE_WOOD_PLANKS, null); - - ItemStack cherryWoodSlab = CHERRY_WOOD_SLAB.copy(); - cherryWoodSlab.stackSize = 2; - addShapelessRecipe(cherryWoodSlab, "craftingToolSaw", null, CHERRY_WOOD_PLANKS, null); - - ItemStack bambooWoodSlab = BAMBOO_WOOD_SLAB.copy(); - bambooWoodSlab.stackSize = 2; - addShapelessRecipe(bambooWoodSlab, "craftingToolSaw", null, BAMBOO_WOOD_PLANKS, null); - - ItemStack redSandstoneSlab = RED_SANDSTONE_SLAB.copy(); - redSandstoneSlab.stackSize = 2; - addShapelessRecipe(redSandstoneSlab, "craftingToolSaw", null, RED_SANDSTONE, null); - - ItemStack purpurSlab = PURPUR_SLAB.copy(); - purpurSlab.stackSize = 2; - addShapelessRecipe(purpurSlab, "craftingToolSaw", null, PURPUR_BLOCK, null); - - ItemStack smoothStoneSlab = SMOOTH_STONE_SLAB.copy(); - smoothStoneSlab.stackSize = 2; - addShapelessRecipe(smoothStoneSlab, "craftingToolSaw", null, "stone", null); + addSlabRecipe(CRIMSON_WOOD_SLAB, CRIMSON_WOOD_PLANKS); + addSlabRecipe(WARPED_WOOD_SLAB, WARPED_WOOD_PLANKS); + addSlabRecipe(MANGROVE_WOOD_SLAB, MANGROVE_WOOD_PLANKS); + addSlabRecipe(CHERRY_WOOD_SLAB, CHERRY_WOOD_PLANKS); + addSlabRecipe(BAMBOO_WOOD_SLAB, BAMBOO_WOOD_PLANKS); + addSlabRecipe(RED_SANDSTONE_SLAB, RED_SANDSTONE); + addSlabRecipe(CUT_RED_SANDSTONE_SLAB, CUT_RED_SANDSTONE); + addSlabRecipe(PURPUR_SLAB, PURPUR_BLOCK); + addSlabRecipe(SMOOTH_STONE_SLAB, "stone"); + addSlabRecipe(MOSSY_COBBLESTONE_SLAB, getModItem(Minecraft.ID, "mossy_cobblestone", 1, 0, missing)); + addSlabRecipe(MOSSY_STONE_BRICK_SLAB, getModItem(Minecraft.ID, "stonebrick", 1, 1, missing)); + addSlabRecipe(SMOOTH_QUARTZ_SLAB, SMOOTH_QUARTZ); + addSlabRecipe(RED_NETHERBRICK_SLAB, RED_NETHERBRICK); + addSlabRecipe(END_STONE_BRICK_SLAB, END_STONE_BRICK); + addSlabRecipe(COBBLED_DEEPSLATE_SLAB, COBBLED_DEEPSLATE); + addSlabRecipe(POLISHED_DEEPSLATE_SLAB, POLISHED_DEEPSLATE); + addSlabRecipe(DEEPSLATE_BRICK_SLAB, DEEPSLATE_BRICKS); + addSlabRecipe(DEEPSLATE_TILE_SLAB, DEEPSLATE_TILES); + addSlabRecipe(TUFF_SLAB, TUFF); + addSlabRecipe(POLISHED_TUFF_SLAB, POLISHED_TUFF); + addSlabRecipe(TUFF_BRICK_SLAB, TUFF_BRICKS); + } - ItemStack mossyCobblestoneSlab = MOSSY_COBBLESTONE_SLAB.copy(); - mossyCobblestoneSlab.stackSize = 2; - addShapelessRecipe(mossyCobblestoneSlab, "craftingToolSaw", null, getModItem(Minecraft.ID, "mossy_cobblestone", 1, 0, missing), null); - - ItemStack mossyStoneBrickSlab = MOSSY_STONE_BRICK_SLAB.copy(); - mossyStoneBrickSlab.stackSize = 2; - addShapelessRecipe(mossyStoneBrickSlab, "craftingToolSaw", null, getModItem(Minecraft.ID, "stonebrick", 1, 1, missing), null); + protected void addSlabRecipe(ItemStack result, Object ingredient) { + ItemStack output = result.copy(); + output.stackSize = 2; + addShapelessRecipe(output, "craftingToolSaw", null, ingredient, null); } }; \ No newline at end of file From 55a4aefacb31fdb5a4a200d7719f8ba23bcf0209 Mon Sep 17 00:00:00 2001 From: wmaxlees Date: Tue, 13 Aug 2024 16:49:41 -0600 Subject: [PATCH 06/11] Added in cutting machine recipes --- .../scripts/ScriptEtFuturumRequiem.java | 165 ++++++++++++------ 1 file changed, 113 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java index 5fde87aa6..f567ea560 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -1,13 +1,20 @@ package com.dreammaster.scripts; import static gregtech.api.enums.Mods.EtFuturumRequiem; +import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import java.util.Arrays; import java.util.List; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -31,38 +38,35 @@ public void loadRecipes() { final ItemStack CRIMSON_WOOD = getModItem(EtFuturumRequiem.ID, "crimson_stem", 1, 1, missing); final ItemStack STRIPPED_CRIMSON_STEM = getModItem(EtFuturumRequiem.ID, "crimson_stem", 1, 2, missing); final ItemStack STRIPPED_CRIMSON_WOOD = getModItem(EtFuturumRequiem.ID, "crimson_stem", 1, 3, missing); + final ItemStack CRIMSON_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 0, missing); + final ItemStack CRIMSON_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 0, missing); final ItemStack WARPED_STEM = getModItem(EtFuturumRequiem.ID, "warped_stem", 1, 0, missing); final ItemStack WARPED_WOOD = getModItem(EtFuturumRequiem.ID, "warped_stem", 1, 1, missing); final ItemStack STRIPPED_WARPED_STEM = getModItem(EtFuturumRequiem.ID, "warped_stem", 1, 2, missing); final ItemStack STRIPPED_WARPED_WOOD = getModItem(EtFuturumRequiem.ID, "warped_stem", 1, 3, missing); + final ItemStack WARPED_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 1, missing); + final ItemStack WARPED_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 1, missing); final ItemStack MANGROVE_LOG = getModItem(EtFuturumRequiem.ID, "mangrove_log", 1, 0, missing); final ItemStack MANGROVE_WOOD = getModItem(EtFuturumRequiem.ID, "mangrove_log", 1, 1, missing); final ItemStack STRIPPED_MANGROVE_LOG = getModItem(EtFuturumRequiem.ID, "mangrove_log", 1, 2, missing); final ItemStack STRIPPED_MANGROVE_WOOD = getModItem(EtFuturumRequiem.ID, "mangrove_log", 1, 3, missing); + final ItemStack MANGROVE_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 2, missing); + final ItemStack MANGROVE_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 2, missing); final ItemStack CHERRY_LOG = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 0, missing); final ItemStack CHERRY_WOOD = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 1, missing); final ItemStack STRIPPED_CHERRY_LOG = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 2, missing); final ItemStack STRIPPED_CHERRY_WOOD = getModItem(EtFuturumRequiem.ID, "cherry_log", 1, 3, missing); - - final ItemStack BAMBOO_BLOCK = getModItem(EtFuturumRequiem.ID, "bamboo_block", 1, 0, missing); - - final ItemStack CRIMSON_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 0, missing); - final ItemStack CRIMSON_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 0, missing); - - final ItemStack WARPED_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 1, missing); - final ItemStack WARPED_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 1, missing); - - final ItemStack MANGROVE_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 2, missing); - final ItemStack MANGROVE_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 2, missing); - final ItemStack CHERRY_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 3, missing); final ItemStack CHERRY_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 3, missing); + final ItemStack BAMBOO_BLOCK = getModItem(EtFuturumRequiem.ID, "bamboo_block", 1, 0, missing); final ItemStack BAMBOO_WOOD_PLANKS = getModItem(EtFuturumRequiem.ID, "wood_planks", 1, 4, missing); final ItemStack BAMBOO_WOOD_SLAB = getModItem(EtFuturumRequiem.ID, "wood_slab", 1, 4, missing); + final ItemStack BAMBOO_MOSAIC = getModItem(EtFuturumRequiem.ID, "bamboo_mosaic", 1, 0, missing); + final ItemStack BAMBOO_MOSAIC_SLAB = getModItem(EtFuturumRequiem.ID, "bamboo_mosaic_slab", 1, 0, missing); final ItemStack RED_SANDSTONE = getModItem(EtFuturumRequiem.ID, "red_sandstone", 1, 0, missing); final ItemStack RED_SANDSTONE_SLAB = getModItem(EtFuturumRequiem.ID, "red_sandstone_slab", 1, 0, missing); @@ -101,52 +105,109 @@ public void loadRecipes() { final ItemStack POLISHED_TUFF_SLAB = getModItem(EtFuturumRequiem.ID, "tuff_slab", 1, 1, missing); final ItemStack TUFF_BRICK_SLAB = getModItem(EtFuturumRequiem.ID, "tuff_slab", 1, 2, missing); - ItemStack crimsonWoodPlanks = CRIMSON_WOOD_PLANKS.copy(); - crimsonWoodPlanks.stackSize = 2; - addShapelessRecipe(crimsonWoodPlanks, CRIMSON_STEM); + final ItemStack MUD_BRICKS = getModItem(EtFuturumRequiem.ID, "packed_mud", 1, 1, missing); + final ItemStack MUD_BRICK_SLAB = getModItem(EtFuturumRequiem.ID, "mud_brick_slab", 1, 0, missing); + + final ItemStack CUT_COPPER = getModItem(EtFuturumRequiem.ID, "copper_block", 1, 4, missing); + final ItemStack CUT_COPPER_SLAB = getModItem(EtFuturumRequiem.ID, "cut_copper_slab", 1, 0, missing); + + final ItemStack BLACKSTONE = getModItem(EtFuturumRequiem.ID, "blackstone", 1, 0, missing); + final ItemStack POLISHED_BLACKSTONE = getModItem(EtFuturumRequiem.ID, "blackstone", 1, 1, missing); + final ItemStack POLISHED_BLACKSTONE_BRICKS = getModItem(EtFuturumRequiem.ID, "blackstone", 1, 2, missing); + final ItemStack BLACKSTONE_SLAB = getModItem(EtFuturumRequiem.ID, "blackstone_slab", 1, 0, missing); + final ItemStack POLISHED_BLACKSTONE_SLAB = getModItem(EtFuturumRequiem.ID, "blackstone_slab", 1, 1, missing); + final ItemStack POLISHED_BLACKSTONE_BRICK_SLAB = getModItem(EtFuturumRequiem.ID, "blackstone_slab", 1, 2, missing); + + addPlankRecipes(CRIMSON_WOOD_PLANKS, CRIMSON_STEM); + addPlankRecipes(WARPED_WOOD_PLANKS, WARPED_STEM); + addPlankRecipes(MANGROVE_WOOD_PLANKS, MANGROVE_LOG); + addPlankRecipes(CHERRY_WOOD_PLANKS, CHERRY_LOG); + addPlankRecipes(BAMBOO_WOOD_PLANKS, BAMBOO_BLOCK); + + addSlabRecipes(CRIMSON_WOOD_SLAB, CRIMSON_WOOD_PLANKS); + addSlabRecipes(WARPED_WOOD_SLAB, WARPED_WOOD_PLANKS); + addSlabRecipes(MANGROVE_WOOD_SLAB, MANGROVE_WOOD_PLANKS); + addSlabRecipes(CHERRY_WOOD_SLAB, CHERRY_WOOD_PLANKS); + addSlabRecipes(BAMBOO_WOOD_SLAB, BAMBOO_WOOD_PLANKS); + addSlabRecipes(RED_SANDSTONE_SLAB, RED_SANDSTONE); + addSlabRecipes(CUT_RED_SANDSTONE_SLAB, CUT_RED_SANDSTONE); + addSlabRecipes(PURPUR_SLAB, PURPUR_BLOCK); + addSlabRecipes(SMOOTH_STONE_SLAB, getModItem(Minecraft.ID, "stone", 1, 0, missing)); + addSlabRecipes(MOSSY_COBBLESTONE_SLAB, getModItem(Minecraft.ID, "mossy_cobblestone", 1, 0, missing)); + addSlabRecipes(MOSSY_STONE_BRICK_SLAB, getModItem(Minecraft.ID, "stonebrick", 1, 1, missing)); + addSlabRecipes(SMOOTH_QUARTZ_SLAB, SMOOTH_QUARTZ); + addSlabRecipes(RED_NETHERBRICK_SLAB, RED_NETHERBRICK); + addSlabRecipes(END_STONE_BRICK_SLAB, END_STONE_BRICK); + addSlabRecipes(COBBLED_DEEPSLATE_SLAB, COBBLED_DEEPSLATE); + addSlabRecipes(POLISHED_DEEPSLATE_SLAB, POLISHED_DEEPSLATE); + addSlabRecipes(DEEPSLATE_BRICK_SLAB, DEEPSLATE_BRICKS); + addSlabRecipes(DEEPSLATE_TILE_SLAB, DEEPSLATE_TILES); + addSlabRecipes(TUFF_SLAB, TUFF); + addSlabRecipes(POLISHED_TUFF_SLAB, POLISHED_TUFF); + addSlabRecipes(TUFF_BRICK_SLAB, TUFF_BRICKS); + addSlabRecipes(MUD_BRICK_SLAB, MUD_BRICKS); + addSlabRecipes(CUT_COPPER_SLAB, CUT_COPPER); + addSlabRecipes(BLACKSTONE_SLAB, BLACKSTONE); + addSlabRecipes(POLISHED_BLACKSTONE_SLAB, POLISHED_BLACKSTONE); + addSlabRecipes(POLISHED_BLACKSTONE_BRICK_SLAB, POLISHED_BLACKSTONE_BRICKS); + } - ItemStack warpedWoodPlanks = WARPED_WOOD_PLANKS.copy(); - warpedWoodPlanks.stackSize = 2; - addShapelessRecipe(warpedWoodPlanks, WARPED_STEM); + protected void addPlankRecipes(ItemStack result, ItemStack ingredient) { + ItemStack outputShapeless = result.copy(); + outputShapeless.stackSize = 2; + addShapelessRecipe(outputShapeless, ingredient); + + ItemStack outputSaw = result.copy(); + outputSaw.stackSize = 4; + addShapedRecipe(outputSaw, ingredient, "craftingToolSaw", null, null); + + ItemStack outputCutterLubricant = result.copy(); + outputCutterLubricant.stackSize = 6; + ItemStack sawdustCutterLubricant = getModItem(GregTech.ID, "gt.metaitem.01", 1, 1809); + GT_Values.RA.stdBuilder().itemInputs(ingredient) + .itemOutputs(outputCutterLubricant, sawdustCutterLubricant) + .fluidInputs(getFluidStack("lubricant", 1)) + .duration(10 * SECONDS).eut(7) + .addTo(cutterRecipes); + + ItemStack outputCutterWater = result.copy(); + outputCutterWater.stackSize = 4; + ItemStack sawdustCutterWater = getModItem(GregTech.ID, "gt.metaitem.01", 2, 1809); + GT_Values.RA.stdBuilder().itemInputs(ingredient) + .itemOutputs(outputCutterWater, sawdustCutterWater) + .fluidInputs(getFluidStack("ic2distilledwater", 3)) + .duration(20 * SECONDS).eut(7) + .addTo(cutterRecipes); + + GT_Values.RA.stdBuilder().itemInputs(ingredient) + .itemOutputs(outputCutterWater, sawdustCutterWater) + .fluidInputs(Materials.Water.getFluid(5)) + .duration(20 * SECONDS).eut(7) + .addTo(cutterRecipes); - ItemStack mangroveWoodPlanks = MANGROVE_WOOD_PLANKS.copy(); - mangroveWoodPlanks.stackSize = 2; - addShapelessRecipe(mangroveWoodPlanks, MANGROVE_LOG); - - ItemStack cherryWoodPlanks = CHERRY_WOOD_PLANKS.copy(); - cherryWoodPlanks.stackSize = 2; - addShapelessRecipe(cherryWoodPlanks, CHERRY_LOG); - - ItemStack bambooWoodPlanks = BAMBOO_WOOD_PLANKS.copy(); - bambooWoodPlanks.stackSize = 2; - addShapelessRecipe(bambooWoodPlanks, BAMBOO_BLOCK); - - addSlabRecipe(CRIMSON_WOOD_SLAB, CRIMSON_WOOD_PLANKS); - addSlabRecipe(WARPED_WOOD_SLAB, WARPED_WOOD_PLANKS); - addSlabRecipe(MANGROVE_WOOD_SLAB, MANGROVE_WOOD_PLANKS); - addSlabRecipe(CHERRY_WOOD_SLAB, CHERRY_WOOD_PLANKS); - addSlabRecipe(BAMBOO_WOOD_SLAB, BAMBOO_WOOD_PLANKS); - addSlabRecipe(RED_SANDSTONE_SLAB, RED_SANDSTONE); - addSlabRecipe(CUT_RED_SANDSTONE_SLAB, CUT_RED_SANDSTONE); - addSlabRecipe(PURPUR_SLAB, PURPUR_BLOCK); - addSlabRecipe(SMOOTH_STONE_SLAB, "stone"); - addSlabRecipe(MOSSY_COBBLESTONE_SLAB, getModItem(Minecraft.ID, "mossy_cobblestone", 1, 0, missing)); - addSlabRecipe(MOSSY_STONE_BRICK_SLAB, getModItem(Minecraft.ID, "stonebrick", 1, 1, missing)); - addSlabRecipe(SMOOTH_QUARTZ_SLAB, SMOOTH_QUARTZ); - addSlabRecipe(RED_NETHERBRICK_SLAB, RED_NETHERBRICK); - addSlabRecipe(END_STONE_BRICK_SLAB, END_STONE_BRICK); - addSlabRecipe(COBBLED_DEEPSLATE_SLAB, COBBLED_DEEPSLATE); - addSlabRecipe(POLISHED_DEEPSLATE_SLAB, POLISHED_DEEPSLATE); - addSlabRecipe(DEEPSLATE_BRICK_SLAB, DEEPSLATE_BRICKS); - addSlabRecipe(DEEPSLATE_TILE_SLAB, DEEPSLATE_TILES); - addSlabRecipe(TUFF_SLAB, TUFF); - addSlabRecipe(POLISHED_TUFF_SLAB, POLISHED_TUFF); - addSlabRecipe(TUFF_BRICK_SLAB, TUFF_BRICKS); } - protected void addSlabRecipe(ItemStack result, Object ingredient) { + protected void addSlabRecipes(ItemStack result, ItemStack ingredient) { ItemStack output = result.copy(); output.stackSize = 2; addShapelessRecipe(output, "craftingToolSaw", null, ingredient, null); + + GT_Values.RA.stdBuilder().itemInputs(ingredient) + .itemOutputs(output) + .fluidInputs(getFluidStack("lubricant", 1)) + .duration(1 * SECONDS + 5 * TICKS).eut(7) + .addTo(cutterRecipes); + + GT_Values.RA.stdBuilder().itemInputs(ingredient) + .itemOutputs(output) + .fluidInputs(getFluidStack("ic2distilledwater", 3)) + .duration(2 * SECONDS + 10 * TICKS).eut(7) + .addTo(cutterRecipes); + + GT_Values.RA.stdBuilder().itemInputs(ingredient) + .itemOutputs(output) + .fluidInputs(Materials.Water.getFluid(4)) + .duration(2 * SECONDS + 10 * TICKS).eut(7) + .addTo(cutterRecipes); } }; \ No newline at end of file From 7fb74437a38c949c637c6b301c406087f71ea0f9 Mon Sep 17 00:00:00 2001 From: wmaxlees Date: Tue, 13 Aug 2024 16:57:10 -0600 Subject: [PATCH 07/11] Reverted local changes for building --- dependencies.gradle | 2 +- repositories.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 9127ea802..037f5c43d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:bb8e42e") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.148:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.2:dev') { transitive = false } diff --git a/repositories.gradle b/repositories.gradle index f6e6039e8..40118b167 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,7 +1,6 @@ // Add any additional repositories for your dependencies here repositories { - mavenLocal() ivy { url 'https://files.vexatos.com/' patternLayout { From 6ac253a3b490a5324b4f1614a3105aaa1abd9ffe Mon Sep 17 00:00:00 2001 From: wmaxlees Date: Tue, 13 Aug 2024 20:51:11 -0600 Subject: [PATCH 08/11] spotlessJava --- .../scripts/ScriptEtFuturumRequiem.java | 73 ++++++++----------- .../dreammaster/scripts/ScriptMinecraft.java | 5 +- 2 files changed, 34 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java index f567ea560..f02d69f44 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -1,8 +1,8 @@ package com.dreammaster.scripts; import static gregtech.api.enums.Mods.EtFuturumRequiem; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; @@ -13,12 +13,14 @@ import java.util.Arrays; import java.util.List; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; + public class ScriptEtFuturumRequiem implements IScriptLoader { + @Override public String getScriptName() { return "Et Futurum Requiem"; @@ -26,10 +28,7 @@ public String getScriptName() { @Override public List getDependencies() { - return Arrays.asList( - EtFuturumRequiem.ID, - GTPlusPlus.ID - ); + return Arrays.asList(EtFuturumRequiem.ID, GTPlusPlus.ID); } @Override @@ -112,11 +111,16 @@ public void loadRecipes() { final ItemStack CUT_COPPER_SLAB = getModItem(EtFuturumRequiem.ID, "cut_copper_slab", 1, 0, missing); final ItemStack BLACKSTONE = getModItem(EtFuturumRequiem.ID, "blackstone", 1, 0, missing); - final ItemStack POLISHED_BLACKSTONE = getModItem(EtFuturumRequiem.ID, "blackstone", 1, 1, missing); - final ItemStack POLISHED_BLACKSTONE_BRICKS = getModItem(EtFuturumRequiem.ID, "blackstone", 1, 2, missing); + final ItemStack POLISHED_BLACKSTONE = getModItem(EtFuturumRequiem.ID, "blackstone", 1, 1, missing); + final ItemStack POLISHED_BLACKSTONE_BRICKS = getModItem(EtFuturumRequiem.ID, "blackstone", 1, 2, missing); final ItemStack BLACKSTONE_SLAB = getModItem(EtFuturumRequiem.ID, "blackstone_slab", 1, 0, missing); final ItemStack POLISHED_BLACKSTONE_SLAB = getModItem(EtFuturumRequiem.ID, "blackstone_slab", 1, 1, missing); - final ItemStack POLISHED_BLACKSTONE_BRICK_SLAB = getModItem(EtFuturumRequiem.ID, "blackstone_slab", 1, 2, missing); + final ItemStack POLISHED_BLACKSTONE_BRICK_SLAB = getModItem( + EtFuturumRequiem.ID, + "blackstone_slab", + 1, + 2, + missing); addPlankRecipes(CRIMSON_WOOD_PLANKS, CRIMSON_STEM); addPlankRecipes(WARPED_WOOD_PLANKS, WARPED_STEM); @@ -163,27 +167,18 @@ protected void addPlankRecipes(ItemStack result, ItemStack ingredient) { ItemStack outputCutterLubricant = result.copy(); outputCutterLubricant.stackSize = 6; - ItemStack sawdustCutterLubricant = getModItem(GregTech.ID, "gt.metaitem.01", 1, 1809); - GT_Values.RA.stdBuilder().itemInputs(ingredient) - .itemOutputs(outputCutterLubricant, sawdustCutterLubricant) - .fluidInputs(getFluidStack("lubricant", 1)) - .duration(10 * SECONDS).eut(7) - .addTo(cutterRecipes); + ItemStack sawdustCutterLubricant = getModItem(GregTech.ID, "gt.metaitem.01", 1, 2809); + GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterLubricant, sawdustCutterLubricant) + .fluidInputs(getFluidStack("lubricant", 1)).duration(10 * SECONDS).eut(7).addTo(cutterRecipes); ItemStack outputCutterWater = result.copy(); outputCutterWater.stackSize = 4; - ItemStack sawdustCutterWater = getModItem(GregTech.ID, "gt.metaitem.01", 2, 1809); - GT_Values.RA.stdBuilder().itemInputs(ingredient) - .itemOutputs(outputCutterWater, sawdustCutterWater) - .fluidInputs(getFluidStack("ic2distilledwater", 3)) - .duration(20 * SECONDS).eut(7) - .addTo(cutterRecipes); + ItemStack sawdustCutterWater = getModItem(GregTech.ID, "gt.metaitem.01", 2, 2809); + GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterWater, sawdustCutterWater) + .fluidInputs(getFluidStack("ic2distilledwater", 3)).duration(20 * SECONDS).eut(7).addTo(cutterRecipes); - GT_Values.RA.stdBuilder().itemInputs(ingredient) - .itemOutputs(outputCutterWater, sawdustCutterWater) - .fluidInputs(Materials.Water.getFluid(5)) - .duration(20 * SECONDS).eut(7) - .addTo(cutterRecipes); + GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterWater, sawdustCutterWater) + .fluidInputs(Materials.Water.getFluid(5)).duration(20 * SECONDS).eut(7).addTo(cutterRecipes); } @@ -192,22 +187,14 @@ protected void addSlabRecipes(ItemStack result, ItemStack ingredient) { output.stackSize = 2; addShapelessRecipe(output, "craftingToolSaw", null, ingredient, null); - GT_Values.RA.stdBuilder().itemInputs(ingredient) - .itemOutputs(output) - .fluidInputs(getFluidStack("lubricant", 1)) - .duration(1 * SECONDS + 5 * TICKS).eut(7) - .addTo(cutterRecipes); + GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(output).fluidInputs(getFluidStack("lubricant", 1)) + .duration(1 * SECONDS + 5 * TICKS).eut(7).addTo(cutterRecipes); - GT_Values.RA.stdBuilder().itemInputs(ingredient) - .itemOutputs(output) - .fluidInputs(getFluidStack("ic2distilledwater", 3)) - .duration(2 * SECONDS + 10 * TICKS).eut(7) - .addTo(cutterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ingredient) - .itemOutputs(output) - .fluidInputs(Materials.Water.getFluid(4)) - .duration(2 * SECONDS + 10 * TICKS).eut(7) + GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(output) + .fluidInputs(getFluidStack("ic2distilledwater", 3)).duration(2 * SECONDS + 10 * TICKS).eut(7) .addTo(cutterRecipes); + + GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(output).fluidInputs(Materials.Water.getFluid(4)) + .duration(2 * SECONDS + 10 * TICKS).eut(7).addTo(cutterRecipes); } -}; \ No newline at end of file +}; diff --git a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java index 6b7ce1fea..c2f5e5ec0 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMinecraft.java @@ -4582,7 +4582,10 @@ private void craftingRecipes() { getModItem(Minecraft.ID, "flower_pot", 1, 0, missing), "craftingToolFile", getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1, 0, missing)); - addShapelessRecipe(getModItem(Minecraft.ID, "stone_slab", 1, 0, missing), "craftingToolSaw", getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, missing)); + addShapelessRecipe( + getModItem(Minecraft.ID, "stone_slab", 1, 0, missing), + "craftingToolSaw", + getModItem(EtFuturumRequiem.ID, "smooth_stone", 1, missing)); addShapelessRecipe(getModItem(Minecraft.ID, "stone_slab", 1, 1, missing), "craftingToolSaw", "sandstone"); addShapelessRecipe(getModItem(Minecraft.ID, "stone_slab", 1, 3, missing), "craftingToolSaw", "cobblestone"); addShapelessRecipe( From 468c2a7efb7e964874d2226e23bd96244f8c1756 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 2 Sep 2024 10:23:42 +0200 Subject: [PATCH 09/11] use unifictaion in recipe (cherry picked from commit 3fc7ac860b31b1d93bab5ed46448d0c4bb05f50c) --- .../com/dreammaster/scripts/ScriptEtFuturumRequiem.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java index f02d69f44..b98e35880 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -2,7 +2,6 @@ import static gregtech.api.enums.Mods.EtFuturumRequiem; import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; @@ -18,6 +17,8 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; public class ScriptEtFuturumRequiem implements IScriptLoader { @@ -167,13 +168,13 @@ protected void addPlankRecipes(ItemStack result, ItemStack ingredient) { ItemStack outputCutterLubricant = result.copy(); outputCutterLubricant.stackSize = 6; - ItemStack sawdustCutterLubricant = getModItem(GregTech.ID, "gt.metaitem.01", 1, 2809); + ItemStack sawdustCutterLubricant = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L); GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterLubricant, sawdustCutterLubricant) .fluidInputs(getFluidStack("lubricant", 1)).duration(10 * SECONDS).eut(7).addTo(cutterRecipes); ItemStack outputCutterWater = result.copy(); outputCutterWater.stackSize = 4; - ItemStack sawdustCutterWater = getModItem(GregTech.ID, "gt.metaitem.01", 2, 2809); + ItemStack sawdustCutterWater = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L); GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterWater, sawdustCutterWater) .fluidInputs(getFluidStack("ic2distilledwater", 3)).duration(20 * SECONDS).eut(7).addTo(cutterRecipes); From 2f6fd9ec04715954a8a907b7a3152c8b78f8be77 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 3 Sep 2024 22:27:41 +0200 Subject: [PATCH 10/11] fix + update --- dependencies.gradle | 2 +- settings.gradle | 2 +- .../scripts/ScriptEtFuturumRequiem.java | 23 +++++++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7de113a62..ea0018abd 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -22,7 +22,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:amunra:0.6.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false } - compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.5-GTNH:dev") + compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev") runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612") runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.2.1-GTNH:dev") diff --git a/settings.gradle b/settings.gradle index 242692e5d..3d3ba12c7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27' } diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java index b98e35880..5024fa386 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -4,6 +4,9 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; +import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -15,10 +18,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; public class ScriptEtFuturumRequiem implements IScriptLoader { @@ -168,17 +171,17 @@ protected void addPlankRecipes(ItemStack result, ItemStack ingredient) { ItemStack outputCutterLubricant = result.copy(); outputCutterLubricant.stackSize = 6; - ItemStack sawdustCutterLubricant = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L); - GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterLubricant, sawdustCutterLubricant) + ItemStack sawdustCutterLubricant = GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L); + GTValues.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterLubricant, sawdustCutterLubricant) .fluidInputs(getFluidStack("lubricant", 1)).duration(10 * SECONDS).eut(7).addTo(cutterRecipes); ItemStack outputCutterWater = result.copy(); outputCutterWater.stackSize = 4; - ItemStack sawdustCutterWater = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L); - GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterWater, sawdustCutterWater) + ItemStack sawdustCutterWater = GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L); + GTValues.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterWater, sawdustCutterWater) .fluidInputs(getFluidStack("ic2distilledwater", 3)).duration(20 * SECONDS).eut(7).addTo(cutterRecipes); - GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterWater, sawdustCutterWater) + GTValues.RA.stdBuilder().itemInputs(ingredient).itemOutputs(outputCutterWater, sawdustCutterWater) .fluidInputs(Materials.Water.getFluid(5)).duration(20 * SECONDS).eut(7).addTo(cutterRecipes); } @@ -188,14 +191,14 @@ protected void addSlabRecipes(ItemStack result, ItemStack ingredient) { output.stackSize = 2; addShapelessRecipe(output, "craftingToolSaw", null, ingredient, null); - GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(output).fluidInputs(getFluidStack("lubricant", 1)) + GTValues.RA.stdBuilder().itemInputs(ingredient).itemOutputs(output).fluidInputs(getFluidStack("lubricant", 1)) .duration(1 * SECONDS + 5 * TICKS).eut(7).addTo(cutterRecipes); - GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(output) + GTValues.RA.stdBuilder().itemInputs(ingredient).itemOutputs(output) .fluidInputs(getFluidStack("ic2distilledwater", 3)).duration(2 * SECONDS + 10 * TICKS).eut(7) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder().itemInputs(ingredient).itemOutputs(output).fluidInputs(Materials.Water.getFluid(4)) + GTValues.RA.stdBuilder().itemInputs(ingredient).itemOutputs(output).fluidInputs(Materials.Water.getFluid(4)) .duration(2 * SECONDS + 10 * TICKS).eut(7).addTo(cutterRecipes); } }; From f557af840d5f157897790c34a4d0eda9231a1c13 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 3 Sep 2024 22:29:58 +0200 Subject: [PATCH 11/11] fix --- .../java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java index 5024fa386..9a3f1cae0 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java +++ b/src/main/java/com/dreammaster/scripts/ScriptEtFuturumRequiem.java @@ -7,9 +7,6 @@ import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; -import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import java.util.Arrays;