diff --git a/src/generated/resources/data/forge/tags/blocks/dirt.json b/src/generated/resources/data/forge/tags/blocks/dirt.json index b89987dca..61918d998 100644 --- a/src/generated/resources/data/forge/tags/blocks/dirt.json +++ b/src/generated/resources/data/forge/tags/blocks/dirt.json @@ -2,7 +2,9 @@ "replace": false, "values": [ "minecraft:dirt", + "minecraft:grass_block", "minecraft:coarse_dirt", - "minecraft:podzol" + "minecraft:podzol", + "minecraft:mycelium" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dyes.json b/src/generated/resources/data/forge/tags/items/dyes.json index 68f024e73..10495c077 100644 --- a/src/generated/resources/data/forge/tags/items/dyes.json +++ b/src/generated/resources/data/forge/tags/items/dyes.json @@ -1,21 +1,21 @@ { "replace": false, "values": [ - "minecraft:white_dye", - "minecraft:orange_dye", - "minecraft:magenta_dye", - "minecraft:light_blue_dye", - "minecraft:yellow_dye", - "minecraft:lime_dye", - "minecraft:pink_dye", - "minecraft:gray_dye", - "minecraft:light_gray_dye", - "minecraft:cyan_dye", - "minecraft:purple_dye", - "minecraft:blue_dye", - "minecraft:brown_dye", - "minecraft:green_dye", - "minecraft:red_dye", - "minecraft:black_dye" + "#forge:dyes/white", + "#forge:dyes/orange", + "#forge:dyes/magenta", + "#forge:dyes/light_blue", + "#forge:dyes/yellow", + "#forge:dyes/lime", + "#forge:dyes/pink", + "#forge:dyes/gray", + "#forge:dyes/light_gray", + "#forge:dyes/cyan", + "#forge:dyes/purple", + "#forge:dyes/blue", + "#forge:dyes/brown", + "#forge:dyes/green", + "#forge:dyes/red", + "#forge:dyes/black" ] } \ 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 f9e707c11..ca27bc773 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -146,7 +146,7 @@ public class ForgeItemTagsProvider extends ItemTagsProvider copy(Tags.Blocks.SUPPORTS_CONDUIT, Tags.Items.SUPPORTS_CONDUIT); } - private void addColored(Consumer consumer, Tag group, String pattern) + private void addColored(Consumer> consumer, Tag group, String pattern) { String prefix = group.getId().getPath().toUpperCase(Locale.ENGLISH) + '_'; for (DyeColor color : DyeColor.values()) @@ -157,7 +157,7 @@ public class ForgeItemTagsProvider extends ItemTagsProvider if (item == null || item == Items.AIR) throw new IllegalStateException("Unknown vanilla item: " + key.toString()); getBuilder(tag).add(item); - consumer.accept(item); + consumer.accept(tag); } }