reran gendata and log workstation replacements

FabricMC · Sep 23, 2023 · 06baabd · 06baabd
1 parent cb30f41
commit 06baabd
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 9 deletions.
diff --git a/...-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/...-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
@@ -1,8 +1,7 @@
 {
   "replace": false,
   "values": [
-    "minecraft:chest",
-    "minecraft:ender_chest",
-    "minecraft:trapped_chest"
+    "#c:chests/wooden",
+    "minecraft:ender_chest"
   ]
 }
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
@@ -0,0 +1,11 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:chest",
+    "minecraft:trapped_chest",
+    {
+      "id": "#c:wooden_chests",
+      "required": false
+    }
+  ]
+}
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
@@ -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"
+  ]
+}
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
@@ -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
@@ -1,8 +1,7 @@
 {
   "replace": false,
   "values": [
-    "minecraft:chest",
-    "minecraft:ender_chest",
-    "minecraft:trapped_chest"
+    "#c:chests/wooden",
+    "minecraft:ender_chest"
   ]
 }
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
@@ -0,0 +1,15 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:chest",
+    "minecraft:trapped_chest",
+    {
+      "id": "#c:wooden_chests",
+      "required": false
+    },
+    {
+      "id": "#c:wooden_chests",
+      "required": false
+    }
+  ]
+}
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
@@ -1,6 +1,10 @@
 {
   "replace": false,
   "values": [
-    "minecraft:glowstone_dust"
+    "minecraft:glowstone_dust",
+    {
+      "id": "#c:glowstone_dusts",
+      "required": false
+    }
   ]
 }
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
@@ -1,6 +1,10 @@
 {
   "replace": false,
   "values": [
-    "minecraft:redstone"
+    "minecraft:redstone",
+    {
+      "id": "#c:redstone_dusts",
+      "required": false
+    }
   ]
 }
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
@@ -0,0 +1,10 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#c:rods/wooden",
+      "required": false
+    },
+    "minecraft:blaze_rod"
+  ]
+}
diff --git a/...ted/resources/data/c/tags/items/axes.json → ...ources/data/c/tags/items/rods/wooden.json b/...ted/resources/data/c/tags/items/axes.json → ...ources/data/c/tags/items/rods/wooden.json
@@ -1,5 +1,6 @@
 {
   "replace": false,
   "values": [
+    "minecraft:stick"
   ]
 }
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
@@ -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"
+  ]
+}
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
@@ -0,0 +1,10 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:string",
+    {
+      "id": "#c:strings",
+      "required": false
+    }
+  ]
+}