work on #75

- reimplemented common tags
- reimplemented mc tags
- started working on tag based crafting

src/main/generated/.cache/33f862717e26ec2d6360a91a8f02941f561a0223

@@ -1,4 +1,4 @@
-// 1.21	2024-07-08T19:07:18.9995461	Enriched/Tags for minecraft:block
+// 1.21	2024-07-09T21:34:10.6729467	Enriched/Tags for minecraft:block
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_ruby_tool.json
 5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\block\redwood_logs.json
 cbffea030c16b76cef765b05e3c84e50fb62855a data\minecraft\tags\block\mineable\axe.json
@@ -7,8 +7,8 @@ bff61c01ce77db92c1b08ffaaf5e7458cf3a8876 data\minecraft\tags\block\needs_iron_to
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_steel_tool.json
 25fdf63da1fa45e77e081e6a5665e33ac1a6e2ec data\minecraft\tags\block\walls.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_obsidian_tool.json
-35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_tanzanite_tool.json
 681323bde66d0fca08ab3237aac95c10dac774ba data\minecraft\tags\block\planks.json
+35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_tanzanite_tool.json
 75832a99d368173979e7472d527816181cd32b23 data\minecraft\tags\block\logs_that_burn.json
 fee3dc8eb98867f287b18093a7005018fe943012 data\minecraft\tags\block\leaves.json
 69aa3d1eeed3ac4e72a293913a933c96f034b5fd data\minecraft\tags\block\mineable\pickaxe.json

src/main/generated/.cache/3e0c651762a148941639324ba0d096b89d34fdb1

@@ -1,4 +1,4 @@
-// 1.21	2024-07-08T19:07:18.9985392	Enriched/Block Loot Tables
+// 1.21	2024-07-09T21:34:10.67194	Enriched/Block Loot Tables
 de886d29608aa25104c1b2e8d6f056a55c95549a data\enriched\loot_table\blocks\polished_dark_granite_stairs.json
 58b8c0cbcc1f69bf41c5952003634e84f9b358f6 data\enriched\loot_table\blocks\steel_block.json
 c2ea10b722d238b6880fb7a966b95763936ee841 data\enriched\loot_table\blocks\stripped_redwood_log.json

src/main/generated/.cache/437931636ae53790c576ca0719d52da14c131efd

@@ -1,11 +1,23 @@
-// 1.21	2024-07-08T19:07:18.9985392	Enriched/Tags for minecraft:item
+// 1.21	2024-07-09T21:34:10.67194	Enriched/Tags for minecraft:item
 7de72c45ab014b3a47886aa8c9c699f9f1f1635d data\c\tags\item\ores.json
+eb373d02e484b65c3e3cb5422b23771fbca65004 data\minecraft\tags\item\foot_armor.json
 a94b97d224da0464fc2bd7209ff67b8238e3302d data\c\tags\item\tools\melee_weapon.json
+680bce04e1c5f6a0a57b2bdbdf484ec28eff5ca4 data\minecraft\tags\item\axes.json
+1c18a5b8f73fd8d4df1792cfa57fbae974afa729 data\minecraft\tags\item\head_armor.json
+4c64607a05aee15148f7083c3053d50d98aa1bd6 data\c\tags\item\gems\sapphire.json
 681323bde66d0fca08ab3237aac95c10dac774ba data\minecraft\tags\item\planks.json
-4d1a35e2634756e0e1191a849f4932e5ca07752d data\c\tags\item\tools\mining_tool.json
-319a81d192361fb43916d37d5ec64108ff99836d data\c\tags\item\ingots.json
+540cf1c4151d4a6c01ff37e8065ec60792fa96d0 data\minecraft\tags\item\hoes.json
 75832a99d368173979e7472d527816181cd32b23 data\minecraft\tags\item\logs_that_burn.json
-863ffe88aba59791de3bc9fd39e1c36c3fdac1ef data\c\tags\item\dusts.json
+f420eabd249474adaa2edb447f783413d7304ecd data\c\tags\item\ingots\steel.json
 5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\item\redwood_logs.json
 89c60d3304c60899777e0814e2f178bc98f1b380 data\c\tags\item\tools.json
+b89af94e429e603debbebc6dcec828fc2d9ef067 data\minecraft\tags\item\swords.json
+0b2f1d30056526fbfe5629d2129f3ca7cdb48107 data\minecraft\tags\item\chest_armor.json
+38905499eb1a4ab8f18dcfee4abc53455ea0d261 data\minecraft\tags\item\leg_armor.json
+889c361c029c8f8047f632df4b12fa545b8cafdc data\minecraft\tags\item\shovels.json
+4d1a35e2634756e0e1191a849f4932e5ca07752d data\c\tags\item\tools\mining_tool.json
+4d1a35e2634756e0e1191a849f4932e5ca07752d data\minecraft\tags\item\pickaxes.json
+319a81d192361fb43916d37d5ec64108ff99836d data\c\tags\item\ingots.json
+863ffe88aba59791de3bc9fd39e1c36c3fdac1ef data\c\tags\item\dusts.json
+4c64607a05aee15148f7083c3053d50d98aa1bd6 data\c\tags\item\gems\ruby.json
 cef670a6b27fb5fd943fa55d23ea352f847db879 data\c\tags\item\armors.json

src/main/generated/.cache/53358fbdef77ef1af7355d18669e01bbae7a80f8

@@ -1,4 +1,4 @@
-// 1.21	2024-07-08T19:07:18.9902606	Enriched/Recipes
+// 1.21	2024-07-09T21:34:10.663357	Enriched/Recipes
 bddaf0484c3f36e7a3db02a1538562976e33553a data\enriched\recipe\steel_blend.json
 7a034820fe10d3bef7737462418cbb790e3c2bf5 data\enriched\advancement\recipes\tools\ruby_pickaxe.json
 b86af3b61d52ef9464d07d781c16767cb10c75be data\enriched\advancement\recipes\tools\sapphire_pickaxe.json

src/main/generated/.cache/59192d6ffc5bfc8e2b71cafcacd1447414fb8b0d

@@ -1,2 +1,2 @@
-// 1.21	2024-07-08T19:07:18.9980341	Enriched/Language (en_us)
+// 1.21	2024-07-09T21:34:10.6714349	Enriched/Language (en_us)
 14fbaa364d29a02102981d88beb99062d29d12fd assets\enriched\lang\en_us.json

src/main/generated/.cache/6ffc7c45f7d836da3acace2d82bb174d99aa9f31

@@ -1,4 +1,4 @@
-// 1.21	2024-07-08T19:07:18.9939767	Enriched/Model Definitions
+// 1.21	2024-07-09T21:34:10.6673571	Enriched/Model Definitions
 edf46cfca1cc6e5d65214045edbf116e3e42645b assets\enriched\models\item\obsidian_sword.json
 b1f2d95256cfcb699a1dac06b306ed086db40f7c assets\enriched\models\block\redwood_log_horizontal.json
 95d2f1008dc3460e4132fbfcc5f3e3aacf37236c assets\enriched\models\item\emerald_chestplate_netherite_trim.json
@@ -334,8 +334,8 @@ b793f014f90d6edd5426fc260cca5a7878bce352 assets\enriched\models\item\ruby_helmet
 fb8c690d5a624908e4bf76336ee0340844d9a91b assets\enriched\models\block\redwood_planks.json
 b849ac41c6e407651bd9888fcb55a842fcf865f5 assets\enriched\models\item\obsidian_pickaxe.json
 5b62c74a0d34e8c10a94cee8ff18c73d54753164 assets\enriched\models\block\redwood_fence_post.json
-5542b3a72f3148bd77c7da8bcc4ca5fd07b9a0e2 assets\enriched\blockstates\redwood_pressure_plate.json
 b35a3f0493528fef4853ca54fee442da1b8acd04 assets\enriched\blockstates\tanzanite_ore.json
+5542b3a72f3148bd77c7da8bcc4ca5fd07b9a0e2 assets\enriched\blockstates\redwood_pressure_plate.json
 eb218067ba4d35402c01022733b9f0481a6db98f assets\enriched\models\item\ruby_block.json
 df244732b43c315845ce8f390b6c0eaaaf1f1909 assets\enriched\models\item\tanzanite_boots_redstone_trim.json
 6db3d995ff803db88709060ffa976da5200e60fd assets\enriched\models\item\steel_helmet_redstone_trim.json

src/main/generated/.cache/e40d229de16c75d411f3b1e8e1d42d6101b221ad

@@ -1,4 +1,4 @@
-// 1.21	2024-07-08T19:07:18.9970342	Enriched/World Gen
+// 1.21	2024-07-09T21:34:10.6704336	Enriched/World Gen
 7f3ba33122767010a50baac5de81e114e519f6ad data\enriched\worldgen\placed_feature\tanzanite_ore_placed.json
 74b8741399af43f74b822c4871969e5bca17f806 data\enriched\worldgen\placed_feature\redwood_placed.json
 bf917c1184cf2a02e434ed262654531dd877225c data\enriched\worldgen\placed_feature\sapphire_ore_placed.json
@@ -12,8 +12,8 @@ e14b485532e4520e024c038297232c9bbecd12cd data\enriched\worldgen\placed_feature\m
 fb55d37a9c27a27debdbdfaac638816b0cd9915e data\enriched\worldgen\configured_feature\ruby_ore_common.json
 efc4a8da1d3e5c6535274e05465cfdb03daf2f10 data\enriched\worldgen\configured_feature\ruby_ore.json
 42eb2267c6afffd304729ea09b31e5c42aa68393 data\enriched\worldgen\placed_feature\ruby_ore_common_placed.json
-780bf5f5dca2f620ac3964ff550e66065ac2a2b5 data\enriched\worldgen\placed_feature\marble_upper_placed.json
 5ae3c672f50e49f6121c1ef849f60ffca065eb86 data\enriched\worldgen\placed_feature\dark_granite_upper_placed.json
+780bf5f5dca2f620ac3964ff550e66065ac2a2b5 data\enriched\worldgen\placed_feature\marble_upper_placed.json
 0debc68e92df367fabafe5de0b1151d890a44649 data\enriched\worldgen\configured_feature\tanzanite_ore_common.json
 907434c3f07db69fe016bfe09d10772d5dea43e9 data\enriched\worldgen\configured_feature\marble.json
 30dd6b9471bab1ed1a1a1698b8d1c2662050496c data\enriched\worldgen\placed_feature\ruby_ore_placed.json

src/main/generated/data/c/tags/item/gems/ruby.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "enriched:ruby"
+  ]
+}

src/main/generated/data/c/tags/item/gems/sapphire.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "enriched:ruby"
+  ]
+}

src/main/generated/data/c/tags/item/ingots/steel.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "enriched:steel_ingot"
+  ]
+}

src/main/generated/data/minecraft/tags/item/axes.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "enriched:steel_axe",
+    "enriched:obsidian_axe",
+    "enriched:copper_axe",
+    "enriched:ruby_axe",
+    "enriched:sapphire_axe",
+    "enriched:tanzanite_axe",
+    "enriched:emerald_axe"
+  ]
+}

src/main/generated/data/minecraft/tags/item/chest_armor.json

@@ -0,0 +1,10 @@
+{
+  "values": [
+    "enriched:steel_chestplate",
+    "enriched:obsidian_chestplate",
+    "enriched:ruby_chestplate",
+    "enriched:sapphire_chestplate",
+    "enriched:tanzanite_chestplate",
+    "enriched:emerald_chestplate"
+  ]
+}

src/main/generated/data/minecraft/tags/item/foot_armor.json

@@ -0,0 +1,10 @@
+{
+  "values": [
+    "enriched:steel_boots",
+    "enriched:obsidian_boots",
+    "enriched:ruby_boots",
+    "enriched:sapphire_boots",
+    "enriched:tanzanite_boots",
+    "enriched:emerald_boots"
+  ]
+}

src/main/generated/data/minecraft/tags/item/head_armor.json

@@ -0,0 +1,10 @@
+{
+  "values": [
+    "enriched:steel_helmet",
+    "enriched:obsidian_helmet",
+    "enriched:ruby_helmet",
+    "enriched:sapphire_helmet",
+    "enriched:tanzanite_helmet",
+    "enriched:emerald_helmet"
+  ]
+}

src/main/generated/data/minecraft/tags/item/hoes.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "enriched:steel_hoe",
+    "enriched:obsidian_hoe",
+    "enriched:copper_hoe",
+    "enriched:ruby_hoe",
+    "enriched:sapphire_hoe",
+    "enriched:tanzanite_hoe",
+    "enriched:emerald_hoe"
+  ]
+}

src/main/generated/data/minecraft/tags/item/leg_armor.json

@@ -0,0 +1,10 @@
+{
+  "values": [
+    "enriched:steel_leggings",
+    "enriched:obsidian_leggings",
+    "enriched:ruby_leggings",
+    "enriched:sapphire_leggings",
+    "enriched:tanzanite_leggings",
+    "enriched:emerald_leggings"
+  ]
+}

src/main/generated/data/minecraft/tags/item/pickaxes.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "enriched:steel_pickaxe",
+    "enriched:obsidian_pickaxe",
+    "enriched:copper_pickaxe",
+    "enriched:ruby_pickaxe",
+    "enriched:sapphire_pickaxe",
+    "enriched:tanzanite_pickaxe",
+    "enriched:emerald_pickaxe"
+  ]
+}

src/main/generated/data/minecraft/tags/item/shovels.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "enriched:steel_shovel",
+    "enriched:obsidian_shovel",
+    "enriched:copper_shovel",
+    "enriched:ruby_shovel",
+    "enriched:sapphire_shovel",
+    "enriched:tanzanite_shovel",
+    "enriched:emerald_shovel"
+  ]
+}

src/main/generated/data/minecraft/tags/item/swords.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "enriched:steel_sword",
+    "enriched:obsidian_sword",
+    "enriched:copper_sword",
+    "enriched:ruby_sword",
+    "enriched:sapphire_sword",
+    "enriched:tanzanite_sword",
+    "enriched:emerald_sword"
+  ]
+}

src/main/java/com/enrichedmc/enriched/datagen/EnrichedRecipeProvider.java

@@ -64,6 +64,8 @@ private void createRubyRecipes(RecipeExporter recipeExporter) {
         EnrichedItems.RUBY,
         EnrichedItems.RUBY_SWORD,
         Lists.newArrayList(EnrichedResourceConditions.RUBY_ENABLED));
+
+    //this.createSwordTag(recipeExporter, RUBIES, EnrichedItems.RUBY_SWORD);
     this.createShovelRecipe(
         recipeExporter,
         EnrichedItems.RUBY,
@@ -864,6 +866,7 @@ private void createMarbleRecipes(RecipeExporter recipeExporter) {
             FabricRecipeProvider.hasItem(EnrichedBlocks.POLISHED_MARBLE),
             FabricRecipeProvider.conditionsFromItem(EnrichedBlocks.POLISHED_MARBLE))
         .offerTo(recipeExporter);
+
   }
 
   /*-------------------------*/
@@ -1107,4 +1110,26 @@ private void createUncraftingRecipe(
                 "uncrafting_"
                     + StringUtils.substringAfterLast(compactItem.getTranslationKey(), ".")));
   }
+/*
+  private void createSwordTag(
+          RecipeExporter exporter, TagKey<Item> compactItemTag, Item outputItem) {
+    ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, outputItem)
+            .input('M', compactItemTag)
+            .input('S', Items.STICK)
+            .pattern(" M ")
+            .pattern(" M ")
+            .pattern(" S ")
+            .criterion(
+                    "has_" + compactItemTag.id().getPath(),
+                    FabricRecipeProvider.conditionsFromTag(compactItemTag))
+            .offerTo(
+                    withConditions(exporter, EnrichedResourceConditions.UNCRAFTING_ENABLED),
+                    Identifier.of(
+                            EnrichedMod.MOD_ID,
+                            StringUtils.substringAfterLast(compactItemTag.getTranslationKey(), ".")
+                                    + "_sword_tag"));
+         }
+ */
+
+
 }

src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedItemTagProvider.java

@@ -1,5 +1,7 @@
 package com.enrichedmc.enriched.datagen.tag;
 
+import static com.enrichedmc.enriched.tag.EnrichedTags.ItemTags.*;
+
 import com.enrichedmc.enriched.block.EnrichedBlocks;
 import com.enrichedmc.enriched.item.EnrichedItems;
 import com.enrichedmc.enriched.tag.EnrichedTags;
@@ -18,6 +20,7 @@ public EnrichedItemTagProvider(
 
   @Override
   protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
+
     this.getOrCreateTagBuilder(ItemTags.PLANKS).add(EnrichedBlocks.REDWOOD_PLANKS.asItem());
 
     this.getOrCreateTagBuilder(ItemTags.LOGS_THAT_BURN)
@@ -85,6 +88,51 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
         .add(EnrichedItems.TANZANITE_PICKAXE)
         .add(EnrichedItems.EMERALD_PICKAXE);
 
+    this.getOrCreateTagBuilder(ItemTags.PICKAXES)
+        .add(EnrichedItems.STEEL_PICKAXE)
+        .add(EnrichedItems.OBSIDIAN_PICKAXE)
+        .add(EnrichedItems.COPPER_PICKAXE)
+        .add(EnrichedItems.RUBY_PICKAXE)
+        .add(EnrichedItems.SAPPHIRE_PICKAXE)
+        .add(EnrichedItems.TANZANITE_PICKAXE)
+        .add(EnrichedItems.EMERALD_PICKAXE);
+
+    this.getOrCreateTagBuilder(ItemTags.AXES)
+        .add(EnrichedItems.STEEL_AXE)
+        .add(EnrichedItems.OBSIDIAN_AXE)
+        .add(EnrichedItems.COPPER_AXE)
+        .add(EnrichedItems.RUBY_AXE)
+        .add(EnrichedItems.SAPPHIRE_AXE)
+        .add(EnrichedItems.TANZANITE_AXE)
+        .add(EnrichedItems.EMERALD_AXE);
+
+    this.getOrCreateTagBuilder(ItemTags.SHOVELS)
+        .add(EnrichedItems.STEEL_SHOVEL)
+        .add(EnrichedItems.OBSIDIAN_SHOVEL)
+        .add(EnrichedItems.COPPER_SHOVEL)
+        .add(EnrichedItems.RUBY_SHOVEL)
+        .add(EnrichedItems.SAPPHIRE_SHOVEL)
+        .add(EnrichedItems.TANZANITE_SHOVEL)
+        .add(EnrichedItems.EMERALD_SHOVEL);
+
+    this.getOrCreateTagBuilder(ItemTags.HOES)
+        .add(EnrichedItems.STEEL_HOE)
+        .add(EnrichedItems.OBSIDIAN_HOE)
+        .add(EnrichedItems.COPPER_HOE)
+        .add(EnrichedItems.RUBY_HOE)
+        .add(EnrichedItems.SAPPHIRE_HOE)
+        .add(EnrichedItems.TANZANITE_HOE)
+        .add(EnrichedItems.EMERALD_HOE);
+
+    this.getOrCreateTagBuilder(ItemTags.SWORDS)
+        .add(EnrichedItems.STEEL_SWORD)
+        .add(EnrichedItems.OBSIDIAN_SWORD)
+        .add(EnrichedItems.COPPER_SWORD)
+        .add(EnrichedItems.RUBY_SWORD)
+        .add(EnrichedItems.SAPPHIRE_SWORD)
+        .add(EnrichedItems.TANZANITE_SWORD)
+        .add(EnrichedItems.EMERALD_SWORD);
+
     this.getOrCreateTagBuilder(ConventionalItemTags.ARMORS)
         .add(EnrichedItems.STEEL_HELMET)
         .add(EnrichedItems.STEEL_CHESTPLATE)
@@ -111,6 +159,38 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
         .add(EnrichedItems.EMERALD_LEGGINGS)
         .add(EnrichedItems.EMERALD_BOOTS);
 
+    this.getOrCreateTagBuilder(ItemTags.HEAD_ARMOR)
+        .add(EnrichedItems.STEEL_HELMET)
+        .add(EnrichedItems.OBSIDIAN_HELMET)
+        .add(EnrichedItems.RUBY_HELMET)
+        .add(EnrichedItems.SAPPHIRE_HELMET)
+        .add(EnrichedItems.TANZANITE_HELMET)
+        .add(EnrichedItems.EMERALD_HELMET);
+
+    this.getOrCreateTagBuilder(ItemTags.CHEST_ARMOR)
+        .add(EnrichedItems.STEEL_CHESTPLATE)
+        .add(EnrichedItems.OBSIDIAN_CHESTPLATE)
+        .add(EnrichedItems.RUBY_CHESTPLATE)
+        .add(EnrichedItems.SAPPHIRE_CHESTPLATE)
+        .add(EnrichedItems.TANZANITE_CHESTPLATE)
+        .add(EnrichedItems.EMERALD_CHESTPLATE);
+
+    this.getOrCreateTagBuilder(ItemTags.LEG_ARMOR)
+        .add(EnrichedItems.STEEL_LEGGINGS)
+        .add(EnrichedItems.OBSIDIAN_LEGGINGS)
+        .add(EnrichedItems.RUBY_LEGGINGS)
+        .add(EnrichedItems.SAPPHIRE_LEGGINGS)
+        .add(EnrichedItems.TANZANITE_LEGGINGS)
+        .add(EnrichedItems.EMERALD_LEGGINGS);
+
+    this.getOrCreateTagBuilder(ItemTags.FOOT_ARMOR)
+        .add(EnrichedItems.STEEL_BOOTS)
+        .add(EnrichedItems.OBSIDIAN_BOOTS)
+        .add(EnrichedItems.RUBY_BOOTS)
+        .add(EnrichedItems.SAPPHIRE_BOOTS)
+        .add(EnrichedItems.TANZANITE_BOOTS)
+        .add(EnrichedItems.EMERALD_BOOTS);
+
     this.getOrCreateTagBuilder(ConventionalItemTags.MELEE_WEAPON_TOOLS)
         .add(EnrichedItems.STEEL_SWORD)
         .add(EnrichedItems.OBSIDIAN_SWORD)
@@ -119,5 +199,10 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
         .add(EnrichedItems.TANZANITE_SWORD)
         .add(EnrichedItems.EMERALD_SWORD)
         .add(EnrichedItems.COPPER_SWORD);
+
+    // Conventional Tags
+    this.getOrCreateTagBuilder(STEEL_INGOTS).add(EnrichedItems.STEEL_INGOT);
+    this.getOrCreateTagBuilder(RUBIES).add(EnrichedItems.RUBY);
+    this.getOrCreateTagBuilder(SAPPHIRES).add(EnrichedItems.RUBY);
   }
 }

src/main/java/com/enrichedmc/enriched/registry/EnrichedRegisters.java

@@ -60,4 +60,9 @@ public static <T> RegistryKey<T> createRegistryKey(
   public static <T> TagKey<T> createTagKey(RegistryKey<Registry<T>> registryKey, String path) {
     return TagKey.of(registryKey, Identifier.of(EnrichedMod.MOD_ID, path));
   }
+
+  public static <T> TagKey<T> createCommonTagKey(
+      RegistryKey<Registry<T>> registryKey, String path) {
+    return TagKey.of(registryKey, Identifier.of("c", path));
+  }
 }