Skip to content

Commit 9a9283d

Browse files
authored
Fix the bone meal -> white dye recipe being deleted unconditionally (#4637)
1 parent dc65059 commit 9a9283d

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ private static void generalRemovals(Consumer<ResourceLocation> registry) {
7575
registry.accept(new ResourceLocation("minecraft:soul_torch"));
7676
registry.accept(new ResourceLocation("minecraft:soul_lantern"));
7777
registry.accept(new ResourceLocation("minecraft:leather_horse_armor"));
78-
79-
// remove vanilla dye recipes to gregify
80-
registry.accept(new ResourceLocation("minecraft:white_dye"));
8178
}
8279

8380
/**
@@ -291,7 +288,9 @@ private static void hardDyeRecipes(Consumer<ResourceLocation> registry) {
291288
registry.accept(new ResourceLocation(String.format("minecraft:dye_%s_wool", colorMaterial.getName())));
292289
registry.accept(new ResourceLocation(String.format("minecraft:dye_%s_carpet", colorMaterial.getName())));
293290
registry.accept(new ResourceLocation(String.format("minecraft:dye_%s_bed", colorMaterial.getName())));
294-
registry.accept(new ResourceLocation("minecraft:black_dye"));
291+
292+
registry.accept(new ResourceLocation("white_dye"));
293+
registry.accept(new ResourceLocation("black_dye"));
295294
registry.accept(new ResourceLocation("black_dye_from_wither_rose"));
296295
registry.accept(new ResourceLocation("blue_dye"));
297296
registry.accept(new ResourceLocation("white_dye_from_lily_of_the_valley"));

src/main/java/com/gregtechceu/gtceu/data/recipe/misc/VanillaStandardRecipes.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,11 +1372,13 @@ private static void dyeRecipes(Consumer<FinishedRecipe> provider) {
13721372
.inputItems(new ItemStack(Items.BONE_MEAL))
13731373
.outputItems(new ItemStack(Items.WHITE_DYE, 1))
13741374
.save(provider);
1375-
EXTRACTOR_RECIPES.recipeBuilder("lapis_dye")
1375+
1376+
EXTRACTOR_RECIPES.recipeBuilder("blue_dye")
13761377
.inputItems(new ItemStack(Items.LAPIS_LAZULI))
13771378
.outputItems(new ItemStack(Items.BLUE_DYE))
13781379
.save(provider);
1379-
EXTRACTOR_RECIPES.recipeBuilder("ink_dye")
1380+
1381+
EXTRACTOR_RECIPES.recipeBuilder("black_dye")
13801382
.inputItems(new ItemStack(Items.INK_SAC))
13811383
.outputItems(new ItemStack(Items.BLACK_DYE))
13821384
.save(provider);

0 commit comments

Comments
 (0)