Fix #4181 and #4182

FabricMC · Nov 1, 2024 · 6f8cf66 · 6f8cf66
1 parent 7feeb73
commit 6f8cf66
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 16 deletions.
diff --git a/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java
@@ -513,6 +513,7 @@ private void generateLogTags() {
 				.add(Blocks.STRIPPED_JUNGLE_LOG)
 				.add(Blocks.STRIPPED_MANGROVE_LOG)
 				.add(Blocks.STRIPPED_OAK_LOG)
+				.add(Blocks.STRIPPED_PALE_OAK_LOG)
 				.add(Blocks.STRIPPED_SPRUCE_LOG);
 
 		getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_WOODS)
@@ -523,6 +524,7 @@ private void generateLogTags() {
 				.add(Blocks.STRIPPED_JUNGLE_WOOD)
 				.add(Blocks.STRIPPED_MANGROVE_WOOD)
 				.add(Blocks.STRIPPED_OAK_WOOD)
+				.add(Blocks.STRIPPED_PALE_OAK_WOOD)
 				.add(Blocks.STRIPPED_SPRUCE_WOOD);
 	}
 

diff --git a/...gen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/...gen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
@@ -471,10 +471,6 @@ private void generateOreAndRelatedTags() {
 				.addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS)
 				.addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS)
 				.addOptionalTag(ConventionalItemTags.IRON_RAW_MATERIALS);
-		getOrCreateTagBuilder(ConventionalItemTags.RAW_MATERIALS)
-				.addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS)
-				.addOptionalTag(ConventionalItemTags.IRON_RAW_MATERIALS)
-				.addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS);
 
 		getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS)
 				.addOptionalTag(ConventionalItemTags.COPPER_RAW_BLOCKS)

diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_logs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_logs.json
@@ -8,6 +8,7 @@
     "minecraft:stripped_jungle_log",
     "minecraft:stripped_mangrove_log",
     "minecraft:stripped_oak_log",
+    "minecraft:stripped_pale_oak_log",
     "minecraft:stripped_spruce_log"
   ]
 }
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_woods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_woods.json
@@ -7,6 +7,7 @@
     "minecraft:stripped_jungle_wood",
     "minecraft:stripped_mangrove_wood",
     "minecraft:stripped_oak_wood",
+    "minecraft:stripped_pale_oak_wood",
     "minecraft:stripped_spruce_wood"
   ]
 }
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_materials.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/raw_materials.json
@@ -11,18 +11,6 @@
     {
       "id": "#c:raw_materials/iron",
       "required": false
-    },
-    {
-      "id": "#c:raw_materials/copper",
-      "required": false
-    },
-    {
-      "id": "#c:raw_materials/iron",
-      "required": false
-    },
-    {
-      "id": "#c:raw_materials/gold",
-      "required": false
     }
   ]
 }
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_logs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_logs.json
@@ -8,6 +8,7 @@
     "minecraft:stripped_jungle_log",
     "minecraft:stripped_mangrove_log",
     "minecraft:stripped_oak_log",
+    "minecraft:stripped_pale_oak_log",
     "minecraft:stripped_spruce_log"
   ]
 }
diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_woods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_woods.json
@@ -7,6 +7,7 @@
     "minecraft:stripped_jungle_wood",
     "minecraft:stripped_mangrove_wood",
     "minecraft:stripped_oak_wood",
+    "minecraft:stripped_pale_oak_wood",
     "minecraft:stripped_spruce_wood"
   ]
 }