Combat expanded split

.github/workflows/main.yml

@@ -57,7 +57,6 @@ jobs:
           BEET_MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           BEET_SMITHED_TOKEN: ${{ secrets.SMITHED_TOKEN }}
           LOG_LEVEL: ${{ runner.debug == 1 && 'DEBUG' || 'INFO'}}
-          MASTER_BUILD: true
 
       - name: Build all modules for pull request
         if: github.event_name == 'pull_request'

.vscode/settings.json

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

base/assets/minecraft/atlases/blocks.json

@@ -9,34 +9,6 @@
             "type": "directory",
             "source": "entity",
             "prefix": "entity/"
-        },
-        {
-            "type": "filter",
-            "pattern":{
-                "namespace": "^((?!gm4).)*$",
-                "path": "gui"
-            }
-        },
-        {
-            "type": "filter",
-            "pattern": {
-                "namespace": "gm4_*",
-                "path": "gui/container"
-            }
-        },
-        {
-            "type": "filter",
-            "pattern": {
-                "namespace": "minecraft",
-                "path": "entity/fishing_hook"
-            }
-        },
-        {
-            "type": "filter",
-            "pattern": {
-                "namespace": "gm4_guidebook",
-                "path": "gui/"
-            }
         }
     ]
-}
+}

beet-release.yaml

@@ -10,9 +10,9 @@ pipeline:
       - gm4.plugins.annotations.add_module_dir_to_diagnostics
       - gm4.plugins.output.release
       - gm4.plugins.manifest.update_patch
-      - gm4.plugins.versioning.isolated_library
     pipeline:
       - beet.contrib.lantern_load.base_data_pack
+      - gm4.plugins.versioning.isolated_library
       - gm4.plugins.manifest.write_credits
       - gm4.plugins.test.strip_tests
       - require: [beet.contrib.copy_files]

gm4/modeldata_registry.json

@@ -50,6 +50,9 @@
     "axolotl_bucket": {
       "gm4_metallurgy:shamir/infinitas": 100
     },
+    "azalea_leaves": {
+      "gm4_monsters_unbound:item/spore/default": 1
+    },
     "bamboo_hanging_sign": {
       "gm4_trapped_signs:item/secret_trapped_bamboo_hanging_sign": 1,
       "gm4_trapped_signs:item/trapped_bamboo_hanging_sign": 2
@@ -189,6 +192,9 @@
       "gm4_trapped_signs:item/secret_trapped_cherry_hanging_sign": 1,
       "gm4_trapped_signs:item/trapped_cherry_hanging_sign": 2
     },
+    "cherry_leaves": {
+      "gm4_monsters_unbound:item/spore/cherry": 1
+    },
     "cherry_sign": {
       "gm4_trapped_signs:item/trapped_cherry_sign": 1,
       "gm4_trapped_signs:item/secret_trapped_cherry_sign": 2
@@ -576,6 +582,9 @@
       "gm4_animi_shamir:shamir/animi": 124,
       "gm4_orb_of_ankou:guidebook_icon/orb_of_ankou": 200
     },
+    "flowering_azalea_leaves": {
+      "gm4_monsters_unbound:item/spore/flowering": 1
+    },
     "furnace": {
       "gm4_smelteries:gui/advancement/smelteries": 1,
       "gm4_forming_press:guidebook_icon/forming_press": 2,
@@ -958,7 +967,6 @@
       "gm4_animi_shamir:shamir/animi": 124
     },
     "leather_chestplate": {
-      "gm4_combat_expanded:gui/advancement/combat_expanded_identify": 1,
       "gm4_weighted_armour:shamir/helious": 103,
       "gm4_metallurgy:shamir/defuse": 106,
       "gm4_iacio_shamir:shamir/iacio": 122,
@@ -992,6 +1000,9 @@
     "lime_concrete_powder": {
       "gm4_zauber_cauldrons:block/liquid_magicol/lime": 300
     },
+    "lime_glazed_terracotta": {
+      "gm4_monsters_unbound:item/elite_headwear/mending": 1
+    },
     "lingering_potion": {
       "gm4_midnight_menaces:guidebook_icon/illusioner_nights": 1,
       "gm4_lightning_in_a_bottle:item/lingering_lightning_in_a_bottle": 4,
@@ -1167,6 +1178,9 @@
     },
     "netherite_sword": {
       "gm4_combat_expanded:guidebook_icon/combat_expanded": 1,
+      "gm4_survival_refightalized:guidebook_icon/survival_refightalized": 2,
+      "gm4_monsters_unbound:guidebook_icon/survival_refightalized": 3,
+      "gm4_augmented_armor:guidebook_icon/survival_refightalized": 4,
       "gm4_end_fishing:item/end_city_swords_1": 10,
       "gm4_end_fishing:item/end_city_swords_2": 11,
       "gm4_end_fishing:item/end_city_swords_3": 12,
@@ -1226,10 +1240,16 @@
     "oxidized_cut_copper": {
       "gm4_tinkering_compressors:block/tinkering_compressor_plate": 1
     },
+    "packed_ice": {
+      "gm4_monsters_unbound:item/elite_headwear/glacial": 1
+    },
     "paper": {
       "gm4_book_binders:item/enchanted_page": 1,
       "gm4_book_binders:gui/advancement/book_binders_debind": 2
     },
+    "pearlescent_froglight": {
+      "gm4_monsters_unbound:item/elite_headwear/pearlescent": 1
+    },
     "phantom_membrane": {
       "gm4_midnight_menaces:guidebook_icon/enlarging_phantoms": 1
     },

gm4_animi_shamir/beet.yaml

@@ -1,6 +1,6 @@
 id: gm4_animi_shamir
 name: Animi Shamir
-version: 1.4.X
+version: 1.3.X
 
 data_pack:
   load: .
@@ -18,8 +18,8 @@ meta:
   gm4:
     versioning:
       required:
-        gm4_metallurgy: 1.4.0
-        lib_player_death: 1.2.0
+        gm4_metallurgy: 1.3.0
+        lib_player_death: 1.1.0
       schedule_loops: [main]
     model_data:
       - reference: shamir/animi

gm4_apple_trees/beet.yaml

@@ -1,6 +1,6 @@
 id: gm4_apple_trees
 name: Apple Trees
-version: 2.4.X
+version: 2.3.X
 
 data_pack:
   load: .
@@ -17,8 +17,8 @@ meta:
   gm4:
     versioning:
       required:
-        lib_trades: 1.5.0
-        lib_trees: 1.2.0
+        lib_trades: 1.4.0
+        lib_trees: 1.1.0
       schedule_loops:
         - main
         - slow_clock

gm4_audere_shamir/beet.yaml

@@ -1,6 +1,6 @@
 id: gm4_audere_shamir
 name: Audere Shamir
-version: 1.4.X
+version: 1.3.X
 
 data_pack:
   load: .
@@ -16,7 +16,7 @@ meta:
   gm4:
     versioning:
       required:
-        gm4_metallurgy: 1.4.0
+        gm4_metallurgy: 1.3.0
       schedule_loops: [main]
     model_data:
       - item: tools

gm4_augmented_armor/README.md

@@ -0,0 +1,11 @@
+# Augmented Armor<!--$headerTitle--><!--$pmc:delete-->
+
+Use special armor augments to defend against mobs that grow ever stronger!<!--$pmc:headerSize-->
+
+<img src="images/augmented_armor.png" alt="Spore Zombies in Lush Caves" height="350"/> <!--$localAssetToURL--> <!--$modrinth:replaceWithVideo--> <!--$pmc:delete-->
+
+### Features:
+- Mobs will drop new Modified armor and weapons. These come with special attributes that allow you to customize your gear!
+- Augments range from a ramping speed boost to a loyal immortal dog to fight by your side. Or a piece of armour that teleports you randomly, if that's what you like.
+
+A full list of all augments to can be found at the [Wiki](https://wiki.gm4.co/Augmented_Armor).

gm4_augmented_armor/beet.yaml

@@ -0,0 +1,36 @@
+id: gm4_augmented_armor
+name: Augmented Armor
+version: 1.0.X
+
+data_pack:
+  load: .
+
+resource_pack:
+  load: .
+
+pipeline:
+  - gm4.plugins.extend.module
+  - gm4.plugins.include.lib_forceload
+  - gm4.plugins.include.lib_lore
+
+meta:
+  gm4:
+    versioning:
+      required:
+        lib_forceload: 1.3.0
+        lib_lore: 1.1.0
+        gm4_survival_refightalized: 1.0.0
+      schedule_loops: 
+        - slow_clock
+    website:
+      description: Use special armor augments to defend against mobs that grow ever stronger.
+      recommended:
+        - gm4_monsters_unbound
+        - gm4_metallurgy
+    video: null
+    wiki: https://wiki.gm4.co/wiki/Augmented_Armor
+    credits:
+      Creator:
+        - Thanathor
+      Icon Design:
+        - Hozz

gm4_augmented_armor/data/gm4/advancement/augmented_armor_identify.json

@@ -0,0 +1,32 @@
+{
+  "display": {
+    "icon": {
+      "id": "minecraft:iron_chestplate"
+    },
+    "title": {
+      "translate": "advancement.gm4.augmented_armor.identify.title",
+      "fallback": "Hidden Power"
+    },
+    "description": {
+      "translate": "advancement.gm4.augmented_armor.identify.description",
+      "fallback": "Obtain an Augmented piece of armor from a monster",
+      "color": "gray"
+    },
+    "frame": "task"
+  },
+  "parent": "gm4:survival_refightalized_armor_damage",
+  "criteria": {
+    "full_set": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "predicates": {
+              "minecraft:custom_data": "{gm4_augmented_armor:{}}"
+            }
+          }
+        ]
+      }
+    }
+  }
+}

gm4_augmented_armor/data/gm4/advancement/augmented_armor_vorpal.json

@@ -0,0 +1,23 @@
+{
+  "display": {
+    "icon": {
+      "id": "minecraft:chorus_fruit"
+    },
+    "title": {
+      "translate": "advancement.gm4.augmented_armor.vorpal.title",
+      "fallback": "Vwoops!"
+    },
+    "description": {
+      "translate": "advancement.gm4.augmented_armor.vorpal.description",
+      "fallback": "Who thought this was a good idea?"
+    },
+    "frame": "challenge",
+    "hidden": true
+  },
+  "parent": "gm4:augmented_armor_identify",
+  "criteria": {
+    "guardian": {
+      "trigger": "minecraft:impossible"
+    }
+  }
+}

gm4_augmented_armor/data/gm4_augmented_armor/advancement/augment/canine_interact.json

@@ -0,0 +1,16 @@
+{
+  "criteria": {
+    "feed": {
+      "trigger": "minecraft:player_interacted_with_entity",
+      "conditions": {
+        "entity": {
+          "type": "wolf",
+          "nbt": "{Tags:[\"gm4_aa_wolf\"]}"
+        }
+      }
+    }
+  },
+  "rewards": {
+    "function": "gm4_augmented_armor:armor/augment/type/canine/wolf_interact_check"
+  }
+}

gm4_augmented_armor/data/gm4_augmented_armor/advancement/augment/hearty_wear.json

@@ -0,0 +1,26 @@
+{
+    "criteria": {
+        "requirement": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "gm4_augmented_armor:modified_armor/augment/hearty"
+                    }
+                ],
+                "items": [
+                    {
+                        "items": "#gm4_survival_refightalized:armor",
+                        "predicates": {
+                            "minecraft:custom_data": "{gm4_augmented_armor:{augment:{name:hearty}}}"
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "gm4_augmented_armor:armor/augment/type/hearty/update"
+    }
+}

gm4_augmented_armor/data/gm4_augmented_armor/advancement/damage_dealt.json

@@ -0,0 +1,32 @@
+{
+  "criteria": {
+    "damage_dealt": {
+      "trigger": "minecraft:player_hurt_entity",
+      "conditions": {
+        "player": [
+          {
+            "condition": "minecraft:reference",
+            "name": "gm4_augmented_armor:modified_armor/generic_damage_dealt"
+          },
+          {
+            "condition": "minecraft:inverted",
+            "term": {
+              "condition": "minecraft:entity_properties",
+              "entity": "this",
+              "predicate": {
+                "nbt": "{Tags:[\"gm4_aa_augment_damager\"]}"
+              }
+            }
+          }
+        ],
+        "damage": {
+          "blocked": false,
+          "type": {}
+        }
+      }
+    }
+  },
+  "rewards": {
+    "function": "gm4_augmented_armor:armor/trigger/damage_dealt"
+  }
+}