From 06baabd54c7ce566b39ae6fabdc5ebc867c851eb Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Sat, 23 Sep 2023 16:41:35 -0400 Subject: [PATCH] reran gendata and log workstation replacements --- .../tag/convention/ConventionLogWarnings.java | 5 ++++- .../resources/data/c/tags/blocks/chests.json | 5 ++--- .../data/c/tags/blocks/chests/wooden.json | 11 +++++++++++ .../resources/data/c/tags/blocks/stones.json | 13 +++++++++++++ .../data/c/tags/items/barrels/wooden.json | 4 ++++ .../resources/data/c/tags/items/chests.json | 5 ++--- .../data/c/tags/items/chests/wooden.json | 15 +++++++++++++++ .../data/c/tags/items/dusts/glowstone.json | 6 +++++- .../data/c/tags/items/dusts/redstone.json | 6 +++++- .../resources/data/c/tags/items/rods.json | 10 ++++++++++ .../c/tags/items/{axes.json => rods/wooden.json} | 1 + .../resources/data/c/tags/items/stones.json | 13 +++++++++++++ .../resources/data/c/tags/items/strings.json | 10 ++++++++++ 13 files changed, 95 insertions(+), 9 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json rename fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/{axes.json => rods/wooden.json} (65%) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index 4f8c9f4704..ec8aa356f6 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -133,7 +133,10 @@ public enum LOG_WARNING_MODES { createMapEntry(RegistryKeys.BLOCK, "glass_pane", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.GLASS_PANES), createMapEntry(RegistryKeys.BLOCK, "immobile", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.RELOCATION_NOT_SUPPORTED), createMapEntry(RegistryKeys.BLOCK, "stone", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.STONES), - createMapEntry(RegistryKeys.BLOCK, "workbench", "workbenches"), + createMapEntry(RegistryKeys.BLOCK, "workbench", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), + createMapEntry(RegistryKeys.BLOCK, "workbenches", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), + createMapEntry(RegistryKeys.BLOCK, "workstation", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), + createMapEntry(RegistryKeys.BLOCK, "workstations", net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.VILLAGER_JOB_SITES), createMapEntry(RegistryKeys.ITEM, "axes", ItemTags.AXES), createMapEntry(RegistryKeys.ITEM, "pickaxes", ItemTags.PICKAXES), diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json index 7acec0eccc..9ec42a987a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests.json @@ -1,8 +1,7 @@ { "replace": false, "values": [ - "minecraft:chest", - "minecraft:ender_chest", - "minecraft:trapped_chest" + "#c:chests/wooden", + "minecraft:ender_chest" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json new file mode 100644 index 0000000000..6f6d1cfd05 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/chests/wooden.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:chest", + "minecraft:trapped_chest", + { + "id": "#c:wooden_chests", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json new file mode 100644 index 0000000000..66ca59d9af --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/blocks/stones.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:infested_stone", + "minecraft:stone", + "minecraft:deepslate", + "minecraft:infested_deepslate", + "minecraft:tuff" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json index a9c1763f11..604c5cde27 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/barrels/wooden.json @@ -2,6 +2,10 @@ "replace": false, "values": [ "minecraft:barrel", + { + "id": "#c:wooden_barrels", + "required": false + }, { "id": "#c:wooden_barrels", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json index 7acec0eccc..9ec42a987a 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests.json @@ -1,8 +1,7 @@ { "replace": false, "values": [ - "minecraft:chest", - "minecraft:ender_chest", - "minecraft:trapped_chest" + "#c:chests/wooden", + "minecraft:ender_chest" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json new file mode 100644 index 0000000000..a877dfe096 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/chests/wooden.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "minecraft:chest", + "minecraft:trapped_chest", + { + "id": "#c:wooden_chests", + "required": false + }, + { + "id": "#c:wooden_chests", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json index 08d35494bb..dcc3a1fa1e 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/glowstone.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ - "minecraft:glowstone_dust" + "minecraft:glowstone_dust", + { + "id": "#c:glowstone_dusts", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json index 2703f553aa..a0b3cfe802 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/dusts/redstone.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ - "minecraft:redstone" + "minecraft:redstone", + { + "id": "#c:redstone_dusts", + "required": false + } ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json new file mode 100644 index 0000000000..e1e19f2959 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:rods/wooden", + "required": false + }, + "minecraft:blaze_rod" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json similarity index 65% rename from fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json rename to fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json index a22514f66a..390efe6924 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/axes.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/rods/wooden.json @@ -1,5 +1,6 @@ { "replace": false, "values": [ + "minecraft:stick" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json new file mode 100644 index 0000000000..66ca59d9af --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/stones.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:infested_stone", + "minecraft:stone", + "minecraft:deepslate", + "minecraft:infested_deepslate", + "minecraft:tuff" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json new file mode 100644 index 0000000000..86c603831b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/items/strings.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:string", + { + "id": "#c:strings", + "required": false + } + ] +} \ No newline at end of file