Merge branch 'combat_expanded_1.20.2' into ce_boss_patch

.github/workflows/main.yml

@@ -85,7 +85,7 @@ jobs:
 
       - name: Push release
         if: github.event_name != 'pull_request'
-        uses: ad-m/github-push-action@v0.6.0
+        uses: ad-m/github-push-action@v0.8.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           directory: release
@@ -141,5 +141,13 @@ jobs:
           cp out/gm4_*.zip world/datapacks
 
       - name: Run test server
+        id: run-tests
         run: |
           java -Xmx2G -Dpacktest.auto -Dpacktest.auto.annotations -jar server.jar nogui
+
+      - name: Upload test world
+        if: ${{ failure() && steps.run-tests.conclusion == 'failure' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: 'Test world for ${{ github.sha }}'
+          path: ${{ github.workspace }}/world/

.vscode/settings.json

@@ -1,7 +1,8 @@
 {
-	"datapack.env.cmdVersion": "1.20",
-	"datapack.env.jsonVersion": "1.20",
-	"datapack.env.dataVersion": "1.20",
+	"datapack.env.cmdVersion": "1.20.3",
+	"datapack.env.dataVersion": "1.20.3",
 	"datapack.lint.stringQuote": ["hint", true],
-	"datapack.lint.nbtStringQuoteType": ["hint", "prefer double"]
+	"datapack.lint.nbtStringQuoteType": ["hint", "prefer double"],
+	"files.insertFinalNewline": true,
+	"files.trimFinalNewlines": true
 }

README.md

@@ -1,10 +1,12 @@
-# GM4_Datapacks
-[![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/Gamemode4Dev/GM4_Datapacks)
+# Gamemode 4 Data Packs
+> Gamemode 4 is an open-source data pack collection designed to augment the vanilla survival experience.
 
-Welcome to the Git for Gamemode 4 modules. This space allows us to work together with the community to update and improve Gamemode 4 modules as well as providing beta versions of modules to you.
+[![Download our Data Packs](./docs/images/badges/gm4-website.svg)](https://gm4.co/modules)
+[![Available on Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/organization/gamemode4/)
+[![Chat with us on Discord](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/social/discord-plural_vector.svg)](https://gm4.co/discord)
+[![Read our Wiki](./docs/images/badges/gm4-wiki.svg)](https://wiki.gm4.co/Main_Page)
 
-For Full Release versions of modules, visit https://gm4.co/modules
+## Contributing
+Contributions are welcome! We use [Beet](https://mcbeet.dev) to build our modules. See [our documentation on how to get started](./docs/getting-started.md).
 
-For information on how to help us, view [`CONTRIBUTING.md`](CONTRIBUTING.md)
-
-For more information about Gamemode 4, visit https://wiki.gm4.co
+Found a bug with one of our modules? You can [create an issue on GitHub](https://github.com/Gamemode4Dev/GM4_Datapacks/issues)!

base/assets/gm4/font/container_gui.json

@@ -0,0 +1,11 @@
+{
+    "providers": [
+        {
+            "type": "space",
+            "advances": {
+                "\uf824": 3,
+                "\uf808": -10
+            }
+        }
+    ]
+}

base/assets/gm4/font/default.json

@@ -0,0 +1,18 @@
+{
+    "providers": [
+        {
+            "type": "space",
+            "advances": {
+                " ": 4,
+                "\u200c": 0
+            }
+        },
+        {
+            "type": "ttf",
+            "file": "gm4:minecraft.ttf",
+            "shift": [0,-0.5],
+            "size": 13,
+            "oversample": 7
+        }
+    ]
+}

base/assets/gm4/font/half_invert.json

@@ -0,0 +1,18 @@
+{
+    "providers": [
+        {
+            "type": "space",
+            "advances": {
+                " ": -2,
+                "\u200c": 0
+            }
+        },
+        {
+            "type": "ttf",
+            "file": "gm4:minecraft.ttf",
+            "shift": [0, -32768],
+            "size": -6.5,
+            "oversample": 1.0
+        }
+    ]
+}

base/assets/gm4/font/offscreen.json

@@ -0,0 +1,18 @@
+{
+    "providers": [
+        {
+            "type": "space",
+            "advances": {
+                " ": 4,
+                "\u200c": 0
+            }
+        },
+        {
+            "type": "ttf",
+            "file": "gm4:minecraft.ttf",
+            "shift": [0, -32768],
+            "size": 13,
+            "oversample": 1.0
+        }
+    ]
+}

base/assets/gm4/lang/en_us.json

@@ -0,0 +1,3 @@
+{
+    "gm4.second": "%2$s"
+}