From 9701148819132ce616fae06a0efd4781d6952c95 Mon Sep 17 00:00:00 2001 From: Tedstar Date: Tue, 25 Jun 2019 13:44:54 -0700 Subject: [PATCH] [1.14.x] Replace dye items in Forge tags. (#5843) --- .../resources/data/forge/tags/items/dyes/black.json | 2 +- .../resources/data/forge/tags/items/dyes/blue.json | 2 +- .../resources/data/forge/tags/items/dyes/brown.json | 2 +- .../resources/data/forge/tags/items/dyes/white.json | 2 +- .../minecraftforge/common/data/ForgeItemTagsProvider.java | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/generated/resources/data/forge/tags/items/dyes/black.json b/src/generated/resources/data/forge/tags/items/dyes/black.json index 7b31404945..c25071e211 100644 --- a/src/generated/resources/data/forge/tags/items/dyes/black.json +++ b/src/generated/resources/data/forge/tags/items/dyes/black.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:ink_sac" + "minecraft:black_dye" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dyes/blue.json b/src/generated/resources/data/forge/tags/items/dyes/blue.json index e46a647221..e794506ca0 100644 --- a/src/generated/resources/data/forge/tags/items/dyes/blue.json +++ b/src/generated/resources/data/forge/tags/items/dyes/blue.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:lapis_lazuli" + "minecraft:blue_dye" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dyes/brown.json b/src/generated/resources/data/forge/tags/items/dyes/brown.json index 0ef71a3763..d7744fde88 100644 --- a/src/generated/resources/data/forge/tags/items/dyes/brown.json +++ b/src/generated/resources/data/forge/tags/items/dyes/brown.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:cocoa_beans" + "minecraft:brown_dye" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dyes/white.json b/src/generated/resources/data/forge/tags/items/dyes/white.json index b2017b20cf..1b92baa6af 100644 --- a/src/generated/resources/data/forge/tags/items/dyes/white.json +++ b/src/generated/resources/data/forge/tags/items/dyes/white.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:bone_meal" + "minecraft:white_dye" ] } \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 5451415961..45fe185870 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -44,9 +44,9 @@ public class ForgeItemTagsProvider extends ItemTagsProvider getBuilder(Tags.Items.DUSTS_PRISMARINE).add(Items.PRISMARINE_SHARD); getBuilder(Tags.Items.DUSTS_REDSTONE).add(Items.REDSTONE); getBuilder(Tags.Items.DYES).add(Tags.Items.DYES_BLACK, Tags.Items.DYES_RED, Tags.Items.DYES_GREEN, Tags.Items.DYES_BROWN, Tags.Items.DYES_BLUE, Tags.Items.DYES_PURPLE, Tags.Items.DYES_CYAN, Tags.Items.DYES_LIGHT_GRAY, Tags.Items.DYES_GRAY, Tags.Items.DYES_PINK, Tags.Items.DYES_LIME, Tags.Items.DYES_YELLOW, Tags.Items.DYES_LIGHT_BLUE, Tags.Items.DYES_MAGENTA, Tags.Items.DYES_ORANGE, Tags.Items.DYES_WHITE); - getBuilder(Tags.Items.DYES_BLACK).add(Items.INK_SAC); - getBuilder(Tags.Items.DYES_BLUE).add(Items.LAPIS_LAZULI); - getBuilder(Tags.Items.DYES_BROWN).add(Items.COCOA_BEANS); + getBuilder(Tags.Items.DYES_BLACK).add(Items.BLACK_DYE); + getBuilder(Tags.Items.DYES_BLUE).add(Items.BLUE_DYE); + getBuilder(Tags.Items.DYES_BROWN).add(Items.BROWN_DYE); getBuilder(Tags.Items.DYES_CYAN).add(Items.CYAN_DYE); getBuilder(Tags.Items.DYES_GRAY).add(Items.GRAY_DYE); getBuilder(Tags.Items.DYES_GREEN).add(Items.GREEN_DYE); @@ -58,7 +58,7 @@ public class ForgeItemTagsProvider extends ItemTagsProvider getBuilder(Tags.Items.DYES_PINK).add(Items.PINK_DYE); getBuilder(Tags.Items.DYES_PURPLE).add(Items.PURPLE_DYE); getBuilder(Tags.Items.DYES_RED).add(Items.RED_DYE); - getBuilder(Tags.Items.DYES_WHITE).add(Items.BONE_MEAL); + getBuilder(Tags.Items.DYES_WHITE).add(Items.WHITE_DYE); getBuilder(Tags.Items.DYES_YELLOW).add(Items.YELLOW_DYE); copy(Tags.Blocks.FENCE_GATES, Tags.Items.FENCE_GATES); copy(Tags.Blocks.FENCE_GATES_WOODEN, Tags.Items.FENCE_GATES_WOODEN);