Fix Quilt templates (#25)

* Fix missing Fabric Loader version in Forge+Quilt templates Fixes #7. The version is needed for the common project. * Fix quilt.mod.json
architectury · Oct 23, 2023 · de38b91 · de38b91
1 parent 05f1883
commit de38b91
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/generator.config.json b/generator.config.json
@@ -350,8 +350,8 @@
             "tokens": {
                 "COMMON_MOD_LOADERS": "quilt,forge",
                 "INCLUDE_FABRIC_OR_QUILT": "include(\"quilt\")",
-                "__FABRIC_LOADER_PROP": "",
-                "__FABRIC_LOADER": "",
+                "__FABRIC_LOADER_PROP": "#FABRIC_LOADER_PROP",
+                "__FABRIC_LOADER": "#FABRIC_LOADER",
                 "__FABRIC_API_PROP": "",
                 "__FABRIC_API": "",
                 "__QUILT_LOADER_PROP": "#QUILT_LOADER_PROP",
@@ -551,8 +551,8 @@
             "tokens": {
                 "COMMON_MOD_LOADERS": "quilt,forge",
                 "INCLUDE_FABRIC_OR_QUILT": "include(\"quilt\")",
-                "__FABRIC_LOADER_PROP": "",
-                "__FABRIC_LOADER": "",
+                "__FABRIC_LOADER_PROP": "#FABRIC_LOADER_PROP",
+                "__FABRIC_LOADER": "#FABRIC_LOADER",
                 "__FABRIC_API_PROP": "",
                 "__FABRIC_API": "",
                 "__QUILT_LOADER_PROP": "#QUILT_LOADER_PROP",
@@ -752,8 +752,8 @@
             "tokens": {
                 "COMMON_MOD_LOADERS": "quilt,forge",
                 "INCLUDE_FABRIC_OR_QUILT": "include(\"quilt\")",
-                "__FABRIC_LOADER_PROP": "",
-                "__FABRIC_LOADER": "",
+                "__FABRIC_LOADER_PROP": "#FABRIC_LOADER_PROP",
+                "__FABRIC_LOADER": "#FABRIC_LOADER",
                 "__FABRIC_API_PROP": "",
                 "__FABRIC_API": "",
                 "__QUILT_LOADER_PROP": "#QUILT_LOADER_PROP",
@@ -953,8 +953,8 @@
             "tokens": {
                 "COMMON_MOD_LOADERS": "quilt,forge",
                 "INCLUDE_FABRIC_OR_QUILT": "include(\"quilt\")",
-                "__FABRIC_LOADER_PROP": "",
-                "__FABRIC_LOADER": "",
+                "__FABRIC_LOADER_PROP": "#FABRIC_LOADER_PROP",
+                "__FABRIC_LOADER": "#FABRIC_LOADER",
                 "__FABRIC_API_PROP": "",
                 "__FABRIC_API": "",
                 "__QUILT_LOADER_PROP": "#QUILT_LOADER_PROP",
@@ -1154,8 +1154,8 @@
             "tokens": {
                 "COMMON_MOD_LOADERS": "quilt,forge",
                 "INCLUDE_FABRIC_OR_QUILT": "include(\"quilt\")",
-                "__FABRIC_LOADER_PROP": "",
-                "__FABRIC_LOADER": "",
+                "__FABRIC_LOADER_PROP": "#FABRIC_LOADER_PROP",
+                "__FABRIC_LOADER": "#FABRIC_LOADER",
                 "__FABRIC_API_PROP": "",
                 "__FABRIC_API": "",
                 "__QUILT_LOADER_PROP": "#QUILT_LOADER_PROP",
@@ -1355,8 +1355,8 @@
             "tokens": {
                 "COMMON_MOD_LOADERS": "quilt,forge",
                 "INCLUDE_FABRIC_OR_QUILT": "include(\"quilt\")",
-                "__FABRIC_LOADER_PROP": "",
-                "__FABRIC_LOADER": "",
+                "__FABRIC_LOADER_PROP": "#FABRIC_LOADER_PROP",
+                "__FABRIC_LOADER": "#FABRIC_LOADER",
                 "__FABRIC_API_PROP": "",
                 "__FABRIC_API": "",
                 "__QUILT_LOADER_PROP": "#QUILT_LOADER_PROP",

diff --git a/templates/architectury_quilt/quilt/src/main/resources/quilt.mod.json b/templates/architectury_quilt/quilt/src/main/resources/quilt.mod.json
@@ -4,16 +4,18 @@
     "group": "${group}",
     "id": "examplemod",
     "version": "${version}",
-    "name": "Example Mod",
-    "description": "This is an example description! Tell everyone what your mod is about!",
-    "authors": ["Me!"],
-    "contact": {
-      "sources": "https://github.com/architectury/architectury-templates"
+    "metadata": {
+      "name": "Example Mod",
+      "description": "This is an example description! Tell everyone what your mod is about!",
+      "contributors": {
+        "Me!": "Owner"
+      },
+      "contact": {
+        "sources": "https://github.com/architectury/architectury-templates"
+      },
+      "icon": "assets/examplemod/icon.png"
     },
-    "license": "Insert License Here",
-    "icon": "assets/examplemod/icon.png",
     "intermediate_mappings": "net.fabricmc:intermediary",
-    "environment": "*",
     "entrypoints": {
       "init": [
         "net.examplemod.quilt.ExampleModQuilt"
@@ -37,5 +39,8 @@
         "version": ">=@ARCHITECTURY_API@"
       }
     ]
+  },
+  "minecraft": {
+    "environment": "*"
   }
 }