Various Recipe Fixes (#1799)

Co-authored-by: YoungOnion <[email protected]>
GregTechCEu · Aug 21, 2024 · f2f02f0 · f2f02f0
1 parent c5e9766
commit f2f02f0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java b/src/main/java/com/gregtechceu/gtceu/common/data/materials/ElementMaterials.java
@@ -205,7 +205,8 @@ public static void register() {
                 .liquid(new FluidBuilder().temperature(1358))
                 .ore()
                 .color(0xe77c56).secondaryColor(0xe4673e).iconSet(BRIGHT)
-                .appendFlags(EXT_METAL, MORTAR_GRINDABLE, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_FINE_WIRE)
+                .appendFlags(EXT_METAL, MORTAR_GRINDABLE, GENERATE_SPRING, GENERATE_SPRING_SMALL, GENERATE_RING,
+                        GENERATE_FINE_WIRE)
                 .element(GTElements.Cu)
                 .cableProperties(GTValues.V[2], 1, 2)
                 .fluidPipeProperties(1696, 6, true)

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
@@ -298,9 +298,9 @@ private static void hardDyeRecipes(Consumer<ResourceLocation> registry) {
             registry.accept(new ResourceLocation(String.format("minecraft:%s_terracotta", colorMaterial.getName())));
             registry.accept(new ResourceLocation(String.format("minecraft:%s_stained_glass", colorMaterial.getName())));
             registry.accept(new ResourceLocation(String.format("minecraft:%s_candle", colorMaterial.getName())));
-            if (colorMaterial != MarkerMaterials.Color.White) {
-                registry.accept(new ResourceLocation(String.format("minecraft:%s_wool", colorMaterial.getName())));
-            }
+            registry.accept(new ResourceLocation(String.format("minecraft:dye_%s_wool", colorMaterial.getName())));
+            registry.accept(new ResourceLocation(String.format("minecraft:dye_%s_carpet", colorMaterial.getName())));
+            registry.accept(new ResourceLocation(String.format("minecraft:dye_%s_bed", colorMaterial.getName())));
         }
         registry.accept(new ResourceLocation("minecraft:dark_prismarine"));
     }
@@ -344,6 +344,7 @@ private static void removeVanillaBlockRecipes(Consumer<ResourceLocation> registr
         registry.accept(new ResourceLocation("minecraft:chiseled_bookshelf"));
         registry.accept(new ResourceLocation("minecraft:quartz_pillar"));
         registry.accept(new ResourceLocation("minecraft:sea_lantern"));
+        registry.accept(new ResourceLocation("minecraft:white_wool_from_string"));
         // TODO Add extruder/laser engraver recipes for all vanilla stones to keep parity with GT stones
         registry.accept(new ResourceLocation("minecraft:cracked_stone_bricks"));
         registry.accept(new ResourceLocation("minecraft:mossy_cobblestone_from_moss_block"));

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
@@ -646,12 +646,25 @@ private static void dyingCleaningRecipes(Consumer<FinishedRecipe> provider) {
                             BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_stained_glass_pane"))))
                     .save(provider);
 
+            CHEMICAL_BATH_RECIPES.recipeBuilder("dye_candle_to_" + dyeName).duration(20).EUt(VA[ULV])
+                    .inputItems(new ItemStack(Items.CANDLE))
+                    .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L / 8))
+                    .outputItems(new ItemStack(
+                            BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_candle"))))
+                    .save(provider);
+
             if (color != DyeColor.WHITE) {
                 CHEMICAL_BATH_RECIPES.recipeBuilder("dye_wool_to_" + dyeName).duration(20).EUt(VA[ULV])
                         .inputItems(new ItemStack(Blocks.WHITE_WOOL))
                         .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L))
                         .outputItems(new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_wool"))))
                         .save(provider);
+
+                CHEMICAL_BATH_RECIPES.recipeBuilder("dye_bed_to_" + dyeName).duration(20).EUt(VA[ULV])
+                        .inputItems(new ItemStack(Blocks.WHITE_BED))
+                        .inputFluids(CHEMICAL_DYES[color.ordinal()].getFluid(L))
+                        .outputItems(new ItemStack(BuiltInRegistries.ITEM.get(new ResourceLocation(dyeName + "_bed"))))
+                        .save(provider);
             }
 
             CUTTER_RECIPES.recipeBuilder("cut_" + dyeName + "_wool_to_carpet").duration(20).EUt(VA[ULV])
@@ -710,6 +723,18 @@ private static void dyingCleaningRecipes(Consumer<FinishedRecipe> provider) {
                 .inputFluids(Chlorine.getFluid(10))
                 .outputItems(new ItemStack(Blocks.PISTON))
                 .duration(30).EUt(VA[LV]).save(provider);
+
+        CHEMICAL_BATH_RECIPES.recipeBuilder("decolor_candle")
+                .inputItems(ItemTags.CANDLES)
+                .inputFluids(Chlorine.getFluid(20))
+                .outputItems(Items.CANDLE)
+                .duration(400).EUt(2).save(provider);
+
+        CHEMICAL_BATH_RECIPES.recipeBuilder("decolor_bed")
+                .inputItems(ItemTags.BEDS)
+                .inputFluids(Chlorine.getFluid(20))
+                .outputItems(Items.WHITE_BED)
+                .duration(400).EUt(2).save(provider);
     }
 
     /**