keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix dyes tag containing dye items instead of tags

Browse source 
Update generated data
This commit is contained in:
tterrag 2020-01-05 18:56:49 -05:00
parent 6e8b976089
commit df04ae11ef
3 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/generated/resources/data/forge/tags/blocks/dirt.json
View file

@ -2,7 +2,9 @@
"replace": false, "replace": false,
"values": [ "values": [
"minecraft:dirt", "minecraft:dirt",
"minecraft:grass_block",
"minecraft:coarse_dirt", "minecraft:coarse_dirt",
"minecraft:podzol" "minecraft:podzol",
"minecraft:mycelium"
] ]
} }

32
src/generated/resources/data/forge/tags/items/dyes.json
View file

@ -1,21 +1,21 @@
{ {
"replace": false, "replace": false,
"values": [ "values": [
"minecraft:white_dye", "#forge:dyes/white",
"minecraft:orange_dye", "#forge:dyes/orange",
"minecraft:magenta_dye", "#forge:dyes/magenta",
"minecraft:light_blue_dye", "#forge:dyes/light_blue",
"minecraft:yellow_dye", "#forge:dyes/yellow",
"minecraft:lime_dye", "#forge:dyes/lime",
"minecraft:pink_dye", "#forge:dyes/pink",
"minecraft:gray_dye", "#forge:dyes/gray",
"minecraft:light_gray_dye", "#forge:dyes/light_gray",
"minecraft:cyan_dye", "#forge:dyes/cyan",
"minecraft:purple_dye", "#forge:dyes/purple",
"minecraft:blue_dye", "#forge:dyes/blue",
"minecraft:brown_dye", "#forge:dyes/brown",
"minecraft:green_dye", "#forge:dyes/green",
"minecraft:red_dye", "#forge:dyes/red",
"minecraft:black_dye" "#forge:dyes/black"
] ]
} }

4
src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java
View file

@ -146,7 +146,7 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
copy(Tags.Blocks.SUPPORTS_CONDUIT, Tags.Items.SUPPORTS_CONDUIT); copy(Tags.Blocks.SUPPORTS_CONDUIT, Tags.Items.SUPPORTS_CONDUIT);
} }
private void addColored(Consumer<Item> consumer, Tag<Item> group, String pattern) private void addColored(Consumer<Tag<Item>> consumer, Tag<Item> group, String pattern)
{ {
String prefix = group.getId().getPath().toUpperCase(Locale.ENGLISH) + '_'; String prefix = group.getId().getPath().toUpperCase(Locale.ENGLISH) + '_';
for (DyeColor color : DyeColor.values()) for (DyeColor color : DyeColor.values())
@ -157,7 +157,7 @@ public class ForgeItemTagsProvider extends ItemTagsProvider
if (item == null || item == Items.AIR) if (item == null || item == Items.AIR)
throw new IllegalStateException("Unknown vanilla item: " + key.toString()); throw new IllegalStateException("Unknown vanilla item: " + key.toString());
getBuilder(tag).add(item); getBuilder(tag).add(item);
consumer.accept(item); consumer.accept(tag);
} }
} }