Merge branch 'release/2.2.3'

.gitignore

@@ -44,4 +44,7 @@ options.txt
 /resources_old
 /resources/assets/tinker
 /resources/assets/unused
-/design
+/design
+
+# Data generator resource cache
+/src/generated/resources/.cache

build.gradle

@@ -69,6 +69,21 @@ minecraft {
                 }
             }
         }
+
+        data {
+            workingDirectory project.file('run')
+
+            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
+            property 'forge.logging.console.level', 'debug'
+
+            args '--mod', 'tmechworks', '--all', '--output', file('src/generated/resources/')
+
+            mods {
+                tmechworks {
+                    source sourceSets.main
+                }
+            }
+        }
     }
 }
 
@@ -93,7 +108,12 @@ dependencies {
 sourceSets {
     main {
         resources {
-            srcDir 'src/resources'
+            srcDirs = [
+                    'src/resources',
+                    'src/generated/resources'
+            ]
+            //But exclude the cache of the generated data from what gets built
+            exclude '.cache'
         }
     }
 }

gradle.properties

@@ -3,7 +3,7 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mod_version=2.2.2
+mod_version=2.2.3
 
 minecraft_version=1.16.3
 minecraft_version_short=1.16

src/generated/resources/data/forge/tags/items/ores.json

@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+    "tmechworks:aluminum_ore",
+    "tmechworks:copper_ore"
+  ]
+}

src/generated/resources/data/forge/tags/items/storage_blocks.json

@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+    "tmechworks:aluminum_block",
+    "tmechworks:copper_block"
+  ]
+}

src/generated/resources/data/tmechworks/advancements/recipes/aluminum_block_from_aluminum_ingot.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "tmechworks:aluminum_block_from_aluminum_ingot"
+    ]
+  },
+  "criteria": {
+    "has_aluminum_ingot": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "tmechworks:aluminum_ingot"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "tmechworks:aluminum_block_from_aluminum_ingot"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_aluminum_ingot",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/tmechworks/advancements/recipes/aluminum_ingot_from_aluminum_block.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "tmechworks:aluminum_ingot_from_aluminum_block"
+    ]
+  },
+  "criteria": {
+    "has_aluminum_block": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "tmechworks:aluminum_block"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "tmechworks:aluminum_ingot_from_aluminum_block"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_aluminum_block",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/tmechworks/advancements/recipes/aluminum_ingot_from_aluminum_nugget.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "tmechworks:aluminum_ingot_from_aluminum_nugget"
+    ]
+  },
+  "criteria": {
+    "has_aluminum_nugget": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "tmechworks:aluminum_nugget"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "tmechworks:aluminum_ingot_from_aluminum_nugget"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_aluminum_nugget",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/tmechworks/advancements/recipes/aluminum_ingot_from_blasting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "tmechworks:aluminum_ingot_from_blasting"
+    ]
+  },
+  "criteria": {
+    "has_aluminum_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "tmechworks:aluminum_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "tmechworks:aluminum_ingot_from_blasting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_aluminum_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/tmechworks/advancements/recipes/aluminum_ingot_from_smelting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "tmechworks:aluminum_ingot_from_smelting"
+    ]
+  },
+  "criteria": {
+    "has_aluminum_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "tmechworks:aluminum_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "tmechworks:aluminum_ingot_from_smelting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_aluminum_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/tmechworks/advancements/recipes/aluminum_nugget_from_aluminum_ingot.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "tmechworks:aluminum_nugget_from_aluminum_ingot"
+    ]
+  },
+  "criteria": {
+    "has_aluminum_ingot": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "tmechworks:aluminum_ingot"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "tmechworks:aluminum_nugget_from_aluminum_ingot"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_aluminum_ingot",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/tmechworks/advancements/recipes/book.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "tmechworks:book"
+    ]
+  },
+  "criteria": {
+    "has_book": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:book"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "tmechworks:book"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_book",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/tmechworks/advancements/recipes/copper_block_from_copper_ingot.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "tmechworks:copper_block_from_copper_ingot"
+    ]
+  },
+  "criteria": {
+    "has_copper_ingot": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "tmechworks:copper_ingot"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "tmechworks:copper_block_from_copper_ingot"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_copper_ingot",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/tmechworks/advancements/recipes/copper_ingot_from_blasting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "tmechworks:copper_ingot_from_blasting"
+    ]
+  },
+  "criteria": {
+    "has_copper_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "tmechworks:copper_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "tmechworks:copper_ingot_from_blasting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_copper_ore",
+      "has_the_recipe"
+    ]
+  ]
+}