Expand Datagen

Shoutouts to Blodgharm and glisco for finding out why Alloy Forgery datagen always runs.
Turns out you have to configure it, see the build.gradle on line 96-101

Signed-off-by: Noaaan <[email protected]>

PATCHNOTES.md

@@ -1,5 +1,10 @@
 # 0.19.7
 
+## Changes
+
+- Added a lot more tags. This is useful with other mods which uses tag filters for storage/transfer of items. 
+- Renamed "gear" tags to "equipment". These tags contain both tools and armor for the associated material
+
 ## Balancing Changes
 
 - Increase the damage of copper tools slightly (+0.5 attack damage)

build.gradle

@@ -93,19 +93,15 @@ sourceSets {
     }
 }
 
+fabricApi {
+    configureDataGeneration {
+        // Set the mod ID so that I won't lose the 50/50 to Alloy Frogery, which throws all the data into the bin
+        modId = project.archives_base_name
+    }
+}
+
 loom {
     accessWidenerPath = file("src/main/resources/mythicmetals.accessWidener")
-    runs {
-        datagen {
-            server()
-
-            name "Minecraft Data"
-            vmArg "-Dfabric-api.datagen"
-            vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
-
-            runDir "build/datagen"
-        }
-    }
 }
 
 java {

gradle.properties

@@ -8,7 +8,7 @@ yarn_mappings=1.20.1+build.9
 loader_version=0.14.21
 
 # Mod Properties
-mod_version = 0.19.6+1.20.1
+mod_version = 0.19.7+1.20.1
 maven_group = nourl.mythicmetals
 archives_base_name = mythicmetals
 

src/main/generated/data/c/tags/blocks/ores.json

@@ -0,0 +1,26 @@
+{
+  "replace": false,
+  "values": [
+    "#mythicmetals:adamantite_ores",
+    "#mythicmetals:aquarium_ores",
+    "#mythicmetals:banglum_ores",
+    "#mythicmetals:carmot_ores",
+    "#mythicmetals:kyber_ores",
+    "#mythicmetals:manganese_ores",
+    "#mythicmetals:morkite_ores",
+    "#mythicmetals:midas_gold_ores",
+    "#mythicmetals:mythril_ores",
+    "#mythicmetals:orichalcum_ores",
+    "#mythicmetals:osmium_ores",
+    "#mythicmetals:palladium_ores",
+    "#mythicmetals:platinum_ores",
+    "#mythicmetals:prometheum_ores",
+    "#mythicmetals:quadrillum_ores",
+    "#mythicmetals:runite_ores",
+    "#mythicmetals:silver_ores",
+    "#mythicmetals:starrite_ores",
+    "#mythicmetals:stormyx_ores",
+    "#mythicmetals:tin_ores",
+    "#mythicmetals:unobtainium_ores"
+  ]
+}

src/main/generated/data/c/tags/items/armor.json

@@ -0,0 +1,30 @@
+{
+  "replace": false,
+  "values": [
+    "#mythicmetals:adamantite_armor",
+    "#mythicmetals:aquarium_armor",
+    "#mythicmetals:banglum_armor",
+    "#mythicmetals:bronze_armor",
+    "#mythicmetals:carmot_armor",
+    "#mythicmetals:celestium_armor",
+    "#mythicmetals:copper_armor",
+    "#mythicmetals:durasteel_armor",
+    "#mythicmetals:hallowed_armor",
+    "#mythicmetals:kyber_armor",
+    "#mythicmetals:legendary_banglum_armor",
+    "#mythicmetals:metallurgium_armor",
+    "#mythicmetals:midas_gold_armor",
+    "#mythicmetals:mythril_armor",
+    "#mythicmetals:orichalcum_armor",
+    "#mythicmetals:osmium_armor",
+    "#mythicmetals:osmium_chainmail_armor",
+    "#mythicmetals:palladium_armor",
+    "#mythicmetals:prometheum_armor",
+    "#mythicmetals:runite_armor",
+    "#mythicmetals:silver_armor",
+    "#mythicmetals:star_platinum_armor",
+    "#mythicmetals:steel_armor",
+    "#mythicmetals:stormyx_armor",
+    "#mythicmetals:tidesinger_armor"
+  ]
+}

src/main/generated/data/c/tags/items/arrows.json

@@ -0,0 +1,8 @@
+{
+  "replace": false,
+  "values": [
+    "mythicmetals:star_platinum_arrow",
+    "mythicmetals:runite_arrow",
+    "mythicmetals:tipped_runite_arrow"
+  ]
+}

src/main/resources/data/c/tags/items/axes.json → src/main/generated/data/c/tags/items/axes.json

@@ -21,6 +21,8 @@
     "mythicmetals:quadrillum_axe",
     "mythicmetals:runite_axe",
     "mythicmetals:star_platinum_axe",
-    "mythicmetals:stormyx_axe"
+    "mythicmetals:steel_axe",
+    "mythicmetals:stormyx_axe",
+    "mythicmetals:tidesinger_axe"
   ]
 }

src/main/generated/data/c/tags/items/elytra.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "mythicmetals:celestium_elytra"
+  ]
+}

src/main/generated/data/c/tags/items/equipment.json

@@ -0,0 +1,53 @@
+{
+  "replace": false,
+  "values": [
+    "#mythicmetals:adamantite_equipment",
+    "#mythicmetals:aquarium_equipment",
+    "#mythicmetals:banglum_equipment",
+    "#mythicmetals:bronze_equipment",
+    "#mythicmetals:carmot_equipment",
+    "#mythicmetals:celestium_equipment",
+    "#mythicmetals:copper_equipment",
+    "#mythicmetals:durasteel_equipment",
+    "#mythicmetals:hallowed_equipment",
+    "#mythicmetals:kyber_equipment",
+    "#mythicmetals:legendary_banglum_equipment",
+    "#mythicmetals:metallurgium_equipment",
+    "#mythicmetals:mythril_equipment",
+    "#mythicmetals:orichalcum_equipment",
+    "#mythicmetals:osmium_equipment",
+    "#mythicmetals:palladium_equipment",
+    "#mythicmetals:prometheum_equipment",
+    "#mythicmetals:quadrillum_equipment",
+    "#mythicmetals:runite_equipment",
+    "#mythicmetals:star_platinum_equipment",
+    "#mythicmetals:steel_equipment",
+    "#mythicmetals:stormyx_equipment",
+    "#mythicmetals:tidesinger_equipment",
+    "#mythicmetals:adamantite_equipment",
+    "#mythicmetals:aquarium_equipment",
+    "#mythicmetals:banglum_equipment",
+    "#mythicmetals:bronze_equipment",
+    "#mythicmetals:carmot_equipment",
+    "#mythicmetals:celestium_equipment",
+    "#mythicmetals:copper_equipment",
+    "#mythicmetals:durasteel_equipment",
+    "#mythicmetals:hallowed_equipment",
+    "#mythicmetals:kyber_equipment",
+    "#mythicmetals:legendary_banglum_equipment",
+    "#mythicmetals:metallurgium_equipment",
+    "#mythicmetals:midas_gold_equipment",
+    "#mythicmetals:mythril_equipment",
+    "#mythicmetals:orichalcum_equipment",
+    "#mythicmetals:osmium_equipment",
+    "#mythicmetals:osmium_chainmail_equipment",
+    "#mythicmetals:palladium_equipment",
+    "#mythicmetals:prometheum_equipment",
+    "#mythicmetals:runite_equipment",
+    "#mythicmetals:silver_equipment",
+    "#mythicmetals:star_platinum_equipment",
+    "#mythicmetals:steel_equipment",
+    "#mythicmetals:stormyx_equipment",
+    "#mythicmetals:tidesinger_equipment"
+  ]
+}

src/main/resources/data/c/tags/items/hoes.json → src/main/generated/data/c/tags/items/hoes.json

@@ -21,6 +21,8 @@
     "mythicmetals:quadrillum_hoe",
     "mythicmetals:runite_hoe",
     "mythicmetals:star_platinum_hoe",
-    "mythicmetals:stormyx_hoe"
+    "mythicmetals:steel_hoe",
+    "mythicmetals:stormyx_hoe",
+    "mythicmetals:tidesinger_hoe"
   ]
 }

src/main/generated/data/c/tags/items/ingots.json

@@ -0,0 +1,30 @@
+{
+  "replace": false,
+  "values": [
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots",
+    "#mythicmetals:ingots"
+  ]
+}

src/main/resources/data/c/tags/items/pickaxes.json → src/main/generated/data/c/tags/items/pickaxes.json

@@ -21,8 +21,10 @@
     "mythicmetals:quadrillum_pickaxe",
     "mythicmetals:runite_pickaxe",
     "mythicmetals:star_platinum_pickaxe",
+    "mythicmetals:steel_pickaxe",
     "mythicmetals:stormyx_pickaxe",
-    "mythicmetals:mythril_drill",
-    "mythicmetals:orichalcum_hammer"
+    "mythicmetals:tidesinger_pickaxe",
+    "mythicmetals:orichalcum_hammer",
+    "mythicmetals:mythril_drill"
   ]
 }

src/main/resources/data/c/tags/blocks/ores.json → src/main/generated/data/c/tags/items/shields.json

@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "#mythicmetals:ores"
+    "mythicmetals:stormyx_shield"
   ]
 }

src/main/resources/data/c/tags/items/shovels.json → src/main/generated/data/c/tags/items/shovels.json

@@ -21,6 +21,8 @@
     "mythicmetals:quadrillum_shovel",
     "mythicmetals:runite_shovel",
     "mythicmetals:star_platinum_shovel",
-    "mythicmetals:stormyx_shovel"
+    "mythicmetals:steel_shovel",
+    "mythicmetals:stormyx_shovel",
+    "mythicmetals:tidesinger_shovel"
   ]
 }

src/main/generated/data/c/tags/items/smithing_templates.json

@@ -0,0 +1,15 @@
+{
+  "replace": false,
+  "values": [
+    "mythicmetals:unobtainium_smithing_template",
+    "mythicmetals:mythril_drill_smithing_template",
+    "mythicmetals:midas_folding_template",
+    "mythicmetals:royal_midas_smithing_template",
+    "mythicmetals:carmot_staff_smithing_template",
+    "mythicmetals:aegis_smithing_template",
+    "mythicmetals:carmot_smithing_template",
+    "mythicmetals:osmium_chainmail_smithing_template",
+    "mythicmetals:tidesinger_smithing_template",
+    "mythicmetals:legendary_banglum_smithing_template"
+  ]
+}

src/main/resources/data/c/tags/items/swords.json → src/main/generated/data/c/tags/items/swords.json

@@ -21,6 +21,13 @@
     "mythicmetals:quadrillum_sword",
     "mythicmetals:runite_sword",
     "mythicmetals:star_platinum_sword",
-    "mythicmetals:stormyx_sword"
+    "mythicmetals:steel_sword",
+    "mythicmetals:stormyx_sword",
+    "mythicmetals:tidesinger_sword",
+    "mythicmetals:red_aegis_sword",
+    "mythicmetals:white_aegis_sword",
+    "mythicmetals:midas_gold_sword",
+    "mythicmetals:gilded_midas_gold_sword",
+    "mythicmetals:royal_midas_gold_sword"
   ]
 }

src/main/generated/data/c/tags/items/tools.json

@@ -0,0 +1,31 @@
+{
+  "replace": false,
+  "values": [
+    "#mythicmetals:adamantite_tools",
+    "#mythicmetals:aquarium_tools",
+    "#mythicmetals:banglum_tools",
+    "#mythicmetals:bronze_tools",
+    "#mythicmetals:carmot_tools",
+    "#mythicmetals:celestium_tools",
+    "#mythicmetals:copper_tools",
+    "#mythicmetals:durasteel_tools",
+    "#mythicmetals:hallowed_tools",
+    "#mythicmetals:kyber_tools",
+    "#mythicmetals:legendary_banglum_tools",
+    "#mythicmetals:metallurgium_tools",
+    "#mythicmetals:mythril_tools",
+    "#mythicmetals:orichalcum_tools",
+    "#mythicmetals:osmium_tools",
+    "#mythicmetals:palladium_tools",
+    "#mythicmetals:prometheum_tools",
+    "#mythicmetals:quadrillum_tools",
+    "#mythicmetals:runite_tools",
+    "#mythicmetals:star_platinum_tools",
+    "#mythicmetals:steel_tools",
+    "#mythicmetals:stormyx_tools",
+    "#mythicmetals:tidesinger_tools",
+    "mythicmetals:red_aegis_sword",
+    "mythicmetals:white_aegis_sword",
+    "mythicmetals:carmot_staff"
+  ]
+}

src/main/generated/data/mythicmetals/tags/blocks/ores.json

@@ -0,0 +1,26 @@
+{
+  "replace": false,
+  "values": [
+    "#mythicmetals:adamantite_ores",
+    "#mythicmetals:aquarium_ores",
+    "#mythicmetals:banglum_ores",
+    "#mythicmetals:carmot_ores",
+    "#mythicmetals:kyber_ores",
+    "#mythicmetals:manganese_ores",
+    "#mythicmetals:morkite_ores",
+    "#mythicmetals:midas_gold_ores",
+    "#mythicmetals:mythril_ores",
+    "#mythicmetals:orichalcum_ores",
+    "#mythicmetals:osmium_ores",
+    "#mythicmetals:palladium_ores",
+    "#mythicmetals:platinum_ores",
+    "#mythicmetals:prometheum_ores",
+    "#mythicmetals:quadrillum_ores",
+    "#mythicmetals:runite_ores",
+    "#mythicmetals:silver_ores",
+    "#mythicmetals:starrite_ores",
+    "#mythicmetals:stormyx_ores",
+    "#mythicmetals:tin_ores",
+    "#mythicmetals:unobtainium_ores"
+  ]
+}

src/main/generated/data/mythicmetals/tags/items/adamantite_armor.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "mythicmetals:adamantite_helmet",
+    "mythicmetals:adamantite_chestplate",
+    "mythicmetals:adamantite_leggings",
+    "mythicmetals:adamantite_boots"
+  ]
+}

src/main/resources/data/mythicmetals/tags/items/adamantite_gear.json → src/main/generated/data/mythicmetals/tags/items/adamantite_equipment.json

@@ -1,14 +1,14 @@
 {
   "replace": false,
   "values": [
-    "mythicmetals:adamantite_helmet",
-    "mythicmetals:adamantite_chestplate",
-    "mythicmetals:adamantite_leggings",
-    "mythicmetals:adamantite_boots",
     "mythicmetals:adamantite_sword",
     "mythicmetals:adamantite_pickaxe",
     "mythicmetals:adamantite_axe",
     "mythicmetals:adamantite_shovel",
-    "mythicmetals:adamantite_hoe"
+    "mythicmetals:adamantite_hoe",
+    "mythicmetals:adamantite_helmet",
+    "mythicmetals:adamantite_chestplate",
+    "mythicmetals:adamantite_leggings",
+    "mythicmetals:adamantite_boots"
   ]
 }