diff --git a/.minecraft/index.toml b/.minecraft/index.toml index 7ab5bff..8fc2ee7 100644 --- a/.minecraft/index.toml +++ b/.minecraft/index.toml @@ -34,11 +34,6 @@ file = "mods/entityculling.pw.toml" hash = "fe4a894703704d94bdf7b5cfed82137b5a11f9953852a033d77e57b09614ce5b" metafile = true -[[files]] -file = "mods/essential.pw.toml" -hash = "29e09db97f62edd724a8f1b4ed7076a5865cd6a761d74faf5fca5f3b8e3abb8b" -metafile = true - [[files]] file = "mods/fabric-api.pw.toml" hash = "74a3dc06ef31f258f4eb6e3b053775bfe466f6b9a1bc9ae1ae333dd2a863279a" @@ -84,16 +79,6 @@ file = "mods/lambdynamiclights.pw.toml" hash = "bd9f2b6ea26e9274021fde6cb5b310aa60506aa67a9afd078c6ac0bb4ab15415" metafile = true -[[files]] -file = "mods/legacybob.pw.toml" -hash = "17b4f370d282cb7a15ee0972f15eb1b14b6d115fe4b8f3d789561f5f9337a468" -metafile = true - -[[files]] -file = "mods/loot-beams-up.pw.toml" -hash = "90ac322b59525802df0a69e1b930e6c32658f78a05c799b2406c3acbda5e12a8" -metafile = true - [[files]] file = "mods/mod-loading-screen.pw.toml" hash = "f7734c2c856b92ed3e1b2af70b6def66bf8cc7a76c0d40b9de96e4f561629d71" @@ -109,11 +94,6 @@ file = "mods/moonrise-opt.pw.toml" hash = "7a0e3430f7e8ad44c6708ac440799bb690177ca0bdc1b1753cd6a95ec066547e" metafile = true -[[files]] -file = "mods/not-enough-pages.pw.toml" -hash = "8876f9702bb7c44fbe1da7470f6cfcfd486969fda6090f33fc38c01f9b871385" -metafile = true - [[files]] file = "mods/one-world-folder.pw.toml" hash = "b36c8cb2182871509a1c8ea3e578acf992e54da5fc2633c3883c174d430ef7d3" @@ -145,8 +125,8 @@ hash = "1d93599397574f7c92d9fda61ce5fa1d1a178a3107464f026ea9c345a7b54de6" metafile = true [[files]] -file = "mods/simple-hud-enhanced.pw.toml" -hash = "a3cc1e85d48a05725ca048c5c7f606f9530454b1285a144aa24ddd46741fd1d4" +file = "mods/scribble.pw.toml" +hash = "2083f219d8d95f3ad3c1bd761be75ed5d2c23987a1ba6500493e045d0bdfcd05" metafile = true [[files]] diff --git a/.minecraft/mods/essential.pw.toml b/.minecraft/mods/essential.pw.toml deleted file mode 100644 index 46463a7..0000000 --- a/.minecraft/mods/essential.pw.toml +++ /dev/null @@ -1,18 +0,0 @@ -name = "Essential Mod" -filename = "essential_1-3-5-1_fabric_1-21-3.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/k2ZPuTBm/versions/FvnZGPEx/essential_1-3-5-1_fabric_1-21-3.jar" -hash-format = "sha512" -hash = "46c8960bd21323a038c177c9d42312827e765cc1ecd5f8189c09a9d37ad190ce5613d5382381260105796f0398042915cca9c30dca682f6359fc3c6e658b35af" - -[update] -[update.modrinth] -mod-id = "k2ZPuTBm" -version = "FvnZGPEx" - -[option] -optional=true -default=false -description="Enhanced Multiplayer Experience" \ No newline at end of file diff --git a/.minecraft/mods/legacybob.pw.toml b/.minecraft/mods/legacybob.pw.toml deleted file mode 100644 index 42f5114..0000000 --- a/.minecraft/mods/legacybob.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "LegacyBob" -filename = "LegacyBob-fabric-1.3+mc1.20.6-1.21.3.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/OeBwF2ij/versions/EZjqn2Bg/LegacyBob-fabric-1.3%2Bmc1.20.6-1.21.3.jar" -hash-format = "sha512" -hash = "c92eba93feb89d00c17ccc6bd0ca3b9601872a98d65b5bddc98c737b2e5ce2b2c36423bf2c444bcf3f9653ab675051451452dcbc78b8cb203e6e86b888add0d7" - -[update] -[update.modrinth] -mod-id = "OeBwF2ij" -version = "EZjqn2Bg" diff --git a/.minecraft/mods/loot-beams-up.pw.toml b/.minecraft/mods/loot-beams-up.pw.toml deleted file mode 100644 index 9771ac1..0000000 --- a/.minecraft/mods/loot-beams-up.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Loot beams" -filename = "lootbeams-2.8.1-mc1.21.2-.3.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/fFPOjWlN/versions/RTdTALLS/lootbeams-2.8.1-mc1.21.2-.3.jar" -hash-format = "sha512" -hash = "2db35320af16ea1c30cca5dc085d9ff3252fdefe23660055f80fe61c6c405f4788550292ec7ce2549d3a5fe02d0501bfcb9749e3cb35dc3e708822f46121d294" - -[update] -[update.modrinth] -mod-id = "fFPOjWlN" -version = "RTdTALLS" diff --git a/.minecraft/mods/not-enough-pages.pw.toml b/.minecraft/mods/not-enough-pages.pw.toml deleted file mode 100644 index 54bc613..0000000 --- a/.minecraft/mods/not-enough-pages.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Not Enough Pages" -filename = "PasteBookText-1.0+1.21.2.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/zitKUUW9/versions/Dc5Ktm4y/PasteBookText-1.0%2B1.21.2.jar" -hash-format = "sha512" -hash = "edad556b2de8c9511faef223c912eff13c2a5b4bb84090b9af0e7a27b8c1e4f78f9e8219f2db1067118d34913cb009d6e0b560a2d5a53767c819a0ed590a88d6" - -[update] -[update.modrinth] -mod-id = "zitKUUW9" -version = "Dc5Ktm4y" diff --git a/.minecraft/mods/scribble.pw.toml b/.minecraft/mods/scribble.pw.toml new file mode 100644 index 0000000..8891bbb --- /dev/null +++ b/.minecraft/mods/scribble.pw.toml @@ -0,0 +1,13 @@ +name = "Scribble" +filename = "Scribble-1.4.1-beta+mc1.21.3-fabric.jar" +side = "client" + +[download] +url = "https://cdn.modrinth.com/data/yXAvIk0x/versions/6JNpa9VS/Scribble-1.4.1-beta%2Bmc1.21.3-fabric.jar" +hash-format = "sha512" +hash = "a7afbf71e314aa4eb152bfb5137ef6c7489097de64fd72b324e1147e0cd20e8d57cbb1392ec18a0baf1c983f54c95c758649afc910faa6abbb4cb045695c9b56" + +[update] +[update.modrinth] +mod-id = "yXAvIk0x" +version = "6JNpa9VS" diff --git a/.minecraft/mods/simple-hud-enhanced.pw.toml b/.minecraft/mods/simple-hud-enhanced.pw.toml deleted file mode 100644 index 3d1705d..0000000 --- a/.minecraft/mods/simple-hud-enhanced.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Simple HUD Enhanced" -filename = "simple-hud-enhanced+1.21.2-1.21.3-4.7.2.jar" -side = "client" - -[download] -url = "https://cdn.modrinth.com/data/PE656UHx/versions/MW0QjG7z/simple-hud-enhanced%2B1.21.2-1.21.3-4.7.2.jar" -hash-format = "sha512" -hash = "3ad5bbd8df6705ccd2c99e79157c57eb2dbfbaae604bd4153eafebb6a4e6d85b3b1d666e1dada5c30b9b336ea7481820d34c3c1f4a048f054e20db7dd59b3aca" - -[update] -[update.modrinth] -mod-id = "PE656UHx" -version = "MW0QjG7z" diff --git a/.minecraft/pack.toml b/.minecraft/pack.toml index 028e7ea..7e54b32 100644 --- a/.minecraft/pack.toml +++ b/.minecraft/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "d29c6c1142462d2d0396d7ac50aa3a37e5cbc43c5db389afac45f204a69a8404" +hash = "e4388f435d532c03c78470e316e02c9d9e36c4cf699bc505bd4a742a1ed8f5e2" [versions] fabric = "0.16.9" diff --git a/Makefile b/Makefile index d90d476..2098c3f 100644 --- a/Makefile +++ b/Makefile @@ -40,9 +40,9 @@ multimc: build 7z a .build/${PACKNAME}-multimc.zip ./* -r 7z a .build/${PACKNAME}-multimc.zip ./.minecraft -r 7z d .build/${PACKNAME}-multimc.zip ./.build ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r - rm ./${ICONNAME}_icon.png - @sed -i 's#$(shell pw detect)#{PACKURL}#g' instance.cfg - @sed -i 's#${ICONNAME}#{ICONNAME}#g' instance.cfg + -rm ./${ICONNAME}_icon.png + @-sed -i 's#$(shell pw detect)#{PACKURL}#g' instance.cfg + @-sed -i 's#${ICONNAME}#{ICONNAME}#g' instance.cfg technic: build @echo "Making Technic pack" @@ -77,7 +77,8 @@ clean: preClean postClean all: preClean curseforge modrinth multimc technic server postClean refresh: - cd .minecraft && packwiz refresh + pw refresh + pw modlist update-packwiz: go install github.com/packwiz/packwiz@latest diff --git a/modlist.md b/modlist.md index 03b1abb..a8f4dce 100644 --- a/modlist.md +++ b/modlist.md @@ -6,22 +6,18 @@ - [BetterF3](https://modrinth.com/mod/8shC1gFX) - [Controlify](https://modrinth.com/mod/DOUdJVEm) - [Entity Culling](https://modrinth.com/mod/NNAgCjsB) -- [Essential Mod](https://modrinth.com/mod/k2ZPuTBm) - [Held Item Info](https://modrinth.com/mod/tEcWzCZz) - [ImmediatelyFast](https://modrinth.com/mod/5ZwdcRci) - [Iris Shaders](https://modrinth.com/mod/YL57xq9U) - [Keybind Fix Plus](https://modrinth.com/mod/JKuinnWa) - [LambDynamicLights](https://modrinth.com/mod/yBW8D80W) -- [LegacyBob](https://modrinth.com/mod/OeBwF2ij) -- [Loot beams](https://modrinth.com/mod/fFPOjWlN) - [Mod Menu](https://modrinth.com/mod/mOgUt4GM) -- [Not Enough Pages](https://modrinth.com/mod/zitKUUW9) - [One World Folder](https://modrinth.com/mod/JL35Xbzz) - [Raised](https://modrinth.com/mod/nCQRBEiR) - [Reese's Sodium Options](https://modrinth.com/mod/Bh37bMuy) - [Resourcify](https://modrinth.com/mod/RLzHAoZe) - [Scoreboard Overhaul](https://modrinth.com/mod/2YIQkF2v) -- [Simple HUD Enhanced](https://modrinth.com/mod/PE656UHx) +- [Scribble](https://modrinth.com/mod/yXAvIk0x) - [Simple Menu](https://modrinth.com/mod/6pdhya1q) - [Sodium Extra](https://modrinth.com/mod/PtjYWJkn) - [Sodium](https://modrinth.com/mod/AANobbMI)