Merge branch 'Gamemode4Dev:master' into master

TheThanathor · Jan 22, 2024 · 8b3a8f5 · 8b3a8f5
2 parents 9d7d421 + f754033
commit 8b3a8f5
Show file tree

Hide file tree

Showing 1,871 changed files with 33,083 additions and 32,949 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,13 +16,11 @@ jobs:
     concurrency:
       group: ${{ github.event_name != 'pull_request' && 'release' || format('pr-{0}', github.event.number) }}
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v4
 
       - name: Checkout release branch
         if: github.event_name != 'pull_request'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: release
           path: release

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@
 .AppleDouble
 .LSOverride
 
+### Libre Office ###
+.~lock.*
+
 ### Python ###
 __pycache__/
 *.py[cod]

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -173,6 +173,9 @@ kill @s
 - Only when your module is about to be approved and merged, you should add `CustomModelData` id's.
 - Contact the collaborators of [GM4 Resources](https://github.com/Gamemode4Dev/GM4_Resources) to make sure the correct id's are allocated. Create an issue or pull request there so the correct translation keys are added.
 
+### Guidebook Pages
+Each Gamemode 4 module must include guidebook pages to aid in the explaination and progression of the module. Details on how to add a section to the guidebook can be found in [`gm4_guidebook/CONTRIBUTING.md`](https://github.com/Gamemode4Dev/GM4_Datapacks/blob/master/gm4_guidebook/CONTRIBUTING.md).
+
 ### Submitting your module
 Make sure to credit all relevant people in `beet.yaml`. Most modules credit the creator (`Creator`), updaters (`Updated by`) and the icon designer (`Icon Design`), however, you may add credits for any work relevant to the module. Each credits section consists of an array of strings, which hold the names of the contributors. To add a link to your social media site of choice add an entry to `contributors.json`.
 

diff --git a/base/data/gm4/tags/blocks/foliage.json b/base/data/gm4/tags/blocks/foliage.json
@@ -14,7 +14,8 @@
     "minecraft:dead_bush",
     "minecraft:fern",
     "minecraft:glow_lichen",
-    "minecraft:grass",
+    { "id": "minecraft:grass", "required": false },
+    { "id": "minecraft:short_grass", "required": false },
     "minecraft:hanging_roots",
     "minecraft:large_fern",
     "minecraft:mangrove_propagule",

diff --git a/base/data/gm4/tags/blocks/no_collision.json b/base/data/gm4/tags/blocks/no_collision.json
@@ -48,7 +48,8 @@
     "minecraft:fern",
     "minecraft:frogspawn",
     "minecraft:glow_lichen",
-    "minecraft:grass",
+    { "id": "minecraft:grass", "required": false },
+    { "id": "minecraft:short_grass", "required": false },
     "minecraft:hanging_roots",
     "minecraft:jungle_sapling",
     "minecraft:ladder",

diff --git a/base/data/gm4/tags/blocks/replaceable.json b/base/data/gm4/tags/blocks/replaceable.json
@@ -7,7 +7,8 @@
     "minecraft:dead_bush",
     "minecraft:fern",
     "minecraft:glow_lichen",
-    "minecraft:grass",
+    { "id": "minecraft:grass", "required": false },
+    { "id": "minecraft:short_grass", "required": false },
     "minecraft:hanging_roots",
     "minecraft:large_fern",
     "minecraft:lava",

diff --git a/beet-release.yaml b/beet-release.yaml
@@ -9,14 +9,15 @@ pipeline:
     require:
       - gm4.plugins.output.release
       - gm4.plugins.player_heads
+      - gm4_guidebook.generate_guidebooks.load_page_data
+      - gm4_guidebook.generate_guidebooks.load_custom_recipes
     pipeline:
       - gm4.plugins.manifest.write_updates
       - gm4.plugins.manifest.write_credits
       - require: [beet.contrib.copy_files]
         meta: {copy_files: {data_pack: {LICENSE.md: "../LICENSE.md"}}}
       - gm4.plugins.readme_generator
       - gm4.plugins.write_mcmeta
-      - gm4.plugins.output.release
     meta:
       mecha:
         formatting:

diff --git a/beet.yaml b/beet.yaml
@@ -6,6 +6,8 @@ pipeline:
     require:
       - gm4.plugins.output
       - gm4.plugins.player_heads
+      - gm4_guidebook.generate_guidebooks.load_page_data
+      - gm4_guidebook.generate_guidebooks.load_custom_recipes
     pipeline:
       - gm4.plugins.write_mcmeta
     meta:

diff --git a/contributors.json b/contributors.json
@@ -118,5 +118,9 @@
     {
         "name": "Wumpacraft",
         "links": ["https://twitter.com/wumpacraft"]
+    },
+    {
+        "name": "Venomousbirds",
+        "links": ["https://venomousbirds.artstation.com/"]
     }
 ]
diff --git a/gm4/commands.py b/gm4/commands.py
@@ -42,10 +42,14 @@ def dev(ctx: click.Context, project: Project, modules: tuple[str], watch: bool,
 		"require": [
 			"gm4.plugins.output",
 			"beet.contrib.livereload",
-			"gm4.plugins.player_heads"
+			"gm4.plugins.player_heads",
+			"gm4_guidebook.generate_guidebooks.load_page_data",
+			"gm4_guidebook.generate_guidebooks.load_custom_recipes",
 		] if reload else [
 			"gm4.plugins.output",
-			"gm4.plugins.player_heads"
+			"gm4.plugins.player_heads",
+			"gm4_guidebook.generate_guidebooks.load_page_data",
+			"gm4_guidebook.generate_guidebooks.load_custom_recipes",
 		],
 		"pipeline": [
 			"gm4.plugins.write_mcmeta"

diff --git a/gm4/plugins/output.py b/gm4/plugins/output.py
@@ -15,7 +15,7 @@
 MODRINTH_AUTH_KEY = "BEET_MODRINTH_TOKEN"
 SMITHED_API = "https://api.smithed.dev/v2"
 SMITHED_AUTH_KEY = "BEET_SMITHED_TOKEN"
-SUPPORTED_GAME_VERSIONS = ["1.20", "1.20.1", "1.20.2"]
+SUPPORTED_GAME_VERSIONS = ["1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4"]
 USER_AGENT = "Gamemode4Dev/GM4_Datapacks/release-pipeline ([email protected])"
 
 class ModrinthConfig(PluginOptions):

diff --git a/gm4/plugins/write_mcmeta.py b/gm4/plugins/write_mcmeta.py
@@ -9,7 +9,7 @@ def beet_default(ctx: Context):
 	ctx.data.pack_format = 15 # manually set as beet's `latest` is not available for 1.20 at this time.
 	ctx.data.supported_formats = {
 		"min_inclusive": 15,
-		"max_inclusive": 18
+		"max_inclusive": 26
 	}
 	ctx.data.description = [
 		ctx.project_name,

diff --git a/gm4/skin_cache.json b/gm4/skin_cache.json
@@ -860,13 +860,13 @@
     },
     "gm4_zauber_cauldrons:crystal/instant_damage": {
       "uuid": [
-        -303046150,
-        435877517,
-        403512583,
-        -719739582
+        470245391,
+        1887978766,
+        -1504051068,
+        1918240691
       ],
-      "value": "ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4NzQ1MDY4OCwKICAicHJvZmlsZUlkIiA6ICJmMGIzYmRkMjEwNDg0Y2VlYjZhNTQyYmZiOGEyNTdiMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJBbm9uaW1ZVFQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTUxN2E0NDE1NDI5NzQ2OTZjNjcxYWI3MmQ1ZmQwMTVhNTI5ZTVmZjVhZjRhYTEwNDM4MWY1ZjllYWYyM2EwYSIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9",
-      "hash": "4a18b3fc9552ea52ee5de35e7ad16b5bc1d652da",
+      "value": "eyd0ZXh0dXJlcyc6IHsnU0tJTic6IHsndXJsJzogJ2h0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzc5MGEwZDY5MTFiYzg4OTI1Nzc1ZWMyYjNmNWFhZDVhZGVlNDRlMTIxM2YzNWQ0OTA5MzE5OTQ1MjQwZjZmNyd9fX0=",
+      "hash": "85058d7509650d94fc1787a09da2aea5a259f732",
       "parent_module": "gm4_zauber_cauldrons"
     },
     "gm4_zauber_cauldrons:crystal/instant_health": {
@@ -882,24 +882,24 @@
     },
     "gm4_zauber_cauldrons:crystal/jump_boost": {
       "uuid": [
-        -306488846,
-        400519617,
-        492543013,
-        -700009782
+        1384053766,
+        -356430469,
+        -1755842415,
+        436879590
       ],
-      "value": "ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4Nzc5NDAwNSwKICAicHJvZmlsZUlkIiA6ICI1NWFkZmYwYWFlOGY0ODViOGFlMTZjOWY5MWFmMmYyYSIsCiAgInByb2ZpbGVOYW1lIiA6ICJSZWRYU3RvbmUiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjk0NTUyNmRmM2RhNTEwZTRhYTZkODk5Njc0MThlYTllZjIyNGM4Mzk2MjI1MmJkNjE1MzYyYTUxZTNjZDUwNCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9",
-      "hash": "a96d8127d50fe48962060546ec8244560bb1be3b",
+      "value": "eyd0ZXh0dXJlcyc6IHsnU0tJTic6IHsndXJsJzogJ2h0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODRlYzgzNmNjZTA2ZTFlZDgxYmQ3MDBmNzc1NDhmNWZlMDkyNDYxZmY5YTJlNjBhNzUyNjQ1YjFkMDVhMjIxOCd9fX0=",
+      "hash": "cfb3d8417b03f6d8ca360c22e64c66fb5eff90a8",
       "parent_module": "gm4_zauber_cauldrons"
     },
     "gm4_zauber_cauldrons:crystal/poison": {
       "uuid": [
-        -306913246,
-        403513617,
-        416233013,
-        -700067452
+        -1452394982,
+        -1051244258,
+        -1129278374,
+        2134833677
       ],
-      "value": "ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4NzgyMjA2MSwKICAicHJvZmlsZUlkIiA6ICIxYWZhZjc2NWI1ZGY0NjA3YmY3ZjY1ZGYzYWIwODhhOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJMb3lfQmxvb2RBbmdlbCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9kZjU0ZTJlMTBlMGQ5MTZlNzMxMTU3ODlmNjBmZmM4Yzk0NzkwN2Q3ZTUxNTIyMGYxMDM5ZWI3Y2QxYTM3M2VmIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0=",
-      "hash": "dc472f6b106e74480a8ca6caa747aec92adbda96",
+      "value": "eyd0ZXh0dXJlcyc6IHsnU0tJTic6IHsndXJsJzogJ2h0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2E0YjY4ZGFiY2JjNDQ4YjBmY2ExNTdhYWU4YTg3YjcwMDlhNmExZmE0Zjg5ZjhkMDVkOTI4MDNkZmY0NTRmMCd9fX0=",
+      "hash": "f63d55839798a67a0e81a64833dae0ee3ad2baba",
       "parent_module": "gm4_zauber_cauldrons"
     },
     "gm4_zauber_cauldrons:crystal/regeneration": {
@@ -915,24 +915,24 @@
     },
     "gm4_zauber_cauldrons:crystal/speed": {
       "uuid": [
-        143602933,
-        54143057,
-        74884136,
-        193769722
+        -565293039,
+        1449936483,
+        -1314907026,
+        -480547454
       ],
-      "value": "ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4Nzg4NDkwOSwKICAicHJvZmlsZUlkIiA6ICJmMGIzYmRkMjEwNDg0Y2VlYjZhNTQyYmZiOGEyNTdiMiIsCiAgInByb2ZpbGVOYW1lIiA6ICJBbm9uaW1ZVFQiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODkwYzMwMzUzN2QwN2FlMTM0Y2YwNzA4MzdkZWMwNGQyN2VhY2NkZTg5M2VlNDIwOTQyMjk5ODk2YmY5Njk3MSIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9",
-      "hash": "ddf903a848cdd7f8fae5347f0d9a75862aa389e6",
+      "value": "eyd0ZXh0dXJlcyc6IHsnU0tJTic6IHsndXJsJzogJ2h0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjBiNmViMTAyZDRmYjM2YTJiMDMwNTVmOGIwYWZkMTg4MWMxZjBiOGNiYzRiODk3YmYxMTA1ZTdhNzFiNDc1Zid9fX0=",
+      "hash": "1a78314b2c4cd93f28861c03f5e20fea903ed354",
       "parent_module": "gm4_zauber_cauldrons"
     },
     "gm4_zauber_cauldrons:crystal/strength": {
       "uuid": [
-        -308545246,
-        403555340,
-        412409013,
-        -705374452
+        944420826,
+        983911599,
+        -1709524351,
+        1416885906
       ],
-      "value": "ewogICJ0aW1lc3RhbXAiIDogMTYyNzU4NzkxOTAyNSwKICAicHJvZmlsZUlkIiA6ICJiNzVjZDRmMThkZjg0MmNlYjJhY2MxNTU5MTNiMjA0YiIsCiAgInByb2ZpbGVOYW1lIiA6ICJLcmlzdGlqb25hczEzIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FjZTJhNWQwM2I0MzczY2RkNjU1YjQ4MzZhZGQxMzdlOGQ4NDNmNTI4MjE4ZTRiNjY2NWViYWZmY2U4YzIxNWQiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ==",
-      "hash": "69be838670f23c28d2ef325292efc188607508c9",
+      "value": "eyd0ZXh0dXJlcyc6IHsnU0tJTic6IHsndXJsJzogJ2h0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTY5M2YwYjc1NGUyNzcwMGNiYWM2MGFjOTMwMGI2YzY2M2NmZDVlMjc1YjkwZjkyYmZmNjczNjY3YzViOWY1Nid9fX0=",
+      "hash": "f0eb5b0c9c1ed40a7c48dd9af588e196b3661429",
       "parent_module": "gm4_zauber_cauldrons"
     },
     "gm4_zauber_liquids:liquids/wormhole": {
@@ -1001,16 +1001,19 @@
       "gm4_metallurgy:band/aluminium"
     ],
     "gm4_zauber_liquids": [
-      "gm4_potion_liquids:liquids/regeneration",
-      "gm4_potion_liquids:liquids/leaping",
       "gm4_potion_liquids:liquids/poison",
+      "gm4_potion_liquids:liquids/harming",
       "gm4_potion_liquids:liquids/strength",
+      "gm4_potion_liquids:liquids/regeneration",
       "gm4_potion_liquids:liquids/healing",
-      "gm4_potion_liquids:liquids/swiftness",
-      "gm4_potion_liquids:liquids/harming"
+      "gm4_potion_liquids:liquids/leaping",
+      "gm4_potion_liquids:liquids/swiftness"
     ],
     "gm4_audere_shamir": [
       "gm4_metallurgy:band/barium"
+    ],
+    "gm4_auto_crafting": [
+      "gm4_custom_crafters:custom_crafter"
     ]
   }
 }
diff --git a/gm4_animi_shamir/beet.yaml b/gm4_animi_shamir/beet.yaml
@@ -7,12 +7,14 @@ data_pack:
 
 pipeline:
   - gm4.plugins.extend.module
+  - gm4.plugins.include.lib_player_death
 
 meta:
   gm4:
     versioning:
       required:
         gm4_metallurgy: 1.2.0
+        lib_player_death: 1.0.0
       schedule_loops: [main]
     website:
       description: Adds the Animi Shamir to Metallurgy. Items with Animi will respawn with you when you die!

diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/advancements/death.json b/gm4_animi_shamir/data/gm4_animi_shamir/advancements/death.json
diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/advancements/join.json b/gm4_animi_shamir/data/gm4_animi_shamir/advancements/join.json
@@ -8,7 +8,9 @@
                         "condition": "minecraft:entity_scores",
                         "entity": "this",
                         "scores": {
-                            "gm4_animi_leave": 1
+                            "gm4_animi_leave": {
+                                "min": 1
+                            }
                         }
                     }
                 ]

diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/functions/guidebook/add_pages.mcfunction b/gm4_animi_shamir/data/gm4_animi_shamir/functions/guidebook/add_pages.mcfunction
diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/functions/guidebook/unlock_page.mcfunction b/gm4_animi_shamir/data/gm4_animi_shamir/functions/guidebook/unlock_page.mcfunction
diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/functions/guidebook/verify_module.mcfunction b/gm4_animi_shamir/data/gm4_animi_shamir/functions/guidebook/verify_module.mcfunction
diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/functions/init.mcfunction b/gm4_animi_shamir/data/gm4_animi_shamir/functions/init.mcfunction
@@ -8,7 +8,6 @@ scoreboard players set animi_shamir gm4_modules 1
 # register shamir with lib_player_heads
 execute unless data storage gm4_player_heads:register heads[{id:"gm4_animi_shamir:band/v0"}] run data modify storage gm4_player_heads:register heads append value {id:"gm4_animi_shamir:band/v1",name:"[Drop to Fix Item] gm4_animi_shamir:band/v0",item:{gm4_metallurgy:{has_shamir:1b,stored_shamir:"animi",metal:{type:"curies_bismium",amount:[9s,3s],castable:1b},item:"obsidian_cast"},SkullOwner:"$gm4_metallurgy:band/curies_bismium",CustomModelData:3420117,display:{Name:'{"italic":false,"translate":"item.gm4.metallurgy.obsidian_cast","fallback":"Obsidian Cast"}',Lore:['{"italic":false,"color":"#467A1B","translate":"item.gm4.metallurgy.band","fallback":"Curie\'s Bismium Band","with":[{"translate":"item.gm4.metallurgy.curies_bismium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.animi","fallback":"Animi"}']}}}
 
-# guidebook
-execute if score gm4_guidebook load.status matches 1 run summon marker ~ 315.331110999018 ~ {CustomName:'"gm4_animi_shamir_guide"',Tags:["gm4_guide"],data:{type:"_expansion",base:"metallurgy",id:"animi_shamir",page_count:2,line_count:1,module_name:"Animi Shamir"}}
+
 
 #$moduleUpdateList
diff --git a/gm4_animi_shamir/data/gm4_animi_shamir/functions/player/upon_death.mcfunction b/gm4_animi_shamir/data/gm4_animi_shamir/functions/player/upon_death.mcfunction
@@ -1,6 +1,6 @@
 # @s = player who has died
 # at @s
-# run from gm4_animi_shamir:death advancement
+# run from #gm4_player_death:soul_bound
 
 # compile item list
 data remove storage gm4_animi_shamir:cache prepared_entry