Unify tag namespace and conventions between Neoforge and Fabric for 1…

….20.5 MC neoforged#135 FabricMC/fabric#3310
shartte · Apr 16, 2024 · 3baf096 · 3baf096
1 parent bac722a
commit 3baf096
Show file tree

Hide file tree

Showing 893 changed files with 7,152 additions and 2,277 deletions.
diff --git a/patches/net/minecraft/world/item/DyeColor.java.patch b/patches/net/minecraft/world/item/DyeColor.java.patch
@@ -12,7 +12,7 @@
          int i = (p_41048_ & 0xFF0000) >> 16;
          int j = (p_41048_ & 0xFF00) >> 8;
          int k = (p_41048_ & 0xFF) >> 0;
-+        this.tag = net.minecraft.tags.ItemTags.create(new net.minecraft.resources.ResourceLocation("forge", "dyes/" + p_41047_));
++        this.tag = net.minecraft.tags.ItemTags.create(new net.minecraft.resources.ResourceLocation("c", "dyes/" + p_41047_));
          this.textureDiffuseColors = new float[]{(float)i / 255.0F, (float)j / 255.0F, (float)k / 255.0F};
          this.fireworkColor = p_41050_;
      }

diff --git a/patches/net/minecraft/world/level/levelgen/feature/Feature.java.patch b/patches/net/minecraft/world/level/levelgen/feature/Feature.java.patch
diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json
diff --git a/src/generated/resources/data/c/tags/blocks/barrels.json b/src/generated/resources/data/c/tags/blocks/barrels.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "#c:barrels/wooden",
+    {
+      "id": "#forge:barrels",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/barrels/wooden.json b/src/generated/resources/data/c/tags/blocks/barrels/wooden.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:barrel",
+    {
+      "id": "#forge:barrels/wooden",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/bookshelves.json b/src/generated/resources/data/c/tags/blocks/bookshelves.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:bookshelf",
+    {
+      "id": "#forge:bookshelves",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/budding_blocks.json b/src/generated/resources/data/c/tags/blocks/budding_blocks.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:budding_amethyst"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/buds.json b/src/generated/resources/data/c/tags/blocks/buds.json
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "minecraft:small_amethyst_bud",
+    "minecraft:medium_amethyst_bud",
+    "minecraft:large_amethyst_bud"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/chains.json b/src/generated/resources/data/c/tags/blocks/chains.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:chain"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/chests.json b/src/generated/resources/data/c/tags/blocks/chests.json
@@ -0,0 +1,11 @@
+{
+  "values": [
+    "#c:chests/ender",
+    "#c:chests/trapped",
+    "#c:chests/wooden",
+    {
+      "id": "#forge:chests",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/chests/ender.json b/src/generated/resources/data/c/tags/blocks/chests/ender.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:ender_chest",
+    {
+      "id": "#forge:chests/ender",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/chests/trapped.json b/src/generated/resources/data/c/tags/blocks/chests/trapped.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:trapped_chest",
+    {
+      "id": "#forge:chests/trapped",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/chests/wooden.json b/src/generated/resources/data/c/tags/blocks/chests/wooden.json
@@ -0,0 +1,10 @@
+{
+  "values": [
+    "minecraft:chest",
+    "minecraft:trapped_chest",
+    {
+      "id": "#forge:chests/wooden",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/clusters.json b/src/generated/resources/data/c/tags/blocks/clusters.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:amethyst_cluster"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/cobblestones.json b/src/generated/resources/data/c/tags/blocks/cobblestones.json
@@ -0,0 +1,12 @@
+{
+  "values": [
+    "#c:cobblestones/normal",
+    "#c:cobblestones/infested",
+    "#c:cobblestones/mossy",
+    "#c:cobblestones/deepslate",
+    {
+      "id": "#forge:cobblestone",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/cobblestones/deepslate.json b/src/generated/resources/data/c/tags/blocks/cobblestones/deepslate.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:cobbled_deepslate",
+    {
+      "id": "#forge:cobblestone/deepslate",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/cobblestones/infested.json b/src/generated/resources/data/c/tags/blocks/cobblestones/infested.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:infested_cobblestone",
+    {
+      "id": "#forge:cobblestone/infested",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/cobblestones/mossy.json b/src/generated/resources/data/c/tags/blocks/cobblestones/mossy.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:mossy_cobblestone",
+    {
+      "id": "#forge:cobblestone/mossy",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/cobblestones/normal.json b/src/generated/resources/data/c/tags/blocks/cobblestones/normal.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:cobblestone",
+    {
+      "id": "#forge:cobblestone/normal",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/dyed.json b/src/generated/resources/data/c/tags/blocks/dyed.json
@@ -0,0 +1,20 @@
+{
+  "values": [
+    "#c:dyed/white",
+    "#c:dyed/orange",
+    "#c:dyed/magenta",
+    "#c:dyed/light_blue",
+    "#c:dyed/yellow",
+    "#c:dyed/lime",
+    "#c:dyed/pink",
+    "#c:dyed/gray",
+    "#c:dyed/light_gray",
+    "#c:dyed/cyan",
+    "#c:dyed/purple",
+    "#c:dyed/blue",
+    "#c:dyed/brown",
+    "#c:dyed/green",
+    "#c:dyed/red",
+    "#c:dyed/black"
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/dyed/black.json b/src/generated/resources/data/c/tags/blocks/dyed/black.json
@@ -0,0 +1,25 @@
+{
+  "values": [
+    "minecraft:black_banner",
+    "minecraft:black_bed",
+    "minecraft:black_candle",
+    "minecraft:black_carpet",
+    "minecraft:black_concrete",
+    "minecraft:black_concrete_powder",
+    "minecraft:black_glazed_terracotta",
+    "minecraft:black_shulker_box",
+    "minecraft:black_stained_glass",
+    "minecraft:black_stained_glass_pane",
+    "minecraft:black_terracotta",
+    "minecraft:black_wall_banner",
+    "minecraft:black_wool",
+    {
+      "id": "#forge:glass/black",
+      "required": false
+    },
+    {
+      "id": "#forge:stained_glass/black",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/dyed/blue.json b/src/generated/resources/data/c/tags/blocks/dyed/blue.json
@@ -0,0 +1,25 @@
+{
+  "values": [
+    "minecraft:blue_banner",
+    "minecraft:blue_bed",
+    "minecraft:blue_candle",
+    "minecraft:blue_carpet",
+    "minecraft:blue_concrete",
+    "minecraft:blue_concrete_powder",
+    "minecraft:blue_glazed_terracotta",
+    "minecraft:blue_shulker_box",
+    "minecraft:blue_stained_glass",
+    "minecraft:blue_stained_glass_pane",
+    "minecraft:blue_terracotta",
+    "minecraft:blue_wall_banner",
+    "minecraft:blue_wool",
+    {
+      "id": "#forge:glass/blue",
+      "required": false
+    },
+    {
+      "id": "#forge:stained_glass/blue",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/dyed/brown.json b/src/generated/resources/data/c/tags/blocks/dyed/brown.json
@@ -0,0 +1,25 @@
+{
+  "values": [
+    "minecraft:brown_banner",
+    "minecraft:brown_bed",
+    "minecraft:brown_candle",
+    "minecraft:brown_carpet",
+    "minecraft:brown_concrete",
+    "minecraft:brown_concrete_powder",
+    "minecraft:brown_glazed_terracotta",
+    "minecraft:brown_shulker_box",
+    "minecraft:brown_stained_glass",
+    "minecraft:brown_stained_glass_pane",
+    "minecraft:brown_terracotta",
+    "minecraft:brown_wall_banner",
+    "minecraft:brown_wool",
+    {
+      "id": "#forge:glass/brown",
+      "required": false
+    },
+    {
+      "id": "#forge:stained_glass/brown",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/dyed/cyan.json b/src/generated/resources/data/c/tags/blocks/dyed/cyan.json
@@ -0,0 +1,25 @@
+{
+  "values": [
+    "minecraft:cyan_banner",
+    "minecraft:cyan_bed",
+    "minecraft:cyan_candle",
+    "minecraft:cyan_carpet",
+    "minecraft:cyan_concrete",
+    "minecraft:cyan_concrete_powder",
+    "minecraft:cyan_glazed_terracotta",
+    "minecraft:cyan_shulker_box",
+    "minecraft:cyan_stained_glass",
+    "minecraft:cyan_stained_glass_pane",
+    "minecraft:cyan_terracotta",
+    "minecraft:cyan_wall_banner",
+    "minecraft:cyan_wool",
+    {
+      "id": "#forge:glass/cyan",
+      "required": false
+    },
+    {
+      "id": "#forge:stained_glass/cyan",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/dyed/gray.json b/src/generated/resources/data/c/tags/blocks/dyed/gray.json
@@ -0,0 +1,25 @@
+{
+  "values": [
+    "minecraft:gray_banner",
+    "minecraft:gray_bed",
+    "minecraft:gray_candle",
+    "minecraft:gray_carpet",
+    "minecraft:gray_concrete",
+    "minecraft:gray_concrete_powder",
+    "minecraft:gray_glazed_terracotta",
+    "minecraft:gray_shulker_box",
+    "minecraft:gray_stained_glass",
+    "minecraft:gray_stained_glass_pane",
+    "minecraft:gray_terracotta",
+    "minecraft:gray_wall_banner",
+    "minecraft:gray_wool",
+    {
+      "id": "#forge:glass/gray",
+      "required": false
+    },
+    {
+      "id": "#forge:stained_glass/gray",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/dyed/green.json b/src/generated/resources/data/c/tags/blocks/dyed/green.json
@@ -0,0 +1,25 @@
+{
+  "values": [
+    "minecraft:green_banner",
+    "minecraft:green_bed",
+    "minecraft:green_candle",
+    "minecraft:green_carpet",
+    "minecraft:green_concrete",
+    "minecraft:green_concrete_powder",
+    "minecraft:green_glazed_terracotta",
+    "minecraft:green_shulker_box",
+    "minecraft:green_stained_glass",
+    "minecraft:green_stained_glass_pane",
+    "minecraft:green_terracotta",
+    "minecraft:green_wall_banner",
+    "minecraft:green_wool",
+    {
+      "id": "#forge:glass/green",
+      "required": false
+    },
+    {
+      "id": "#forge:stained_glass/green",
+      "required": false
+    }
+  ]
+}
diff --git a/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json b/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json
@@ -0,0 +1,25 @@
+{
+  "values": [
+    "minecraft:light_blue_banner",
+    "minecraft:light_blue_bed",
+    "minecraft:light_blue_candle",
+    "minecraft:light_blue_carpet",
+    "minecraft:light_blue_concrete",
+    "minecraft:light_blue_concrete_powder",
+    "minecraft:light_blue_glazed_terracotta",
+    "minecraft:light_blue_shulker_box",
+    "minecraft:light_blue_stained_glass",
+    "minecraft:light_blue_stained_glass_pane",
+    "minecraft:light_blue_terracotta",
+    "minecraft:light_blue_wall_banner",
+    "minecraft:light_blue_wool",
+    {
+      "id": "#forge:glass/light_blue",
+      "required": false
+    },
+    {
+      "id": "#forge:stained_glass/light_blue",
+      "required": false
+    }
+  ]
+}