Merge branch 'QuestCraftPlusPlus:QuestCraft' into QuestCraft

thewiilover · Sep 2, 2024 · 380eb99 · 380eb99
2 parents 236a134 + cb8b764
commit 380eb99
Show file tree

Hide file tree

Showing 19 changed files with 271 additions and 1,620 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -5,7 +5,7 @@
 # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
-name: Java CI with Gradle
+name: Build Pojlib
 
 on:
   workflow_dispatch:
@@ -18,7 +18,6 @@ permissions:
 
 jobs:
   build:
-
     runs-on: windows-2022
 
     steps:
@@ -34,9 +33,23 @@ jobs:
       with:
         ndk-version: r21d
         local-cache: true
-    - name: Make Gradle wrapper executable
+        link-to-sdk: true
+    - uses: nttld/setup-ndk@v1
+      with:
+        ndk-version: r26b
+        local-cache: true
+        link-to-sdk: true
+    - name: Make Gradle wrapper executable and pull LFS
       run: git lfs pull | chmod +x ./gradlew
+    - name: Decode keystore
+      run: |
+        bash -c 'base64 --decode <<< "$QCXR_KEYSTORE_BASE64" > qcxr.keystore'
+      env:
+        QCXR_KEYSTORE_BASE64: ${{ secrets.QCXR_KEYSTORE_BASE64 }}
     - name: Build with Gradle
       uses: gradle/gradle-build-action@v2
       with:
         arguments: build
+      env:
+        QCXR_KEYSTORE_ALIAS: ${{ secrets.QCXR_KEYSTORE_ALIAS }}
+        QCXR_KEYSTORE_PASS: ${{ secrets.QCXR_KEYSTORE_PASS }}
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Pojlib | Minecraft Launcher Core
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-![Lines of code](https://img.shields.io/tokei/lines/github/questcraftplusplus/pojlib?style=flat)
+[![Pojlib Build](https://github.com/QuestCraftPlusPlus/Pojlib/actions/workflows/gradle.yml/badge.svg)](https://github.com/QuestCraftPlusPlus/Pojlib/actions/workflows/gradle.yml)
 
 A Minecraft: Java Edition launcher library partially made with elements from PojavLauncher.
 

diff --git a/devmods.json b/devmods.json
@@ -49,83 +49,31 @@
 					"slug": "Modern-Fix",
 					"version": "5.10.0",
 					"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/vxDb5tOq/modernfix-fabric-5.10.0%2Bmc1.20.3.jar"
-				}
-			]
-		},
-		{
-			"name": "1.20.2",
-			"coreMods": [
-				{
-					"slug": "Vivecraft",
-					"version": "1.1.1",
-					"download_link": "https://github.com/QuestCraftPlusPlus/VivecraftBuilder/releases/download/1.20.2/vivecraft.jar"
 				},
 				{
-					"slug": "Fabric-API",
-					"version": "0.91.6",
-					"download_link": "https://cdn.modrinth.com/data/P7dR8mSH/versions/8GVp7wDk/fabric-api-0.91.6%2B1.20.2.jar"
-				}
-			],
-			"defaultMods": [
-				{
-					"slug": "Lithium",
-					"version": "0.12.0",
-					"download_link": "https://cdn.modrinth.com/data/gvQqBUqZ/versions/qdzL5Hkg/lithium-fabric-mc1.20.2-0.12.0.jar"
+					"slug": "Noisium",
+					"version": "2.0.3",
+					"download_link": "https://cdn.modrinth.com/data/KuNKN7d2/versions/Eie3f6ki/noisium-fabric-2.0.3%2Bmc1.20.2-1.20.4.jar"
 				},
 				{
-					"slug": "Ferrite-Core",
-					"version": "6.0.1",
-					"download_link": "https://cdn.modrinth.com/data/uXXizFIs/versions/unerR5MN/ferritecore-6.0.1-fabric.jar"
-				},
-				{
-					"slug": "Entity-Culling",
-					"version": "1.6.2",
-					"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/BDwHAdWc/entityculling-fabric-1.6.2-mc1.20.1.jar"
-				},
-				{
-					"slug": "Sodium",
-					"version": "0.5.5",
-					"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.2-0.5.5/sodium-fabric-mc1.20.2-0.5.5.jar"
+					"slug": "Lithium",
+					"version": "0.12.1",
+					"download_link": "https://cdn.modrinth.com/data/gvQqBUqZ/versions/nMhjKWVE/lithium-fabric-mc1.20.4-0.12.1.jar"
 				},
 				{
-					"slug": "Cloth-Config",
-					"version": "12.0.109",
-					"download_link": "https://cdn.modrinth.com/data/9s6osm5g/versions/LnfolBYb/cloth-config-12.0.109-fabric.jar"
+					"slug": "EntityCulling",
+					"version": "1.6.5",
+					"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/hyejM5za/entityculling-fabric-1.6.5-mc1.20.4.jar"
 				},
 				{
-					"slug": "Fabric-Language-Kotlin",
-					"version": "1.10.13+kotlin.1.9.20",
-					"download_link": "https://cdn.modrinth.com/data/Ha28R6CL/versions/atZwzPrT/fabric-language-kotlin-1.10.13%2Bkotlin.1.9.20.jar"
+					"slug": "Ferrite-Core",
+					"version": "6.0.3",
+					"download_link": "https://cdn.modrinth.com/data/uXXizFIs/versions/pguEMpy9/ferritecore-6.0.3-fabric.jar"
 				},
 				{
 					"slug": "Krypton",
-					"version": "0.2.4",
-					"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/cQ60Ouax/krypton-0.2.4.jar"
-				},
-				{
-					"slug": "Server-Core",
-					"version": "1.5.0",
-					"download_link": "https://cdn.modrinth.com/data/4WWQxlQP/versions/wgjsjWPu/servercore-fabric-1.5.0%2B1.20.2.jar"
-				},
-				{
-					"slug": "Mod-Menu",
-					"version": "8.0.0",
-					"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/TwfjidT5/modmenu-8.0.0.jar"
-				},
-				{
-					"slug": "ImmediatelyFast",
-					"version": "1.2.6",
-					"download_link": "https://cdn.modrinth.com/data/5ZwdcRci/versions/mbeaDZtb/ImmediatelyFast-1.2.6%2B1.20.2.jar"
-				},
-				{
-					"slug": "Simple-Voice-Chat",
-					"version": "2.5.12",
-					"download_link": "https://cdn.modrinth.com/data/9eGKb6K1/versions/zwnfweMB/voicechat-fabric-1.20.2-2.5.12.jar"
-				},
-				{
-					"slug": "Modern-Fix",
-					"version": "5.9.0",
-					"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/FDGaMHFj/modernfix-fabric-5.9.0%2Bmc1.20.1.jar"
+					"version": "0.2.6",
+					"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/bRcuOnao/krypton-0.2.6.jar"
 				}
 			]
 		},
@@ -154,11 +102,6 @@
 					"version": "6.0.0",
 					"download_link": "https://cdn.modrinth.com/data/uXXizFIs/versions/FCnCG6PS/ferritecore-6.0.0-fabric.jar"
 				},
-				{
-					"slug": "Entity-Culling",
-					"version": "1.6.2",
-					"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/d20sUcYn/entityculling-fabric-1.6.2-mc1.20.jar"
-				},
 				{
 					"slug": "Sodium",
 					"version": "0.5.8",
@@ -189,11 +132,6 @@
 					"version": "1.5.0",
 					"download_link": "https://cdn.modrinth.com/data/4WWQxlQP/versions/dXmFuxyH/servercore-fabric-1.5.0%2B1.20.1.jar"
 				},
-				{
-					"slug": "Mod-Menu",
-					"version": "7.0.1",
-					"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/RTFDnTKf/modmenu-7.0.1.jar"
-				},
 				{
 					"slug": "ImmediatelyFast",
 					"version": "1.1.15",
@@ -246,11 +184,6 @@
 					"version": "1.7.0",
 					"download_link": "https://cdn.modrinth.com/data/FWumhS4T/versions/I9TkHxLI/smoothboot-fabric-1.19.4-1.7.0.jar"
 				},
-				{
-					"slug": "Entity-Culling",
-					"version": "1.6.2",
-					"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/UvJN5Cy4/entityculling-fabric-1.6.2-mc1.19.4.jar"
-				},
 				{
 					"slug": "Sodium",
 					"version": "0.4.10",
@@ -291,11 +224,6 @@
 					"version": "1.3.5-1.19.4",
 					"download_link": "https://cdn.modrinth.com/data/4WWQxlQP/versions/aq6o4qRe/servercore-1.3.5-1.19.4.jar"
 				},
-				{
-					"slug": "Mod-Menu",
-					"version": "6.2.1",
-					"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/yjjsLqbS/modmenu-6.2.1.jar"
-				},
 				{
 					"slug": "ImmediatelyFast",
 					"version": "1.1.12",
@@ -353,11 +281,6 @@
 					"version": "1.7.1",
 					"download_link": "https://cdn.modrinth.com/data/FWumhS4T/versions/1.19-1.7.1/smoothboot-fabric-1.19-1.7.1.jar"
 				},
-				{
-					"slug": "Entity-Culling",
-					"version": "1.6.1",
-					"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/twdGLDHv/entityculling-fabric-1.6.1-mc1.19.2.jar"
-				},
 				{
 					"slug": "Sodium",
 					"version": "0.4.4",
@@ -378,11 +301,6 @@
 					"version": "0.2.1",
 					"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/0.2.1/krypton-0.2.1.jar"
 				},
-				{
-					"slug": "Mod_Menu",
-					"version": "4.2.0-beta.2",
-					"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/gSoPJyVn/modmenu-4.2.0-beta.2.jar"
-				},
 				{
 					"slug": "Better-Biome-Blend",
 					"version": "1.3.6",
@@ -445,11 +363,6 @@
 					"version": "1.7.0",
 					"download_link": "https://cdn.modrinth.com/data/FWumhS4T/versions/iy4eaYy2/smoothboot-fabric-1.18.2-1.7.0.jar"
 				},
-				{
-					"slug": "Entity-Culling",
-					"version": "1.5.1",
-					"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/1.5.1-fabric-1.18/entityculling-fabric-mc1.18-1.5.1.jar"
-				},
 				{
 					"slug": "Sodium",
 					"version": "0.5.0",
@@ -490,11 +403,6 @@
 					"version": "0.1.9",
 					"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/0.1.9/krypton-0.1.9.jar"
 				},
-				{
-					"slug": "Mod-Menu",
-					"version": "3.2.5",
-					"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/nVxObSbX/modmenu-3.2.5.jar"
-				},
 				{
 					"slug": "Modern-Fix",
 					"version": "5.9.0",