add new mods change makefile and update github actions

.github/workflows/release.yml

@@ -20,7 +20,6 @@ jobs:
 
       - name: Download Dependencys
         run: |
-          sudo apt install p7zip
           go install github.com/packwiz/packwiz@latest
 
       - name: Split branch name
@@ -32,7 +31,6 @@ jobs:
       - name: Make Release
         run: |
           make release VERSION=${{ github.ref_name }} MINECRAFT=${{ steps.split.outputs.fragment }} MODRINTH_TOKEN=${{ secrets.MODRINTH_TOKEN }}
-          cd ./build && 7z a warp-core-${{ steps.split.outputs.fragment }}-auto-update-server.zip ./server/*
       
       - name: Create release
         id: create_release
@@ -44,9 +42,9 @@ jobs:
           tag_name: ${{ github.ref }}
           name: Warp Core ${{ github.ref_name }}
           files: |
-            ./build/warp-core-${{ github.ref_name }}.mrpack
-            ./build/warp-core-${{ github.ref_name }}.zip
-            ./build/warp-core-${{ steps.split.outputs.fragment }}-auto-update-server.zip
+            ./build/rainbow-${{ github.ref_name }}.mrpack
+            ./build/rainbow-${{ github.ref_name }}.zip
+            ./build/rainbow-${{ steps.split.outputs.fragment }}-auto-update-server.zip
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3

Makefile

@@ -44,13 +44,10 @@ run-server: prepare-server $(BUILDDIR)/$(MINECRAFT)/server/eula.txt
 
 export-mrpack:
 	@echo "Making ${MINECRAFT} Modrinth pack"
-	cd $(BUILDDIR)/$(MINECRAFT) && pw modrinth export --pack-file ../pack/${MINECRAFT}/pack.toml
-
-upload-modrinth:
 	sed -i -e '/version =/ s/= .*/= "${VERSION}"/' pack/${MINECRAFT}/pack.toml
-	make modrinth
-	make curseforge
-	make quilt-server
+	cd $(BUILDDIR)/$(MINECRAFT) && packwiz modrinth export --pack-file ../../pack/${MINECRAFT}/pack.toml
+
+upload-modrinth: export-mrpack
 	ID=${ID} VERSION=${VERSION} LOADER=${LOADER} MINECRAFT=${MINECRAFT} MODRINTH_TOKEN=${MODRINTH_TOKEN} gradle modrinth
 
 clean:

build.gradle

@@ -21,7 +21,7 @@ modrinth {
   gameVersions = ["${minecraft}"]
   loaders = ["${loader}"]
   changelog = project.file("pack/${minecraft}/CHANGELOG.md").text
-  uploadFile = project.file("build/warp-core-${version}.mrpack")
+  uploadFile = project.file("build/${minecraft}/rainbow-${version}.mrpack")
   syncBodyFrom = project.file("README.md").text
 }
 

pack/1.20.1/index.toml

@@ -20,10 +20,6 @@ hash = "56e38e1d6039cbcf32c68416b60be42a4f5f3006c3caf50eb1eae1fc03580e86"
 file = "config/yosbr/config/dynamic_fps.json"
 hash = "03446bd8438e32366f310541f383bce5cdb2154fb5fb51973a7f3cf14f3ef173"
 
-[[files]]
-file = "config/yosbr/config/enhanced_bes.properties"
-hash = "b13fc3336312546cbe5e466005a5123422861687179420cf143963e7d10d71bf"
-
 [[files]]
 file = "config/yosbr/config/ferritecore.mixin.properties"
 hash = "81513f54851d7f9a8155ca4171004be8a28e13c0a3bf4b1151c1a630588914b2"
@@ -56,15 +52,6 @@ hash = "c37edec3875da8e561eb60bb7a18dcdce128cc41cfe26261c65a8e942f65d58f"
 file = "config/yosbr/options.txt"
 hash = "d59932dd2c071b31efe654f70de11decc23bd0f05af492dd6e42f89e4dd7369d"
 
-[[files]]
-file = "mods/Plutonium-1.0.0.jar"
-hash = "26422ea7f2cc606255d8db74c579c00fc0b35800f2d7d664f73044e7e0219703"
-
-[[files]]
-file = "mods/argonauts.pw.toml"
-hash = "6d52f489c0129b5246a8382405fbdd6511b78b66f51d6a16a735dae33278babd"
-metafile = true
-
 [[files]]
 file = "mods/cloth-config.pw.toml"
 hash = "b6348f94ec939f563285dc96683e61da8fc17ab2f2897be2751fa24789513691"
@@ -75,16 +62,6 @@ file = "mods/controlify.pw.toml"
 hash = "a1659dc663c6e42f1e410b1833594e8f36cd4f7f2dbfc40068f9ed65676af691"
 metafile = true
 
-[[files]]
-file = "mods/create-fabric.pw.toml"
-hash = "e5bbc96d6d5d6bffb8e36c89bbd1331d923e23fbb87be8bae208d206832adb1c"
-metafile = true
-
-[[files]]
-file = "mods/create-steam-n-rails.pw.toml"
-hash = "2995bd6fc4d6cfb207625005e7392fc09aefe226a0441cceca6687dfc1883ad6"
-metafile = true
-
 [[files]]
 file = "mods/dynamic-fps.pw.toml"
 hash = "ad214677d7d7b71d0d962d4b3f668d34ba2faa19b30ad007afd89a205256505c"
@@ -95,11 +72,6 @@ file = "mods/ears.pw.toml"
 hash = "6a4afd7b42387477795e73b17b8963ea313ce6f8a960343a2579ff0b41544beb"
 metafile = true
 
-[[files]]
-file = "mods/ebe.pw.toml"
-hash = "b8270928d44781b9e59982d376bb3cc0d24089ceebef3c79d3e1e881ba7ece60"
-metafile = true
-
 [[files]]
 file = "mods/emi-loot.pw.toml"
 hash = "8766521465c1cc6b57199a24008be030eabfd417c0ba7eb6c91f26c2f6ffa70a"
@@ -120,11 +92,6 @@ file = "mods/emitrades.pw.toml"
 hash = "4c59088a2cb975f60347da57d72bb1069b65452c6a7b92af8facec6e1bed9409"
 metafile = true
 
-[[files]]
-file = "mods/estrogen.pw.toml"
-hash = "2d1175001b4e3370895ef6affb21f7d9dc5a5fe7405236feb5ef5479de9b48b3"
-metafile = true
-
 [[files]]
 file = "mods/fabric-api.pw.toml"
 hash = "49e15403e817f170b3aac836e9b334ef0044aa5cf81e344356a7b7d6042d0585"
@@ -135,11 +102,6 @@ file = "mods/ferrite-core.pw.toml"
 hash = "03e174cf691b52da20bd973b955fae6f3720d3d2120f9d6cc1de5fdf3180013c"
 metafile = true
 
-[[files]]
-file = "mods/forge-config-api-port.pw.toml"
-hash = "129bb8b135edc60038f021b693f5b88a0067b722f326e0d6067112243774289b"
-metafile = true
-
 [[files]]
 file = "mods/immediatelyfast.pw.toml"
 hash = "3cc35c86abdf13b0a159dca601ab82f3ca7b39de7c682b266598849987fe93af"
@@ -165,6 +127,11 @@ file = "mods/lithium.pw.toml"
 hash = "c239c951796882b9c93e649a0dba4f2d95804441faaed707b686381b7a5c67da"
 metafile = true
 
+[[files]]
+file = "mods/luckperms.pw.toml"
+hash = "ebc7a77402069acd00a1a84eaeefc06c586035c31d7abbc941b9cf204afec2a9"
+metafile = true
+
 [[files]]
 file = "mods/modernfix.pw.toml"
 hash = "e5f92dc07f3f57d187c366dc98c1d16d75df5cf47775b1c2d8589f5a01900536"
@@ -175,29 +142,34 @@ file = "mods/modmenu.pw.toml"
 hash = "4cd171d3f5f3e1d2948cb1b0062e742a5e85110c9e9a668f9aed5b0cebcb9c97"
 metafile = true
 
+[[files]]
+file = "mods/mouse-tweaks.pw.toml"
+hash = "669008dbd2508a67f8c409096cf2357de450f26a69494289e5852045ade7d358"
+metafile = true
+
 [[files]]
 file = "mods/no-chat-reports.pw.toml"
 hash = "7ca62a9da5c2ec9f0a8bed5394021c959e90077db16b313be44f4c8736f7fbf5"
 metafile = true
 
 [[files]]
-file = "mods/opac-fabric-create-support.pw.toml"
-hash = "5f9113ba8565bb1bbfc6534dbb3e0dcc767b721d534dd1a0f210f9ae16fb5d40"
+file = "mods/plasmo-voice.pw.toml"
+hash = "1ef638a5a1bc05863d2a3798114f5f338f70775cb03a39b75b236e06cd156fbd"
 metafile = true
 
 [[files]]
-file = "mods/open-parties-and-claims.pw.toml"
-hash = "1296ce4ca13eeb1b1b0f52d9098fa50e7545c8234aef898cb766d8c983003ca1"
+file = "mods/plutonium.pw.toml"
+hash = "a50f80071da16ec78a88cd220938a8f9e97a71fb79d68d826ef8b86b8831c570"
 metafile = true
 
 [[files]]
-file = "mods/plasmo-voice.pw.toml"
-hash = "1ef638a5a1bc05863d2a3798114f5f338f70775cb03a39b75b236e06cd156fbd"
+file = "mods/pv-addon-broadcast.pw.toml"
+hash = "99dc10c737cff18f2f08d076f3c6ba1f54a714fddd4d690cfb9631e1d25136f7"
 metafile = true
 
 [[files]]
-file = "mods/prometheus.pw.toml"
-hash = "4fd1f8ac48d71a58de8b3f79dd26de65f13763a8eb0fb6739c821eb9ef1fb0ec"
+file = "mods/pv-addon-priority.pw.toml"
+hash = "8ae6bb366235402b73a6fd38c86adaaad89c3358574f4d59a2e23fbee694a6dc"
 metafile = true
 
 [[files]]
@@ -211,13 +183,13 @@ hash = "699022f3c6f29cdc0aa6c629f46b087f1b2a65766cf14f1889c8f61c4c83cc9a"
 metafile = true
 
 [[files]]
-file = "mods/reeses-sodium-options.pw.toml"
-hash = "e2bed47188f1d68aeb0307276146be12b6a6bcf863627c2fceeed213f8258d36"
+file = "mods/pv-addon-whisper.pw.toml"
+hash = "c3e8d0f94318d2deb4ca9d9a05f18889315e046bffc72235213d9094d5c1d634"
 metafile = true
 
 [[files]]
-file = "mods/resourceful-lib.pw.toml"
-hash = "c89835f045a03832c287470cd1729a70f1265e3eac7b3cdaf603c3c1fd677689"
+file = "mods/reeses-sodium-options.pw.toml"
+hash = "e2bed47188f1d68aeb0307276146be12b6a6bcf863627c2fceeed213f8258d36"
 metafile = true
 
 [[files]]
@@ -251,33 +223,53 @@ hash = "250689d1d6e59b0e76638f28693b3148e72ae66d95c162dfeb7a8f872307f05b"
 metafile = true
 
 [[files]]
-file = "mods/threadtweak.pw.toml"
-hash = "bb044cd95d56fb9e1f52a8c18a843df8daf56d22a822568112e9dfa28dab7926"
+file = "mods/styled-chat.pw.toml"
+hash = "4df7a83e4162bb71e20ef2bea25042daadf04ac5daab143b0035af0405160b65"
 metafile = true
 
 [[files]]
-file = "mods/trinkets.pw.toml"
-hash = "b2e02d1210f025b905299bfc88f895058640158343322641aca2c4875622c992"
+file = "mods/styled-nicknames.pw.toml"
+hash = "e6f4e06c4d4442c08a9f64772a3e078209d57a5d81f6c8ee0fde0da006789a3a"
 metafile = true
 
 [[files]]
-file = "mods/vivecraft.pw.toml"
-hash = "c977b3bfece9ac913c3c61f6e61babd1886cf2d1706fa42013b40cfa094bb569"
+file = "mods/swingthrough.pw.toml"
+hash = "164bd9070d86ca231da118c32790f2144195a29a9ed1c556fcbf9714a1e633f7"
 metafile = true
 
 [[files]]
-file = "mods/vmp-fabric.pw.toml"
-hash = "40f1effd2c65b6c6f9a1b5dfd0903c87df02b23da6b57f389f61f361ef86d425"
+file = "mods/switchy-inventories.pw.toml"
+hash = "b7b3080acea13424a7f6301ec97b61eb6fb8b541abc0b43864da3768059e6e86"
+metafile = true
+
+[[files]]
+file = "mods/switchy-proxy.pw.toml"
+hash = "515798e6cbe4410d55b01bababc9e1589eb8c7a0ff426d921870b1e7b5e933b4"
+metafile = true
+
+[[files]]
+file = "mods/switchy-teleport.pw.toml"
+hash = "2565eba14e887a66cd6688e5078de5554ad6ac0a4f6a83724b94aa21a849924f"
+metafile = true
+
+[[files]]
+file = "mods/switchy.pw.toml"
+hash = "0e53613ac0177c7840e8d6e064aa518bfe3dcb98178a45aeeab99c00672b4465"
+metafile = true
+
+[[files]]
+file = "mods/threadtweak.pw.toml"
+hash = "bb044cd95d56fb9e1f52a8c18a843df8daf56d22a822568112e9dfa28dab7926"
 metafile = true
 
 [[files]]
-file = "mods/xaeros-minimap.pw.toml"
-hash = "33ac4f6bb510cf129a3be9e78f12b368bcbf0c813d78aad7c510d748e52c7db4"
+file = "mods/vivecraft.pw.toml"
+hash = "c977b3bfece9ac913c3c61f6e61babd1886cf2d1706fa42013b40cfa094bb569"
 metafile = true
 
 [[files]]
-file = "mods/xaeros-world-map.pw.toml"
-hash = "3da4278dce5b43b0e0288cea2f86b342aa231b4188d23f3462481afd6d50b197"
+file = "mods/vmp-fabric.pw.toml"
+hash = "40f1effd2c65b6c6f9a1b5dfd0903c87df02b23da6b57f389f61f361ef86d425"
 metafile = true
 
 [[files]]
@@ -289,3 +281,43 @@ metafile = true
 file = "mods/yosbr.pw.toml"
 hash = "6f6334f336a876088431df70e2bba6ac52ca2ddeb73a4880ce88d6954b09af00"
 metafile = true
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/assets/minecraft/textures/gui/title/background/panorama_0.png"
+hash = "ca743d3d692cbc843ed3873c5828c416531c123a5c3d191ccff464dc0d6fa7ff"
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/assets/minecraft/textures/gui/title/background/panorama_1.png"
+hash = "c3a1daaa9c982bc60a145f93e0f8634ea2d5059d961cbea025c501c48793f6ec"
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/assets/minecraft/textures/gui/title/background/panorama_2.png"
+hash = "0c98c4c2de8f8478e9d49b9afa65bc7873ee027bc427b6b78a729c108a04b052"
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/assets/minecraft/textures/gui/title/background/panorama_3.png"
+hash = "4b019edb3c266c254a6d482e8355f7c0fa78bda8db8a776d0d007924649b773b"
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/assets/minecraft/textures/gui/title/background/panorama_4.png"
+hash = "2b59491acebe34fdb2b1cc731d4e9f608a4de5ea2ef06050f49e450bf7496bd2"
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/assets/minecraft/textures/gui/title/background/panorama_5.png"
+hash = "f7990bb935ccfc251e3ef4fe2caf2a9f6452a26c1e886448a8701369c50d07eb"
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/assets/minecraft/textures/gui/title/minceraft.png"
+hash = "69545d684dcc9fd4f5e5f3950a9e65e911af854533b8891aa6b31177208b4b96"
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/assets/minecraft/textures/gui/title/minecraft.png"
+hash = "84ff260faa1cb3e3b92c40e111be17f605a633f5c7c7abdf363ff463af7aa65b"
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/assets/rainbow/lang/en_us.json"
+hash = "2b7b6e1ec17ad913fc14014cf6dde57fb2b5a55d4555db0046ad3cb0ed07749e"
+
+[[files]]
+file = "resourcepacks/Rainbow Resources/pack.mcmeta"
+hash = "8c275bd77dd3bb1aad1e95780ba25c986b3417e3729297bd3427069aaa3b1607"