…

.gitattributes

@@ -5,5 +5,3 @@
 # These are Windows script files and should use crlf
 *.bat           text eol=crlf
 *.so filter=lfs diff=lfs merge=lfs -text
-*.so !text !filter !merge !diff
-* !text !filter !merge !diff

.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,19 +18,44 @@ permissions:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    runs-on: windows-2022
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+      with:
+        submodules: true
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '11'
         distribution: 'temurin'
-    - name: Make Gradle wrapper executable
+    - uses: nttld/setup-ndk@v1
+      with:
+        ndk-version: r21d
+        local-cache: true
+        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 }}
+
+    - name: Upload APK
+      uses: actions/upload-artifact@v3
+      with:
+          name: app-debug
+          path: build/outputs/aar/*

.gitignore

@@ -17,3 +17,4 @@ local.properties
 bin
 .classpath
 .project
+/.cxx

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "wrapper"]
+	path = wrapper
+	url = https://github.com/QuestCraftPlusPlus/Wrapper-IL2CPP.git

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.
 
@@ -28,6 +28,14 @@ Make sure your pull request describes exactly what the code does and explains wh
 * [@MrNavaStar](https://github.com/MrNavaStar) | Previous Main Feature Implementor
 
 ### Components:
-- [PojavLauncher](https://github.com/PojavLauncherTeam/PojavLauncher) (Pojlib Base application): [GNU GPLv3](https://github.com/khanhduytran0/PojavLauncher/blob/master/LICENSE).
+- [PojavLauncher](https://github.com/PojavLauncherTeam/PojavLauncher) (Pojlib Base application): [GNU LGPLv3](https://github.com/khanhduytran0/PojavLauncher/blob/master/LICENSE).
+- [OpenComposite](https://gitlab.com/znixian/OpenOVR) - Pending removal for direct OpenXR (Used for OpenVR to OpenXR interpretation): [GNU GPLv3](https://gitlab.com/znixian/OpenOVR/-/blob/openxr/LICENSE.txt).
+- Android Support Libraries: [Apache License 2.0](https://android.googlesource.com/platform/prebuilts/maven_repo/android/+/master/NOTICE.txt).
+- [OpenJDK](https://github.com/PojavLauncherTeam/openjdk-multiarch-jdk8u): [GNU GPLv2 License](https://openjdk.java.net/legal/gplv2+ce.html).
+- [LWJGL3](https://github.com/PojavLauncherTeam/lwjgl3): [BSD-3 License](https://github.com/LWJGL/lwjgl3/blob/master/LICENSE.md).
+- [LWJGLX](https://github.com/PojavLauncherTeam/lwjglx) (LWJGL2 API compatibility layer for LWJGL3): unknown license.
+- [Mesa 3D Graphics Library](https://gitlab.freedesktop.org/mesa/mesa): [MIT License](https://docs.mesa3d.org/license.html).
+- [libepoxy](https://github.com/anholt/libepoxy): [MIT License](https://github.com/anholt/libepoxy/blob/master/COPYING).
+- [bhook](https://github.com/bytedance/bhook) (Used for exit code trapping): [MIT license](https://github.com/bytedance/bhook/blob/main/LICENSE).
+- [pro-grade](https://github.com/pro-grade/pro-grade) (Java sandboxing security manager): [Apache License 2.0](https://github.com/pro-grade/pro-grade/blob/master/LICENSE.txt).
 
-- [OpenComposite](https://gitlab.com/znixian/OpenOVR) (Used for OpenVR to OpenXR interpretation): [GNU GPLv3](https://gitlab.com/znixian/OpenOVR/-/blob/openxr/LICENSE.txt).

build.gradle

@@ -1,12 +1,15 @@
 plugins {
-    id("com.android.library") version("7.4.0")
+    id("com.android.library") version("7.1.0")
 }
 
 android {
     ndkVersion = "26.1.10909125"
     compileSdkVersion = "android-32"
     defaultConfig {
-        minSdkVersion(32)
+        minSdkVersion(29)
+        multiDexEnabled true
+
+        ndk.stl = "c++_shared"
     }
 
     buildTypes {
@@ -27,6 +30,10 @@ android {
     buildToolsVersion = "30.0.3"
 }
 
+build {
+    //finalizedBy(':wrapper:launcher:build')
+}
+
 dependencies {
     // This dependency is exported to consumers, that is to say found on their compile classpath.
     api("org.apache.commons:commons-math3:3.6.1")
@@ -41,14 +48,9 @@ dependencies {
     implementation("org.json:json:20220924")
     implementation("commons-io:commons-io:2.13.0")
     implementation("commons-codec:commons-codec:1.15")
-    implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.legacy:legacy-preference-v14:1.0.0")
-    implementation("com.google.android.material:material:1.8.0")
     implementation("androidx.annotation:annotation:1.7.1")
+    implementation("androidx.core:core:1.13.1")
     implementation("com.microsoft.azure:msal4j:1.14.0")
-    implementation("androidx.browser:browser:1.7.0")
+    implementation("com.github.Mathias-Boulay:android_gamepad_remapper:2.0.3")
     implementation("blank:unity-classes")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-}
+}

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,15 +184,10 @@
 					"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",
-					"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/b4hTi3mo/sodium-fabric-mc1.19.4-0.4.10%2Bbuild.24.jar"
+					"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.19.4-0.4.11/sodium-fabric-mc1.19.4-0.4.11+build.1.jar"
 				},
 				{
 					"slug": "Cloth-Config",
@@ -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,15 +281,10 @@
 					"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",
-					"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/rAfhHfow/sodium-fabric-mc1.19.2-0.4.4%2Bbuild.18.jar"
+					"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.19.2-0.4.4/Sodium.jar"
 				},
 				{
 					"slug": "Cloth-Config",
@@ -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,15 +363,10 @@
 					"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.4.1",
-					"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/mc1.18.2-0.4.1/sodium-fabric-mc1.18.2-0.4.1%2Bbuild.15.jar"
+					"version": "0.5.0",
+					"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.18.2-0.4.1/Sodium.jar"
 				},
 				{
 					"slug": "Better-Biome-Blend",
@@ -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",

gradle.properties

@@ -1 +1,2 @@
-android.useAndroidX=true
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx4G

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Jun 04 16:34:57 EDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists