update mods

.minecraft/index.toml

@@ -116,7 +116,7 @@ metafile = true
 
 [[files]]
 file = "mods/controlify.pw.toml"
-hash = "aca86ec8af1e3fd5e52aac904f7d5145113ae0f792b6f55778ea44341902d93b"
+hash = "f7cd5b8dc67e95c0487feb346c798b125e16cbde30b3718e931990c17f51a1ba"
 metafile = true
 
 [[files]]
@@ -141,7 +141,7 @@ metafile = true
 
 [[files]]
 file = "mods/fabric-api.pw.toml"
-hash = "6592715d9a03bbafbfa9c4688f5ee436df29239d9b7808f1f964724568ec0bb9"
+hash = "fc1323ed77ac0b485d55f12edde21a1a9cde29b90f85e353fab11b034b7ab9d8"
 metafile = true
 
 [[files]]
@@ -181,7 +181,7 @@ metafile = true
 
 [[files]]
 file = "mods/iris.pw.toml"
-hash = "853c3c3509313aecaa5db6c01f6a94419ec0128ec7630b7bf8caf46e80dec67a"
+hash = "6c6e0bcb90802217634be01c864499b11b6061295bfe3731fe42d7994d3fb063"
 metafile = true
 
 [[files]]
@@ -221,7 +221,7 @@ metafile = true
 
 [[files]]
 file = "mods/no-chat-reports.pw.toml"
-hash = "c947125039216bc6763671c675dc37b58b14ef2ee7a34270ec66ffb9c11afd8d"
+hash = "14574e7d1366c476b3ec720107fb0b255cd119640a2bd06f040733de6af4e27a"
 metafile = true
 
 [[files]]
@@ -236,7 +236,7 @@ metafile = true
 
 [[files]]
 file = "mods/polymer.pw.toml"
-hash = "f18eda761f84c110ecffe6e7c8541a4064865194aab08c83a49c2af84fc47cb0"
+hash = "c690c76bd9058860d423ec7c5079f600379bc3e1c521346401bf8840d4132c62"
 metafile = true
 
 [[files]]
@@ -271,12 +271,12 @@ metafile = true
 
 [[files]]
 file = "mods/searchables.pw.toml"
-hash = "ef780ba6a6b33a174847a730e47f73a89d2b372f6b1ad8601eda9dcbad4b69ef"
+hash = "c0f323ff5bfab41f040119b04532ca1e1e8732c7ea52f60227a0932aa8d448af"
 metafile = true
 
 [[files]]
 file = "mods/simple-voice-chat.pw.toml"
-hash = "d8ae225565aa80b048bd31523bcc08ce6cc3d561d12ff9b3f5fdc21aec817a40"
+hash = "9d16aed014509b4af4d782ecb5f8d4ad7265e5ec662248edc3384c097b3534e1"
 metafile = true
 
 [[files]]
@@ -331,7 +331,7 @@ metafile = true
 
 [[files]]
 file = "mods/viafabric.pw.toml"
-hash = "9ce65b7dba0f8d936c9cd745763a39dc40d170d63a7a54481ff02688b561c088"
+hash = "b572bcb363214650ffd0c28ebfa43df04efacbd66e3a3c8426aeb9df2abe600f"
 metafile = true
 
 [[files]]
@@ -351,12 +351,12 @@ metafile = true
 
 [[files]]
 file = "mods/xaeros-minimap.pw.toml"
-hash = "86a94f99ae9fddc9c111cd2de06f2c0898b481d70ba2b993665321df96856ddc"
+hash = "9a52d0b15c1c1e5b1d49e20f0a90ffe085f3ddb473219740a56e06cc01773ecc"
 metafile = true
 
 [[files]]
 file = "mods/xaeros-world-map.pw.toml"
-hash = "666a1851661f830a129614ddb27da843d4dc3287609ecade06dbc6623d42a8ef"
+hash = "5bab133844d37e16d98c469fe33bfa8283b44a29ebdf4cb433dbc18e54707955"
 metafile = true
 
 [[files]]

.minecraft/mods/controlify.pw.toml

@@ -1,13 +1,13 @@
 name = "Controlify"
-filename = "Controlify-1.1.1+1.19.4-fabric-1.19.4.jar"
+filename = "Controlify-1.2.0+1.19.4-fabric-1.19.4.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/DOUdJVEm/versions/jvUMhWpD/Controlify-1.1.1%2B1.19.4-fabric-1.19.4.jar"
+url = "https://cdn.modrinth.com/data/DOUdJVEm/versions/3L7GCFAd/Controlify-1.2.0%2B1.19.4-fabric-1.19.4.jar"
 hash-format = "sha1"
-hash = "c48f03b53571bb58d1d3dc366a93a1353f6eac1c"
+hash = "3bb6586107596f9b16d80b57ca9efbdabf9d4548"
 
 [update]
 [update.modrinth]
 mod-id = "DOUdJVEm"
-version = "jvUMhWpD"
+version = "3L7GCFAd"

.minecraft/mods/fabric-api.pw.toml

@@ -1,13 +1,13 @@
 name = "Fabric API"
-filename = "fabric-api-0.80.0+1.19.4.jar"
+filename = "fabric-api-0.81.1+1.19.4.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/s5UrEfIY/fabric-api-0.80.0%2B1.19.4.jar"
+url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/qMk5NmAs/fabric-api-0.81.1%2B1.19.4.jar"
 hash-format = "sha1"
-hash = "d1e66307336d0c6b99e9457d2088d116183533fe"
+hash = "15af0813d0522c2137bb4ed2cc46603843bc7169"
 
 [update]
 [update.modrinth]
 mod-id = "P7dR8mSH"
-version = "s5UrEfIY"
+version = "qMk5NmAs"

.minecraft/mods/iris.pw.toml

@@ -1,13 +1,13 @@
 name = "Iris Shaders"
-filename = "iris-mc1.19.4-1.6.1.jar"
+filename = "iris-mc1.19.4-1.6.3.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/YL57xq9U/versions/347HlKZS/iris-mc1.19.4-1.6.1.jar"
+url = "https://cdn.modrinth.com/data/YL57xq9U/versions/AQqB1OqQ/iris-mc1.19.4-1.6.3.jar"
 hash-format = "sha1"
-hash = "6fc8ea409fb248721701272e66d2c3bea283f94a"
+hash = "58fab3e31c03d9830ee614deadb705e54491b8b6"
 
 [update]
 [update.modrinth]
 mod-id = "YL57xq9U"
-version = "347HlKZS"
+version = "AQqB1OqQ"

.minecraft/mods/no-chat-reports.pw.toml

@@ -1,13 +1,13 @@
 name = "No Chat Reports"
-filename = "NoChatReports-FABRIC-1.19.4-v2.1.1.jar"
+filename = "NoChatReports-FABRIC-1.19.4-v2.1.2.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/qQyHxfxd/versions/UB0mRick/NoChatReports-FABRIC-1.19.4-v2.1.1.jar"
+url = "https://cdn.modrinth.com/data/qQyHxfxd/versions/h1AaG3zP/NoChatReports-FABRIC-1.19.4-v2.1.2.jar"
 hash-format = "sha1"
-hash = "09129a9ad265b60776e18169993ef917535f4ba7"
+hash = "c0b44012c7a0fbd6e5b2a2a919a7618f58af18d0"
 
 [update]
 [update.modrinth]
 mod-id = "qQyHxfxd"
-version = "UB0mRick"
+version = "h1AaG3zP"

.minecraft/mods/polymer.pw.toml

@@ -1,13 +1,13 @@
 name = "Polymer"
-filename = "polymer-bundled-0.4.7+1.19.4.jar"
+filename = "polymer-bundled-0.4.9+1.19.4.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/xGdtZczs/versions/VraJ1qRh/polymer-bundled-0.4.7%2B1.19.4.jar"
+url = "https://cdn.modrinth.com/data/xGdtZczs/versions/iTZr1ADT/polymer-bundled-0.4.9%2B1.19.4.jar"
 hash-format = "sha1"
-hash = "031746faac178ef6038f06045d8aca60d204626d"
+hash = "e0157cb419db2616a974b8a1af9152ce22c1102b"
 
 [update]
 [update.modrinth]
 mod-id = "xGdtZczs"
-version = "VraJ1qRh"
+version = "iTZr1ADT"

.minecraft/mods/searchables.pw.toml

@@ -1,13 +1,13 @@
 name = "Searchables"
-filename = "Searchables-fabric-1.19.4-1.0.2.jar"
+filename = "Searchables-fabric-1.19.4-1.0.3.jar"
 side = "both"
 
 [download]
 hash-format = "sha1"
-hash = "0e94ea47ce439b50a1b55cd40942116f54cc03c7"
+hash = "3527015fb5d2185cb6b57e3a359e3a772028c933"
 mode = "metadata:curseforge"
 
 [update]
 [update.curseforge]
-file-id = 4529868
+file-id = 4539624
 project-id = 858542

.minecraft/mods/simple-voice-chat.pw.toml

@@ -1,13 +1,13 @@
 name = "Simple Voice Chat"
-filename = "voicechat-fabric-1.19.4-2.4.7.jar"
+filename = "voicechat-fabric-1.19.4-2.4.8.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/9eGKb6K1/versions/5Zjrtwhl/voicechat-fabric-1.19.4-2.4.7.jar"
+url = "https://cdn.modrinth.com/data/9eGKb6K1/versions/h0edb0O5/voicechat-fabric-1.19.4-2.4.8.jar"
 hash-format = "sha1"
-hash = "6d8cd43357752938d562b6695baa1404c01faf71"
+hash = "3bc56e934d8d9de93149bedb81de0bc4df9d2650"
 
 [update]
 [update.modrinth]
 mod-id = "9eGKb6K1"
-version = "5Zjrtwhl"
+version = "h0edb0O5"

.minecraft/mods/viafabric.pw.toml

@@ -1,13 +1,13 @@
 name = "ViaFabric"
-filename = "viafabric-0.4.10+33-dev.jar"
+filename = "viafabric-0.4.10+34-dev.jar"
 side = "both"
 
 [download]
-url = "https://cdn.modrinth.com/data/YlKdE5VK/versions/HijWckMU/viafabric-0.4.10%2B33-dev.jar"
+url = "https://cdn.modrinth.com/data/YlKdE5VK/versions/1wDlgp1s/viafabric-0.4.10%2B34-dev.jar"
 hash-format = "sha1"
-hash = "b72413d475bb48a2835b1efe71944b43b9070b93"
+hash = "fc53a5247c65c9f9734b1f9f44a455e8ef58ad43"
 
 [update]
 [update.modrinth]
 mod-id = "YlKdE5VK"
-version = "HijWckMU"
+version = "1wDlgp1s"

.minecraft/mods/xaeros-minimap.pw.toml

@@ -1,13 +1,13 @@
 name = "Xaero's Minimap"
-filename = "Xaeros_Minimap_23.4.1_Fabric_1.19.4.jar"
+filename = "Xaeros_Minimap_23.4.3_Fabric_1.19.4.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/1bokaNcj/versions/wA5lTfMy/Xaeros_Minimap_23.4.1_Fabric_1.19.4.jar"
+url = "https://cdn.modrinth.com/data/1bokaNcj/versions/5GPcMgHh/Xaeros_Minimap_23.4.3_Fabric_1.19.4.jar"
 hash-format = "sha1"
-hash = "856849eb3fdeed4ec2258b4b13f3ad9603f94162"
+hash = "18a5283f8a1dcda9f86fb84ee2d89fa2d2bdcc54"
 
 [update]
 [update.modrinth]
 mod-id = "1bokaNcj"
-version = "wA5lTfMy"
+version = "5GPcMgHh"

.minecraft/mods/xaeros-world-map.pw.toml

@@ -1,13 +1,13 @@
 name = "Xaero's World Map"
-filename = "XaerosWorldMap_1.30.1_Fabric_1.19.4.jar"
+filename = "XaerosWorldMap_1.30.2_Fabric_1.19.4.jar"
 side = "client"
 
 [download]
-url = "https://cdn.modrinth.com/data/NcUtCpym/versions/UsAkUS2z/XaerosWorldMap_1.30.1_Fabric_1.19.4.jar"
+url = "https://cdn.modrinth.com/data/NcUtCpym/versions/kIscoBGn/XaerosWorldMap_1.30.2_Fabric_1.19.4.jar"
 hash-format = "sha1"
-hash = "836cabc1e2379ba066967b4f7013a52499de4fae"
+hash = "7ad026c90ed6c38a3375b633a226d9002d39842b"
 
 [update]
 [update.modrinth]
 mod-id = "NcUtCpym"
-version = "UsAkUS2z"
+version = "kIscoBGn"

.minecraft/pack.toml

@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "00f04a0435707cc96da702919480cfd4530ae4c27a951a063d79b48aeddfe607"
+hash = "fee3b4eb9b09d1dc5e4c658a07e48b6214ba865704fa38ac46fe223a0b3c95c2"
 
 [versions]
 fabric = "0.14.19"

Makefile

@@ -1,21 +1,31 @@
 default:
 	@echo "No Default make command configured"
 	@echo "Please use either"
-	@echo "   - make curseforge"
 	@echo "	- make multimc"
+	@echo "	- make curseforge"
+	@echo "	- make modrinth"
 	@echo "	- make technic"
+	@echo "	- make server"
 	@echo "	- make all"
 	@echo ""
-	@echo "Curseforge will make a curseforge compatible zip"
+	@echo "Curseforge will make a curseforge import file"
+	@echo ""
+	@echo "Modrinth will make a modrinth import file"
+	@echo ""
 	@echo "Multimc will make a multimc zip file which contains"
 	@echo "   the packwiz updater"
 	@echo ""
 	@echo "Technic will make a technic pack zip"
 	@echo ""
+	@echo "Server will make a server pack zip"
+	@echo "   This will include the packwiz updater,"
+	@echo "   but will not be configured to run by default"
+	@echo ""
 	@echo "All will make all packs it can"
 	@echo ""
 
 PACKNAME := $(notdir $(CURDIR))
+PACKURL := $(shell pw detect)
 
 curseforge: refresh
 	-mkdir .build
@@ -27,16 +37,18 @@ modrinth: refresh
 	-mkdir .build
 	@echo "Making Modrinth pack"
 	packwiz modrinth export --pack-file .minecraft/pack.toml 
-	mv ./*.mrpack ./.build/${PACKNAME}-modrinth.zip
+	mv ./*.mrpack ./.build/${PACKNAME}-modrinth.mrpack
 
 multimc: refresh
 	-mkdir .build
 	@echo "Making MultiMC pack"
 	7z d .build/${PACKNAME}-multimc.zip ./* -r
 	7z d .build/${PACKNAME}-multimc.zip ./.minecraft -r
+	@sed -i 's#{PACKURL}#${PACKURL}#' instance.cfg
 	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
+	@sed -i 's#${PACKURL}#{PACKURL}#' instance.cfg
 
 technic: refresh
 	-mkdir .build
@@ -54,16 +66,19 @@ server: refresh
 	@echo "Making Server pack"
 	-rm -rf .server
 	-cp -r .minecraft .server
-	cp ${PACKNAME}_icon.png .technic/icon.png
+	cp ${PACKNAME}_icon.png .server/server-icon.png
 	cd .server && java -jar ../.minecraft/packwiz-installer-bootstrap.jar -s server ../.minecraft/pack.toml && cd ..
 	7z d .build/${PACKNAME}-server.zip ./* ./.* -r
 	7z a .build/${PACKNAME}-server.zip ./.server/* -r
 
 preClean: refresh
 	-rm -rf .build
+	-rm -rf .server
 postClean: refresh
 	-rm -rf .technic
+	-rm -rf .server
 	-git gc --aggressive --prune
+clean: preClean postClean
 
 all: preClean curseforge modrinth multimc technic server postClean
 
@@ -73,8 +88,6 @@ refresh:
 update-packwiz:
 	go install github.com/packwiz/packwiz@latest
 	go install github.com/Merith-TK/packwiz-wrapper/cmd/pw@main
-	go install github.com/Merith-TK/packwiz-wrapper/cmd/pw-modlist@main
-	go install github.com/Merith-TK/packwiz-wrapper/cmd/pw-reinstall@main
 	clear
 	@echo "Packwiz has been Updated"
 

instance.cfg

@@ -2,4 +2,4 @@ InstanceType=OneSix
 iconKey=vanillia_icon
 name=Minecraft Vanillia
 OverrideCommands=true
-PreLaunchCommand="$INST_JAVA" -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/vanillia-modpack/-/raw/stable/.minecraft/pack.toml
+PreLaunchCommand="$INST_JAVA" -jar packwiz-installer-bootstrap.jar {PACKURL}