fix texture path consistency, updates, ballotbox

ModFest · Jul 1, 2024 · 326d63e · 326d63e
1 parent b8cfe96
commit 326d63e
Show file tree

Hide file tree

Showing 18 changed files with 97 additions and 37 deletions.
diff --git a/pack/config/openloader/resources/modfest-assets/assets/modfest/font/icons.json b/pack/config/openloader/resources/modfest-assets/assets/modfest/font/icons.json
@@ -11,7 +11,7 @@
         },
         {
             "type": "bitmap",
-            "file": "modfest:icons/icon.png",
+            "file": "modfest:art/icon/transparent-modfest.png",
             "ascent": 20,
             "height": 32,
             "chars": [

diff --git a/...s/assets/modfest/textures/icons/cover.png → ...xtures/art/graphics/background-lockup.png b/...s/assets/modfest/textures/icons/cover.png → ...xtures/art/graphics/background-lockup.png
diff --git a/...rces/modfest-assets/assets/modfest/textures/art/graphics/lockup-transparent.png b/...rces/modfest-assets/assets/modfest/textures/art/graphics/lockup-transparent.png
diff --git a/...sources/modfest-assets/assets/modfest/textures/art/icon/transparent-modfest.png b/...sources/modfest-assets/assets/modfest/textures/art/icon/transparent-modfest.png
diff --git a/...nfig/openloader/resources/modfest-assets/assets/modfest/textures/icons/icon.png b/...nfig/openloader/resources/modfest-assets/assets/modfest/textures/icons/icon.png
diff --git a/pack/index.toml b/pack/index.toml
@@ -22,7 +22,19 @@ hash = "f68c22ae4d5d6535fef1a381c1f440c21e9537da9e5b70e0012882622f88047d"
 
 [[files]]
 file = "config/openloader/resources/modfest-assets/assets/modfest/font/icons.json"
-hash = "27a30d3cfc75e5ba78687ecaf82513933bef19e614fd6eac7242345f86b5d63b"
+hash = "86ecc7148f0b22b28ccf41e63b08a4924910b2c3fa5cefa19c9ce1017a1bdf8f"
+
+[[files]]
+file = "config/openloader/resources/modfest-assets/assets/modfest/textures/art/graphics/background-lockup.png"
+hash = "a7a3d5d8f766bc37fe580782ac203c550447b3f780194c26ea728bed1ec10478"
+
+[[files]]
+file = "config/openloader/resources/modfest-assets/assets/modfest/textures/art/graphics/lockup-transparent.png"
+hash = "64d29ec8c6649137f5c3f09a7091078e0470e5bec8f299402559cd613fe4f1a6"
+
+[[files]]
+file = "config/openloader/resources/modfest-assets/assets/modfest/textures/art/icon/transparent-modfest.png"
+hash = "09021a99026f006afc95f103fde9ac685034eccf2e141f0bb489218c2ab395b8"
 
 [[files]]
 file = "config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/ace_heart.png"
@@ -148,14 +160,6 @@ hash = "0d5387a3fe09ef88831afe47dca44dac1476092201bc67255c964ca1bed4b197"
 file = "config/openloader/resources/modfest-assets/assets/modfest/textures/emoji/yeefuckinghaw.png"
 hash = "02299c4555ea9ddf5f92caa52e51a61a2b6c07079eb25d33c4b251bbc83d7cd7"
 
-[[files]]
-file = "config/openloader/resources/modfest-assets/assets/modfest/textures/icons/cover.png"
-hash = "a7a3d5d8f766bc37fe580782ac203c550447b3f780194c26ea728bed1ec10478"
-
-[[files]]
-file = "config/openloader/resources/modfest-assets/assets/modfest/textures/icons/icon.png"
-hash = "4ca54cd3b618326211c28b31d1dd0188f9db59f505b1484c7532f75a648e5267"
-
 [[files]]
 file = "config/openloader/resources/modfest-assets/gen_emoji.js"
 hash = "4c7074c5596244eca8118cb5e535db21546df8c024e933c70f7cc0a1d608d217"
@@ -419,9 +423,14 @@ file = "mods/balloons-away!.pw.toml"
 hash = "7b2816b3815a7f9f461cd870244f41e1572244fbc613397e3000ea321542f357"
 metafile = true
 
+[[files]]
+file = "mods/ballotbox.pw.toml"
+hash = "aa8b9fe3277faeb65e91f7bcbe943d8e9339e59567ffa9b769bcfe9cbbb8685f"
+metafile = true
+
 [[files]]
 file = "mods/beeg-smol.pw.toml"
-hash = "adbb123c1d4a1ffec5cdf6d4a9123faf4a8778be3ff93b60ae410faa582ffdfc"
+hash = "e0def8382ab5518bf7ed71aac25667403b0b9db6d597f938cddd7089bcdb7e09"
 metafile = true
 
 [[files]]
@@ -449,6 +458,11 @@ file = "mods/carnival-confections.pw.toml"
 hash = "b93ef63bd9eee13e273728e257c9e94f1098c27ee842e06a71244014e2094ed5"
 metafile = true
 
+[[files]]
+file = "mods/carnival-cuisine.pw.toml"
+hash = "354ccaef725e0666b19a6240b8ffa922be8e9e8611ac26aec26d07679dc27063"
+metafile = true
+
 [[files]]
 file = "mods/carnival-foods.pw.toml"
 hash = "4482bf29fbecf34df7f2969252b7eb753ddcad299f3aadab43fd360a133f1ca8"
@@ -481,7 +495,7 @@ metafile = true
 
 [[files]]
 file = "mods/confetti-stuff.pw.toml"
-hash = "ddbdd31be3bd3eb1216524424f134c3273d3474b2ac7c8019a89d4f28125ae61"
+hash = "6725b92dde10c22e0313ea34783cd7cec41baf3487dadd0678757bb47a823c91"
 metafile = true
 
 [[files]]
@@ -506,7 +520,7 @@ metafile = true
 
 [[files]]
 file = "mods/dancerizer.pw.toml"
-hash = "64c19933c01066b7025c5e0805375fe940cb1d4cf29ea25bb8bb4d62c62049c0"
+hash = "58415fb7373816e9e0d0f1667f0c6025183e520453430547c593a1da002633d5"
 metafile = true
 
 [[files]]
@@ -586,7 +600,7 @@ metafile = true
 
 [[files]]
 file = "mods/lets-parkour.pw.toml"
-hash = "0cbe8307ed2ff6ae492408f488a9b6e62772e1742c3855a7bad7b9ead6ee462a"
+hash = "cff5730a93438edce8642623b62e0955b85ea8aaf190996b13fea5dfa8b04cd9"
 metafile = true
 
 [[files]]
@@ -629,6 +643,11 @@ file = "mods/modmenu.pw.toml"
 hash = "e37792db4c4b69e11243c7470f0f2a791dc016381e460cd5616eccb6b567b5ab"
 metafile = true
 
+[[files]]
+file = "mods/no-fun-allowed.pw.toml"
+hash = "8666e34e47f702404f8514f812512d7caa236c1d3b6541330eba61c8b8cbdf9d"
+metafile = true
+
 [[files]]
 file = "mods/obscure-masks.pw.toml"
 hash = "bf688db71b5bbc5767e50d16e2009c21d375f0f1ee1225d083b090469ee058fc"
@@ -701,7 +720,7 @@ metafile = true
 
 [[files]]
 file = "mods/sodium.pw.toml"
-hash = "7cb74081033769dbc3d65702e4ddcf83e4a8152f7e6122ea50d7e98909c3e549"
+hash = "280cf7ad4ec95bd95eef81a7f327095c5f40e1b8aa45cea91284bfd19395d69e"
 metafile = true
 
 [[files]]

diff --git a/pack/mods/ballotbox.pw.toml b/pack/mods/ballotbox.pw.toml
@@ -0,0 +1,7 @@
+name = "ballotbox"
+filename = "ballotbox-0.1.0+1.21.jar"
+
+[download]
+url = "https://github.com/ModFest/ballotbox/releases/download/v0.1.0/ballotbox-0.1.0+1.21.jar"
+hash-format = "sha256"
+hash = "d1f5f37590e669218d3e29b5b794b78be0174d016f74bf048e524bbaf8ee64b0"
diff --git a/pack/mods/beeg-smol.pw.toml b/pack/mods/beeg-smol.pw.toml
@@ -1,13 +1,13 @@
 name = "Beeg Smol"
-filename = "beeg-smol-1.0.0.jar"
+filename = "beeg-smol-1.1.0.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/TtKxsI01/versions/qwfbuVZ6/beeg-smol-1.0.0.jar"
+url = "https://cdn.modrinth.com/data/TtKxsI01/versions/DfVLjUqM/beeg-smol-1.1.0.jar"
 hash-format = "sha1"
-hash = "8e36e0994635e00ceddb634c8340a0bed69361ee"
+hash = "4485c5c6f93302547fc0ca9186bd34ae4a5f6a75"
 
 [update]
 [update.modrinth]
 mod-id = "TtKxsI01"
-version = "qwfbuVZ6"
+version = "DfVLjUqM"
diff --git a/pack/mods/carnival-cuisine.pw.toml b/pack/mods/carnival-cuisine.pw.toml
@@ -0,0 +1,13 @@
+name = "Carnival Cuisine"
+filename = "carnival-additions-0.0.2.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/q0W2RUFs/versions/odY7O5aT/carnival-additions-0.0.2.jar"
+hash-format = "sha1"
+hash = "abb9d51a42899bcc88006cf57700a8c0c6484e88"
+
+[update]
+[update.modrinth]
+mod-id = "q0W2RUFs"
+version = "odY7O5aT"
diff --git a/pack/mods/confetti-stuff.pw.toml b/pack/mods/confetti-stuff.pw.toml
@@ -1,13 +1,13 @@
 name = "Confetti Stuff"
-filename = "confetti_stuff-1.0.3.jar"
+filename = "confetti_stuff-1.1.0.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/6yBwpkox/versions/fpazNPGr/confetti_stuff-1.0.3.jar"
+url = "https://cdn.modrinth.com/data/6yBwpkox/versions/w2SuS8ug/confetti_stuff-1.1.0.jar"
 hash-format = "sha1"
-hash = "76233dc5e2558727846bf473696a7fee0c315562"
+hash = "155bd380e0320f44feb18151ba35da0a2b3ec9cd"
 
 [update]
 [update.modrinth]
 mod-id = "6yBwpkox"
-version = "fpazNPGr"
+version = "w2SuS8ug"
diff --git a/pack/mods/dancerizer.pw.toml b/pack/mods/dancerizer.pw.toml
@@ -1,13 +1,13 @@
 name = "Dancerizer"
-filename = "dancerizer-1.0.1.jar"
+filename = "dancerizer-1.1.0.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/hZ4lZ6jX/versions/6FdqCK2l/dancerizer-1.0.1.jar"
+url = "https://cdn.modrinth.com/data/hZ4lZ6jX/versions/gVW8wDJF/dancerizer-1.1.0.jar"
 hash-format = "sha1"
-hash = "391942f953320648a32a91b107193b1cefad1c3b"
+hash = "4f75c4cf48da396df8e2005f46ab5b7880bd1fac"
 
 [update]
 [update.modrinth]
 mod-id = "hZ4lZ6jX"
-version = "6FdqCK2l"
+version = "gVW8wDJF"
diff --git a/pack/mods/lets-parkour.pw.toml b/pack/mods/lets-parkour.pw.toml
@@ -1,13 +1,13 @@
 name = "Let's Parkour"
-filename = "letsparkour-1.21.0-1.5.jar"
+filename = "letsparkour-1.21.0-1.6.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/yCBnCQ6f/versions/iWVGjXSF/letsparkour-1.21.0-1.5.jar"
+url = "https://cdn.modrinth.com/data/yCBnCQ6f/versions/oQW0gAuJ/letsparkour-1.21.0-1.6.jar"
 hash-format = "sha1"
-hash = "f243641462ac1d59ff1f144cf05abcf9b0b03555"
+hash = "7a3e79921bc882fee32c0b67f31b063edf97ce70"
 
 [update]
 [update.modrinth]
 mod-id = "yCBnCQ6f"
-version = "iWVGjXSF"
+version = "oQW0gAuJ"
diff --git a/pack/mods/no-fun-allowed.pw.toml b/pack/mods/no-fun-allowed.pw.toml
@@ -0,0 +1,13 @@
+name = "no fun allowed"
+filename = "nofunallowed-1.0.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/E5ro6j6i/versions/6bbCFWII/nofunallowed-1.0.jar"
+hash-format = "sha1"
+hash = "dece9d55c27133e535dc90f59f86ee5deac764c5"
+
+[update]
+[update.modrinth]
+mod-id = "E5ro6j6i"
+version = "6bbCFWII"
diff --git a/pack/mods/sodium.pw.toml b/pack/mods/sodium.pw.toml
@@ -1,13 +1,13 @@
 name = "Sodium"
-filename = "sodium-fabric-0.5.9+mc1.21.jar"
+filename = "sodium-fabric-0.5.11+mc1.21.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/AANobbMI/versions/dNHeFokL/sodium-fabric-0.5.9%2Bmc1.21.jar"
+url = "https://cdn.modrinth.com/data/AANobbMI/versions/RncWhTxD/sodium-fabric-0.5.11%2Bmc1.21.jar"
 hash-format = "sha1"
-hash = "3b1ad241af59c32f6ed016c8a285429bfb5c5f86"
+hash = "d67e66ea4bb2409997b636dae4203d33764cdcc8"
 
 [update]
 [update.modrinth]
 mod-id = "AANobbMI"
-version = "dNHeFokL"
+version = "RncWhTxD"
diff --git a/pack/pack.toml b/pack/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "6e32048abc9ce9cac2fa8b62f6ebfe0ba327b29dce3db85a06906523ec37f138"
+hash = "21226204c2d333adc643253f581155ec1b9b1f9f570b9ecf3678575ebb8ebef3"
 
 [versions]
 fabric = "0.15.11"

diff --git a/scripts/override_add.json5 b/scripts/override_add.json5
@@ -18,7 +18,7 @@
   {"project_id": "reeses-sodium-options"}, // nice/util
   {"project_id": "wthit"}, // nice/util
 //  {"project_id": "resetting"}, // nice/build
-//  {"project_id": "nofunallowed"}, // nice/build
+  {"project_id": "no-fun-allowed"}, // nice/build
   {"project_id": "armorstandeditor"}, // nice/build
 //  {"project_id": "picturesign"}, // nice/build
   {"project_id": "axiom"}, // nice/build

diff --git a/scripts/override_remove.json5 b/scripts/override_remove.json5
@@ -1,4 +1,5 @@
 [
   {"project_id": "emi"}, // crashes (might be incompat)
   {"project_id": "mid-journey"}, // server crash
+  {"project_id": "dMltSin1"}, // thwackinator 404
 ]
diff --git a/scripts/overrides/ballotbox.pw.toml b/scripts/overrides/ballotbox.pw.toml
@@ -0,0 +1,7 @@
+name = "ballotbox"
+filename = "ballotbox-0.1.0+1.21.jar"
+
+[download]
+url = "https://github.com/ModFest/ballotbox/releases/download/v0.1.0/ballotbox-0.1.0+1.21.jar"
+hash-format = "sha256"
+hash = "d1f5f37590e669218d3e29b5b794b78be0174d016f74bf048e524bbaf8ee64b0"