Make beet.yaml video field optional (#1225)

runcows · web-flow · commit ef8a7555a2c5 · 2025-12-08T22:47:08.000+01:00
* Make video field optional

* Remove null video fields

* Modify xp storage video link to not link to a playlist

* Remove RP null video field

* Update docs

* Review comments

* Review part 2
diff --git a/docs/making-a-module.md b/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
diff --git a/gm4/plugins/readme_generator.py b/gm4/plugins/readme_generator.py
@@ -119,8 +119,8 @@ def beet_default(ctx: Context, opts: ManifestConfig):
         })
 
     # Modrinth Youtube Video Embed
-    if (vid_url:=ctx.meta['gm4']['video']) is not None:
-        embed_url = re.sub(r'https:\/\/www.youtube.com\/watch\?v=(\w+)', r'https://www.youtube.com/embed/\1', vid_url)
+    if 'video' in ctx.meta['gm4'] and ctx.meta['gm4']['video'] is not None:
+        embed_url = re.sub(r'https:\/\/www.youtube.com\/watch\?v=(\w+)', r'https://www.youtube.com/embed/\1', ctx.meta['gm4']['video'])
 
         site_replacements["modrinth"].update({
             r"(.+)<!-- *\$modrinth:replaceWithVideo[ -]+?>" : (
diff --git a/gm4_animi_shamir/beet.yaml b/gm4_animi_shamir/beet.yaml
@@ -35,7 +35,6 @@ meta:
         - Modifies items right after a player died, and might fight over those items with other Datapacks that do the same.
     modrinth:
       project_id: bPnAELDm
-    video: null
     wiki: https://wiki.gm4.co/wiki/Metallurgy/Animi_Shamir
     credits:
       Creator:
diff --git a/gm4_apple_trees/beet.yaml b/gm4_apple_trees/beet.yaml
@@ -34,7 +34,6 @@ meta:
       project_id: Afacz65w
     smithed:
       pack_id: gm4_apple_trees
-    video: null
     wiki: https://wiki.gm4.co/wiki/Apple_Trees
     credits:
       Creators:
diff --git a/gm4_audere_shamir/beet.yaml b/gm4_audere_shamir/beet.yaml
@@ -31,7 +31,6 @@ meta:
       notes: []
     modrinth:
       project_id: 2rSIqoh7
-    video: null
     wiki: https://wiki.gm4.co/wiki/Metallurgy/Audere_Shamir
     credits:
       Creator:
diff --git a/gm4_balloon_animals/beet.yaml b/gm4_balloon_animals/beet.yaml
@@ -23,7 +23,6 @@ meta:
       description: Looking for exotic animals? This module makes some Wandering Traders sell cute baby animals!
     modrinth:
       project_id: zKRZZHQ3
-    video: null
     wiki: https://wiki.gm4.co/wiki/Balloon_Animals
     credits:
       Creator:
diff --git a/gm4_blossoming_pots/beet.yaml b/gm4_blossoming_pots/beet.yaml
@@ -29,7 +29,6 @@ meta:
       pack_id: gm4_blossoming_pots
     planetminecraft:
       uid: 6135276
-    video: null
     wiki: https://wiki.gm4.co/wiki/Blossoming_Pots
     credits:
       Creator:
diff --git a/gm4_book_binders/beet.yaml b/gm4_book_binders/beet.yaml
@@ -41,7 +41,6 @@ meta:
       notes: []
     modrinth:
       project_id: oIqNf2N4
-    video: null
     wiki: https://wiki.gm4.co/wiki/Book_Binders
     credits:
       Creators:
diff --git a/gm4_bookshelf_inspector/beet.yaml b/gm4_bookshelf_inspector/beet.yaml
@@ -23,7 +23,6 @@ meta:
       project_id: hI6pAf86
     smithed:
       pack_id: gm4_bookshelf_inspector
-    video: null
     wiki: https://wiki.gm4.co/wiki/Bookshelf_Inspector
     credits:
       Creator:
diff --git a/gm4_calling_bell/beet.yaml b/gm4_calling_bell/beet.yaml
@@ -31,7 +31,6 @@ meta:
       project_id: qNzelyE3
     smithed:
       pack_id: gm4_calling_bell
-    video: null
     wiki: https://wiki.gm4.co/wiki/Calling_Bell
     credits:
       Creator:
diff --git a/gm4_dangerous_dungeons/beet.yaml b/gm4_dangerous_dungeons/beet.yaml
@@ -22,7 +22,6 @@ meta:
       notes: []
     modrinth:
       project_id: Go9VJGOZ
-    video: null
     wiki: https://wiki.gm4.co/wiki/Orbis/Dangerous_Dungeons
     credits:
       Creator:
diff --git a/gm4_disassemblers/beet.yaml b/gm4_disassemblers/beet.yaml
@@ -86,7 +86,6 @@ meta:
       notes: []
     modrinth:
       project_id: Cg5FQaTk
-    video: null
     wiki: https://wiki.gm4.co/wiki/Disassemblers
     credits:
       Creator:
diff --git a/gm4_display_frames/beet.yaml b/gm4_display_frames/beet.yaml
@@ -24,7 +24,6 @@ meta:
       notes: []
     modrinth:
       project_id: u59ticCz
-    video: null
     wiki: https://wiki.gm4.co/wiki/Display_Frames
     credits:
       Creators:
diff --git a/gm4_double_doors/beet.yaml b/gm4_double_doors/beet.yaml
@@ -24,7 +24,6 @@ meta:
       project_id: Vx4zJ1Np
     smithed:
       pack_id: gm4_double_doors
-    video: null
     wiki: https://wiki.gm4.co/wiki/Double_Doors
     credits:
       Creator:
diff --git a/gm4_dripleaf_filters/beet.yaml b/gm4_dripleaf_filters/beet.yaml
@@ -19,7 +19,6 @@ meta:
       notes: []
     modrinth:
       project_id: WNvo6RJr
-    video: null
     wiki: https://wiki.gm4.co/wiki/Dripleaf_Filters
     credits:
       Creator:
diff --git a/gm4_dripleaf_launchers/beet.yaml b/gm4_dripleaf_launchers/beet.yaml
@@ -22,7 +22,6 @@ meta:
       project_id: kUn3Z6gZ
     smithed:
       pack_id: gm4_dripleaf_launchers
-    video: null
     wiki: https://wiki.gm4.co/wiki/Dripleaf_Launchers
     credits:
       Creator:
diff --git a/gm4_end_fishing/beet.yaml b/gm4_end_fishing/beet.yaml
@@ -60,7 +60,6 @@ meta:
       notes: []
     modrinth:
       project_id: BbEwao9o
-    video: null
     wiki: https://wiki.gm4.co/wiki/End_Fishing
     credits:
       Creator:
diff --git a/gm4_everstone/beet.yaml b/gm4_everstone/beet.yaml
@@ -34,7 +34,6 @@ meta:
       notes: []
     modrinth:
       project_id: 4XVj9LBh
-    video: null
     wiki: https://wiki.gm4.co/wiki/Everstone
     credits:
       Creators:
diff --git a/gm4_fulcio_shamir/beet.yaml b/gm4_fulcio_shamir/beet.yaml
@@ -33,7 +33,6 @@ meta:
       notes: []
     modrinth:
       project_id: N09PsTgz
-    video: null
     wiki: https://wiki.gm4.co/wiki/Metallurgy/Fulcio_Shamir
     credits:
       Creators:
diff --git a/gm4_guidebook/beet.yaml b/gm4_guidebook/beet.yaml
@@ -46,7 +46,6 @@ meta:
         - gm4_resource_pack
       notes:
         - Experimental Module! Features may be added or removed without an easy upgrade path. You may encounter unintentional behaviour.
-    video: null
     wiki: https://wiki.gm4.co/wiki/Guidebook
     credits:
       Creators:
diff --git a/gm4_holographic_tags/beet.yaml b/gm4_holographic_tags/beet.yaml
@@ -24,7 +24,6 @@ meta:
       project_id: AzpWemXn
     smithed:
       pack_id: gm4_holographic_tags
-    video: null
     wiki: https://wiki.gm4.co/wiki/Holographic_Tags
     credits:
       Creator:
diff --git a/gm4_iacio_shamir/beet.yaml b/gm4_iacio_shamir/beet.yaml
@@ -30,7 +30,6 @@ meta:
       notes: []
     modrinth:
       project_id: DTk79ZcR
-    video: null
     wiki: https://wiki.gm4.co/wiki/Metallurgy/Iacio_Shamir
     credits:
       Creator:
diff --git a/gm4_lightning_in_a_bottle/beet.yaml b/gm4_lightning_in_a_bottle/beet.yaml
@@ -50,7 +50,6 @@ meta:
         - Brewing Stands may need to be broken and replaced to be able to craft Lightning in a Bottle when the module is first installed.
     modrinth:
       project_id: GVqJxowR
-    video: null
     wiki: https://wiki.gm4.co/wiki/Lightning_in_a_Bottle
     credits:
       Creator:
diff --git a/gm4_liquid_minecarts/beet.yaml b/gm4_liquid_minecarts/beet.yaml
@@ -35,7 +35,6 @@ meta:
       notes: []
     modrinth:
       project_id: Ymtg3OOc
-    video: null
     wiki: https://wiki.gm4.co/wiki/Liquid_Tanks/Liquid_Minecarts
     credits:
       Creator:
diff --git a/gm4_live_catch/beet.yaml b/gm4_live_catch/beet.yaml
@@ -24,7 +24,6 @@ meta:
         - fishing
     modrinth:
       project_id: uSXn7pVW
-    video: null
     wiki: https://wiki.gm4.co/wiki/Live_Catch
     credits:
       Creator:
diff --git a/gm4_lively_lily_pads/beet.yaml b/gm4_lively_lily_pads/beet.yaml
@@ -36,7 +36,6 @@ meta:
       pack_id: gm4_lively_lily_pads
     planetminecraft:
       uid: 6138391
-    video: null
     wiki: https://wiki.gm4.co/wiki/Lively_Lily_Pads
     credits:
       Creator:
diff --git a/gm4_lumos_shamir/beet.yaml b/gm4_lumos_shamir/beet.yaml
@@ -31,7 +31,6 @@ meta:
       notes: []
     modrinth:
       project_id: vYbLApXc
-    video: null
     wiki: https://wiki.gm4.co/wiki/Metallurgy/Lumos_Shamir
     credits:
       Creators:
diff --git a/gm4_mending_tanks/beet.yaml b/gm4_mending_tanks/beet.yaml
@@ -19,7 +19,6 @@ meta:
       notes: []
     modrinth:
       project_id: DPYixL7Y
-    video: null
     wiki: https://wiki.gm4.co/wiki/Liquid_Tanks/Mending_Tanks
     credits:
       Creator:
diff --git a/gm4_metallurgy/beet.yaml b/gm4_metallurgy/beet.yaml
@@ -56,7 +56,6 @@ meta:
         - shamir
     modrinth:
       project_id: raWyrHxi
-    video: null
     wiki: https://wiki.gm4.co/wiki/Metallurgy
     credits:
       Creators:
diff --git a/gm4_midnight_menaces/beet.yaml b/gm4_midnight_menaces/beet.yaml
@@ -20,7 +20,6 @@ meta:
       notes: []
     modrinth:
       project_id: 9aTlLrlw
-    video: null
     wiki: https://wiki.gm4.co/wiki/Mysterious_Midnights/Midnight_Menaces
     credits:
       Creator:
diff --git a/gm4_mob_curing/beet.yaml b/gm4_mob_curing/beet.yaml
@@ -30,7 +30,6 @@ meta:
       notes: []
     modrinth:
       project_id: F06LrkeC
-    video: null
     wiki: https://wiki.gm4.co/wiki/Mob_Curing
     credits:
       Creator:
diff --git a/gm4_monsters_unbound/beet.yaml b/gm4_monsters_unbound/beet.yaml
@@ -27,7 +27,6 @@ meta:
       description: Mobs gain special effects based on their biome.
       recommended:
         - gm4_survival_refightalized
-    video: null
     wiki: https://wiki.gm4.co/wiki/Monsters_Unbound
     credits:
       Creator:
diff --git a/gm4_mountaineering/beet.yaml b/gm4_mountaineering/beet.yaml
@@ -42,7 +42,6 @@ meta:
       project_id: Wq7Qfkuh
     smithed:
       pack_id: gm4_mountaineering
-    video: null
     wiki: https://wiki.gm4.co/wiki/Mountaineering
     credits:
       Creator:
diff --git a/gm4_mysterious_midnights/beet.yaml b/gm4_mysterious_midnights/beet.yaml
@@ -26,7 +26,6 @@ meta:
       notes: []
     modrinth:
       project_id: 9skST20d
-    video: null
     wiki: https://wiki.gm4.co/wiki/Mysterious_Midnights
     credits:
       Creator:
diff --git a/gm4_orb_of_ankou/beet.yaml b/gm4_orb_of_ankou/beet.yaml
@@ -41,7 +41,6 @@ meta:
       notes: []
     modrinth:
       project_id: rRP5afZM
-    video: null
     wiki: https://wiki.gm4.co/wiki/Orb_of_Ankou
     credits:
       Creator:
diff --git a/gm4_percurro_shamir/beet.yaml b/gm4_percurro_shamir/beet.yaml
@@ -30,7 +30,6 @@ meta:
       notes: []
     modrinth:
       project_id: MrSTch8u
-    video: null
     wiki: https://wiki.gm4.co/wiki/Metallurgy/Percurro_Shamir
     credits:
       Creator:
diff --git a/gm4_phantom_scarecrows/beet.yaml b/gm4_phantom_scarecrows/beet.yaml
@@ -24,7 +24,6 @@ meta:
       notes: []
     modrinth:
       project_id: OQYrrgEP
-    video: null
     wiki: https://wiki.gm4.co/wiki/Phantom_Scarecrows
     credits:
       Creator:
diff --git a/gm4_podzol_rooting_soil/beet.yaml b/gm4_podzol_rooting_soil/beet.yaml
@@ -17,7 +17,6 @@ meta:
       notes: []
     modrinth:
       project_id: keFbZ5iO
-    video: null
     wiki: https://wiki.gm4.co/wiki/Podzol_Rooting_Soil
     credits:
       Creator:
diff --git a/gm4_reeling_rods/beet.yaml b/gm4_reeling_rods/beet.yaml
@@ -32,7 +32,6 @@ meta:
       pack_id: gm4_reeling_rods
     planetminecraft:
       uid: 6733043
-    video: null
     wiki: https://wiki.gm4.co/wiki/Reeling_Rods
     credits:
       Creators:
diff --git a/gm4_relocators/beet.yaml b/gm4_relocators/beet.yaml
@@ -43,7 +43,6 @@ meta:
       notes: []
     modrinth:
       project_id: FdwwppEn
-    video: null
     wiki: https://wiki.gm4.co/wiki/Relocators
     credits:
       Creator:
diff --git a/gm4_rope_ladders/beet.yaml b/gm4_rope_ladders/beet.yaml
@@ -26,7 +26,6 @@ meta:
       project_id: wN3RC3Zr
     smithed:
       pack_id: gm4_rope_ladders
-    video: null
     wiki: https://wiki.gm4.co/wiki/Rope_Ladders
     credits:
       Creator:
diff --git a/gm4_scuba_gear/beet.yaml b/gm4_scuba_gear/beet.yaml
@@ -25,7 +25,6 @@ meta:
       notes: []
     modrinth:
       project_id: 6AVYWZgD
-    video: null
     wiki: https://wiki.gm4.co/wiki/SCUBA_Gear
     credits:
       Creator:
diff --git a/gm4_shapeless_portals/beet.yaml b/gm4_shapeless_portals/beet.yaml
@@ -20,7 +20,6 @@ meta:
       project_id: eq7hf4YU
     smithed:
       pack_id: gm4_shapeless_portals
-    video: null
     wiki: https://wiki.gm4.co/wiki/Shapeless_Portals
     credits:
       Creator:
diff --git a/gm4_shroomites/beet.yaml b/gm4_shroomites/beet.yaml
@@ -20,7 +20,6 @@ meta:
       notes: []
     modrinth:
       project_id: 7Rcai2W4
-    video: null
     wiki: https://wiki.gm4.co/wiki/Shroomites
     credits:
       Creators:
diff --git a/gm4_smelteries/beet.yaml b/gm4_smelteries/beet.yaml
@@ -33,7 +33,6 @@ meta:
       notes: []
     modrinth:
       project_id: AHj8RSHk
-    video: null
     wiki: https://wiki.gm4.co/wiki/smelteries
     credits:
       Creator:
diff --git a/gm4_soul_glass/beet.yaml b/gm4_soul_glass/beet.yaml
@@ -31,7 +31,6 @@ meta:
         - On versions <1.21, Blast Furnaces may need to be broken and replaced to be able to craft Soul Glass when the module is first installed.
     modrinth:
       project_id: Hi8fkYoI
-    video: null
     wiki: https://wiki.gm4.co/wiki/Soul_Glass
     credits:
       Creators:
diff --git a/gm4_spawner_minecarts/beet.yaml b/gm4_spawner_minecarts/beet.yaml
@@ -22,7 +22,6 @@ meta:
       notes: []
     modrinth:
       project_id: j4qeIaSW
-    video: null
     wiki: https://wiki.gm4.co/wiki/Spawner_Minecarts
     credits:
       Creators:
diff --git a/gm4_survival_refightalized/beet.yaml b/gm4_survival_refightalized/beet.yaml
@@ -34,7 +34,6 @@ meta:
       description: A reworked survival experience with more varied mobs and new armor and shield mechanics.
       recommended:
         - gm4_monsters_unbound
-    video: null
     wiki: https://wiki.gm4.co/wiki/Survival_Refightalized
     credits:
       Creator:
diff --git a/gm4_teleportation_anchors/beet.yaml b/gm4_teleportation_anchors/beet.yaml
@@ -63,7 +63,6 @@ meta:
       notes: []
     modrinth:
       project_id: CQkaELVA
-    video: null
     wiki: https://wiki.gm4.co/wiki/Teleportation_Anchors
     credits:
       Creator:
diff --git a/gm4_tower_structures/beet.yaml b/gm4_tower_structures/beet.yaml
diff --git a/gm4_tunnel_bores/beet.yaml b/gm4_tunnel_bores/beet.yaml
diff --git a/gm4_vecto_shamir/beet.yaml b/gm4_vecto_shamir/beet.yaml
diff --git a/gm4_vigere_shamir/beet.yaml b/gm4_vigere_shamir/beet.yaml
diff --git a/gm4_washing_tanks/beet.yaml b/gm4_washing_tanks/beet.yaml
diff --git a/gm4_xp_storage/beet.yaml b/gm4_xp_storage/beet.yaml
diff --git a/resource_pack/beet.yaml b/resource_pack/beet.yaml
