Skip to content

Commit 9764b28

Browse files
sylv256sylv256
committed
fix: emojis and update branding to DIY
1 parent 3219cbd commit 9764b28

25 files changed

Lines changed: 82 additions & 19 deletions

File tree

‎pack/config/styled-chat.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
"strikethrough": true
6262
},
6363
"emoticons": {
64-
"$emojibase:builtin:joypixels": "<font:'twemoji:font'><white>${emoji}",
65-
"$default:from_file:styled_chat_emoji.json": "<font:'modgarden:emoji'><white>${emoji}",
64+
"$emojibase:builtin:joypixels": "<font 'twemoji:font'><white>${emoji}",
65+
"$default:from_file:styled_chat_emoji.json": "<font 'modgarden:emoji'><white>${emoji}",
6666
"real_shrug": "¯\\\\_(ツ)_/¯",
6767
"table_flip": "(╯°□°）╯︵ ┻━┻",
6868
"mcsword": "🗡",

‎pack/config/styled_chat_emoji.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"ace_heart":"","agender_heart":"","aroace_heart":"","aro_heart":"","bi_heart":"","nature":"","blob_waaaaa":"","demi_heart":"","femboy_heart":"","furry_pride":"","genderfluid_heart":"","genderflux_heart":"","genderqueer_heart":"","intersex_heart":"","lesbian_heart":"","tiny_pineapple":"","mod_garden":"","nb_heart":"","neurodiversity_heart":"","ohno":"","pan_heart":"","pineapple":"","plural_heart":"","queer_heart":"","queer_prog_heart":"","trans_heart":"","uh":"","vincian_heart":"","winnger":"","yeefuckinghaw":"","bigender_heart":"","dead_garden":""}
1+
{"ace_heart":"","agender_heart":"","aroace_heart":"","aro_heart":"","bi_heart":"","mg_nature":"","blob_waaaaa":"","demi_heart":"","femboy_heart":"","furry_pride":"","genderfluid_heart":"","genderflux_heart":"","genderqueer_heart":"","intersex_heart":"","lesbian_heart":"","tiny_pineapple":"","mod_garden":"","nb_heart":"","neurodiversity_heart":"","ohno":"","pan_heart":"","pineapple":"","plural_heart":"","queer_heart":"","queer_prog_heart":"","trans_heart":"","uh":"","vincian_heart":"","winnger":"","yeefuckinghaw":"","bigender_heart":"","dead_garden":"","mg_diy":""}

‎pack/config/styledplayerlist/config.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
}
3232
]
3333
},
34-
"format": "[<white><font 'modgarden:emoji'></*>] %player:displayname%",
34+
"format": "[<white><font 'modgarden:emoji'></*>] %player:displayname%",
3535
"passthrough": false
3636
},
3737
{
@@ -56,15 +56,15 @@
5656
}
5757
]
5858
},
59-
"format": "[<white><font 'modgarden:emoji'></*>] %player:displayname%",
59+
"format": "[<white><font 'modgarden:emoji'></*>] %player:displayname%",
6060
"passthrough": false
6161
},
6262
{
6363
"require": {
6464
"type": "permission",
6565
"permission": "modgarden.participant"
6666
},
67-
"format": "[<white><font 'modgarden:emoji'></*>] %player:displayname%",
67+
"format": "[<white><font 'modgarden:emoji'></*>] %player:displayname%",
6868
"passthrough": false
6969
},
7070
{

‎pack/config/styledplayerlist/styles/default.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"list_header": [
55
"",
66
"",
7-
"<font:'modgarden:icons'>-0</> <font:'unsanded:default'>Mod Garden: Nature",
7+
"<font:'modgarden:icons'>-1</> <font:'unsanded:default'>Mod Garden: DIY",
88
"",
9-
"<font:'unsanded:default'><gr #a9ffa7 #6da26c><st> </>[ </><#ffffff>%server:online%<#6da26c>/</>%server:max_players%</><gr #6da26c #a9ffa7> ]<st> </>"
9+
"<font:'unsanded:default'><gr #e600e6 #990099><st> </>[ </><#ffffff>%server:online%<#990099>/</>%server:max_players%</><gr #990099 #e600e6> ]<st> </>"
1010
],
1111
"list_footer": [
12-
"<font:'unsanded:default'><gr #a9ffa7 #6da26c #a9ffa7><st> </st>",
12+
"<font:'unsanded:default'><gr #e600e6 #990099 #e600e6><st> </st>",
1313
"",
14-
"<#805453>TPS: %server:tps_colored% <#6da26c>|</> <#805453>Ping: <#ffffff>%player:ping_colored%</>",
14+
"<#660066>TPS: %server:tps_colored% <#cc00cc>|</> <#660066>Ping: <#ffffff>%player:ping_colored%</>",
1515
""
1616
],
1717
"hidden_in_commands": false

‎pack/index.toml‎

Lines changed: 53 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@ metafile = true
126126
file = "mods/barricade.pw.toml"
127127
metafile = true
128128

129-
[[files]]
130-
file = "mods/barricade.pw.toml.disabled"
131-
132129
[[files]]
133130
file = "mods/barriers-dont-block-rain.pw.toml.disabled"
134131

@@ -180,9 +177,6 @@ metafile = true
180177
file = "mods/frappe.pw.toml"
181178
metafile = true
182179

183-
[[files]]
184-
file = "mods/glowcase-2.4.0+1.21.7.jar"
185-
186180
[[files]]
187181
file = "mods/glowcase.pw.toml"
188182
metafile = true
@@ -417,6 +411,18 @@ file = "resources/resourcepack/required/mg_branding/assets/minecraft/textures/gu
417411
[[files]]
418412
file = "resources/resourcepack/required/mg_branding/assets/minecraft/textures/gui/title/minecraft.png"
419413

414+
[[files]]
415+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/diy/icon.png"
416+
417+
[[files]]
418+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/diy/logo-full.png"
419+
420+
[[files]]
421+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/diy/logo-minimal.png"
422+
423+
[[files]]
424+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/diy/logo-outline.png"
425+
420426
[[files]]
421427
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/generic/icon-background.png"
422428

@@ -441,6 +447,18 @@ file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/ar
441447
[[files]]
442448
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/nature/logo-outline.png"
443449

450+
[[files]]
451+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/1x/mod-garden/diy/icon.png"
452+
453+
[[files]]
454+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/1x/mod-garden/diy/logo-full.png"
455+
456+
[[files]]
457+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/1x/mod-garden/diy/logo-minimal.png"
458+
459+
[[files]]
460+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/1x/mod-garden/diy/logo-outline.png"
461+
444462
[[files]]
445463
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/1x/mod-garden/generic/icon-background.png"
446464

@@ -465,6 +483,18 @@ file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/ar
465483
[[files]]
466484
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/1x/mod-garden/nature/logo-outline.png"
467485

486+
[[files]]
487+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/64x/mod-garden/diy/icon.png"
488+
489+
[[files]]
490+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/64x/mod-garden/diy/logo-full.png"
491+
492+
[[files]]
493+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/64x/mod-garden/diy/logo-minimal.png"
494+
495+
[[files]]
496+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/64x/mod-garden/diy/logo-outline.png"
497+
468498
[[files]]
469499
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/64x/mod-garden/generic/icon-background.png"
470500

@@ -489,6 +519,18 @@ file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/ar
489519
[[files]]
490520
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/64x/mod-garden/nature/logo-outline.png"
491521

522+
[[files]]
523+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/8x/mod-garden/diy/icon.png"
524+
525+
[[files]]
526+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/8x/mod-garden/diy/logo-full.png"
527+
528+
[[files]]
529+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/8x/mod-garden/diy/logo-minimal.png"
530+
531+
[[files]]
532+
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/8x/mod-garden/diy/logo-outline.png"
533+
492534
[[files]]
493535
file = "resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/8x/mod-garden/generic/icon-background.png"
494536

@@ -583,10 +625,13 @@ file = "resources/resourcepack/required/mg_emoji/assets/modgarden/textures/emoji
583625
file = "resources/resourcepack/required/mg_emoji/assets/modgarden/textures/emoji/lesbian_heart.png"
584626

585627
[[files]]
586-
file = "resources/resourcepack/required/mg_emoji/assets/modgarden/textures/emoji/mod_garden.png"
628+
file = "resources/resourcepack/required/mg_emoji/assets/modgarden/textures/emoji/mg_diy.png"
587629

588630
[[files]]
589-
file = "resources/resourcepack/required/mg_emoji/assets/modgarden/textures/emoji/nature.png"
631+
file = "resources/resourcepack/required/mg_emoji/assets/modgarden/textures/emoji/mg_nature.png"
632+
633+
[[files]]
634+
file = "resources/resourcepack/required/mg_emoji/assets/modgarden/textures/emoji/mod_garden.png"
590635

591636
[[files]]
592637
file = "resources/resourcepack/required/mg_emoji/assets/modgarden/textures/emoji/nb_heart.png"

‎pack/resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/diy/icon.png‎

572 Bytes
Loading

‎pack/resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/diy/logo-full.png‎

15.9 KB
Loading

‎pack/resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/diy/logo-minimal.png‎

13.2 KB
Loading

‎pack/resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/16x/mod-garden/diy/logo-outline.png‎

13.8 KB
Loading

‎pack/resources/resourcepack/required/mg_branding/assets/modgarden/textures/art/graphics/1x/mod-garden/diy/icon.png‎

254 Bytes
Loading

0 commit comments

Comments
 (0)