From 24d9ece9e6fc4df62b682d34992e538b992ae2d2 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 1 Oct 2024 21:53:01 +0100 Subject: [PATCH 01/31] hweat --- .../gtceu/data/recipe/misc/VanillaStandardRecipes.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index ed30b06f44..e9a2f4d512 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -3,6 +3,7 @@ import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; import com.gregtechceu.gtceu.api.data.chemical.material.stack.UnificationEntry; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.CustomTags; @@ -1239,6 +1240,8 @@ private static void miscRecipes(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("hopper_minecart").EUt(4).duration(100) .inputItems(new ItemStack(Items.MINECART)).inputItems(new ItemStack(Blocks.HOPPER)) .outputItems(new ItemStack(Items.HOPPER_MINECART)).save(provider); + + VanillaRecipeHelper.addShapelessRecipe(provider, "hay_block_to_hay", new ItemStack(Items.WHEAT, 9), Items.HAY_BLOCK, 'k'); } /** From a54f4b3e6eaee7e92219b37ff03d2f3f025f7663 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 1 Oct 2024 21:59:16 +0100 Subject: [PATCH 02/31] Iron nugget sawing --- .../gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java index 62554759b5..196c9ae4d8 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java @@ -88,6 +88,7 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addSmeltingRecipe(provider, "wrought_iron_nugget", ChemicalHelper.getTag(nugget, Iron), ChemicalHelper.get(nugget, WroughtIron)); + VanillaRecipeHelper.addShapelessRecipe(provider, "iron_nugget_sawing", new ItemStack(Items.IRON_NUGGET), new ItemStack(Items.IRON_INGOT), 's'); // TODO clipboard // VanillaRecipeHelper.addShapedRecipe(provider, "clipboard", CLIPBOARD.asStack(), " Sd", "BWR", "PPP", 'P', From 45ad1bfb4e8146c8d0840a8abdeb43022cd3b362 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 1 Oct 2024 22:47:52 +0100 Subject: [PATCH 03/31] Change recipe ID to be in line with processNuggets --- .../gtceu/data/recipe/misc/CraftingRecipeLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java index 196c9ae4d8..a5ef26b551 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java @@ -88,7 +88,7 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addSmeltingRecipe(provider, "wrought_iron_nugget", ChemicalHelper.getTag(nugget, Iron), ChemicalHelper.get(nugget, WroughtIron)); - VanillaRecipeHelper.addShapelessRecipe(provider, "iron_nugget_sawing", new ItemStack(Items.IRON_NUGGET), new ItemStack(Items.IRON_INGOT), 's'); + VanillaRecipeHelper.addShapelessRecipe(provider, "nugget_disassembling_iron", new ItemStack(Items.IRON_NUGGET), new ItemStack(Items.IRON_INGOT), 's'); // TODO clipboard // VanillaRecipeHelper.addShapedRecipe(provider, "clipboard", CLIPBOARD.asStack(), " Sd", "BWR", "PPP", 'P', From 6ab54e19d00082e0e8e9cccb0f91f5fa6f28df92 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:37:23 +0100 Subject: [PATCH 04/31] Light concrete :lets: --- .../gtceu/data/recipe/misc/MiscRecipeLoader.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java index c774185737..63927f8666 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java @@ -539,5 +539,12 @@ public static void init(Consumer provider) { .inputItems(ring, Steel, 2) .outputItems(STEEL_MINECART_WHEELS) .duration(60).EUt(20).save(provider); + + FLUID_SOLIDFICATION_RECIPES.recipeBuilder("light_concrete") + .inputFluids(Concrete.getFluid(144)) + .inputItems(SHAPE_MOLD_BLOCK) + .outputItems(GTBlocks.LIGHT_CONCRETE) + .duration(100).EUt(VA[ULV]) + .save(provider); } } From 0fda8cbfb16af3e16d27fa54e33578a49538184b Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:37:31 +0100 Subject: [PATCH 05/31] Carpet --- .../gtceu/data/recipe/configurable/RecipeAddition.java | 10 ++++++++++ .../gtceu/data/recipe/configurable/RecipeRemoval.java | 1 + 2 files changed, 11 insertions(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java index fa8be29532..60ee5e53bb 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java @@ -19,6 +19,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; +import java.util.Locale; import java.util.function.Consumer; import static com.gregtechceu.gtceu.api.GTValues.*; @@ -1335,6 +1336,7 @@ private static void hardMiscRecipes(Consumer provider) { for (DyeColor color : DyeColor.values()) { addBedRecipe(provider, color); + addCarpetRecipe(provider, color); } } else { @@ -1374,6 +1376,14 @@ private static void addBedRecipe(Consumer provider, DyeColor col 'F', ItemTags.WOODEN_FENCES); } + private static void addCarpetRecipe(Consumer provider, DyeColor color) { + String colorName = color.getName(); + VanillaRecipeHelper.addShapedRecipe(provider, colorName + "_carpet", + new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(colorName + "_carpet"))), "WW", + 'W', BuiltInRegistries.ITEM.get(new ResourceLocation(colorName + "_wool")) + ); + } + private static void hardGlassRecipes(Consumer provider) {} private static void nerfPaperCrafting(Consumer provider) { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index 9e44650774..38f9a94520 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -349,6 +349,7 @@ private static void removeVanillaBlockRecipes(Consumer registr registry.accept(new ResourceLocation("minecraft:cracked_stone_bricks")); registry.accept(new ResourceLocation("minecraft:mossy_cobblestone_from_moss_block")); registry.accept(new ResourceLocation("minecraft:mossy_cobblestone_from_vine")); + // TODO add recipes for ALL of these. sigh where do the nitpicks end // registry.accept(new ResourceLocation("minecraft:deepslate_bricks")); // registry.accept(new ResourceLocation("minecraft:cracked_nether_bricks")); // registry.accept(new ResourceLocation("minecraft:chiseled_nether_bricks")); From 616149248c16543bdef90d321293816bc41a0ba0 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:49:32 +0100 Subject: [PATCH 06/31] Nuggets for days! A nugget for you, a nugget for you, and a nugget for YOU --- .../gtceu/data/recipe/misc/CraftingRecipeLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java index a5ef26b551..fca1492df6 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java @@ -88,7 +88,7 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addSmeltingRecipe(provider, "wrought_iron_nugget", ChemicalHelper.getTag(nugget, Iron), ChemicalHelper.get(nugget, WroughtIron)); - VanillaRecipeHelper.addShapelessRecipe(provider, "nugget_disassembling_iron", new ItemStack(Items.IRON_NUGGET), new ItemStack(Items.IRON_INGOT), 's'); + VanillaRecipeHelper.addShapelessRecipe(provider, "nugget_disassembling_iron", new ItemStack(Items.IRON_NUGGET, 9), new ItemStack(Items.IRON_INGOT), 's'); // TODO clipboard // VanillaRecipeHelper.addShapedRecipe(provider, "clipboard", CLIPBOARD.asStack(), " Sd", "BWR", "PPP", 'P', From 4bcf4a6a6b9c4c99cbd35ce177c31b52a489554a Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Wed, 2 Oct 2024 00:14:45 +0100 Subject: [PATCH 07/31] Ok. actually fixed light concrete this time --- .../gregtechceu/gtceu/common/data/GTMaterials.java | 3 ++- .../gtceu/data/recipe/misc/MiscRecipeLoader.java | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java index 1119778619..4572925da0 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java @@ -176,8 +176,8 @@ public static void init() { rock.setIgnored(Deepslate, Blocks.DEEPSLATE); rock.setIgnored(Basalt, Blocks.BASALT); block.setIgnored(Sculk, Blocks.SCULK); - block.setIgnored(Concrete, SupplierMemoizer.memoizeBlockSupplier(() -> GTBlocks.LIGHT_CONCRETE.get())); block.setIgnored(Concrete, SupplierMemoizer.memoizeBlockSupplier(() -> GTBlocks.DARK_CONCRETE.get())); + block.setIgnored(Concrete, SupplierMemoizer.memoizeBlockSupplier(() -> GTBlocks.LIGHT_CONCRETE.get())); for (TagPrefix prefix : ORES.keySet()) { TagPrefix.OreType oreType = ORES.get(prefix); @@ -921,6 +921,7 @@ private static void excludeAllGemsButNormal(Material material) { public static Material Gypsum; public static Material Zeolite; public static Material Concrete; + public static Material DarkConcrete; public static Material SteelMagnetic; public static Material VanadiumSteel; public static Material Potin; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java index 63927f8666..830870e67e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java @@ -540,11 +540,11 @@ public static void init(Consumer provider) { .outputItems(STEEL_MINECART_WHEELS) .duration(60).EUt(20).save(provider); - FLUID_SOLIDFICATION_RECIPES.recipeBuilder("light_concrete") - .inputFluids(Concrete.getFluid(144)) - .inputItems(SHAPE_MOLD_BLOCK) - .outputItems(GTBlocks.LIGHT_CONCRETE) - .duration(100).EUt(VA[ULV]) - .save(provider); +// FLUID_SOLIDFICATION_RECIPES.recipeBuilder("light_concrete") +// .inputFluids(Concrete.getFluid(144)) +// .inputItems(SHAPE_MOLD_BLOCK) +// .outputItems(GTBlocks.LIGHT_CONCRETE) +// .duration(100).EUt(VA[ULV]) +// .save(provider); } } From f4abb55219c73a5a0343de5637e58b868f4cd358 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:03:11 +0100 Subject: [PATCH 08/31] Glass pane recipe in correct config --- .../gtceu/data/recipe/configurable/RecipeAddition.java | 5 ++++- .../gtceu/data/recipe/misc/VanillaStandardRecipes.java | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java index 60ee5e53bb..d76680a1dc 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java @@ -1384,7 +1384,10 @@ private static void addCarpetRecipe(Consumer provider, DyeColor ); } - private static void hardGlassRecipes(Consumer provider) {} + private static void hardGlassRecipes(Consumer provider) { + VanillaRecipeHelper.addShapedRecipe(provider, "glass_pane", new ItemStack(Blocks.GLASS_PANE, 2), "sG", 'G', + new ItemStack(Blocks.GLASS)); + } private static void nerfPaperCrafting(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, "paper_dust", diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index e9a2f4d512..d2b7fed085 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -209,9 +209,6 @@ private static void glassRecipes(Consumer provider) { // .save(provider); // } - VanillaRecipeHelper.addShapedRecipe(provider, "glass_pane", new ItemStack(Blocks.GLASS_PANE, 2), "sG", 'G', - new ItemStack(Blocks.GLASS)); - CUTTER_RECIPES.recipeBuilder("cut_glass_block_to_plate").duration(50).EUt(VA[ULV]) .inputItems(new ItemStack(Blocks.GLASS, 3)) .outputItems(new ItemStack(Blocks.GLASS_PANE, 8)) From af593c165dfd83644dc9a31c82c569e7319b8b39 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Sun, 6 Oct 2024 09:33:28 +0100 Subject: [PATCH 09/31] Skee biddy (wood tag for wooden drums and crates) --- .../resources/data/minecraft/tags/blocks/mineable/axe.json | 4 +++- .../com/gregtechceu/gtceu/data/tags/BlockTagLoader.java | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index f954d8b13f..ab4457c554 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -28,6 +28,8 @@ "gtceu:treated_wood_wall_hanging_sign", "gtceu:treated_wood_pressure_plate", "gtceu:treated_wood_trapdoor", - "gtceu:treated_wood_stairs" + "gtceu:treated_wood_stairs", + "gtceu:wood_drum", + "gtceu:wood_crate" ] } \ No newline at end of file diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java index f9726f9cca..995ffb3fc6 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/BlockTagLoader.java @@ -3,12 +3,14 @@ import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTMachines; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.data.recipe.CustomTags; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagEntry; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; @@ -37,6 +39,10 @@ public static void init(RegistrateTagsProvider provider) { GTMaterials.OilHeavy.getFluid().defaultFluidState().createLegacyBlock().getBlock(), GTMaterials.RawOil.getFluid().defaultFluidState().createLegacyBlock().getBlock(), GTMaterials.NaturalGas.getFluid().defaultFluidState().createLegacyBlock().getBlock()); + + provider.addTag(BlockTags.MINEABLE_WITH_AXE) + .add(TagEntry.element(GTMachines.WOODEN_DRUM.getId())) + .add(TagEntry.element(GTMachines.WOODEN_CRATE.getId())); } private static void create(RegistrateTagsProvider provider, TagPrefix prefix, Material material, From 2125e36e97cbb0796fd1a49ddbaa2cfed5f2a7df Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Sun, 6 Oct 2024 10:02:34 +0100 Subject: [PATCH 10/31] Tooltip for basic tape --- src/generated/resources/assets/gtceu/lang/en_ud.json | 5 ++--- src/generated/resources/assets/gtceu/lang/en_us.json | 5 ++--- src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 2b901d21ea..83c4732c64 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -4107,7 +4107,7 @@ "item.gtceu.basic_integrated_circuit.tooltip.0": "ןnɟɹǝʍod ǝɹoɯ puɐ ɹǝןןɐɯSㄥ§", "item.gtceu.basic_integrated_circuit.tooltip.1": "ʇınɔɹıƆ ɹǝı⟘-ΛꞀ9§", "item.gtceu.basic_tape": "ǝdɐ⟘", - "item.gtceu.basic_tape.tooltip": "sǝnssı ןɐɔıuɐɥɔǝɯ ɹoɟ ɥbnouǝ buoɹʇs ʇoN", + "item.gtceu.basic_tape.tooltip": "sɯǝʇı ɹıǝɥʇ buıddoɹp ʇnoɥʇıʍ sǝʇɐɹɔ dn ʞɔıd oʇ pǝsn ǝq uɐƆ\nsǝnssı ןɐɔıuɐɥɔǝɯ ɹoɟ ɥbnouǝ buoɹʇs ʇoㄥ§N", "item.gtceu.battery.charge_detailed.0": ")ㄥ§buıuıɐɯǝɹ %s %s/%sɐ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sɐ§", "item.gtceu.battery.charge_detailed.1": ")ㄥ§buıuıɐɯǝɹ %s %s/%sǝ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sǝ§", "item.gtceu.battery.charge_detailed.2": ")ㄥ§buıuıɐɯǝɹ %s %s/%sɔ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sɔ§", @@ -4184,7 +4184,6 @@ "item.gtceu.cpu_chip.tooltip": "ʇıu∩ buıssǝɔoɹԀ ןɐɹʇuǝƆㄥ§", "item.gtceu.cpu_wafer": "ɹǝɟɐM ∩ԀƆ", "item.gtceu.cpu_wafer.tooltip": "ʇıu∩ buıssǝɔoɹԀ ʍɐᴚㄥ§", - "item.gtceu.crafting_table_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ǝuıɥɔɐW ɐ uo ㄥ§ɥɔuǝqʞɹoM pǝɔuɐʌpⱯɟ§", "item.gtceu.credit_casting_mold": ")ǝbɐuıoƆ( pןoW buıʇsɐƆ", "item.gtceu.credit_casting_mold.tooltip": ")¡ʇı ǝsoן ʇ,uoᗡ( suıoƆ buıʞɐɯ ɹoɟ pןoW ǝɹnɔǝSㄥ§", "item.gtceu.crushed_bentonite_ore": "ǝʇıuoʇuǝᗺ punoɹ⅁", @@ -4809,7 +4808,7 @@ "item.gtceu.sticky_resin": "uısǝᴚ ʎʞɔıʇS", "item.gtceu.sugar_gem": "ǝqnƆ ɹɐbnS", "item.gtceu.sus_record": "ɔsıᗡ ɔısnW", - "item.gtceu.sus_record.desc": "¡ʎssns", + "item.gtceu.sus_record.desc": "¡ʎssnsㄥ§", "item.gtceu.sword_extruder_mold.tooltip": "spɹoʍS buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§", "item.gtceu.talc_dust": "ɔןɐ⟘", "item.gtceu.tantalum_capacitor": "ɹoʇıɔɐdɐƆ ɯnןɐʇuɐ⟘", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 7513de071c..9894c88e0f 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -4107,7 +4107,7 @@ "item.gtceu.basic_integrated_circuit.tooltip.0": "§7Smaller and more powerful", "item.gtceu.basic_integrated_circuit.tooltip.1": "§6LV-Tier Circuit", "item.gtceu.basic_tape": "Tape", - "item.gtceu.basic_tape.tooltip": "Not strong enough for mechanical issues", + "item.gtceu.basic_tape.tooltip": "N§7ot strong enough for mechanical issues\nCan be used to pick up crates without dropping their items", "item.gtceu.battery.charge_detailed.0": "§a%s/%s EU§7 - Tier %s §7(§a%s/%s %s remaining§7)", "item.gtceu.battery.charge_detailed.1": "§e%s/%s EU§7 - Tier %s §7(§e%s/%s %s remaining§7)", "item.gtceu.battery.charge_detailed.2": "§c%s/%s EU§7 - Tier %s §7(§c%s/%s %s remaining§7)", @@ -4184,7 +4184,6 @@ "item.gtceu.cpu_chip.tooltip": "§7Central Processing Unit", "item.gtceu.cpu_wafer": "CPU Wafer", "item.gtceu.cpu_wafer.tooltip": "§7Raw Processing Unit", - "item.gtceu.crafting_table_cover.tooltip": "§fAdvanced Workbench§7 on a Machine as §fCover§7.", "item.gtceu.credit_casting_mold": "Casting Mold (Coinage)", "item.gtceu.credit_casting_mold.tooltip": "§7Secure Mold for making Coins (Don't lose it!)", "item.gtceu.crushed_bentonite_ore": "Ground Bentonite", @@ -4809,7 +4808,7 @@ "item.gtceu.sticky_resin": "Sticky Resin", "item.gtceu.sugar_gem": "Sugar Cube", "item.gtceu.sus_record": "Music Disc", - "item.gtceu.sus_record.desc": "sussy!", + "item.gtceu.sus_record.desc": "§7sussy!", "item.gtceu.sword_extruder_mold.tooltip": "§7Extruder Shape for making Swords", "item.gtceu.talc_dust": "Talc", "item.gtceu.tantalum_capacitor": "Tantalum Capacitor", diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java index 44432f61f7..a0b0ff58b8 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java @@ -327,7 +327,6 @@ private static void initItemTooltips(RegistrateLangProvider provider) { "§7Voids §fItems§7 with amount control as §fCover§7.\nActivate with §fSoft Mallet§7 after placement."); provider.add("item.gtceu.facade_cover.tooltip", "§7Decorative Outfit §fCover§7."); provider.add("item.gtceu.computer_monitor_cover.tooltip", "§7Displays §fData§7 as §fCover§7."); - provider.add("item.gtceu.crafting_table_cover.tooltip", "§fAdvanced Workbench§7 on a Machine as §fCover§7."); provider.add("item.gtceu.shutter_module_cover.tooltip", "§fBlocks Transfer§7 through attached Side as §fCover§7."); multilineLang(provider, "item.gtceu.solar_panel.tooltip", @@ -342,8 +341,8 @@ private static void initItemTooltips(RegistrateLangProvider provider) { multilineLang(provider, "item.gtceu.foam_sprayer.tooltip", "§7Sprays Construction Foam\nUse on a frame to foam connected frames\nFoam can be colored"); provider.add("item.gtceu.firebrick.tooltip", "§7Heat resistant"); - provider.add("item.gtceu.basic_tape.tooltip", "Not strong enough for mechanical issues"); + provider.add("item.gtceu.basic_tape.tooltip", "N§7ot strong enough for mechanical issues\nCan be used to pick up crates without dropping their items"); - provider.add("item.gtceu.sus_record.desc", "sussy!"); + provider.add("item.gtceu.sus_record.desc", "§7sussy!"); } } From 12c69048af48aa36aeb4896e1c929b3847755050 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:41:15 +0100 Subject: [PATCH 11/31] Copper recipe removals for harder --- .../gtceu/data/recipe/configurable/RecipeRemoval.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index 38f9a94520..72bee57c1b 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -102,7 +102,8 @@ private static void disableManualCompression(Consumer registry registry.accept(new ResourceLocation("minecraft:glowstone")); registry.accept(new ResourceLocation("minecraft:amethyst_block")); registry.accept(new ResourceLocation("minecraft:copper_block")); - registry.accept(new ResourceLocation("minecraft:copper")); + registry.accept(new ResourceLocation("minecraft:copper_ingot")); + registry.accept(new ResourceLocation("minecraft:copper_ingot_from_waxed_copper_block")); registry.accept(new ResourceLocation("minecraft:honeycomb_block")); registry.accept(new ResourceLocation("minecraft:snow_block")); registry.accept(new ResourceLocation("minecraft:netherite_block")); From 0eb5a945d534d2d65d7f6aa004ea8a91989e0c0f Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 8 Oct 2024 05:28:21 +0100 Subject: [PATCH 12/31] Packed ice --- .../gtceu/data/recipe/configurable/RecipeRemoval.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index 72bee57c1b..e473b8c5b9 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -266,6 +266,7 @@ private static void hardMiscRecipes(Consumer registry) { registry.accept(new ResourceLocation("minecraft:recovery_compass")); registry.accept(new ResourceLocation("minecraft:spyglass")); registry.accept(new ResourceLocation("minecraft:chain")); + registry.accept(new ResourceLocation("minecraft:packed_ice")); } private static void hardGlassRecipes(Consumer registry) { From 45a2f7a5b6b1d106bf69d40af6e91a7815bf6de5 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 8 Oct 2024 05:48:26 +0100 Subject: [PATCH 13/31] Soul lantern stuff --- .../recipe/misc/VanillaStandardRecipes.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index d2b7fed085..26a335dffa 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -394,13 +394,6 @@ private static void woodRecipes(Consumer provider) { .duration(100).EUt(4) .save(provider); - // todo trapdoors - // ASSEMBLER_RECIPES.recipeBuilder() - // .inputItems(ItemTags.PLANKS, 3).circuitMeta(3) - // .outputItems(new ItemStack(Blocks.TRAPDOOR, 2)) - // .duration(100).EUt(4) - // .save(provider); - ASSEMBLER_RECIPES.recipeBuilder("chest") .inputItems(ItemTags.PLANKS, 8) .outputItems(new ItemStack(Blocks.CHEST)) @@ -443,7 +436,7 @@ private static void woodRecipes(Consumer provider) { .outputItems(new ItemStack(Blocks.SOUL_TORCH)) .duration(100).EUt(1).save(provider); - ASSEMBLER_RECIPES.recipeBuilder("soul_lantern") + ASSEMBLER_RECIPES.recipeBuilder("soul_lantern_from_lantern") .inputItems(new ItemStack(Blocks.LANTERN)) .inputItems(ItemTags.SOUL_FIRE_BASE_BLOCKS) .outputItems(new ItemStack(Blocks.SOUL_LANTERN)) @@ -545,6 +538,16 @@ private static void woodRecipes(Consumer provider) { 'W', ItemTags.WOOL, 'S', new ItemStack(Items.STICK), 'B', Creosote.getBucket()); VanillaRecipeHelper.addShapedRecipe(provider, "soul_torch", new ItemStack(Blocks.SOUL_TORCH, 1), "WB", 'W', ItemTags.SOUL_FIRE_BASE_BLOCKS, 'B', new ItemStack(Blocks.TORCH)); + if (!ConfigHolder.INSTANCE.recipes.hardMiscRecipes) { + VanillaRecipeHelper.addShapedRecipe(provider, "soul_lantern", new ItemStack(Blocks.SOUL_LANTERN, 1), "WB", + 'W', ItemTags.SOUL_FIRE_BASE_BLOCKS, 'B', new ItemStack(Blocks.SOUL_LANTERN)); + + ASSEMBLER_RECIPES.recipeBuilder("soul_lantern") + .inputItems(new ItemStack(Blocks.LANTERN)) + .inputItems(ItemTags.SOUL_FIRE_BASE_BLOCKS) + .outputItems(new ItemStack(Blocks.SOUL_LANTERN)) + .duration(100).EUt(1).save(provider); + } ASSEMBLER_RECIPES.recipeBuilder("redstone_torch").EUt(4).inputItems(dust, Redstone) .inputItems(new ItemStack(Items.STICK)).outputItems(new ItemStack(Blocks.REDSTONE_TORCH, 1)) From cc01ea65851844687d6796ca0b838d080fc0ec5e Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 8 Oct 2024 05:48:34 +0100 Subject: [PATCH 14/31] Hard wood recipe removals --- .../data/recipe/misc/WoodMachineRecipes.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java index 44ef34d4be..b383e18629 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java @@ -846,6 +846,21 @@ private static void hardWoodTypeRecipes(Consumer registry, @No registry.accept(new ResourceLocation(entry.modid, entry.fenceGateRecipeName)); } } + if (entry.trapdoor != null) { + if (entry.trapdoorRecipeName != null) { + registry.accept(new ResourceLocation(entry.modid, entry.trapdoorRecipeName)); + } + } + if (entry.chestBoat != null) { + if (entry.chestBoatRecipeName != null) { + registry.accept(new ResourceLocation(entry.modid, entry.chestBoatRecipeName)); + } + } + if (entry.sign != null) { + if (entry.signRecipeName != null) { + registry.accept(new ResourceLocation(entry.modid, entry.signRecipeName)); + } + } } } From efda8dd22d63fe4ad59494bcef35339200d3fb5f Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:55:13 +0100 Subject: [PATCH 15/31] Lightning rod recipe --- .../gtceu/data/recipe/configurable/RecipeAddition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java index d76680a1dc..cb0ab6edb5 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java @@ -1243,8 +1243,8 @@ private static void hardMiscRecipes(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, "lightning_rod", new ItemStack(Blocks.LIGHTNING_ROD), " B ", "fRh", " R ", - 'R', rod, Copper, - 'B', plateDouble, Copper); + 'R', new UnificationEntry(rod, Copper), + 'B', new UnificationEntry(plateDouble, Copper)); ASSEMBLER_RECIPES.recipeBuilder("lightning_rod") .inputItems(rod, Copper, 2) From e838bcc421065e3110354d6fd44c7758fbcde001 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:44:22 +0100 Subject: [PATCH 16/31] Lodestone removal --- .../gtceu/data/recipe/configurable/RecipeRemoval.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index e473b8c5b9..8b0dfb70a3 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -267,6 +267,7 @@ private static void hardMiscRecipes(Consumer registry) { registry.accept(new ResourceLocation("minecraft:spyglass")); registry.accept(new ResourceLocation("minecraft:chain")); registry.accept(new ResourceLocation("minecraft:packed_ice")); + registry.accept(new ResourceLocation("minecraft:lodestone")); } private static void hardGlassRecipes(Consumer registry) { From 38453ce3a7697439b9daced5d5140c82be2e13c6 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:44:38 +0100 Subject: [PATCH 17/31] Hanging sign --- .../gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java index b383e18629..1e76b9c4e7 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java @@ -535,8 +535,8 @@ public static void registerWoodTypeRecipe(Consumer provider, @No String recipeNameHanging = hasHangingSignRecipe ? entry.hangingSignRecipeName : name + "_hanging_sign"; ASSEMBLER_RECIPES.recipeBuilder(recipeNameHanging) .inputItems(entry.sign) - .inputItems(ring, Iron, 2) .inputItems(Items.CHAIN, 2) + .outputItems(entry.hangingSign) .circuitMeta(5) .duration(150) .EUt(4) From 0286a05c65173b46411512606f5ed86a60ab301d Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:52:57 +0100 Subject: [PATCH 18/31] Misc compressor recipe fixes --- .../recipe/misc/VanillaStandardRecipes.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index 26a335dffa..e74f508ccd 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -93,20 +93,34 @@ private static void compressingRecipes(Consumer provider) { .outputItems(new ItemStack(Blocks.GLOWSTONE)) .save(provider); - COMPRESSOR_RECIPES.recipeBuilder("packed_ice").inputItems(new ItemStack(Blocks.ICE, 9)) - .outputItems(new ItemStack(Blocks.PACKED_ICE)).save(provider); - COMPRESSOR_RECIPES.recipeBuilder("blue_ice").inputItems(new ItemStack(Blocks.PACKED_ICE, 9)) - .outputItems(new ItemStack(Blocks.BLUE_ICE)).save(provider); - COMPRESSOR_RECIPES.recipeBuilder("ice_from_dust").inputItems(dust, Ice).outputItems(new ItemStack(Blocks.ICE)) + COMPRESSOR_RECIPES.recipeBuilder("packed_ice") + .inputItems(new ItemStack(Blocks.ICE, 9)) + .outputItems(new ItemStack(Blocks.PACKED_ICE)) + .duration(300).EUt(2) .save(provider); + + COMPRESSOR_RECIPES.recipeBuilder("blue_ice") + .inputItems(new ItemStack(Blocks.PACKED_ICE, 9)) + .outputItems(new ItemStack(Blocks.BLUE_ICE)) + .duration(300).EUt(2) + .save(provider); + + COMPRESSOR_RECIPES.recipeBuilder("ice_from_dust") + .inputItems(dust, Ice) + .outputItems(new ItemStack(Blocks.ICE)) + .duration(300).EUt(2) + .save(provider); + COMPRESSOR_RECIPES.recipeBuilder("dripstone_block_from_pointed_dripstone") .inputItems(new ItemStack(Items.POINTED_DRIPSTONE, 4)) .outputItems(new ItemStack(Blocks.DRIPSTONE_BLOCK)) + .duration(300).EUt(2) .save(provider); FORGE_HAMMER_RECIPES.recipeBuilder("pointed_dripstone_from_dripstone_block") .inputItems(new ItemStack(Blocks.DRIPSTONE_BLOCK)) .outputItems(new ItemStack(Items.POINTED_DRIPSTONE, 4)) + .duration(300).EUt(2) .save(provider); PACKER_RECIPES.recipeBuilder("hay_block") From 278617018881904df1c75951326a250012f87b31 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Thu, 10 Oct 2024 07:16:28 +0100 Subject: [PATCH 19/31] Misc removals --- .../gtceu/data/recipe/configurable/RecipeRemoval.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index 8b0dfb70a3..311f5ff376 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -378,8 +378,9 @@ private static void removeVanillaBlockRecipes(Consumer registr // registry.accept(new ResourceLocation("minecraft:waxed_weathered_cut_copper")); // registry.accept(new ResourceLocation("minecraft:waxed_oxidized_cut_copper")); // registry.accept(new ResourceLocation("minecraft:end_crystal")); - // registry.accept(new ResourceLocation("minecraft:end_rod")); // wait for approval before uncommenting this one + registry.accept(new ResourceLocation("minecraft:end_rod")); // registry.accept(new ResourceLocation("minecraft:mud_bricks")); //no other way to obtain these rn + registry.accept(new ResourceLocation("minecraft:dripstone_block")); // Carpet replacement for (DyeColor color : DyeColor.values()) { From 8cf32eb6cc6af60fb7ef78999fc21b57955b155a Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:02:56 +0100 Subject: [PATCH 20/31] More chain --- .../recipe/configurable/RecipeAddition.java | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java index cb0ab6edb5..098f441ab9 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java @@ -1325,13 +1325,31 @@ private static void hardMiscRecipes(Consumer provider) { // 'L', new ItemStack(Items.CRYING_OBSIDIAN), // 'G', new UnificationEntry(plate, Glowstone)); - VanillaRecipeHelper.addShapedRecipe(provider, "chain", new ItemStack(Items.CHAIN), " R ", + VanillaRecipeHelper.addShapedRecipe(provider, "chain_iron", new ItemStack(Items.CHAIN), " R ", "wR ", " R ", 'R', new UnificationEntry(ring, Iron)); - ASSEMBLER_RECIPES.recipeBuilder("chain") + ASSEMBLER_RECIPES.recipeBuilder("chain_iron") .inputItems(ring, Iron, 3) - .outputItems(new ItemStack(Items.CHAIN)) + .outputItems(new ItemStack(Items.CHAIN, 2)) + .duration(40).EUt(10).save(provider); + + VanillaRecipeHelper.addShapedRecipe(provider, "chain_wrought_iron", new ItemStack(Items.CHAIN, 2), " R ", + "wR ", " R ", + 'R', new UnificationEntry(ring, WroughtIron)); + + ASSEMBLER_RECIPES.recipeBuilder("chain_wrought_iron") + .inputItems(ring, WroughtIron, 3) + .outputItems(new ItemStack(Items.CHAIN, 3)) + .duration(40).EUt(10).save(provider); + + VanillaRecipeHelper.addShapedRecipe(provider, "chain_steel", new ItemStack(Items.CHAIN, 3), " R ", + "wR ", " R ", + 'R', new UnificationEntry(ring, Steel)); + + ASSEMBLER_RECIPES.recipeBuilder("chain_steel") + .inputItems(ring, Steel, 3) + .outputItems(new ItemStack(Items.CHAIN, 4)) .duration(40).EUt(10).save(provider); for (DyeColor color : DyeColor.values()) { From ad343bb64080824bff4010d786e2a66f1b70b786 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:04:13 +0100 Subject: [PATCH 21/31] Spotless --- .../com/gregtechceu/gtceu/data/lang/ItemLang.java | 3 ++- .../data/recipe/configurable/RecipeAddition.java | 4 +--- .../gtceu/data/recipe/misc/CraftingRecipeLoader.java | 3 ++- .../gtceu/data/recipe/misc/MiscRecipeLoader.java | 12 ++++++------ .../data/recipe/misc/VanillaStandardRecipes.java | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java index a0b0ff58b8..846292f510 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java @@ -341,7 +341,8 @@ private static void initItemTooltips(RegistrateLangProvider provider) { multilineLang(provider, "item.gtceu.foam_sprayer.tooltip", "§7Sprays Construction Foam\nUse on a frame to foam connected frames\nFoam can be colored"); provider.add("item.gtceu.firebrick.tooltip", "§7Heat resistant"); - provider.add("item.gtceu.basic_tape.tooltip", "N§7ot strong enough for mechanical issues\nCan be used to pick up crates without dropping their items"); + provider.add("item.gtceu.basic_tape.tooltip", + "N§7ot strong enough for mechanical issues\nCan be used to pick up crates without dropping their items"); provider.add("item.gtceu.sus_record.desc", "§7sussy!"); } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java index 098f441ab9..36f8f9fc0c 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java @@ -19,7 +19,6 @@ import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; -import java.util.Locale; import java.util.function.Consumer; import static com.gregtechceu.gtceu.api.GTValues.*; @@ -1398,8 +1397,7 @@ private static void addCarpetRecipe(Consumer provider, DyeColor String colorName = color.getName(); VanillaRecipeHelper.addShapedRecipe(provider, colorName + "_carpet", new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(colorName + "_carpet"))), "WW", - 'W', BuiltInRegistries.ITEM.get(new ResourceLocation(colorName + "_wool")) - ); + 'W', BuiltInRegistries.ITEM.get(new ResourceLocation(colorName + "_wool"))); } private static void hardGlassRecipes(Consumer provider) { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java index fca1492df6..86a0e8686d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CraftingRecipeLoader.java @@ -88,7 +88,8 @@ public static void init(Consumer provider) { VanillaRecipeHelper.addSmeltingRecipe(provider, "wrought_iron_nugget", ChemicalHelper.getTag(nugget, Iron), ChemicalHelper.get(nugget, WroughtIron)); - VanillaRecipeHelper.addShapelessRecipe(provider, "nugget_disassembling_iron", new ItemStack(Items.IRON_NUGGET, 9), new ItemStack(Items.IRON_INGOT), 's'); + VanillaRecipeHelper.addShapelessRecipe(provider, "nugget_disassembling_iron", + new ItemStack(Items.IRON_NUGGET, 9), new ItemStack(Items.IRON_INGOT), 's'); // TODO clipboard // VanillaRecipeHelper.addShapedRecipe(provider, "clipboard", CLIPBOARD.asStack(), " Sd", "BWR", "PPP", 'P', diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java index 830870e67e..8c8990d131 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java @@ -540,11 +540,11 @@ public static void init(Consumer provider) { .outputItems(STEEL_MINECART_WHEELS) .duration(60).EUt(20).save(provider); -// FLUID_SOLIDFICATION_RECIPES.recipeBuilder("light_concrete") -// .inputFluids(Concrete.getFluid(144)) -// .inputItems(SHAPE_MOLD_BLOCK) -// .outputItems(GTBlocks.LIGHT_CONCRETE) -// .duration(100).EUt(VA[ULV]) -// .save(provider); + FLUID_SOLIDFICATION_RECIPES.recipeBuilder("light_concrete") + .inputFluids(Concrete.getFluid(144)) + .inputItems(SHAPE_MOLD_BLOCK) + .outputItems(GTBlocks.LIGHT_CONCRETE) + .duration(100).EUt(VA[ULV]) + .save(provider); } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index 6101ec6831..aae878c859 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -3,7 +3,6 @@ import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; import com.gregtechceu.gtceu.api.data.chemical.material.stack.UnificationEntry; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.CustomTags; @@ -1193,7 +1192,8 @@ private static void miscRecipes(Consumer provider) { .inputItems(new ItemStack(Items.MINECART)).inputItems(new ItemStack(Blocks.HOPPER)) .outputItems(new ItemStack(Items.HOPPER_MINECART)).save(provider); - VanillaRecipeHelper.addShapelessRecipe(provider, "hay_block_to_hay", new ItemStack(Items.WHEAT, 9), Items.HAY_BLOCK, 'k'); + VanillaRecipeHelper.addShapelessRecipe(provider, "hay_block_to_hay", new ItemStack(Items.WHEAT, 9), + Items.HAY_BLOCK, 'k'); } /** From 3cab1b4470d865f1ec2aec5d4c65122a4dcc04c9 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:12:27 +0100 Subject: [PATCH 22/31] Remove DarkConcrete material --- src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java index 4572925da0..15ab23d9dc 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java @@ -921,7 +921,6 @@ private static void excludeAllGemsButNormal(Material material) { public static Material Gypsum; public static Material Zeolite; public static Material Concrete; - public static Material DarkConcrete; public static Material SteelMagnetic; public static Material VanadiumSteel; public static Material Potin; From 3c286c3c99b3eeb906b194a75a990250a251d845 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:30:36 +0100 Subject: [PATCH 23/31] No more broom-sized brush lmao --- .../gtceu/data/recipe/configurable/RecipeAddition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java index 36f8f9fc0c..94bf79f3eb 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java @@ -1273,7 +1273,7 @@ private static void hardMiscRecipes(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, "brush", new ItemStack(Items.BRUSH), " F ", "fRr", " S ", - 'S', new UnificationEntry(rodLong, Wood), + 'S', new UnificationEntry(rod, Wood), 'R', new UnificationEntry(ring, Copper), 'F', new ItemStack(Items.FEATHER)); From ffb4af6292a2e956775c4fbc79d7c975fefb5cbc Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 07:32:58 +0100 Subject: [PATCH 24/31] Spotless again --- .../gtceu/data/recipe/misc/MiscRecipeLoader.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java index 8c8990d131..63927f8666 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MiscRecipeLoader.java @@ -541,10 +541,10 @@ public static void init(Consumer provider) { .duration(60).EUt(20).save(provider); FLUID_SOLIDFICATION_RECIPES.recipeBuilder("light_concrete") - .inputFluids(Concrete.getFluid(144)) - .inputItems(SHAPE_MOLD_BLOCK) - .outputItems(GTBlocks.LIGHT_CONCRETE) - .duration(100).EUt(VA[ULV]) - .save(provider); + .inputFluids(Concrete.getFluid(144)) + .inputItems(SHAPE_MOLD_BLOCK) + .outputItems(GTBlocks.LIGHT_CONCRETE) + .duration(100).EUt(VA[ULV]) + .save(provider); } } From bd2e26fd5db5882a126100b184efe3f1c8ffd2eb Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:15:59 +0100 Subject: [PATCH 25/31] Remove blue ice recipe --- .../gtceu/data/recipe/configurable/RecipeRemoval.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index c93e041d78..7f536d1c41 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -271,6 +271,7 @@ private static void hardMiscRecipes(Consumer registry) { registry.accept(new ResourceLocation("minecraft:spyglass")); registry.accept(new ResourceLocation("minecraft:chain")); registry.accept(new ResourceLocation("minecraft:packed_ice")); + registry.accept(new ResourceLocation("minecraft:blue_ice")); registry.accept(new ResourceLocation("minecraft:respawn_anchor")); registry.accept(new ResourceLocation("minecraft:lodestone")); registry.accept(new ResourceLocation("minecraft:chiseled_bookshelf")); From 573cba2a5cfba422990bed96fb224bdaccd19492 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:16:13 +0100 Subject: [PATCH 26/31] Hay block -> wheat --- .../gtceu/data/recipe/misc/VanillaStandardRecipes.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index a11ad3e5dd..eb1b3e892b 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -129,6 +129,12 @@ private static void compressingRecipes(Consumer provider) { .duration(200).EUt(2) .save(provider); + FORGE_HAMMER_RECIPES.recipeBuilder("wheat_from_hay_block") + .inputItems(new ItemStack(Blocks.HAY_BLOCK)) + .outputItems(new ItemStack(Items.WHEAT, 9)) + .duration(200).EUt(2) + .save(provider); + PACKER_RECIPES.recipeBuilder("melon") .inputItems(new ItemStack(Items.MELON_SLICE, 9)) .circuitMeta(9) From 93df97564f5ee3c9e6de548d0edb4a3f2850e5f7 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:48:05 +0100 Subject: [PATCH 27/31] Fix tooltip for tape --- src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java index 846292f510..c5aa689572 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java @@ -342,7 +342,7 @@ private static void initItemTooltips(RegistrateLangProvider provider) { "§7Sprays Construction Foam\nUse on a frame to foam connected frames\nFoam can be colored"); provider.add("item.gtceu.firebrick.tooltip", "§7Heat resistant"); provider.add("item.gtceu.basic_tape.tooltip", - "N§7ot strong enough for mechanical issues\nCan be used to pick up crates without dropping their items"); + "§7Not strong enough for mechanical issues\nCan be used to pick up crates without dropping their items"); provider.add("item.gtceu.sus_record.desc", "§7sussy!"); } From 66cb3fe93a5b4cbf168d8858eefe9f6b9ec4364e Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:48:18 +0100 Subject: [PATCH 28/31] Hay block packer --- .../gtceu/data/recipe/misc/VanillaStandardRecipes.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index eb1b3e892b..803e2dffe0 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -124,11 +124,18 @@ private static void compressingRecipes(Consumer provider) { PACKER_RECIPES.recipeBuilder("hay_block") .inputItems(new ItemStack(Items.WHEAT, 9)) - .circuitMeta(9) + .circuitMeta(8) .outputItems(new ItemStack(Blocks.HAY_BLOCK)) .duration(200).EUt(2) .save(provider); + PACKER_RECIPES.recipeBuilder("wheat") + .inputItems(new ItemStack(Blocks.HAY_BLOCK)) + .outputItems(new ItemStack(Items.WHEAT, 9)) + .circuitMeta(9) + .duration(200).EUt(2) + .save(provider); + FORGE_HAMMER_RECIPES.recipeBuilder("wheat_from_hay_block") .inputItems(new ItemStack(Blocks.HAY_BLOCK)) .outputItems(new ItemStack(Items.WHEAT, 9)) From 485323b61a1e87ddc5de737aa33f41234983c8b9 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 19:26:04 +0100 Subject: [PATCH 29/31] Bricked casings --- src/generated/resources/assets/gtceu/lang/en_ud.json | 10 +++++----- src/generated/resources/assets/gtceu/lang/en_us.json | 10 +++++----- .../com/gregtechceu/gtceu/data/lang/BlockLang.java | 4 ++-- .../gtceu/data/recipe/misc/MetaTileEntityLoader.java | 7 ------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index a73abec01d..6d945edf21 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -114,7 +114,7 @@ "block.gtceu.blue_studs": "spnʇS ǝnןᗺ", "block.gtceu.boss_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ssoᗺ", "block.gtceu.brittle_charcoal": "ןɐoɔɹɐɥƆ ǝןʇʇıɹᗺ", - "block.gtceu.bronze_brick_casing": "buısɐƆ ʞɔıɹᗺ ǝzuoɹᗺ", + "block.gtceu.bronze_brick_casing": "buısɐƆ ǝzuoɹᗺ pǝʞɔıɹᗺ", "block.gtceu.bronze_crate": "ǝʇɐɹƆ ǝzuoɹᗺ", "block.gtceu.bronze_drum": "ɯnɹᗡ ǝzuoɹᗺ", "block.gtceu.bronze_firebox_casing": "buısɐƆ xoqǝɹıℲ ǝzuoɹᗺ", @@ -127,10 +127,8 @@ "block.gtceu.brown_large_metal_sheet": "ʇǝǝɥS ןɐʇǝW ǝbɹɐꞀ uʍoɹᗺ", "block.gtceu.brown_metal_sheet": "ʇǝǝɥS ןɐʇǝW uʍoɹᗺ", "block.gtceu.brown_studs": "spnʇS uʍoɹᗺ", - "block.gtceu.casing_bronze_bricks": "buısɐƆ ǝuıɥɔɐW ǝzuoɹᗺ", "block.gtceu.casing_coke_bricks": "sʞɔıɹᗺ uǝʌO ǝʞoƆ", "block.gtceu.casing_grate": "buısɐƆ ǝuıɥɔɐW ǝʇɐɹ⅁", - "block.gtceu.casing_primitive_bricks": "sʞɔıɹqǝɹıℲ", "block.gtceu.causality_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ʎʇıןɐsnɐƆ", "block.gtceu.charcoal_pile_igniter": "ɹǝʇıubI ǝןıԀ ןɐoɔɹɐɥƆ", "block.gtceu.chiseled_dark_concrete": "ǝʇǝɹɔuoƆ ʞɹɐᗡ pǝןǝsıɥƆ", @@ -1117,7 +1115,7 @@ "block.gtceu.steam_output_bus": ")ɯɐǝʇS( snᗺ ʇndʇnO", "block.gtceu.steam_oven": "uǝʌO ɯɐǝʇS", "block.gtceu.steam_solid_boiler.bronze": "ɹǝןıoᗺ pıןoS ɯɐǝʇS ןןɐɯS", - "block.gtceu.steel_brick_casing": "buısɐƆ ʞɔıɹᗺ ןǝǝʇS", + "block.gtceu.steel_brick_casing": "buısɐƆ uoɹI ʇɥbnoɹM pǝʞɔıɹᗺ", "block.gtceu.steel_crate": "ǝʇɐɹƆ ןǝǝʇS", "block.gtceu.steel_drum": "ɯnɹᗡ ןǝǝʇS", "block.gtceu.steel_firebox_casing": "buısɐƆ xoqǝɹıℲ ןǝǝʇS", @@ -2266,6 +2264,7 @@ "config.gtceu.option.hardGlassRecipes": "sǝdıɔǝᴚssɐן⅁pɹɐɥ", "config.gtceu.option.hardIronRecipes": "sǝdıɔǝᴚuoɹIpɹɐɥ", "config.gtceu.option.hardMiscRecipes": "sǝdıɔǝᴚɔsıWpɹɐɥ", + "config.gtceu.option.hardMultiRecipes": "sǝdıɔǝᴚıʇןnWpɹɐɥ", "config.gtceu.option.hardRedstoneRecipes": "sǝdıɔǝᴚǝuoʇspǝᴚpɹɐɥ", "config.gtceu.option.hardToolArmorRecipes": "sǝdıɔǝᴚɹoɯɹⱯןoo⟘pɹɐɥ", "config.gtceu.option.hardWoodRecipes": "sǝdıɔǝᴚpooMpɹɐɥ", @@ -2331,6 +2330,7 @@ "config.gtceu.option.solarBoilerBaseOutput": "ʇndʇnOǝsɐᗺɹǝןıoᗺɹɐןos", "config.gtceu.option.solidBoilerBaseOutput": "ʇndʇnOǝsɐᗺɹǝןıoᗺpıןos", "config.gtceu.option.sprayCanChainLength": "ɥʇbuǝꞀuıɐɥƆuɐƆʎɐɹds", + "config.gtceu.option.steamMultiParallelAmount": "ʇunoɯⱯןǝןןɐɹɐԀıʇןnWɯɐǝʇs", "config.gtceu.option.steamPerWater": "ɹǝʇɐMɹǝԀɯɐǝʇs", "config.gtceu.option.steelBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺןǝǝʇs", "config.gtceu.option.steelBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺןǝǝʇs", @@ -4108,7 +4108,7 @@ "item.gtceu.basic_integrated_circuit.tooltip.0": "ןnɟɹǝʍod ǝɹoɯ puɐ ɹǝןןɐɯSㄥ§", "item.gtceu.basic_integrated_circuit.tooltip.1": "ʇınɔɹıƆ ɹǝı⟘-ΛꞀ9§", "item.gtceu.basic_tape": "ǝdɐ⟘", - "item.gtceu.basic_tape.tooltip": "sɯǝʇı ɹıǝɥʇ buıddoɹp ʇnoɥʇıʍ sǝʇɐɹɔ dn ʞɔıd oʇ pǝsn ǝq uɐƆ\nsǝnssı ןɐɔıuɐɥɔǝɯ ɹoɟ ɥbnouǝ buoɹʇs ʇoㄥ§N", + "item.gtceu.basic_tape.tooltip": "sɯǝʇı ɹıǝɥʇ buıddoɹp ʇnoɥʇıʍ sǝʇɐɹɔ dn ʞɔıd oʇ pǝsn ǝq uɐƆ\nsǝnssı ןɐɔıuɐɥɔǝɯ ɹoɟ ɥbnouǝ buoɹʇs ʇoNㄥ§", "item.gtceu.battery.charge_detailed.0": ")ㄥ§buıuıɐɯǝɹ %s %s/%sɐ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sɐ§", "item.gtceu.battery.charge_detailed.1": ")ㄥ§buıuıɐɯǝɹ %s %s/%sǝ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sǝ§", "item.gtceu.battery.charge_detailed.2": ")ㄥ§buıuıɐɯǝɹ %s %s/%sɔ§(ㄥ§ %s ɹǝı⟘ - ㄥ§∩Ǝ %s/%sɔ§", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index e848c081eb..79c65d5e60 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -114,7 +114,7 @@ "block.gtceu.blue_studs": "Blue Studs", "block.gtceu.boss_hazard_sign_block": "Boss Hazard Sign Block", "block.gtceu.brittle_charcoal": "Brittle Charcoal", - "block.gtceu.bronze_brick_casing": "Bronze Brick Casing", + "block.gtceu.bronze_brick_casing": "Bricked Bronze Casing", "block.gtceu.bronze_crate": "Bronze Crate", "block.gtceu.bronze_drum": "Bronze Drum", "block.gtceu.bronze_firebox_casing": "Bronze Firebox Casing", @@ -127,10 +127,8 @@ "block.gtceu.brown_large_metal_sheet": "Brown Large Metal Sheet", "block.gtceu.brown_metal_sheet": "Brown Metal Sheet", "block.gtceu.brown_studs": "Brown Studs", - "block.gtceu.casing_bronze_bricks": "Bronze Machine Casing", "block.gtceu.casing_coke_bricks": "Coke Oven Bricks", "block.gtceu.casing_grate": "Grate Machine Casing", - "block.gtceu.casing_primitive_bricks": "Firebricks", "block.gtceu.causality_hazard_sign_block": "Causality Hazard Sign Block", "block.gtceu.charcoal_pile_igniter": "Charcoal Pile Igniter", "block.gtceu.chiseled_dark_concrete": "Chiseled Dark Concrete", @@ -1117,7 +1115,7 @@ "block.gtceu.steam_output_bus": "Output Bus (Steam)", "block.gtceu.steam_oven": "Steam Oven", "block.gtceu.steam_solid_boiler.bronze": "Small Steam Solid Boiler", - "block.gtceu.steel_brick_casing": "Steel Brick Casing", + "block.gtceu.steel_brick_casing": "Bricked Wrought Iron Casing", "block.gtceu.steel_crate": "Steel Crate", "block.gtceu.steel_drum": "Steel Drum", "block.gtceu.steel_firebox_casing": "Steel Firebox Casing", @@ -2266,6 +2264,7 @@ "config.gtceu.option.hardGlassRecipes": "hardGlassRecipes", "config.gtceu.option.hardIronRecipes": "hardIronRecipes", "config.gtceu.option.hardMiscRecipes": "hardMiscRecipes", + "config.gtceu.option.hardMultiRecipes": "hardMultiRecipes", "config.gtceu.option.hardRedstoneRecipes": "hardRedstoneRecipes", "config.gtceu.option.hardToolArmorRecipes": "hardToolArmorRecipes", "config.gtceu.option.hardWoodRecipes": "hardWoodRecipes", @@ -2331,6 +2330,7 @@ "config.gtceu.option.solarBoilerBaseOutput": "solarBoilerBaseOutput", "config.gtceu.option.solidBoilerBaseOutput": "solidBoilerBaseOutput", "config.gtceu.option.sprayCanChainLength": "sprayCanChainLength", + "config.gtceu.option.steamMultiParallelAmount": "steamMultiParallelAmount", "config.gtceu.option.steamPerWater": "steamPerWater", "config.gtceu.option.steelBoilerHeatSpeed": "steelBoilerHeatSpeed", "config.gtceu.option.steelBoilerMaxTemperature": "steelBoilerMaxTemperature", @@ -4108,7 +4108,7 @@ "item.gtceu.basic_integrated_circuit.tooltip.0": "§7Smaller and more powerful", "item.gtceu.basic_integrated_circuit.tooltip.1": "§6LV-Tier Circuit", "item.gtceu.basic_tape": "Tape", - "item.gtceu.basic_tape.tooltip": "N§7ot strong enough for mechanical issues\nCan be used to pick up crates without dropping their items", + "item.gtceu.basic_tape.tooltip": "§7Not strong enough for mechanical issues\nCan be used to pick up crates without dropping their items", "item.gtceu.battery.charge_detailed.0": "§a%s/%s EU§7 - Tier %s §7(§a%s/%s %s remaining§7)", "item.gtceu.battery.charge_detailed.1": "§e%s/%s EU§7 - Tier %s §7(§e%s/%s %s remaining§7)", "item.gtceu.battery.charge_detailed.2": "§c%s/%s EU§7 - Tier %s §7(§c%s/%s %s remaining§7)", diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java index 440de04732..2984ab5569 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/BlockLang.java @@ -30,8 +30,8 @@ private static void initCasingLang(RegistrateLangProvider provider) { replace(provider, "block.gtceu.wire_coil.tooltip_energy_cracking", " §aEnergy Usage: §f%s%%"); // Casings - replace(provider, "block.gtceu.casing_bronze_bricks", "Bronze Machine Casing"); - replace(provider, "block.gtceu.casing_primitive_bricks", "Firebricks"); + replace(provider, "block.gtceu.bronze_brick_casing", "Bricked Bronze Casing"); + replace(provider, "block.gtceu.steel_brick_casing", "Bricked Wrought Iron Casing"); replace(provider, "block.gtceu.heatproof_machine_casing", "Heat Proof Invar Machine Casing"); replace(provider, "block.gtceu.frostproof_machine_casing", "Frost Proof Aluminium Machine Casing"); replace(provider, "block.gtceu.steel_machine_casing", "Solid Steel Machine Casing"); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java index 73a0810cd4..e934c1f1f4 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MetaTileEntityLoader.java @@ -417,13 +417,6 @@ public static void init(Consumer provider) { new UnificationEntry(TagPrefix.pipeSmallFluid, GTMaterials.Steel), 'H', GTMachines.HULL[HV].asStack(), 'S', GTBlocks.CASING_TEMPERED_GLASS); - // TODO Charcoal pile igniter - // VanillaRecipeHelper.addShapedRecipe(provider, true, "charcoal_pile_igniter", - // GTMachines.CHARCOAL_PILE_IGNITER.getStackForm(), "ERE", "EHE", "FFF", 'E', new - // UnificationEntry(TagPrefix.plate, GTMaterials.Bronze), 'R', new UnificationEntry(TagPrefix.rotor, - // GTMaterials.Iron), 'H', MetaBlocks.STEAM_CASING.getItemVariant(BRONZE_BRICKS_HULL), 'F', new - // ItemStack(Items.FLINT)); - // STEAM MACHINES VanillaRecipeHelper.addShapedRecipe(provider, true, "bronze_hull", GTBlocks.BRONZE_HULL.asStack(), "PPP", "PhP", "PPP", 'P', new UnificationEntry(TagPrefix.plate, GTMaterials.Bronze)); From 242135647de89d3c40f29563ecedae4844245505 Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:24:22 +0100 Subject: [PATCH 30/31] Facade cover tooltip --- src/generated/resources/assets/gtceu/lang/en_ud.json | 3 ++- src/generated/resources/assets/gtceu/lang/en_us.json | 3 ++- src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index 6d945edf21..be2ccd3fdd 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -4271,7 +4271,8 @@ "item.gtceu.ev_voltage_coil.tooltip": "ןıoƆ ǝɯǝɹʇxƎ", "item.gtceu.exquisite_glass_gem": "ןɐʇsʎɹƆ ssɐן⅁ ǝʇısınbxƎ", "item.gtceu.facade_cover": "ǝpɐɔɐℲ ɹǝʌoƆ %s", - "item.gtceu.facade_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ ʇıɟʇnO ǝʌıʇɐɹoɔǝᗡㄥ§", + "item.gtceu.facade_cover.tooltip.0": "˙ㄥ§ɹǝʌoƆɟ§ ʇıɟʇnO ǝʌıʇɐɹoɔǝᗡㄥ§", + "item.gtceu.facade_cover.tooltip.1": "ʞɔoןq ʎuɐ puɐ ǝʇɐןԀ uoɹI buısn pǝʇɟɐɹƆㄥ§", "item.gtceu.face_mask": "ʞsɐW ǝɔɐℲ", "item.gtceu.fertilizer": "ɹǝzıןıʇɹǝℲ", "item.gtceu.fiber_reinforced_circuit_board": "pɹɐoᗺ ʇınɔɹıƆ pǝɔɹoɟuıǝᴚ-ɹǝqıℲ", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 79c65d5e60..6670a3022f 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -4271,7 +4271,8 @@ "item.gtceu.ev_voltage_coil.tooltip": "Extreme Coil", "item.gtceu.exquisite_glass_gem": "Exquisite Glass Crystal", "item.gtceu.facade_cover": "%s Cover Facade", - "item.gtceu.facade_cover.tooltip": "§7Decorative Outfit §fCover§7.", + "item.gtceu.facade_cover.tooltip.0": "§7Decorative Outfit §fCover§7.", + "item.gtceu.facade_cover.tooltip.1": "§7Crafted using Iron Plate and any block", "item.gtceu.face_mask": "Face Mask", "item.gtceu.fertilizer": "Fertilizer", "item.gtceu.fiber_reinforced_circuit_board": "Fiber-Reinforced Circuit Board", diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java index c5aa689572..cb7980c987 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java @@ -325,7 +325,7 @@ private static void initItemTooltips(RegistrateLangProvider provider) { "§7Voids §fItems§7 as §fCover§7.\nActivate with §fSoft Mallet§7 after placement."); multilineLang(provider, "item.gtceu.advanced_item_voiding_cover.tooltip", "§7Voids §fItems§7 with amount control as §fCover§7.\nActivate with §fSoft Mallet§7 after placement."); - provider.add("item.gtceu.facade_cover.tooltip", "§7Decorative Outfit §fCover§7."); + multilineLang(provider,"item.gtceu.facade_cover.tooltip", "§7Decorative Outfit §fCover§7.\n§7Crafted using 3 Iron Plates and any block"); provider.add("item.gtceu.computer_monitor_cover.tooltip", "§7Displays §fData§7 as §fCover§7."); provider.add("item.gtceu.shutter_module_cover.tooltip", "§fBlocks Transfer§7 through attached Side as §fCover§7."); From f4912592945e0b38f9c542e3e6037ffeed50b51b Mon Sep 17 00:00:00 2001 From: JuiceyBeans <75553966+JuiceyBeans@users.noreply.github.com> Date: Fri, 11 Oct 2024 22:36:31 +0100 Subject: [PATCH 31/31] holy skibidi its done --- .../resources/assets/gtceu/lang/en_ud.json | 2 +- .../resources/assets/gtceu/lang/en_us.json | 2 +- .../gregtechceu/gtceu/data/lang/ItemLang.java | 3 +- .../gtceu/data/recipe/WoodTypeEntry.java | 134 ++++++-- .../recipe/configurable/RecipeAddition.java | 313 ++---------------- .../recipe/configurable/RecipeRemoval.java | 102 +++--- .../data/recipe/misc/BatteryRecipes.java | 4 +- .../gtceu/data/recipe/misc/FusionLoader.java | 6 +- .../gtceu/data/recipe/misc/GCyMRecipes.java | 2 +- .../data/recipe/misc/MachineRecipeLoader.java | 2 +- .../recipe/misc/VanillaStandardRecipes.java | 30 +- .../data/recipe/misc/WoodMachineRecipes.java | 149 ++++++--- .../serialized/chemistry/PolymerRecipes.java | 18 +- .../serialized/chemistry/ReactorRecipes.java | 14 +- 14 files changed, 344 insertions(+), 437 deletions(-) diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index be2ccd3fdd..90ac1ee525 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -4272,7 +4272,7 @@ "item.gtceu.exquisite_glass_gem": "ןɐʇsʎɹƆ ssɐן⅁ ǝʇısınbxƎ", "item.gtceu.facade_cover": "ǝpɐɔɐℲ ɹǝʌoƆ %s", "item.gtceu.facade_cover.tooltip.0": "˙ㄥ§ɹǝʌoƆɟ§ ʇıɟʇnO ǝʌıʇɐɹoɔǝᗡㄥ§", - "item.gtceu.facade_cover.tooltip.1": "ʞɔoןq ʎuɐ puɐ ǝʇɐןԀ uoɹI buısn pǝʇɟɐɹƆㄥ§", + "item.gtceu.facade_cover.tooltip.1": "ʞɔoןq ʎuɐ puɐ sǝʇɐןԀ uoɹI Ɛ buısn pǝʇɟɐɹƆㄥ§", "item.gtceu.face_mask": "ʞsɐW ǝɔɐℲ", "item.gtceu.fertilizer": "ɹǝzıןıʇɹǝℲ", "item.gtceu.fiber_reinforced_circuit_board": "pɹɐoᗺ ʇınɔɹıƆ pǝɔɹoɟuıǝᴚ-ɹǝqıℲ", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 6670a3022f..c19ab77c85 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -4272,7 +4272,7 @@ "item.gtceu.exquisite_glass_gem": "Exquisite Glass Crystal", "item.gtceu.facade_cover": "%s Cover Facade", "item.gtceu.facade_cover.tooltip.0": "§7Decorative Outfit §fCover§7.", - "item.gtceu.facade_cover.tooltip.1": "§7Crafted using Iron Plate and any block", + "item.gtceu.facade_cover.tooltip.1": "§7Crafted using 3 Iron Plates and any block", "item.gtceu.face_mask": "Face Mask", "item.gtceu.fertilizer": "Fertilizer", "item.gtceu.fiber_reinforced_circuit_board": "Fiber-Reinforced Circuit Board", diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java index cb7980c987..d02cc72896 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java @@ -325,7 +325,8 @@ private static void initItemTooltips(RegistrateLangProvider provider) { "§7Voids §fItems§7 as §fCover§7.\nActivate with §fSoft Mallet§7 after placement."); multilineLang(provider, "item.gtceu.advanced_item_voiding_cover.tooltip", "§7Voids §fItems§7 with amount control as §fCover§7.\nActivate with §fSoft Mallet§7 after placement."); - multilineLang(provider,"item.gtceu.facade_cover.tooltip", "§7Decorative Outfit §fCover§7.\n§7Crafted using 3 Iron Plates and any block"); + multilineLang(provider, "item.gtceu.facade_cover.tooltip", + "§7Decorative Outfit §fCover§7.\n§7Crafted using 3 Iron Plates and any block"); provider.add("item.gtceu.computer_monitor_cover.tooltip", "§7Displays §fData§7 as §fCover§7."); provider.add("item.gtceu.shutter_module_cover.tooltip", "§fBlocks Transfer§7 through attached Side as §fCover§7."); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java index ddab441154..27419b9b56 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java @@ -88,6 +88,14 @@ public final class WoodTypeEntry { public final Item hangingSign; @Nullable public final String hangingSignRecipeName; + @Nullable + public final Item button; + @Nullable + public final String buttonRecipeName; + @Nullable + public final Item pressurePlate; + @Nullable + public final String pressurePlateRecipeName; public final Material material; public final boolean addLogOreDict; @@ -97,6 +105,11 @@ public final class WoodTypeEntry { public final boolean addFencesOreDict; public final boolean addFenceGatesOreDict; public final boolean addStairsOreDict; + public final boolean addBoatsOreDict; + public final boolean addChestBoatsOreDict; + public final boolean addButtonsOreDict; + public final boolean addPressurePlatesOreDict; + public final boolean addPlanksUnificationInfo; public final boolean addDoorsUnificationInfo; public final boolean addSlabsUnificationInfo; @@ -105,10 +118,12 @@ public final class WoodTypeEntry { public final boolean addStairsUnificationInfo; public final boolean addBoatsUnificationInfo; public final boolean addChestBoatsUnificationInfo; + public final boolean addButtonsUnificationInfo; + public final boolean addPressurePlatesUnificationInfo; public final boolean generateLogToPlankRecipe; /** - * @see WoodTypeEntry.Builder + * @see Builder */ private WoodTypeEntry(@NotNull String modid, @NotNull String woodName, @NotNull TagKey logTag, @Nullable Item log, @Nullable Item strippedLog, @@ -125,14 +140,19 @@ private WoodTypeEntry(@NotNull String modid, @NotNull String woodName, @NotNull @Nullable Item chestBoat, @Nullable String chestBoatRecipeName, @Nullable Item sign, @Nullable String signRecipeName, @Nullable Item hangingSign, @Nullable String hangingSignRecipeName, + @Nullable Item button, @Nullable String buttonRecipeName, + @Nullable Item pressurePlate, @Nullable String pressurePlateRecipeName, @Nullable Material material, boolean addLogOreDict, boolean addPlanksOreDict, boolean addDoorsOreDict, boolean addSlabsOreDict, boolean addFencesOreDict, boolean addFenceGatesOreDict, boolean addStairsOreDict, + boolean addBoatsOreDict, boolean addChestBoatsOreDict, + boolean addButtonsOreDict, boolean addPressurePlatesOreDict, boolean addPlanksUnificationInfo, boolean addDoorsUnificationInfo, boolean addSlabsUnificationInfo, boolean addFencesUnificationInfo, boolean addFenceGatesUnificationInfo, boolean addStairsUnificationInfo, boolean addBoatsUnificationInfo, boolean addChestBoatsUnificationInfo, + boolean addPressurePlatesUnificationInfo, boolean addButtonsUnificationInfo, boolean generateLogToPlankRecipe) { this.modid = modid; this.woodName = woodName; @@ -167,6 +187,10 @@ private WoodTypeEntry(@NotNull String modid, @NotNull String woodName, @NotNull this.signRecipeName = signRecipeName; this.hangingSign = hangingSign; this.hangingSignRecipeName = hangingSignRecipeName; + this.button = button; + this.buttonRecipeName = buttonRecipeName; + this.pressurePlate = pressurePlate; + this.pressurePlateRecipeName = pressurePlateRecipeName; this.material = material != null ? material : GTMaterials.Wood; this.addLogOreDict = addLogOreDict; @@ -176,6 +200,10 @@ private WoodTypeEntry(@NotNull String modid, @NotNull String woodName, @NotNull this.addFencesOreDict = addFencesOreDict; this.addFenceGatesOreDict = addFenceGatesOreDict; this.addStairsOreDict = addStairsOreDict; + this.addBoatsOreDict = addBoatsOreDict; + this.addChestBoatsOreDict = addChestBoatsOreDict; + this.addButtonsOreDict = addButtonsOreDict; + this.addPressurePlatesOreDict = addPressurePlatesOreDict; this.addPlanksUnificationInfo = addPlanksUnificationInfo; this.addDoorsUnificationInfo = addDoorsUnificationInfo; this.addSlabsUnificationInfo = addSlabsUnificationInfo; @@ -184,6 +212,8 @@ private WoodTypeEntry(@NotNull String modid, @NotNull String woodName, @NotNull this.addStairsUnificationInfo = addStairsUnificationInfo; this.addBoatsUnificationInfo = addBoatsUnificationInfo; this.addChestBoatsUnificationInfo = addChestBoatsUnificationInfo; + this.addButtonsUnificationInfo = addButtonsUnificationInfo; + this.addPressurePlatesUnificationInfo = addPressurePlatesUnificationInfo; this.generateLogToPlankRecipe = generateLogToPlankRecipe; } @@ -237,6 +267,10 @@ public static class Builder { private String signRecipeName; private Item hangingSign = null; private String hangingSignRecipeName; + private Item button = null; + private String buttonRecipeName; + private Item pressurePlate = null; + private String pressurePlateRecipeName; @Nullable private Material material = null; @@ -247,6 +281,10 @@ public static class Builder { private boolean addFencesOreDict; private boolean addFenceGatesOreDict; private boolean addStairsOreDict; + private boolean addBoatsOreDict; + private boolean addChestBoatsOreDict; + private boolean addButtonOreDict; + private boolean addPressurePlateOreDict; private boolean addPlanksUnificationInfo; private boolean addDoorsUnificationInfo; @@ -256,6 +294,8 @@ public static class Builder { private boolean addStairsUnificationInfo; private boolean addBoatsUnificationInfo; private boolean addChestBoatsUnificationInfo; + private boolean addButtonUnificationInfo; + private boolean addPressurePlateUnificationInfo; private boolean generateLogToPlankRecipe = true; /** @@ -506,6 +546,32 @@ public Builder hangingSign(@NotNull Item hangingSign, @Nullable String hangingSi return this; } + /** + * Add an entry for a sign + * + * @param button the hanging sign to add + * @param buttonRecipeName the recipe name for crafting the hanging sign + * @return this + */ + public Builder button(@NotNull Item button, @Nullable String buttonRecipeName) { + this.button = button; + this.buttonRecipeName = buttonRecipeName; + return this; + } + + /** + * Add an entry for a sign + * + * @param pressurePlate the hanging sign to add + * @param pressurePlateRecipeName the recipe name for crafting the hanging sign + * @return this + */ + public Builder pressurePlate(@NotNull Item pressurePlate, @Nullable String pressurePlateRecipeName) { + this.pressurePlate = pressurePlate; + this.pressurePlateRecipeName = pressurePlateRecipeName; + return this; + } + /** * Specify material for wood entry. If not provided, {@link GTMaterials#Wood} will be used * @@ -518,12 +584,12 @@ public Builder material(@NotNull Material material) { } /** - * Register all possible ore dictionary for wood entry. + * Register all possible tags for wood entry. * * @return this */ public Builder registerAllTags() { - return registerTag(true, true, true, true, true, true, true); + return registerTag(true, true, true, true, true, true, true, true, true, true, true); } /** @@ -532,23 +598,28 @@ public Builder registerAllTags() { * @return this */ public Builder registerAllUnificationInfo() { - return registerUnificationInfo(true, true, true, true, true, true, true, true); + return registerUnificationInfo(true, true, true, true, true, true, true, true, true, true); } /** - * Register ore dictionary for wood entry. + * Register tags for wood entry. * - * @param log whether to add ore dictionary for logs - * @param planks whether to add ore dictionary for planks - * @param door whether to add ore dictionary for doors - * @param slab whether to add ore dictionary for slab - * @param fence whether to add ore dictionary for fences - * @param fenceGate whether to add ore dictionary for fence gates - * @param stairs whether to add ore dictionary for stairs + * @param log whether to add tags for logs + * @param planks whether to add tags for planks + * @param door whether to add tags for doors + * @param slab whether to add tags for slab + * @param fence whether to add tags for fences + * @param fenceGate whether to add tags for fence gates + * @param stairs whether to add tags for stairs + * @param boat whether to add unification info for boats + * @param chestBoat whether to add unification info for chest boats + * @param button whether to add unification info for buttons + * @param pressurePlate whether to add unification info for pressure plates * @return this */ public Builder registerTag(boolean log, boolean planks, boolean door, boolean slab, boolean fence, - boolean fenceGate, boolean stairs) { + boolean fenceGate, boolean stairs, boolean boat, boolean chestBoat, boolean button, + boolean pressurePlate) { this.addLogOreDict = log; this.addPlanksOreDict = planks; this.addDoorsOreDict = door; @@ -556,24 +627,31 @@ public Builder registerTag(boolean log, boolean planks, boolean door, boolean sl this.addFencesOreDict = fence; this.addFenceGatesOreDict = fenceGate; this.addStairsOreDict = stairs; + this.addBoatsOreDict = boat; + this.addChestBoatsOreDict = chestBoat; + this.addButtonOreDict = button; + this.addPressurePlateOreDict = pressurePlate; return this; } /** * Register unification info for wood entry. * - * @param planks whether to add unification info for planks - * @param door whether to add unification info for doors - * @param slab whether to add unification info for slab - * @param fence whether to add unification info for fences - * @param fenceGate whether to add unification info for fence gates - * @param stairs whether to add unification info for stairs - * @param boat whether to add unification info for boats - * @param chestBoat whether to add unification info for chest boats + * @param planks whether to add unification info for planks + * @param door whether to add unification info for doors + * @param slab whether to add unification info for slab + * @param fence whether to add unification info for fences + * @param fenceGate whether to add unification info for fence gates + * @param stairs whether to add unification info for stairs + * @param boat whether to add unification info for boats + * @param chestBoat whether to add unification info for chest boats + * @param button whether to add unification info for buttons + * @param pressurePlate whether to add unification info for pressure plates * @return this */ public Builder registerUnificationInfo(boolean planks, boolean door, boolean slab, boolean fence, - boolean fenceGate, boolean stairs, boolean boat, boolean chestBoat) { + boolean fenceGate, boolean stairs, boolean boat, boolean chestBoat, + boolean button, boolean pressurePlate) { this.addPlanksUnificationInfo = planks; this.addDoorsUnificationInfo = door; this.addSlabsUnificationInfo = slab; @@ -582,6 +660,8 @@ public Builder registerUnificationInfo(boolean planks, boolean door, boolean sla this.addStairsUnificationInfo = stairs; this.addBoatsUnificationInfo = boat; this.addChestBoatsUnificationInfo = chestBoat; + this.addButtonUnificationInfo = button; + this.addPressurePlateUnificationInfo = pressurePlate; return this; } @@ -618,12 +698,16 @@ public WoodTypeEntry build() { stairs, stairsRecipeName, addStairsCraftingRecipe, boat, boatRecipeName, chestBoat, chestBoatRecipeName, sign, signRecipeName, hangingSign, hangingSignRecipeName, + button, buttonRecipeName, pressurePlate, pressurePlateRecipeName, material, addLogOreDict, addPlanksOreDict, addDoorsOreDict, addSlabsOreDict, - addFencesOreDict, addFenceGatesOreDict, addStairsOreDict, addPlanksUnificationInfo, - addDoorsUnificationInfo, addSlabsUnificationInfo, addFencesUnificationInfo, + addFencesOreDict, addFenceGatesOreDict, addStairsOreDict, addBoatsOreDict, addChestBoatsOreDict, + addButtonOreDict, addPressurePlateOreDict, + addPlanksUnificationInfo, addDoorsUnificationInfo, addSlabsUnificationInfo, + addFencesUnificationInfo, addFenceGatesUnificationInfo, addStairsUnificationInfo, addBoatsUnificationInfo, - addChestBoatsUnificationInfo, generateLogToPlankRecipe); + addChestBoatsUnificationInfo, addButtonUnificationInfo, addPressurePlateUnificationInfo, + generateLogToPlankRecipe); } } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java index c10b6db065..d54ce6b22e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java @@ -175,7 +175,7 @@ private static void hardRedstoneRecipes(Consumer provider) { 'G', new UnificationEntry(TagPrefix.gearSmall, GTMaterials.Iron), 'A', new UnificationEntry(TagPrefix.rod, GTMaterials.RedAlloy)); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("dispenser").duration(100).EUt(VA[LV]) + ASSEMBLER_RECIPES.recipeBuilder("dispenser").duration(100).EUt(VA[LV]) .inputItems(ItemTags.STONE_CRAFTING_MATERIALS, 2) .inputItems(TagPrefix.ring, GTMaterials.Iron) .inputItems(TagPrefix.spring, GTMaterials.Iron, 2) @@ -198,7 +198,7 @@ private static void hardRedstoneRecipes(Consumer provider) { 'G', new UnificationEntry(TagPrefix.gearSmall, GTMaterials.Iron), 'F', ItemTags.WOODEN_FENCES); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("piston_iron") + ASSEMBLER_RECIPES.recipeBuilder("piston_iron") .inputItems(TagPrefix.rod, GTMaterials.Iron) .inputItems(TagPrefix.gearSmall, GTMaterials.Iron) .inputItems(ItemTags.WOODEN_SLABS) @@ -207,7 +207,7 @@ private static void hardRedstoneRecipes(Consumer provider) { .outputItems(new ItemStack(Blocks.PISTON)) .duration(240).EUt(VA[ULV]).save(provider); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("piston_steel") + ASSEMBLER_RECIPES.recipeBuilder("piston_steel") .inputItems(TagPrefix.rod, GTMaterials.Steel) .inputItems(TagPrefix.gearSmall, GTMaterials.Steel) .inputItems(ItemTags.WOODEN_SLABS, 2) @@ -216,7 +216,7 @@ private static void hardRedstoneRecipes(Consumer provider) { .outputItems(new ItemStack(Blocks.PISTON, 2)) .duration(240).EUt(16).save(provider); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("piston_aluminium") + ASSEMBLER_RECIPES.recipeBuilder("piston_aluminium") .inputItems(TagPrefix.rod, GTMaterials.Aluminium) .inputItems(TagPrefix.gearSmall, GTMaterials.Aluminium) .inputItems(ItemTags.WOODEN_SLABS, 4) @@ -225,7 +225,7 @@ private static void hardRedstoneRecipes(Consumer provider) { .outputItems(new ItemStack(Blocks.PISTON, 4)) .duration(240).EUt(VA[LV]).save(provider); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("piston_stainless_steel") + ASSEMBLER_RECIPES.recipeBuilder("piston_stainless_steel") .inputItems(TagPrefix.rod, GTMaterials.StainlessSteel) .inputItems(TagPrefix.gearSmall, GTMaterials.StainlessSteel) .inputItems(ItemTags.WOODEN_SLABS, 8) @@ -234,7 +234,7 @@ private static void hardRedstoneRecipes(Consumer provider) { .outputItems(new ItemStack(Blocks.PISTON, 8)) .duration(600).EUt(VA[LV]).save(provider); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("piston_titanium") + ASSEMBLER_RECIPES.recipeBuilder("piston_titanium") .inputItems(TagPrefix.rod, GTMaterials.Titanium) .inputItems(TagPrefix.gearSmall, GTMaterials.Titanium) .inputItems(ItemTags.WOODEN_SLABS, 16) @@ -249,82 +249,10 @@ private static void hardRedstoneRecipes(Consumer provider) { 'L', new ItemStack(Blocks.STONE_SLAB), 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - VanillaRecipeHelper.addShapedRecipe(provider, "oak_pressure_plate", - new ItemStack(Blocks.OAK_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.OAK_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "birch_pressure_plate", - new ItemStack(Blocks.BIRCH_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.BIRCH_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "spruce_pressure_plate", - new ItemStack(Blocks.SPRUCE_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.SPRUCE_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "jungle_pressure_plate", - new ItemStack(Blocks.JUNGLE_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.JUNGLE_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "acacia_pressure_plate", - new ItemStack(Blocks.ACACIA_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.ACACIA_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "dark_oak_pressure_plate", - new ItemStack(Blocks.DARK_OAK_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.DARK_OAK_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "crimson_pressure_plate", - new ItemStack(Blocks.CRIMSON_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.CRIMSON_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "warped_pressure_plate", - new ItemStack(Blocks.WARPED_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.WARPED_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "mangrove_pressure_plate", - new ItemStack(Blocks.MANGROVE_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.MANGROVE_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "cherry_pressure_plate", - new ItemStack(Blocks.CHERRY_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.CHERRY_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "bamboo_pressure_plate", - new ItemStack(Blocks.BAMBOO_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', Blocks.BAMBOO_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "rubber_pressure_plate", - new ItemStack(GTBlocks.RUBBER_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', GTBlocks.RUBBER_SLAB.asItem(), - 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); - - VanillaRecipeHelper.addShapedRecipe(provider, "treated_wood_pressure_plate", - new ItemStack(GTBlocks.TREATED_WOOD_PRESSURE_PLATE, 2), "SrS", "LCL", "SdS", - 'S', new UnificationEntry(TagPrefix.bolt, GTMaterials.Wood), - 'L', GTBlocks.TREATED_WOOD_SLAB.asItem(), + VanillaRecipeHelper.addShapedRecipe(provider, "polished_blackstone_pressure_plate", + new ItemStack(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE, 2), "ShS", "LCL", "SdS", + 'S', new UnificationEntry(TagPrefix.screw, GTMaterials.Iron), + 'L', new ItemStack(Blocks.POLISHED_BLACKSTONE_SLAB), 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Iron)); VanillaRecipeHelper.addShapedRecipe(provider, "heavy_weighted_pressure_plate", @@ -339,97 +267,25 @@ private static void hardRedstoneRecipes(Consumer provider) { 'L', new UnificationEntry(TagPrefix.plate, GTMaterials.Iron), 'C', new UnificationEntry(TagPrefix.spring, GTMaterials.Steel)); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("stone_pressure_plate") + ASSEMBLER_RECIPES.recipeBuilder("stone_pressure_plate") .inputItems(TagPrefix.spring, GTMaterials.Iron) .inputItems(new ItemStack(Blocks.STONE_SLAB, 2)) .outputItems(new ItemStack(Blocks.STONE_PRESSURE_PLATE, 2)) .duration(100).EUt(VA[ULV]).save(provider); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("oak_pressure_plate") + ASSEMBLER_RECIPES.recipeBuilder("polished_blackstone_pressure_plate") .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.OAK_SLAB, 2)) - .outputItems(new ItemStack(Blocks.OAK_PRESSURE_PLATE, 2)) + .inputItems(new ItemStack(Blocks.POLISHED_BLACKSTONE_SLAB, 2)) + .outputItems(new ItemStack(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE, 2)) .duration(100).EUt(VA[ULV]).save(provider); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("birch_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.BIRCH_SLAB, 2)) - .outputItems(new ItemStack(Blocks.BIRCH_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("spruce_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.SPRUCE_SLAB, 2)) - .outputItems(new ItemStack(Blocks.SPRUCE_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("jungle_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.JUNGLE_SLAB, 2)) - .outputItems(new ItemStack(Blocks.JUNGLE_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("acacia_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.ACACIA_SLAB, 2)) - .outputItems(new ItemStack(Blocks.ACACIA_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("dark_oak_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.DARK_OAK_SLAB, 2)) - .outputItems(new ItemStack(Blocks.DARK_OAK_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("crimson_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.CRIMSON_SLAB, 2)) - .outputItems(new ItemStack(Blocks.CRIMSON_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("warped_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.WARPED_SLAB, 2)) - .outputItems(new ItemStack(Blocks.WARPED_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("mangrove_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.MANGROVE_SLAB, 2)) - .outputItems(new ItemStack(Blocks.MANGROVE_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("cherry_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.CHERRY_SLAB, 2)) - .outputItems(new ItemStack(Blocks.CHERRY_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("bamboo_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(Blocks.BAMBOO_SLAB, 2)) - .outputItems(new ItemStack(Blocks.BAMBOO_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("rubber_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(GTBlocks.RUBBER_SLAB, 2)) - .outputItems(new ItemStack(GTBlocks.RUBBER_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("treated_wood_pressure_plate") - .inputItems(TagPrefix.spring, GTMaterials.Iron) - .inputItems(new ItemStack(GTBlocks.TREATED_WOOD_SLAB, 2)) - .outputItems(new ItemStack(GTBlocks.TREATED_WOOD_PRESSURE_PLATE, 2)) - .duration(100).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("light_weighted_pressure_plate") + ASSEMBLER_RECIPES.recipeBuilder("light_weighted_pressure_plate") .inputItems(TagPrefix.spring, GTMaterials.Steel) .inputItems(TagPrefix.plate, GTMaterials.Gold) .outputItems(new ItemStack(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE)) .duration(200).EUt(16).save(provider); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("heavy_weighted_pressure_plate") + ASSEMBLER_RECIPES.recipeBuilder("heavy_weighted_pressure_plate") .inputItems(TagPrefix.spring, GTMaterials.Steel) .inputItems(TagPrefix.plate, GTMaterials.Iron) .outputItems(new ItemStack(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE)) @@ -438,118 +294,18 @@ private static void hardRedstoneRecipes(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, "stone_button", new ItemStack(Blocks.STONE_BUTTON, 6), "sP", 'P', new ItemStack(Blocks.STONE_PRESSURE_PLATE)); - VanillaRecipeHelper.addShapedRecipe(provider, "oak_button", new ItemStack(Blocks.OAK_BUTTON, 6), "sP", - 'P', new ItemStack(Blocks.OAK_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "birch_button", new ItemStack(Blocks.BIRCH_BUTTON, 6), "sP", - 'P', new ItemStack(Blocks.BIRCH_PRESSURE_PLATE)); + VanillaRecipeHelper.addShapedRecipe(provider, "blackstone_button", + new ItemStack(Blocks.POLISHED_BLACKSTONE_BUTTON, 6), "sP", + 'P', new ItemStack(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE)); - VanillaRecipeHelper.addShapedRecipe(provider, "spruce_button", new ItemStack(Blocks.SPRUCE_BUTTON, 6), "sP", - 'P', new ItemStack(Blocks.SPRUCE_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "jungle_button", new ItemStack(Blocks.JUNGLE_BUTTON, 6), "sP", - 'P', new ItemStack(Blocks.JUNGLE_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "acacia_button", new ItemStack(Blocks.ACACIA_BUTTON, 6), "sP", - 'P', new ItemStack(Blocks.ACACIA_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "dark_oak_button", new ItemStack(Blocks.DARK_OAK_BUTTON, 6), - "sP", - 'P', new ItemStack(Blocks.DARK_OAK_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "crimson_button", new ItemStack(Blocks.CRIMSON_BUTTON, 6), - "sP", - 'P', new ItemStack(Blocks.CRIMSON_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "warped_button", new ItemStack(Blocks.WARPED_BUTTON, 6), "sP", - 'P', new ItemStack(Blocks.WARPED_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "mangrove_button", new ItemStack(Blocks.MANGROVE_BUTTON, 6), - "sP", - 'P', new ItemStack(Blocks.MANGROVE_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "cherry_button", new ItemStack(Blocks.CHERRY_BUTTON, 6), "sP", - 'P', new ItemStack(Blocks.CHERRY_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "bamboo_button", new ItemStack(Blocks.BAMBOO_BUTTON, 6), "sP", - 'P', new ItemStack(Blocks.BAMBOO_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "rubber_button", new ItemStack(GTBlocks.RUBBER_BUTTON, 6), - "sP", - 'P', new ItemStack(GTBlocks.RUBBER_PRESSURE_PLATE)); - - VanillaRecipeHelper.addShapedRecipe(provider, "treated_wood_button", - new ItemStack(GTBlocks.TREATED_WOOD_BUTTON, 6), "sP", - 'P', new ItemStack(GTBlocks.TREATED_WOOD_PRESSURE_PLATE)); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("stone_button") + CUTTER_RECIPES.recipeBuilder("stone_button") .inputItems(new ItemStack(Blocks.STONE_PRESSURE_PLATE)) .outputItems(new ItemStack(Blocks.STONE_BUTTON, 12)) .duration(25).EUt(VA[ULV]).save(provider); - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("oak_button") - .inputItems(new ItemStack(Blocks.OAK_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.OAK_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("birch_button") - .inputItems(new ItemStack(Blocks.BIRCH_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.BIRCH_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("spruce_button") - .inputItems(new ItemStack(Blocks.SPRUCE_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.SPRUCE_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("jungle_button") - .inputItems(new ItemStack(Blocks.JUNGLE_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.JUNGLE_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("acacia_button") - .inputItems(new ItemStack(Blocks.ACACIA_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.ACACIA_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("dark_oak_button") - .inputItems(new ItemStack(Blocks.DARK_OAK_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.DARK_OAK_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("crimson_button") - .inputItems(new ItemStack(Blocks.CRIMSON_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.CRIMSON_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("warped_button") - .inputItems(new ItemStack(Blocks.WARPED_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.WARPED_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("mangrove_button") - .inputItems(new ItemStack(Blocks.MANGROVE_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.MANGROVE_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("cherry_button") - .inputItems(new ItemStack(Blocks.CHERRY_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.CHERRY_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("bamboo_button") - .inputItems(new ItemStack(Blocks.BAMBOO_PRESSURE_PLATE)) - .outputItems(new ItemStack(Blocks.BAMBOO_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("rubber_button") - .inputItems(new ItemStack(GTBlocks.RUBBER_PRESSURE_PLATE)) - .outputItems(new ItemStack(GTBlocks.RUBBER_BUTTON, 12)) - .duration(25).EUt(VA[ULV]).save(provider); - - GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("treated_wood_button") - .inputItems(new ItemStack(GTBlocks.TREATED_WOOD_PRESSURE_PLATE)) - .outputItems(new ItemStack(GTBlocks.TREATED_WOOD_BUTTON, 12)) + CUTTER_RECIPES.recipeBuilder("blackstone_button") + .inputItems(new ItemStack(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE)) + .outputItems(new ItemStack(Blocks.POLISHED_BLACKSTONE_BUTTON, 12)) .duration(25).EUt(VA[ULV]).save(provider); VanillaRecipeHelper.addShapedRecipe(provider, "lever", new ItemStack(Blocks.LEVER), "B", "S", @@ -577,7 +333,7 @@ private static void hardRedstoneRecipes(Consumer provider) { 'S', ItemTags.WOODEN_SLABS, 'R', new UnificationEntry(TagPrefix.rod, GTMaterials.RedAlloy)); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("daylight_detector") + ASSEMBLER_RECIPES.recipeBuilder("daylight_detector") .inputItems(rod, RedAlloy) .inputItems(new ItemStack(Blocks.GLASS, 3)) .inputItems(gem, NetherQuartz, 3) @@ -585,7 +341,7 @@ private static void hardRedstoneRecipes(Consumer provider) { .outputItems(new ItemStack(Blocks.DAYLIGHT_DETECTOR)) .duration(200).EUt(16).save(provider); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("daylight_detector_certus") + ASSEMBLER_RECIPES.recipeBuilder("daylight_detector_certus") .inputItems(rod, RedAlloy) .inputItems(new ItemStack(Blocks.GLASS, 3)) .inputItems(gem, CertusQuartz, 3) @@ -593,7 +349,7 @@ private static void hardRedstoneRecipes(Consumer provider) { .outputItems(new ItemStack(Blocks.DAYLIGHT_DETECTOR)) .duration(200).EUt(16).save(provider); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("daylight_detector_quartzite") + ASSEMBLER_RECIPES.recipeBuilder("daylight_detector_quartzite") .inputItems(rod, RedAlloy) .inputItems(new ItemStack(Blocks.GLASS, 3)) .inputItems(gem, Quartzite, 3) @@ -852,7 +608,7 @@ private static void hardToolArmorRecipes(Consumer provider) { 'P', new UnificationEntry(TagPrefix.plate, GTMaterials.Iron), 'A', new UnificationEntry(TagPrefix.bolt, GTMaterials.RedAlloy)); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("compass") + ASSEMBLER_RECIPES.recipeBuilder("compass") .inputItems(TagPrefix.plate, GTMaterials.Iron) .inputItems(TagPrefix.ring, GTMaterials.Zinc) .inputItems(TagPrefix.bolt, GTMaterials.RedAlloy) @@ -874,7 +630,7 @@ private static void hardToolArmorRecipes(Consumer provider) { 'C', new ItemStack(Items.COMPARATOR), 'S', new UnificationEntry(TagPrefix.screw, GTMaterials.Gold)); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("clock") + ASSEMBLER_RECIPES.recipeBuilder("clock") .inputItems(TagPrefix.plate, GTMaterials.Gold) .inputItems(TagPrefix.ring, GTMaterials.Gold) .inputItems(TagPrefix.bolt, GTMaterials.Gold, 2) @@ -1008,7 +764,7 @@ private static void hardMiscRecipes(Consumer provider) { 'R', new UnificationEntry(TagPrefix.ring, GTMaterials.Iron), 'G', new UnificationEntry(TagPrefix.gear, GTMaterials.Iron)); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("jukebox") + ASSEMBLER_RECIPES.recipeBuilder("jukebox") .inputItems(TagPrefix.bolt, GTMaterials.Diamond) .inputItems(TagPrefix.gear, GTMaterials.Iron) .inputItems(TagPrefix.ring, GTMaterials.Iron) @@ -1024,7 +780,7 @@ private static void hardMiscRecipes(Consumer provider) { 'G', new UnificationEntry(TagPrefix.gear, GTMaterials.Wood), 'R', new UnificationEntry(TagPrefix.rod, GTMaterials.RedAlloy)); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("note_block") + ASSEMBLER_RECIPES.recipeBuilder("note_block") .inputItems(TagPrefix.plate, GTMaterials.Wood, 4) .inputItems(TagPrefix.gear, GTMaterials.Wood) .inputItems(TagPrefix.rod, GTMaterials.RedAlloy) @@ -1036,7 +792,7 @@ private static void hardMiscRecipes(Consumer provider) { 'F', new ItemStack(Items.FLINT), 'C', ItemTags.STONE_CRAFTING_MATERIALS); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("furnace") + ASSEMBLER_RECIPES.recipeBuilder("furnace") .circuitMeta(8) .inputItems(ItemTags.STONE_CRAFTING_MATERIALS, 8) .inputItems(new ItemStack(Items.FLINT)) @@ -1048,7 +804,7 @@ private static void hardMiscRecipes(Consumer provider) { 'F', new ItemStack(Items.FLINT), 'W', ItemTags.LOGS); - GTRecipeTypes.ASSEMBLER_RECIPES.recipeBuilder("crafting_table").duration(80).EUt(6) + ASSEMBLER_RECIPES.recipeBuilder("crafting_table").duration(80).EUt(6) .inputItems(ItemTags.LOGS) .inputItems(new ItemStack(Items.FLINT)) .outputItems(new ItemStack(Blocks.CRAFTING_TABLE)) @@ -1321,9 +1077,8 @@ private static void hardMiscRecipes(Consumer provider) { .outputItems(new ItemStack(Blocks.LIGHTNING_ROD)) .duration(100).EUt(4).save(provider); - ASSEMBLER_RECIPES.recipeBuilder("chiseled_bookshelf") // based this one on bookshelf recipe, might need - // rebalancing - .inputItems(ItemTags.PLANKS, 6) // also consider a table crafting recipe + ASSEMBLER_RECIPES.recipeBuilder("chiseled_bookshelf") + .inputItems(ItemTags.PLANKS, 6) .circuitMeta(4) .outputItems(new ItemStack(Blocks.CHISELED_BOOKSHELF)) .duration(100).EUt(4).save(provider); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java index 7f536d1c41..19e18926e5 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java @@ -151,31 +151,11 @@ private static void hardRedstoneRecipes(Consumer registry) { registry.accept(new ResourceLocation("minecraft:activator_rail")); registry.accept(new ResourceLocation("minecraft:redstone_torch")); registry.accept(new ResourceLocation("minecraft:stone_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:oak_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:birch_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:spruce_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:jungle_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:acacia_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:dark_oak_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:crimson_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:warped_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:mangrove_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:cherry_pressure_plate")); - registry.accept(new ResourceLocation("minecraft:bamboo_pressure_plate")); + registry.accept(new ResourceLocation("minecraft:polished_blackstone_pressure_plate")); registry.accept(new ResourceLocation("minecraft:heavy_weighted_pressure_plate")); registry.accept(new ResourceLocation("minecraft:light_weighted_pressure_plate")); registry.accept(new ResourceLocation("minecraft:stone_button")); - registry.accept(new ResourceLocation("minecraft:oak_button")); - registry.accept(new ResourceLocation("minecraft:birch_button")); - registry.accept(new ResourceLocation("minecraft:spruce_button")); - registry.accept(new ResourceLocation("minecraft:jungle_button")); - registry.accept(new ResourceLocation("minecraft:acacia_button")); - registry.accept(new ResourceLocation("minecraft:dark_oak_button")); - registry.accept(new ResourceLocation("minecraft:crimson_button")); - registry.accept(new ResourceLocation("minecraft:warped_button")); - registry.accept(new ResourceLocation("minecraft:mangrove_button")); - registry.accept(new ResourceLocation("minecraft:cherry_button")); - registry.accept(new ResourceLocation("minecraft:bamboo_button")); + registry.accept(new ResourceLocation("minecraft:polished_blackstone_button")); } private static void hardToolArmorRecipes(Consumer registry) { @@ -211,23 +191,12 @@ private static void hardToolArmorRecipes(Consumer registry) { * - Removes Vanilla Fire Charge recipe */ private static void hardMiscRecipes(Consumer registry) { - registry.accept(new ResourceLocation("minecraft:beacon")); - registry.accept(new ResourceLocation("minecraft:jack_o_lantern")); registry.accept(new ResourceLocation("minecraft:golden_apple")); registry.accept(new ResourceLocation("minecraft:book")); - registry.accept(new ResourceLocation("minecraft:brewing_stand")); registry.accept(new ResourceLocation("minecraft:ender_eye")); registry.accept(new ResourceLocation("minecraft:glistering_melon_slice")); registry.accept(new ResourceLocation("minecraft:golden_carrot")); registry.accept(new ResourceLocation("minecraft:magma_cream")); - registry.accept(new ResourceLocation("minecraft:enchanting_table")); - registry.accept(new ResourceLocation("minecraft:jukebox")); - registry.accept(new ResourceLocation("minecraft:note_block")); - registry.accept(new ResourceLocation("minecraft:furnace")); - registry.accept(new ResourceLocation("minecraft:crafting_table")); - registry.accept(new ResourceLocation("minecraft:polished_granite")); - registry.accept(new ResourceLocation("minecraft:polished_diorite")); - registry.accept(new ResourceLocation("minecraft:polished_andesite")); registry.accept(new ResourceLocation("minecraft:lead")); registry.accept(new ResourceLocation("minecraft:item_frame")); registry.accept(new ResourceLocation("minecraft:painting")); @@ -235,46 +204,17 @@ private static void hardMiscRecipes(Consumer registry) { registry.accept(new ResourceLocation("minecraft:furnace_minecart")); registry.accept(new ResourceLocation("minecraft:tnt_minecart")); registry.accept(new ResourceLocation("minecraft:hopper_minecart")); - registry.accept(new ResourceLocation("minecraft:flower_pot")); - registry.accept(new ResourceLocation("minecraft:armor_stand")); - registry.accept(new ResourceLocation("minecraft:trapped_chest")); - registry.accept(new ResourceLocation("minecraft:ender_chest")); for (DyeColor color : DyeColor.values()) { registry.accept(new ResourceLocation(color.getName() + "_bed")); } registry.accept(new ResourceLocation("minecraft:fermented_spider_eye")); registry.accept(new ResourceLocation("minecraft:fire_charge")); - // All items from here downward need to be checked for if they belong to miscRecipes or - // removeVanillaBlockRecipes - registry.accept(new ResourceLocation("minecraft:lantern")); - registry.accept(new ResourceLocation("minecraft:tinted_glass")); - registry.accept(new ResourceLocation("minecraft:stonecutter")); - registry.accept(new ResourceLocation("minecraft:cartography_table")); - registry.accept(new ResourceLocation("minecraft:fletching_table")); - registry.accept(new ResourceLocation("minecraft:smithing_table")); - registry.accept(new ResourceLocation("minecraft:grindstone")); - registry.accept(new ResourceLocation("minecraft:smoker")); - registry.accept(new ResourceLocation("minecraft:blast_furnace")); - registry.accept(new ResourceLocation("minecraft:loom")); - registry.accept(new ResourceLocation("minecraft:composter")); - registry.accept(new ResourceLocation("minecraft:bell")); - registry.accept(new ResourceLocation("minecraft:conduit")); - registry.accept(new ResourceLocation("minecraft:candle")); - registry.accept(new ResourceLocation("minecraft:scaffolding")); - registry.accept(new ResourceLocation("minecraft:beehive")); - registry.accept(new ResourceLocation("minecraft:lightning_rod")); - registry.accept(new ResourceLocation("minecraft:lectern")); registry.accept(new ResourceLocation("minecraft:music_disc_5")); registry.accept(new ResourceLocation("minecraft:turtle_helmet")); registry.accept(new ResourceLocation("minecraft:brush")); registry.accept(new ResourceLocation("minecraft:recovery_compass")); registry.accept(new ResourceLocation("minecraft:spyglass")); registry.accept(new ResourceLocation("minecraft:chain")); - registry.accept(new ResourceLocation("minecraft:packed_ice")); - registry.accept(new ResourceLocation("minecraft:blue_ice")); - registry.accept(new ResourceLocation("minecraft:respawn_anchor")); - registry.accept(new ResourceLocation("minecraft:lodestone")); - registry.accept(new ResourceLocation("minecraft:chiseled_bookshelf")); } private static void hardGlassRecipes(Consumer registry) { @@ -387,6 +327,44 @@ private static void removeVanillaBlockRecipes(Consumer registr registry.accept(new ResourceLocation("minecraft:end_rod")); // registry.accept(new ResourceLocation("minecraft:mud_bricks")); //no other way to obtain these rn registry.accept(new ResourceLocation("minecraft:dripstone_block")); + registry.accept(new ResourceLocation("minecraft:beacon")); + registry.accept(new ResourceLocation("minecraft:jack_o_lantern")); + registry.accept(new ResourceLocation("minecraft:packed_ice")); + registry.accept(new ResourceLocation("minecraft:blue_ice")); + registry.accept(new ResourceLocation("minecraft:respawn_anchor")); + registry.accept(new ResourceLocation("minecraft:lodestone")); + registry.accept(new ResourceLocation("minecraft:chiseled_bookshelf")); + registry.accept(new ResourceLocation("minecraft:brewing_stand")); + registry.accept(new ResourceLocation("minecraft:enchanting_table")); + registry.accept(new ResourceLocation("minecraft:jukebox")); + registry.accept(new ResourceLocation("minecraft:note_block")); + registry.accept(new ResourceLocation("minecraft:furnace")); + registry.accept(new ResourceLocation("minecraft:crafting_table")); + registry.accept(new ResourceLocation("minecraft:polished_granite")); + registry.accept(new ResourceLocation("minecraft:polished_diorite")); + registry.accept(new ResourceLocation("minecraft:polished_andesite")); + registry.accept(new ResourceLocation("minecraft:flower_pot")); + registry.accept(new ResourceLocation("minecraft:armor_stand")); + registry.accept(new ResourceLocation("minecraft:trapped_chest")); + registry.accept(new ResourceLocation("minecraft:ender_chest")); + registry.accept(new ResourceLocation("minecraft:lantern")); + registry.accept(new ResourceLocation("minecraft:tinted_glass")); + registry.accept(new ResourceLocation("minecraft:stonecutter")); + registry.accept(new ResourceLocation("minecraft:cartography_table")); + registry.accept(new ResourceLocation("minecraft:fletching_table")); + registry.accept(new ResourceLocation("minecraft:smithing_table")); + registry.accept(new ResourceLocation("minecraft:grindstone")); + registry.accept(new ResourceLocation("minecraft:smoker")); + registry.accept(new ResourceLocation("minecraft:blast_furnace")); + registry.accept(new ResourceLocation("minecraft:loom")); + registry.accept(new ResourceLocation("minecraft:composter")); + registry.accept(new ResourceLocation("minecraft:bell")); + registry.accept(new ResourceLocation("minecraft:conduit")); + registry.accept(new ResourceLocation("minecraft:candle")); + registry.accept(new ResourceLocation("minecraft:scaffolding")); + registry.accept(new ResourceLocation("minecraft:beehive")); + registry.accept(new ResourceLocation("minecraft:lightning_rod")); + registry.accept(new ResourceLocation("minecraft:lectern")); // Carpet replacement for (DyeColor color : DyeColor.values()) { diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java index 68a2eb6f26..0f2c7da8d3 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/BatteryRecipes.java @@ -88,7 +88,7 @@ private static void standardBatteries(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("battery_hull_ev") .inputItems(cableGtSingle, Aluminium, 2) .inputItems(plate, BlueSteel, 2) - .inputFluids(Polytetrafluoroethylene.getFluid(144)) + .inputFluids(Polytetrafluoroethylene.getFluid(L)) .outputItems(BATTERY_HULL_SMALL_VANADIUM) .duration(100).EUt(VA[HV]).save(provider); @@ -104,7 +104,7 @@ private static void standardBatteries(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("battery_hull_luv") .inputItems(cableGtSingle, NiobiumTitanium, 2) .inputItems(plate, RedSteel, 18) - .inputFluids(Polybenzimidazole.getFluid(144)) + .inputFluids(Polybenzimidazole.getFluid(L)) .outputItems(BATTERY_HULL_LARGE_VANADIUM) .duration(300).EUt(VA[IV]).save(provider); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FusionLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FusionLoader.java index 71907619b2..efb46ff0c2 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FusionLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FusionLoader.java @@ -176,9 +176,9 @@ public static void init(Consumer provider) { .save(provider); FUSION_RECIPES.recipeBuilder("silver_and_lithium_to_indium_plasma") - .inputFluids(GTMaterials.Silver.getFluid(144)) - .inputFluids(GTMaterials.Lithium.getFluid(144)) - .outputFluids(GTMaterials.Indium.getFluid(144)) + .inputFluids(GTMaterials.Silver.getFluid(L)) + .inputFluids(GTMaterials.Lithium.getFluid(L)) + .outputFluids(GTMaterials.Indium.getFluid(L)) .duration(16) .EUt(24576) .fusionStartEU(280_000_000) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCyMRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCyMRecipes.java index 0ad9b66849..621807ab3e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCyMRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/GCyMRecipes.java @@ -218,7 +218,7 @@ private static void registerAssemblerRecipes(Consumer provider) ASSEMBLER_RECIPES.recipeBuilder("mds_coil_block") .inputItems(ChemicalHelper.get(ring, MolybdenumDisilicide, 32)) .inputItems(ChemicalHelper.get(foil, Graphene, 16)) - .inputFluids(HSLASteel.getFluid(144)) + .inputFluids(HSLASteel.getFluid(L)) .outputItems(MOLYBDENUM_DISILICIDE_COIL_BLOCK.asStack(1)) .duration(500).EUt(1920) .save(provider); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java index d6eda43c39..ab11a2761e 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/MachineRecipeLoader.java @@ -889,7 +889,7 @@ private static void registerAssemblerRecipes(Consumer provider) .inputItems(CARBON_MESH).inputFluids(Polyethylene.getFluid(288)).outputItems(DUCT_TAPE, 2).duration(100) .save(provider); ASSEMBLER_RECIPES.recipeBuilder("duct_tape_polycaprolactam").EUt(VA[LV]).inputItems(foil, Polycaprolactam, 2) - .inputItems(CARBON_MESH).inputFluids(Polyethylene.getFluid(144)).outputItems(DUCT_TAPE, 4).duration(100) + .inputItems(CARBON_MESH).inputFluids(Polyethylene.getFluid(L)).outputItems(DUCT_TAPE, 4).duration(100) .save(provider); ASSEMBLER_RECIPES.recipeBuilder("duct_tape_polybenzimidazole").EUt(VA[LV]).inputItems(foil, Polybenzimidazole) .inputItems(CARBON_MESH).inputFluids(Polyethylene.getFluid(72)).outputItems(DUCT_TAPE, 8).duration(100) diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java index 803e2dffe0..87e342992a 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java @@ -735,6 +735,24 @@ private static void redstoneRecipes(Consumer provider) { .inputFluids(Concrete.getFluid(L)) .outputItems(new ItemStack(Items.COMPARATOR)) .duration(100).EUt(1).save(provider); + + if (!ConfigHolder.INSTANCE.recipes.hardRedstoneRecipes) { + CUTTER_RECIPES.recipeBuilder("stone_pressure_plate") + .inputItems(new ItemStack(Blocks.STONE_SLAB)) + .outputItems(new ItemStack(Blocks.STONE_PRESSURE_PLATE, 8)) + .duration(250).EUt(VA[ULV]).save(provider); + + CUTTER_RECIPES.recipeBuilder("polished_blackstone_pressure_plate") + .inputItems(new ItemStack(Blocks.POLISHED_BLACKSTONE_SLAB)) + .outputItems(new ItemStack(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE, 8)) + .duration(250).EUt(VA[ULV]).save(provider); + + CUTTER_RECIPES.recipeBuilder("polished_blackstone_pressure_plate") + .inputItems(plate, Iron) + .outputItems(new ItemStack(Blocks.POLISHED_BLACKSTONE_PRESSURE_PLATE, 8)) + .circuitMeta(10) + .duration(250).EUt(VA[ULV]).save(provider); + } } /** @@ -784,19 +802,19 @@ private static void metalRecipes(Consumer provider) { VanillaRecipeHelper.addShapedRecipe(provider, "chainmail_helmet", new ItemStack(Items.CHAINMAIL_HELMET), "PPP", "PhP", - 'P', new UnificationEntry(ring, Iron)); + 'P', Items.CHAIN); VanillaRecipeHelper.addShapedRecipe(provider, "chainmail_chestplate", new ItemStack(Items.CHAINMAIL_CHESTPLATE), "PhP", "PPP", "PPP", - 'P', new UnificationEntry(ring, Iron)); + 'P', Items.CHAIN); VanillaRecipeHelper.addShapedRecipe(provider, "chainmail_leggings", new ItemStack(Items.CHAINMAIL_LEGGINGS), "PPP", "PhP", "P P", - 'P', new UnificationEntry(ring, Iron)); + 'P', Items.CHAIN); VanillaRecipeHelper.addShapedRecipe(provider, "chainmail_boots", new ItemStack(Items.CHAINMAIL_BOOTS), "P P", "PhP", - 'P', new UnificationEntry(ring, Iron)); + 'P', Items.CHAIN); ASSEMBLER_RECIPES.recipeBuilder("cauldron") .inputItems(plate, Iron, 7) @@ -1105,7 +1123,7 @@ private static void miscRecipes(Consumer provider) { .outputItems(new ItemStack(Items.ARMOR_STAND)).save(provider); FLUID_SOLIDFICATION_RECIPES.recipeBuilder("candle") - .inputFluids(Wax.getFluid(144)) + .inputFluids(Wax.getFluid(L)) .inputItems(new ItemStack(Items.STRING)) .outputItems(new ItemStack(Blocks.CANDLE, 2)) .duration(20).EUt(1).save(provider); @@ -1274,7 +1292,7 @@ private static void dyeRecipes(Consumer provider) { CHEMICAL_BATH_RECIPES.recipeBuilder("dark_prismarine") .inputItems(new ItemStack(Items.PRISMARINE_SHARD, 8)) - .inputFluids(DyeBlack.getFluid(144)) + .inputFluids(DyeBlack.getFluid(L)) .outputItems(new ItemStack(Blocks.DARK_PRISMARINE)) .duration(20).EUt(VA[ULV]).save(provider); } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java index 9fc0c7df70..11e78b576c 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/WoodMachineRecipes.java @@ -68,6 +68,8 @@ private static List getDefaultEntries() { .chestBoat(Items.OAK_CHEST_BOAT, "oak_chest_boat") .sign(Items.OAK_SIGN, "oak_sign") .hangingSign(Items.OAK_HANGING_SIGN, "oak_hanging_sign") + .button(Items.OAK_BUTTON, "oak_button") + .pressurePlate(Items.OAK_PRESSURE_PLATE, "oak_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "spruce") @@ -86,6 +88,8 @@ private static List getDefaultEntries() { .chestBoat(Items.SPRUCE_CHEST_BOAT, "spruce_chest_boat") .sign(Items.SPRUCE_SIGN, "spruce_sign") .hangingSign(Items.SPRUCE_HANGING_SIGN, "spruce_hanging_sign") + .button(Items.SPRUCE_BUTTON, "spruce_button") + .pressurePlate(Items.SPRUCE_PRESSURE_PLATE, "spruce_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "birch") @@ -104,6 +108,8 @@ private static List getDefaultEntries() { .chestBoat(Items.BIRCH_CHEST_BOAT, "birch_chest_boat") .sign(Items.BIRCH_SIGN, "birch_sign") .hangingSign(Items.BIRCH_HANGING_SIGN, "birch_hanging_sign") + .button(Items.BIRCH_BUTTON, "birch_button") + .pressurePlate(Items.BIRCH_PRESSURE_PLATE, "birch_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "jungle") @@ -122,6 +128,8 @@ private static List getDefaultEntries() { .chestBoat(Items.JUNGLE_CHEST_BOAT, "jungle_chest_boat") .sign(Items.JUNGLE_SIGN, "jungle_sign") .hangingSign(Items.JUNGLE_HANGING_SIGN, "jungle_hanging_sign") + .button(Items.JUNGLE_BUTTON, "jungle_button") + .pressurePlate(Items.JUNGLE_PRESSURE_PLATE, "jungle_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "acacia") @@ -140,6 +148,8 @@ private static List getDefaultEntries() { .chestBoat(Items.ACACIA_CHEST_BOAT, "acacia_chest_boat") .sign(Items.ACACIA_SIGN, "acacia_sign") .hangingSign(Items.ACACIA_HANGING_SIGN, "acacia_hanging_sign") + .button(Items.ACACIA_BUTTON, "acacia_button") + .pressurePlate(Items.ACACIA_PRESSURE_PLATE, "acacia_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "dark_oak") @@ -158,6 +168,8 @@ private static List getDefaultEntries() { .chestBoat(Items.DARK_OAK_CHEST_BOAT, "dark_oak_chest_boat") .sign(Items.DARK_OAK_SIGN, "dark_oak_sign") .hangingSign(Items.DARK_OAK_HANGING_SIGN, "dark_oak_hanging_sign") + .button(Items.DARK_OAK_BUTTON, "dark_oak_button") + .pressurePlate(Items.DARK_OAK_PRESSURE_PLATE, "dark_oak_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "bamboo") @@ -175,6 +187,8 @@ private static List getDefaultEntries() { .chestBoat(Items.BAMBOO_CHEST_RAFT, "bamboo_chest_raft") .sign(Items.BAMBOO_SIGN, "bamboo_sign") .hangingSign(Items.BAMBOO_HANGING_SIGN, "bamboo_hanging_sign") + .button(Items.BAMBOO_BUTTON, "bamboo_button") + .pressurePlate(Items.BAMBOO_PRESSURE_PLATE, "bamboo_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "cherry") @@ -193,6 +207,8 @@ private static List getDefaultEntries() { .chestBoat(Items.CHERRY_CHEST_BOAT, "cherry_chest_boat") .sign(Items.CHERRY_SIGN, "cherry_sign") .hangingSign(Items.CHERRY_HANGING_SIGN, "cherry_hanging_sign") + .button(Items.CHERRY_BUTTON, "cherry_button") + .pressurePlate(Items.CHERRY_PRESSURE_PLATE, "cherry_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "mangrove") @@ -211,6 +227,8 @@ private static List getDefaultEntries() { .chestBoat(Items.MANGROVE_CHEST_BOAT, "mangrove_chest_boat") .sign(Items.MANGROVE_SIGN, "mangrove_sign") .hangingSign(Items.MANGROVE_HANGING_SIGN, "mangrove_hanging_sign") + .button(Items.MANGROVE_BUTTON, "mangrove_button") + .pressurePlate(Items.MANGROVE_PRESSURE_PLATE, "mangrove_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "crimson") @@ -228,6 +246,8 @@ private static List getDefaultEntries() { .stairs(Items.CRIMSON_STAIRS, "crimson_stairs") .sign(Items.CRIMSON_SIGN, "crimson_sign") .hangingSign(Items.CRIMSON_HANGING_SIGN, "crimson_hanging_sign") + .button(Items.CRIMSON_BUTTON, "crimson_button") + .pressurePlate(Items.CRIMSON_PRESSURE_PLATE, "crimson_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(mcModId, "warped") @@ -245,6 +265,8 @@ private static List getDefaultEntries() { .stairs(Items.WARPED_STAIRS, "warped_stairs") .sign(Items.WARPED_SIGN, "warped_sign") .hangingSign(Items.WARPED_HANGING_SIGN, "warped_hanging_sign") + .button(Items.WARPED_BUTTON, "warped_button") + .pressurePlate(Items.WARPED_PRESSURE_PLATE, "warped_pressure_plate") .registerAllUnificationInfo() .build(), new WoodTypeEntry.Builder(GTCEu.MOD_ID, "rubber") @@ -263,6 +285,8 @@ private static List getDefaultEntries() { .chestBoat(GTItems.RUBBER_CHEST_BOAT.asItem(), null) .sign(GTBlocks.RUBBER_SIGN.asItem(), null) .hangingSign(GTBlocks.RUBBER_HANGING_SIGN.asItem(), null) + .button(GTBlocks.RUBBER_BUTTON.asItem(), null) + .pressurePlate(GTBlocks.RUBBER_PRESSURE_PLATE.asItem(), null) .registerAllTags() .registerAllUnificationInfo() .build(), @@ -278,9 +302,11 @@ private static List getDefaultEntries() { .chestBoat(GTItems.TREATED_WOOD_CHEST_BOAT.asItem(), null) .sign(GTBlocks.TREATED_WOOD_SIGN.asItem(), null) .hangingSign(GTBlocks.TREATED_WOOD_HANGING_SIGN.asItem(), null) + .button(GTBlocks.TREATED_WOOD_BUTTON.asItem(), null) + .pressurePlate(GTBlocks.TREATED_WOOD_PRESSURE_PLATE.asItem(), null) .material(TreatedWood) .generateLogToPlankRecipe(false) - .registerUnificationInfo(false, true, true, true, true, true, true, true) + .registerUnificationInfo(false, true, true, true, true, true, true, true, true, true) .build()); } return DEFAULT_ENTRIES; @@ -385,13 +411,20 @@ public static void registerWoodUnificationInfo(@NotNull WoodTypeEntry entry) { new ItemMaterialInfo(new MaterialStack(entry.material, M * 5))); } - /* - * TODO should this really be included? - * if (entry.chestBoat != null && entry.addChestBoatsUnificationInfo) { - * ChemicalHelper.registerMaterialInfo(entry.chestBoat, - * new ItemMaterialInfo(new MaterialStack(entry.material, M * 13))); - * } - */ + if (entry.chestBoat != null && entry.addChestBoatsUnificationInfo) { + ChemicalHelper.registerMaterialInfo(entry.chestBoat, + new ItemMaterialInfo(new MaterialStack(entry.material, M * 13))); + } + + if (entry.button != null && entry.addButtonsUnificationInfo) { + ChemicalHelper.registerMaterialInfo(entry.button, + new ItemMaterialInfo(new MaterialStack(entry.material, M / 6))); + } + + if (entry.pressurePlate != null && entry.addPressurePlatesUnificationInfo) { + ChemicalHelper.registerMaterialInfo(entry.pressurePlate, + new ItemMaterialInfo(new MaterialStack(entry.material, M))); + } } /** @@ -523,10 +556,6 @@ public static void registerWoodTypeRecipe(Consumer provider, @No .outputItems(entry.sign, 5) .duration(200).EUt(4).save(provider); } else { - VanillaRecipeHelper.addShapedRecipe(provider, recipeName + "_saw", new ItemStack(entry.sign, 3), - "PPP", "PPP", " s ", - 'P', entry.planks); - if (!hasSignRecipe) { VanillaRecipeHelper.addShapedRecipe(provider, recipeName + "_stick", new ItemStack(entry.sign, 3), "PPP", "PPP", " S ", @@ -542,6 +571,7 @@ public static void registerWoodTypeRecipe(Consumer provider, @No .duration(100).EUt(4).save(provider); } + // hanging sign if (entry.hangingSign != null && entry.strippedLog != null) { final boolean hasHangingSignRecipe = entry.hangingSignRecipeName != null; String recipeNameHanging = hasHangingSignRecipe ? entry.hangingSignRecipeName : name + "_hanging_sign"; @@ -554,14 +584,6 @@ public static void registerWoodTypeRecipe(Consumer provider, @No 'S', new ItemStack(entry.sign), 'L', new ItemStack(entry.slab)); - ASSEMBLER_RECIPES.recipeBuilder(name + "_hanging_sign_iron") - .inputItems(entry.slab, 3) - .inputItems(entry.sign) - .inputItems(Items.CHAIN, 2) - .outputItems(entry.hangingSign) - .circuitMeta(5) - .duration(150).EUt(4).save(provider); - VanillaRecipeHelper.addShapedRecipe(provider, recipeNameHanging + "_steel", new ItemStack(entry.hangingSign, 2), "LLL", "C C", "RSR", @@ -570,12 +592,11 @@ public static void registerWoodTypeRecipe(Consumer provider, @No 'S', new ItemStack(entry.sign), 'L', new ItemStack(entry.slab)); - ASSEMBLER_RECIPES.recipeBuilder(name + "_hanging_sign_steel") + ASSEMBLER_RECIPES.recipeBuilder(name + "_hanging_sign") .inputItems(entry.slab, 3) .inputItems(entry.sign) .inputItems(Items.CHAIN, 2) - .inputFluids(Steel.getFluid(GTValues.L / 9)) - .outputItems(entry.hangingSign, 2) + .outputItems(entry.hangingSign) .circuitMeta(5) .duration(150).EUt(4).save(provider); } else { @@ -639,7 +660,7 @@ public static void registerWoodTypeRecipe(Consumer provider, @No ASSEMBLER_RECIPES.recipeBuilder(name + "_trapdoor") .circuitMeta(3) .inputItems(new ItemStack(entry.planks), 6) - .outputItems(new ItemStack(entry.trapdoor), 2) + .outputItems(new ItemStack(entry.trapdoor), 4) .duration(100).EUt(4).save(provider); } } @@ -657,7 +678,7 @@ public static void registerWoodTypeRecipe(Consumer provider, @No // plank -> stairs assembling ASSEMBLER_RECIPES.recipeBuilder(name + "_stairs") - .inputItems(new ItemStack(entry.planks, 6)) + .inputItems(new ItemStack(entry.planks, 3)) .outputItems(new ItemStack(entry.stairs, 4)) .circuitMeta(7) .EUt(1).duration(100).save(provider); @@ -752,7 +773,6 @@ public static void registerWoodTypeRecipe(Consumer provider, @No final boolean hasBoatRecipe = entry.boatRecipeName != null; if (ConfigHolder.INSTANCE.recipes.hardWoodRecipes) { if (entry.slab != null) { - VanillaRecipeHelper.addShapedRecipe(provider, hasBoatRecipe ? entry.boatRecipeName : name + "_boat", new ItemStack(entry.boat), "PHP", "PkP", "SSS", @@ -801,6 +821,58 @@ public static void registerWoodTypeRecipe(Consumer provider, @No .duration(100).EUt(4).save(provider); } } + + // button + if (entry.button != null) { + final boolean hasButtonRecipe = entry.buttonRecipeName != null; + if (ConfigHolder.INSTANCE.recipes.hardWoodRecipes) { + VanillaRecipeHelper.addShapedRecipe(provider, name + "_button", new ItemStack(entry.button, 6), "sP", + 'P', new ItemStack(entry.pressurePlate)); + } else { + if (!hasButtonRecipe) { + VanillaRecipeHelper.addShapedRecipe(provider, name + "_button", new ItemStack(entry.button), "P", + 'P', new ItemStack(entry.planks)); + } + } + + // plank -> button cutting + CUTTER_RECIPES.recipeBuilder(name + "_button") + .inputItems(new ItemStack(entry.planks)) + .outputItems(entry.button, 12) + .duration(250).EUt(VA[ULV]).save(provider); + } + + // preesure plate + if (entry.pressurePlate != null) { + final boolean hasPressurePlateRecipe = entry.pressurePlateRecipeName != null; + if (ConfigHolder.INSTANCE.recipes.hardWoodRecipes) { + VanillaRecipeHelper.addShapedRecipe(provider, name + "_pressure_plate", + new ItemStack(entry.pressurePlate, 2), "SrS", "LCL", "SdS", + 'S', new UnificationEntry(bolt, GTMaterials.Wood), + 'L', entry.slab.asItem(), + 'C', new UnificationEntry(spring, GTMaterials.Iron)); + + ASSEMBLER_RECIPES.recipeBuilder(name + "_pressure_plate") + .inputItems(new ItemStack(entry.slab, 2)) + .inputItems(spring, Iron) + .outputItems(entry.pressurePlate) + .circuitMeta(7) + .duration(100).EUt(VA[ULV]).save(provider); + } else { + if (!hasPressurePlateRecipe) { + VanillaRecipeHelper.addShapedRecipe(provider, name + "_pressure_plate", + new ItemStack(entry.pressurePlate), "PP", + 'P', new ItemStack(entry.planks)); + } + + // slab -> pressure plate cutting + CUTTER_RECIPES.recipeBuilder(name + "_pressure_plate") + .inputItems(new ItemStack(entry.slab)) + .outputItems(entry.pressurePlate, 8) + .duration(250).EUt(VA[ULV]).save(provider); + } + + } } /** @@ -824,19 +896,6 @@ private static void registerGTWoodRecipes(Consumer provider) { 'L', GTBlocks.TREATED_WOOD_PLANK.asItem()); } - if (!ConfigHolder.INSTANCE.recipes.hardRedstoneRecipes) { - VanillaRecipeHelper.addShapelessRecipe(provider, "rubber_button", GTBlocks.RUBBER_BUTTON.asStack(), - GTBlocks.RUBBER_PLANK.asStack()); - VanillaRecipeHelper.addShapelessRecipe(provider, "treated_wood_button", - GTBlocks.TREATED_WOOD_BUTTON.asStack(), - GTBlocks.TREATED_WOOD_PLANK.asStack()); - VanillaRecipeHelper.addShapedRecipe(provider, "rubber_pressure_plate", - GTBlocks.RUBBER_PRESSURE_PLATE.asStack(), - "aa", 'a', GTBlocks.RUBBER_PLANK.asStack()); - VanillaRecipeHelper.addShapedRecipe(provider, "treated_wood_plate", - GTBlocks.TREATED_WOOD_PRESSURE_PLATE.asStack(), "aa", 'a', GTBlocks.TREATED_WOOD_PLANK.asStack()); - } - VanillaRecipeHelper.addShapedRecipe(provider, "rubber_wood", GTBlocks.RUBBER_WOOD.asStack(3), "LL", "LL", 'L', GTBlocks.RUBBER_LOG.asStack()); @@ -924,6 +983,18 @@ private static void hardWoodTypeRecipes(Consumer registry, @No registry.accept(new ResourceLocation(entry.modid, entry.hangingSignRecipeName)); } } + if (entry.button != null) { + // hard plank -> button crafting + if (entry.buttonRecipeName != null) { + registry.accept(new ResourceLocation(entry.modid, entry.buttonRecipeName)); + } + } + if (entry.pressurePlate != null) { + // hard plank -> pressure plate crafting + if (entry.pressurePlateRecipeName != null) { + registry.accept(new ResourceLocation(entry.modid, entry.pressurePlateRecipeName)); + } + } } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PolymerRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PolymerRecipes.java index b33550523c..c7d3fd7ed1 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PolymerRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/PolymerRecipes.java @@ -39,14 +39,14 @@ private static void polyethyleneProcess(Consumer provider) { CHEMICAL_RECIPES.recipeBuilder("polyethylene_from_air") .circuitMeta(1) .inputFluids(Air.getFluid(1000)) - .inputFluids(Ethylene.getFluid(144)) - .outputFluids(Polyethylene.getFluid(144)) + .inputFluids(Ethylene.getFluid(L)) + .outputFluids(Polyethylene.getFluid(L)) .duration(160).EUt(VA[LV]).save(provider); CHEMICAL_RECIPES.recipeBuilder("polyethylene_from_oxygen") .circuitMeta(1) .inputFluids(Oxygen.getFluid(1000)) - .inputFluids(Ethylene.getFluid(144)) + .inputFluids(Ethylene.getFluid(L)) .outputFluids(Polyethylene.getFluid(216)) .duration(160).EUt(VA[LV]).save(provider); @@ -95,14 +95,14 @@ private static void polyvinylChlorideProcess(Consumer provider) CHEMICAL_RECIPES.recipeBuilder("polyvinyl_chloride_from_air") .circuitMeta(1) .inputFluids(Air.getFluid(1000)) - .inputFluids(VinylChloride.getFluid(144)) - .outputFluids(PolyvinylChloride.getFluid(144)) + .inputFluids(VinylChloride.getFluid(L)) + .outputFluids(PolyvinylChloride.getFluid(L)) .duration(160).EUt(VA[LV]).save(provider); CHEMICAL_RECIPES.recipeBuilder("polyvinyl_chloride_from_oxygen") .circuitMeta(1) .inputFluids(Oxygen.getFluid(1000)) - .inputFluids(VinylChloride.getFluid(144)) + .inputFluids(VinylChloride.getFluid(L)) .outputFluids(PolyvinylChloride.getFluid(216)) .duration(160).EUt(VA[LV]).save(provider); @@ -151,14 +151,14 @@ private static void ptfeProcess(Consumer provider) { CHEMICAL_RECIPES.recipeBuilder("ptfe_from_air") .circuitMeta(1) .inputFluids(Air.getFluid(1000)) - .inputFluids(Tetrafluoroethylene.getFluid(144)) - .outputFluids(Polytetrafluoroethylene.getFluid(144)) + .inputFluids(Tetrafluoroethylene.getFluid(L)) + .outputFluids(Polytetrafluoroethylene.getFluid(L)) .duration(160).EUt(VA[LV]).save(provider); CHEMICAL_RECIPES.recipeBuilder("ptfe_from_oxygen") .circuitMeta(1) .inputFluids(Oxygen.getFluid(1000)) - .inputFluids(Tetrafluoroethylene.getFluid(144)) + .inputFluids(Tetrafluoroethylene.getFluid(L)) .outputFluids(Polytetrafluoroethylene.getFluid(216)) .duration(160).EUt(VA[LV]).save(provider); diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java index 466360b0cb..4a3df055c8 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/ReactorRecipes.java @@ -23,14 +23,14 @@ public class ReactorRecipes { public static void init(Consumer provider) { CHEMICAL_RECIPES.recipeBuilder("raw_rubber_from_air") .circuitMeta(1) - .inputFluids(Isoprene.getFluid(144)) + .inputFluids(Isoprene.getFluid(L)) .inputFluids(Air.getFluid(2000)) .outputItems(dust, RawRubber) .duration(160).EUt(VA[LV]).save(provider); CHEMICAL_RECIPES.recipeBuilder("raw_rubber_from_oxygen") .circuitMeta(1) - .inputFluids(Isoprene.getFluid(144)) + .inputFluids(Isoprene.getFluid(L)) .inputFluids(Oxygen.getFluid(2000)) .outputItems(dust, RawRubber, 3) .duration(160).EUt(VA[LV]).save(provider); @@ -219,14 +219,14 @@ public static void init(Consumer provider) { CHEMICAL_RECIPES.recipeBuilder("pva_from_air") .circuitMeta(1) .inputFluids(Air.getFluid(1000)) - .inputFluids(VinylAcetate.getFluid(144)) - .outputFluids(PolyvinylAcetate.getFluid(144)) + .inputFluids(VinylAcetate.getFluid(L)) + .outputFluids(PolyvinylAcetate.getFluid(L)) .duration(160).EUt(VA[LV]).save(provider); CHEMICAL_RECIPES.recipeBuilder("pva_from_oxygen") .circuitMeta(1) .inputFluids(Oxygen.getFluid(1000)) - .inputFluids(VinylAcetate.getFluid(144)) + .inputFluids(VinylAcetate.getFluid(L)) .outputFluids(PolyvinylAcetate.getFluid(216)) .duration(160).EUt(VA[LV]).save(provider); @@ -704,8 +704,8 @@ public static void init(Consumer provider) { CHEMICAL_RECIPES.recipeBuilder("polyvinyl_butyral") .inputFluids(Butyraldehyde.getFluid(250)) - .inputFluids(PolyvinylAcetate.getFluid(144)) - .outputFluids(PolyvinylButyral.getFluid(144)) + .inputFluids(PolyvinylAcetate.getFluid(L)) + .outputFluids(PolyvinylButyral.getFluid(L)) .duration(400).EUt(VA[HV]).save(provider); CHEMICAL_RECIPES.recipeBuilder("biphenyl_from_toluene")