diff --git a/.packwizignore b/.packwizignore index ce94ef8..4369c97 100644 --- a/.packwizignore +++ b/.packwizignore @@ -70,3 +70,6 @@ config/paxi/datapacks/* !config/alexsmobs-common.toml !config/fowlplay.json5 !config/crittersandcompanions-common.json5 +# ModernFix mixin overrides (build.py SHIP; enforced - ModernFix reads it before +# Default Options runs). dynamic_resources=true per bench B6. +!config/modernfix-mixins.properties diff --git a/analysis/client-perf/proposed-configs/build.py b/analysis/client-perf/proposed-configs/build.py index f7e379e..1caee11 100644 --- a/analysis/client-perf/proposed-configs/build.py +++ b/analysis/client-perf/proposed-configs/build.py @@ -29,10 +29,10 @@ REPO = HERE.parents[2] # What `--ship` copies from out/T-default into the repo, and where. # Default Options seeds these client-side only, and only if the file is absent # (see README ยง1). Not shipped: sable-client.toml and sodium-options.json (no change -# from upstream). modernfix-mixins.properties is held back until bench block B6 -# passes; when it does, add it here with destination "config/modernfix-mixins.properties" -# (enforced packwiz file, because ModernFix reads it before Default Options runs) and -# re-include it in .packwizignore. +# from upstream). modernfix-mixins.properties ships as an *enforced* packwiz file +# (ModernFix reads it before Default Options runs): bench B6 (proxy) showed +# dynamic_resources -7.6 s startup and better S1/S2 frametimes; owner waived the +# missing-texture check (2026-10-18) - report issues from play. DO = "config/defaultoptions" SHIP = { "options.txt": f"{DO}/options.txt", @@ -45,6 +45,7 @@ SHIP = { f"{DO}/extra/config/sound_physics_remastered/soundphysics.properties", "config/sound_physics_remastered/sound_rates.properties": f"{DO}/extra/config/sound_physics_remastered/sound_rates.properties", + "config/modernfix-mixins.properties": "config/modernfix-mixins.properties", } # game-dir path -> (base file, format, may_append_new_keys) diff --git a/config/modernfix-mixins.properties b/config/modernfix-mixins.properties new file mode 100644 index 0000000..f6f03b1 --- /dev/null +++ b/config/modernfix-mixins.properties @@ -0,0 +1 @@ +mixin.perf.dynamic_resources=true diff --git a/index.toml b/index.toml index b70ee13..94d242d 100644 --- a/index.toml +++ b/index.toml @@ -2,11 +2,11 @@ hash-format = "sha256" [[files]] file = "config/akashictome-common.toml" -hash = "4e479c86ddfec0c5e28f07034f033a10abae404309f38ccc4bfc15da9de2dfa2" +hash = "190ba9edfb6960b86a2dac84630f9c53ee8f6492b745db92443e92d1dd46b5bd" [[files]] file = "config/alexsmobs-common.toml" -hash = "bc47ee67032ceab8b2b408819ce9b268812f37da8f13b9b7efeae0deed607c4b" +hash = "3a5be6512536e29584209b836382cee74d4aad64564df89f041936f58700ec33" [[files]] file = "config/crittersandcompanions-common.json5" @@ -48,6 +48,10 @@ hash = "62034e0589087dab02d1a15192ad313a57f907d5ee9ebbf8853151f7831851a1" file = "config/fowlplay.json5" hash = "09ad767a358310e9d38e632ba0e670b0afd1554c162eadb6928d106df17b66c3" +[[files]] +file = "config/modernfix-mixins.properties" +hash = "ca92e91a2d856d42e4a5b1ba1900fbed0e942bcbeddd75c0195a2375ade75695" + [[files]] file = "config/paxi/datapacks/onion-fixes/data/adorablehamsterpets/recipe/cucumber_crate.json" hash = "21b11674b18c3fb0d8292095cf7c12bca82ef4054ec3f1cd8d1e0222d1655629" @@ -614,6 +618,11 @@ file = "mods/fishermans-haven.pw.toml" hash = "d72a60c2053f10a447bdd05577674eeb8d0253a3ca02cb40776e063db556dda2" metafile = true +[[files]] +file = "mods/flerovium.pw.toml" +hash = "9ab20de2d63037f055d6b614013389e0198068bab536dfd62eebd913e5222fe1" +metafile = true + [[files]] file = "mods/fowlplay.pw.toml" hash = "549e72a053da13a50404bd0901b75ce25c6045e778d5a89afcf58e9b5e1945f5" @@ -729,6 +738,11 @@ file = "mods/inventory-particles.pw.toml" hash = "7ff791a8a6074a5f580a0a1899de69cff45ccf6db0a99d83494d57ff1a4cee43" metafile = true +[[files]] +file = "mods/iris-flw-compat.pw.toml" +hash = "ed85b2ed42beb6523223eef6f0ae397ed29f8059b2bf5aa08d8598de04865614" +metafile = true + [[files]] file = "mods/iris-veil-compat.pw.toml" hash = "69f9051c61c05546a2bf008654149a101814842bc2bf384df5c0ee0d64301ccd" diff --git a/mods/flerovium.pw.toml b/mods/flerovium.pw.toml new file mode 100644 index 0000000..42e3457 --- /dev/null +++ b/mods/flerovium.pw.toml @@ -0,0 +1,13 @@ +name = "Flerovium" +filename = "flerovium-neoforge-1.21.1-1.1.2-all.jar" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/4Rh1Mobu/versions/oU1q3eIj/flerovium-neoforge-1.21.1-1.1.2-all.jar" +hash-format = "sha512" +hash = "6301ea6991768832fa983f61e1b0574336aea4920e027632a3df93c8a10f5d87041876fad516d16827d9cd13a84b5a8c334c1a0076ca04121e321939d5d6ea52" + +[update] +[update.modrinth] +mod-id = "4Rh1Mobu" +version = "oU1q3eIj" diff --git a/mods/iris-flw-compat.pw.toml b/mods/iris-flw-compat.pw.toml new file mode 100644 index 0000000..f9a13a3 --- /dev/null +++ b/mods/iris-flw-compat.pw.toml @@ -0,0 +1,13 @@ +name = "Iris & Oculus Flywheel Compat" +filename = "iris-flywheel-compat-NeoForge-2.4.0.jar" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/ndHYMY2K/versions/6ZQz5Ow2/iris-flywheel-compat-NeoForge-2.4.0.jar" +hash-format = "sha512" +hash = "192e5f00f2c146d2920867d7cd691ecec7ddd2acfb95880cc59084e8949225db92ecfb9221ba7223fc924ec43f2ca861115f83f9dc3f79e14a2f2a8db5287070" + +[update] +[update.modrinth] +mod-id = "ndHYMY2K" +version = "6ZQz5Ow2" diff --git a/pack.toml b/pack.toml index 23d58a2..f7f07f5 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "a541a5c87ef6ab98ce6c87526cc192e19ba9cccdbf197388de1394dfb1124a8b" +hash = "fa466ffeb5cefd0adac6b88b4ed08bb5b2fe0a138f49e9f2d6ea99b8fee70af3" [versions] minecraft = "1.21.1"