Convention Tags

station-items-v0/src/main/java/net/modificationstation/stationapi/api/registry/tag/ItemTags.java

@@ -10,10 +10,33 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class ItemTags {
     public static final TagKey<Item>
-            SAPLINGS = of("saplings"),
-            LOGS = of("logs"),
-            PLANKS = of("planks"),
-            COALS = of("coals");
+            COALS = of("c:coals"), // Used for Fuel
+
+            SAPLINGS = of("c:saplings"),
+            PLANKS = of("c:planks"),
+            NORMAL_COBBLESTONE = of("c:cobblestones/normal"),
+            NORMAL_SAND = of("c:sands/normal"),
+            WOODEN_CHESTS = of("c:chests/wooden"),
+            WOOLS = of("c:wools"),
+            IRON_INGOT = of("c:ingots/iron"),
+            GOLD_INGOT = of("c:ingots/gold"),
+            GLOWSTONE_DUST = of("c:dusts/glowstone"),
+            REDSTONE_DUST = of("c:dusts/redstone"),
+            DIAMOND = of("c:gems/diamond"),
+            GOLD_BLOCKS = of("c:storage_blocks/gold"),
+            NORMAL_BRICKS = of("c:bricks/normal"),
+            STRINGS = of("c:strings"),
+            GUNPOWDERS = of("c:gunpowders"),
+            LEATHERS = of("c:leathers"),
+            FEATHERS = of("c:feathers"),
+            SLIMEBALLS = of("c:slime_balls"),
+            BONE = of("c:bones"),
+            EGGS = of("c:eggs"),
+            WHEAT = of("c:crops/wheat"),
+            BOWS = of("c:tools/bows"),
+            WOODEN_STICK = of("c:sticks/wooden"),
+            RED_MUSHROOMS = of("c:mushrooms/red"),
+            BROWN_MUSHROOMS = of("c:mushrooms/brown");
 
     private static TagKey<Item> of(String id) {
         return TagKey.of(ItemRegistry.KEY, Identifier.of(id));

station-vanilla-fix-v0/src/main/java/net/modificationstation/stationapi/impl/vanillafix/block/VanillaBlockFixImpl.java

@@ -118,9 +118,9 @@ private static void registerBlocks(BlockRegistryEvent event) {
                 .accept("cobblestone_stairs", COBBLESTONE_STAIRS)
                 .accept("oak_wall_sign", WALL_SIGN)
                 .accept("lever", LEVER)
-                .accept("oak_pressure_plate", STONE_PRESSURE_PLATE)
+                .accept("stone_pressure_plate", STONE_PRESSURE_PLATE)
                 .accept("iron_door", IRON_DOOR)
-                .accept("stone_pressure_plate", WOODEN_PRESSURE_PLATE)
+                .accept("oak_pressure_plate", WOODEN_PRESSURE_PLATE)
                 .accept("redstone_ore", REDSTONE_ORE)
                 .accept("redstone_ore_lit", LIT_REDSTONE_ORE)
                 .accept("redstone_torch", REDSTONE_TORCH)

station-vanilla-fix-v0/src/main/java/net/modificationstation/stationapi/impl/vanillafix/recipe/VanillaFuelItemFixImpl.java

@@ -27,7 +27,7 @@ private static void registerFuel(RecipeRegisterEvent event) {
             for (Block block : Block.BLOCKS)
                 if (block != null && block.material == Material.WOOD && Item.ITEMS[block.id] != null)
                     FuelRegistry.addFuelItem(Item.ITEMS[block.id], 300);
-            FuelRegistry.addFuelItem(Item.STICK, 100);
+            FuelRegistry.addFuelTag(ItemTags.WOODEN_STICK, 100);
             FuelRegistry.addFuelTag(ItemTags.COALS, 1600);
             FuelRegistry.addFuelItem(Item.LAVA_BUCKET, 20000);
             FuelRegistry.addFuelTag(ItemTags.SAPLINGS, 100);

station-vanilla-fix-v0/src/main/java/net/modificationstation/stationapi/impl/vanillafix/recipe/VanillaTagRecipeFixImpl.java

@@ -13,6 +13,29 @@ public class VanillaTagRecipeFixImpl {
     private static final Supplier<ImmutableMap<Item, TagKey<Item>>> TAGIFICATION_MAP = Suppliers.memoize(() -> {
         val builder = ImmutableMap.<Item, TagKey<Item>>builder();
         builder.put(Block.PLANKS.asItem(), ItemTags.PLANKS);
+        builder.put(Block.COBBLESTONE.asItem(), ItemTags.NORMAL_COBBLESTONE);
+        builder.put(Block.SAND.asItem(), ItemTags.NORMAL_SAND);
+        builder.put(Block.CHEST.asItem(), ItemTags.WOODEN_CHESTS);
+        builder.put(Block.WOOL.asItem(), ItemTags.WOOLS);
+        builder.put(Item.IRON_INGOT, ItemTags.IRON_INGOT);
+        builder.put(Item.GOLD_INGOT, ItemTags.GOLD_INGOT);
+        builder.put(Item.GLOWSTONE_DUST, ItemTags.GLOWSTONE_DUST);
+        builder.put(Item.REDSTONE, ItemTags.REDSTONE_DUST);
+        builder.put(Item.DIAMOND, ItemTags.DIAMOND);
+        builder.put(Block.GOLD_BLOCK.asItem(), ItemTags.GOLD_BLOCKS);
+        builder.put(Item.BRICK, ItemTags.NORMAL_BRICKS);
+        builder.put(Item.STRING, ItemTags.STRINGS);
+        builder.put(Item.GUNPOWDER, ItemTags.GUNPOWDERS);
+        builder.put(Item.LEATHER, ItemTags.LEATHERS);
+        builder.put(Item.FEATHER, ItemTags.FEATHERS);
+        builder.put(Item.SLIMEBALL, ItemTags.SLIMEBALLS);
+        builder.put(Item.BONE, ItemTags.BONE);
+        builder.put(Item.EGG, ItemTags.EGGS);
+        builder.put(Item.WHEAT, ItemTags.WHEAT);
+        builder.put(Item.BOW, ItemTags.BOWS);
+        builder.put(Item.STICK, ItemTags.WOODEN_STICK);
+        builder.put(Block.RED_MUSHROOM.asItem(), ItemTags.RED_MUSHROOMS);
+        builder.put(Block.BROWN_MUSHROOM.asItem(), ItemTags.BROWN_MUSHROOMS);
         return builder.build();
     });
 

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/bookshelves.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:bookshelf"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/brick_blocks.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:brick_blocks/normal",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/brick_blocks/normal.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:bricks"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/buttons.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:buttons/stone",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/buttons/stone.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:stone_button"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/cacti.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:cactus"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/chests.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:chests/wooden",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/chests/wooden.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:chest"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/clay_blocks.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:clay"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/cobblestones.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#c:cobblestones/normal",
+      "required": false
+    },
+    {
+      "id": "#c:cobblestones/mossy",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/cobblestones/mossy.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:mossy_cobblestone"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/cobblestones/normal.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:cobblestone"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/dirts.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:dirt"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/doors.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#c:doors/wooden",
+      "required": false
+    },
+    {
+      "id": "#c:doors/iron",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/doors/iron.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:iron_door"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/doors/wooden.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:doors/wooden/oak",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/doors/wooden/oak.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:oak_door"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/fence_gates.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:fence_gates/wooden",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/minecraft/stationapi/tags/items/logs_that_burn.json → station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/fence_gates/wooden.json

@@ -1,5 +1,4 @@
 {
   "values": [
-    "log"
   ]
 }

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/fences.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:fences/wooden",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/fences/wooden.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:fences/wooden/oak",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/fences/wooden/oak.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:oak_fence"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/flowers.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#c:flowers/small",
+      "required": false
+    },
+    {
+      "id": "#c:flowers/tall",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/flowers/normal.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "minecraft:dandelion",
+    "minecraft:rose"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/minecraft/stationapi/tags/blocks/logs_that_burn.json → station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/flowers/tall.json

@@ -1,5 +1,4 @@
 {
   "values": [
-    "log"
   ]
 }

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/glass_blocks.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:glass_blocks/colorless",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/glass_blocks/colorless.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:glass"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/grass_blocks.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:grass_block"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/gravels.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:gravel"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/ladders.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:ladders/wooden",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/ladders/wooden.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:ladders/wooden/oak",
+      "required": false
+    }
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/ladders/wooden/oak.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:ladder"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/leaves.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:leaves"
+  ]
+}

station-vanilla-fix-v0/src/main/resources/data/minecraft/stationapi/tags/blocks/leaves.json → station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/logs.json

@@ -1,5 +1,5 @@
 {
   "values": [
-    "leaves"
+    "minecraft:log"
   ]
 }

station-vanilla-fix-v0/src/main/resources/data/c/stationapi/tags/blocks/mushrooms.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#c:mushrooms/brown",
+      "required": false
+    },
+    {
+      "id": "#c:mushrooms/red",
+      "required": false
+    }
+  ]
+}