Merge remote-tracking branch 'upstream/master' into liquid-tanks-1.20

Author: SpecialBuilder32

.github/workflows/main.yml

@@ -93,10 +93,18 @@ jobs:
             fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.5/0.16.13/1.0.3/server/jar
             fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/FZ4q3wQK/fabric-api-0.119.9%2B1.21.5.jar
             packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/Swh7th09/packtest-2.1-mc1.21.5.jar
-          - version: '1.21.7' 
+          - version: '1.21.7'
             fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.7/0.16.14/1.0.3/server/jar
             fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/sLmbxWpX/fabric-api-0.128.1%2B1.21.7.jar
             packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/PAYctH3X/packtest-2.2-mc1.21.7.jar
+          - version: '1.21.10'
+            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.10/0.18.1/1.1.0/server/jar
+            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/dQ3p80zK/fabric-api-0.138.3%2B1.21.10.jar
+            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/11yGLsYO/packtest-2.3-beta1-mc1.21.10.jar
+          - version: '1.21.11'
+            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.11-rc2/0.18.1/1.1.0/server/jar
+            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/RDb9rvBm/fabric-api-0.139.4%2B1.21.11.jar
+            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/GN6fvTsW/packtest-2.4-beta2-mc1.21.11.jar
     name: 'test-${{ matrix.version }}'
     runs-on: ubuntu-24.04
     steps:

base/assets/translations.csv

@@ -1,3 +1,3 @@
 key,en_us
-advancement.gm4.root.title,"Gamemode 4",
-advancement.gm4.root.description,"Semi-funny blurb about GM4",
+advancement.gm4.root.title,Gamemode 4
+advancement.gm4.root.description,Semi-funny blurb about GM4

base/data/gm4/tags/block/no_collision.json

@@ -27,6 +27,7 @@
     "minecraft:cave_vines_plant",
     "minecraft:cherry_sapling",
     "minecraft:cobweb",
+    {"id": "minecraft:copper_torch", "required": false},
     "minecraft:crimson_fungus",
     "minecraft:crimson_roots",
     "minecraft:dark_oak_sapling",

base/data/gm4/tags/block/waterloggable.json

@@ -1,26 +1,33 @@
 {
   "values": [
-    "#minecraft:rails",
+    "#minecraft:all_signs",
+    {"id": "#minecraft:bars", "required": false},
     "#minecraft:campfires",
     "#minecraft:candles",
+    {"id": "#minecraft:chains", "required": false},
+    {"id": "#minecraft:copper_chests", "required": false},
+    {"id": "#minecraft:copper_golem_statues", "required": false},
+    "#minecraft:corals",
     "#minecraft:fences",
+    {"id": "#minecraft:lanterns", "required": false},
     "#minecraft:leaves",
-    "#minecraft:all_signs",
+    {"id": "#minecraft:lightning_rods", "required": false},
+    "#minecraft:rails",
     "#minecraft:slabs",
     "#minecraft:stairs",
     "#minecraft:trapdoors",
-    "#minecraft:corals",
     "#minecraft:wall_corals",
     "#minecraft:wall_signs",
     "#minecraft:walls",
+    {"id": "#minecraft:wooden_shelves", "required": false},
     "minecraft:amethyst_cluster",
     "minecraft:big_dripleaf",
     "minecraft:big_dripleaf_stem",
     "minecraft:black_stained_glass_pane",
     "minecraft:blue_stained_glass_pane",
     "minecraft:brown_stained_glass_pane",
     "minecraft:calibrated_sculk_sensor",
-    "minecraft:chain",
+    { "id": "minecraft:chain", "required": false },
     "minecraft:chest",
     "minecraft:conduit",
     "minecraft:cyan_stained_glass_pane",

base/data/gm4/tags/entity_type/hostile.json

@@ -13,6 +13,7 @@
         "minecraft:hoglin",
         "minecraft:husk",
         "minecraft:magma_cube",
+        {"id": "minecraft:parched", "required": false},
         "minecraft:phantom",
         "minecraft:piglin_brute",
         "minecraft:pillager",

base/data/gm4/tags/entity_type/neutral_hostile.json

@@ -1,11 +1,13 @@
 {
     "values": [
+        {"id": "minecraft:camel_husk", "required": false},
         "minecraft:cave_spider",
         "minecraft:creaking",
         "minecraft:drowned",
         "minecraft:enderman",
         "minecraft:piglin",
         "minecraft:spider",
+        {"id": "minecraft:zombie_nautilus", "required": false},
         "minecraft:zombified_piglin"
     ]
 }

base/data/gm4/tags/entity_type/passive.json

@@ -8,13 +8,16 @@
         "minecraft:cat",
         "minecraft:chicken",
         "minecraft:cod",
+        {"id": "minecraft:copper_golem", "required": false},
         "minecraft:cow",
         "minecraft:donkey",
         "minecraft:frog",
         "minecraft:glow_squid",
+        {"id": "minecraft:happy_ghast", "required": false},
         "minecraft:horse",
         "minecraft:mooshroom",
         "minecraft:mule",
+        {"id": "minecraft:nautilus", "required": false},
         "minecraft:ocelot",
         "minecraft:parrot",
         "minecraft:pig",

docs/making-a-module.md

@@ -82,7 +82,7 @@ meta:
         - shamir
         - enderpuff
 
-    # Either null or a link to the YouTube video
+    # Either null or a link to the YouTube video. Not needed if there is no video
     video: null
     # Either null or a link to the wiki page
     wiki: https://wiki.gm4.co/wiki/Disassemblers

docs/resource-pack-management.md

@@ -196,6 +196,50 @@ model_data:
       - reference: item/lump/thorianite
 ```
 
+- `base_model` (optional), a json (or yaml) object that will be merged into the base model's custom model data definition. This used when specific control over the minecraft base item model is required (e.g. adding a tints field for leather armor). The `base_model` json object will be merged into the `model` json object, overwriting existing fields.
+E.g. to acheive the following custom model data:
+```json
+{
+  "threshold": 3420002,
+  "model": {
+    "type": "minecraft:model",
+    "model": "gm4_scuba_gear:item/flippers",
+    "tints": [
+      {
+        "type": "minecraft:dye",
+        "default": -14455863
+      }
+    ]
+  }
+}
+```
+The following `base_model` config can be used:
+```yaml
+model_data:
+  - item: leather_boots
+    reference: item/flippers
+    template: generated_overlay
+    base_model: 
+      tints: 
+        - type: minecraft:dye
+          default: -14455863
+```
+Or alternatively with JSON:
+```yaml
+model_data:
+  - item: leather_boots
+    reference: item/flippers
+    template: generated_overlay
+    base_model: {
+      "tints": [
+        {
+          "type": "minecraft:dye",
+          "default": -14455863
+        }
+      ]
+    }
+```
+
 ### `gui_fonts` Config
 Custom textured GUIs using fonts can easily be setup using the `meta.gm4.gui_fonts` entry of `beet.yaml` or the `gui_fonts` entry of `model_data.yaml`. These will create a translation that displays a given image texture inside a container, like a dropper or hopper. Empty images of the correct size are available in the `base` to use as a starting point for custom GUIs. 
 

gm4/contributors.json

@@ -4,8 +4,8 @@
         "links": ["https://twitter.com/15Redstones"]
     },
     {
-        "name": "Andante",
-        "links": ["https://bsky.app/profile/andante.dev"]
+        "name": "dvitski",
+        "links": ["https://bsky.app/profile/dvitski.cc"]
     },
     {
         "name": "Bloo",
@@ -51,6 +51,10 @@
         "name": "JP12",
         "links": ["https://github.com/jpeterik12"]
     },
+    {
+        "name": "kindabland",
+        "links": ["https://github.com/kindabland"]
+    },
     {
         "name": "Kroppeb",
         "links": ["https://tech.lgbt/@Kroppeb"]