Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/making-a-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions gm4/plugins/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ManifestConfig(PluginOptions, extra=Extra.ignore):
smithed: Optional[SmithedConfig]
pmc: Optional[PMCConfig]
# promo
video: str|None
video: Optional[str]
wiki: str|None
credits: CreditsModel

Expand All @@ -61,7 +61,7 @@ class ManifestModuleModel(BaseModel):
name: str
version: str
hash: str
video_link: str = ""
video_link: Optional[str]
wiki_link: str = ""
credits: CreditsModel
requires: list[str] = []
Expand Down Expand Up @@ -109,7 +109,7 @@ def create(ctx: Context):
name = config.name,
version = config.version,
hash = "",
video_link = gm4_meta.video or "",
video_link = gm4_meta.video if gm4_meta.video else None,
wiki_link = gm4_meta.wiki or "",
credits = gm4_meta.credits,
requires = [e for e in gm4_meta.versioning.required.keys() if not e.startswith("lib")] if gm4_meta.versioning else [],
Expand Down
4 changes: 2 additions & 2 deletions gm4/plugins/readme_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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[ -]+?>" : (
Expand Down
1 change: 0 additions & 1 deletion gm4_animi_shamir/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_apple_trees/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_audere_shamir/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ meta:
notes: []
modrinth:
project_id: 2rSIqoh7
video: null
wiki: https://wiki.gm4.co/wiki/Metallurgy/Audere_Shamir
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_balloon_animals/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_blossoming_pots/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_book_binders/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ meta:
notes: []
modrinth:
project_id: oIqNf2N4
video: null
wiki: https://wiki.gm4.co/wiki/Book_Binders
credits:
Creators:
Expand Down
1 change: 0 additions & 1 deletion gm4_bookshelf_inspector/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_calling_bell/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_dangerous_dungeons/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ meta:
notes: []
modrinth:
project_id: Go9VJGOZ
video: null
wiki: https://wiki.gm4.co/wiki/Orbis/Dangerous_Dungeons
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_disassemblers/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ meta:
notes: []
modrinth:
project_id: Cg5FQaTk
video: null
wiki: https://wiki.gm4.co/wiki/Disassemblers
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_display_frames/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ meta:
notes: []
modrinth:
project_id: u59ticCz
video: null
wiki: https://wiki.gm4.co/wiki/Display_Frames
credits:
Creators:
Expand Down
1 change: 0 additions & 1 deletion gm4_double_doors/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_dripleaf_filters/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ meta:
notes: []
modrinth:
project_id: WNvo6RJr
video: null
wiki: https://wiki.gm4.co/wiki/Dripleaf_Filters
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_dripleaf_launchers/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_end_fishing/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ meta:
notes: []
modrinth:
project_id: BbEwao9o
video: null
wiki: https://wiki.gm4.co/wiki/End_Fishing
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_everstone/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ meta:
notes: []
modrinth:
project_id: 4XVj9LBh
video: null
wiki: https://wiki.gm4.co/wiki/Everstone
credits:
Creators:
Expand Down
1 change: 0 additions & 1 deletion gm4_fulcio_shamir/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ meta:
notes: []
modrinth:
project_id: N09PsTgz
video: null
wiki: https://wiki.gm4.co/wiki/Metallurgy/Fulcio_Shamir
credits:
Creators:
Expand Down
1 change: 0 additions & 1 deletion gm4_guidebook/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_holographic_tags/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_iacio_shamir/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ meta:
notes: []
modrinth:
project_id: DTk79ZcR
video: null
wiki: https://wiki.gm4.co/wiki/Metallurgy/Iacio_Shamir
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_lightning_in_a_bottle/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_liquid_minecarts/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ meta:
notes: []
modrinth:
project_id: Ymtg3OOc
video: null
wiki: https://wiki.gm4.co/wiki/Liquid_Tanks/Liquid_Minecarts
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_live_catch/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ meta:
- fishing
modrinth:
project_id: uSXn7pVW
video: null
wiki: https://wiki.gm4.co/wiki/Live_Catch
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_lively_lily_pads/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_lumos_shamir/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ meta:
notes: []
modrinth:
project_id: vYbLApXc
video: null
wiki: https://wiki.gm4.co/wiki/Metallurgy/Lumos_Shamir
credits:
Creators:
Expand Down
1 change: 0 additions & 1 deletion gm4_mending_tanks/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ meta:
notes: []
modrinth:
project_id: DPYixL7Y
video: null
wiki: https://wiki.gm4.co/wiki/Liquid_Tanks/Mending_Tanks
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_metallurgy/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ meta:
- shamir
modrinth:
project_id: raWyrHxi
video: null
wiki: https://wiki.gm4.co/wiki/Metallurgy
credits:
Creators:
Expand Down
1 change: 0 additions & 1 deletion gm4_midnight_menaces/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ meta:
notes: []
modrinth:
project_id: 9aTlLrlw
video: null
wiki: https://wiki.gm4.co/wiki/Mysterious_Midnights/Midnight_Menaces
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_mob_curing/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ meta:
notes: []
modrinth:
project_id: F06LrkeC
video: null
wiki: https://wiki.gm4.co/wiki/Mob_Curing
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_monsters_unbound/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_mountaineering/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ meta:
project_id: Wq7Qfkuh
smithed:
pack_id: gm4_mountaineering
video: null
wiki: https://wiki.gm4.co/wiki/Mountaineering
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_mysterious_midnights/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ meta:
notes: []
modrinth:
project_id: 9skST20d
video: null
wiki: https://wiki.gm4.co/wiki/Mysterious_Midnights
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_orb_of_ankou/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ meta:
notes: []
modrinth:
project_id: rRP5afZM
video: null
wiki: https://wiki.gm4.co/wiki/Orb_of_Ankou
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_percurro_shamir/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ meta:
notes: []
modrinth:
project_id: MrSTch8u
video: null
wiki: https://wiki.gm4.co/wiki/Metallurgy/Percurro_Shamir
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_phantom_scarecrows/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ meta:
notes: []
modrinth:
project_id: OQYrrgEP
video: null
wiki: https://wiki.gm4.co/wiki/Phantom_Scarecrows
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_podzol_rooting_soil/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ meta:
notes: []
modrinth:
project_id: keFbZ5iO
video: null
wiki: https://wiki.gm4.co/wiki/Podzol_Rooting_Soil
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_reeling_rods/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_relocators/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ meta:
notes: []
modrinth:
project_id: FdwwppEn
video: null
wiki: https://wiki.gm4.co/wiki/Relocators
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_rope_ladders/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_scuba_gear/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ meta:
notes: []
modrinth:
project_id: 6AVYWZgD
video: null
wiki: https://wiki.gm4.co/wiki/SCUBA_Gear
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_shapeless_portals/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion gm4_shroomites/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ meta:
notes: []
modrinth:
project_id: 7Rcai2W4
video: null
wiki: https://wiki.gm4.co/wiki/Shroomites
credits:
Creators:
Expand Down
1 change: 0 additions & 1 deletion gm4_smelteries/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ meta:
notes: []
modrinth:
project_id: AHj8RSHk
video: null
wiki: https://wiki.gm4.co/wiki/smelteries
credits:
Creator:
Expand Down
1 change: 0 additions & 1 deletion gm4_soul_glass/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading
Loading