hopefully fix Sodium

Author: SolDev69

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -17,7 +17,7 @@ body:
   attributes:
     label: The log file and images/videos
     description: |
-      The log file called `latestlog.txt` is located under `/storage/emulated/0/Android/data/net.kdt.pojavlaunch/files` (on Android 10 and higher) or `/storage/emulated/0/games/PojavLauncher/` (on Android 9 and lower). You may have to activate an option in your file explorer to see hidden files and folders. Recommended file managers are ZArchiver and MiXplorer. |
+      The log file called `latestlog.txt` is located under `/storage/emulated/0/Android/data/net.kdt.pojavlaunch/files` (on Android 10 and higher) or `/storage/emulated/0/games/SolCraftLauncher/` (on Android 9 and lower). You may have to activate an option in your file explorer to see hidden files and folders. Recommended file managers are ZArchiver and MiXplorer. |
       You can also upload here screenshots or videos of the buggy behavior, if possible.
       
       Tip: You can attach files by clicking this area to highlight it and then dragging files in or select them on 🖼 option at the toolbar. Do not click anything before the file successfully uploads, otherwise the upload is going to stop and the file won't attach.
@@ -29,7 +29,7 @@ body:
     label: Steps To Reproduce
     description: Steps to reproduce the issue.
     placeholder: |
-      1. Start PojavLauncher
+      1. Start SolCraftLauncher
       ... *(your set of actions to reproduce the bug)*
     render: markdown
   validations:
@@ -51,12 +51,12 @@ body:
         - **Device model**: Huawei P30 Pro 8/512G
         - **CPU architecture**: arm64 (can be arm64, arm, x86_64 or x86 depending on the device)
         - **Android version**: 10
-        - **PojavLauncher version**: (can be found in Android Apps settings, for example `dahlia-20230813-5e8842b-v3_openjdk`)
+        - **SolCraftLauncher version**: (can be found in Android Apps settings, for example `dahlia-20230813-5e8842b-v3_openjdk`)
     value: |
         - Device model: 
         - CPU architecture: 
         - Android version: 
-        - PojavLauncher version: 
+        - SolCraftLauncher version: 
     render: markdown
   validations:
     required: true

.github/workflows/android.yml

@@ -32,15 +32,15 @@ jobs:
         run: |
           apt update && apt install wget
           cd app_pojavlauncher/libs
-          wget https://github.com/PojavLauncherTeam/LTW/releases/latest/download/ltw-release.aar
+          wget https://github.com/SolCraftLauncherTeam/LTW/releases/latest/download/ltw-release.aar
 
       - name: Get JRE 8
         uses: dawidd6/action-download-artifact@v9
         with:
           workflow: build.yml
           path: app_pojavlauncher/src/main/assets/components/jre
           workflow_conclusion: success
-          repo: PojavLauncherTeam/android-openjdk-build-multiarch
+          repo: SolCraftLauncherTeam/android-openjdk-build-multiarch
           branch: buildjre8
           name: jre8-pojav
 
@@ -50,7 +50,7 @@ jobs:
           workflow: build.yml
           path: app_pojavlauncher/src/main/assets/components/jre-new
           workflow_conclusion: success
-          repo: PojavLauncherTeam/android-openjdk-build-multiarch
+          repo: SolCraftLauncherTeam/android-openjdk-build-multiarch
           branch: buildjre17-21
           name: jre17-pojav
 
@@ -60,7 +60,7 @@ jobs:
           workflow: build.yml
           path: app_pojavlauncher/src/main/assets/components/jre-21
           workflow_conclusion: success
-          repo: PojavLauncherTeam/android-openjdk-build-multiarch
+          repo: SolCraftLauncherTeam/android-openjdk-build-multiarch
           branch: buildjre17-21
           name: jre21-pojav
 
@@ -83,7 +83,7 @@ jobs:
           java-version: '17'
 
       - name: Build Google Play .aab
-        if: github.repository_owner == 'PojavLauncherTeam' && github.ref_name == 'v3_openjdk'
+        if: github.repository_owner == 'SolCraftLauncherTeam' && github.ref_name == 'v3_openjdk'
         run: |
           gradle :app_pojavlauncher:bundleGplay
           mv app_pojavlauncher/build/outputs/bundle/gplay/app_pojavlauncher-gplay.aab out/app-gplay.aab
@@ -120,7 +120,7 @@ jobs:
 
       - name: Upload onto the Google Play testing track
         continue-on-error: true
-        if: github.repository_owner == 'PojavLauncherTeam' && github.ref_name == 'v3_openjdk'
+        if: github.repository_owner == 'SolCraftLauncherTeam' && github.ref_name == 'v3_openjdk'
         uses: r0adkll/upload-google-play@v1.1.2
         with:
           serviceAccountJsonPlainText: ${{ secrets.GPLAY_SERVICE_JSON }}

README.md

@@ -6,7 +6,7 @@
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/SolDev69/SolCraftLauncher)](https://github.com/SolDev69/SolCraftLauncher/actions)
 [![Discord](https://img.shields.io/discord/1199157907523117066.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.com/invite/qeVjdcU4CJ)
 
-SolCraftLauncher is a fork of PojavLauncher/Angel Aura Amethyst with more technical added features, new renderers, and some QOL improvements.
+SolCraftLauncher is a fork of SolCraftLauncher/Angel Aura Amethyst with more technical added features, new renderers, and some QOL improvements.
 
 
 
@@ -19,7 +19,7 @@ SolCraftLauncher is a fork of PojavLauncher/Angel Aura Amethyst with more techni
 [![Crowdin](https://badges.crowdin.net/amethyst/localized.svg)](https://crowdin.com/project/amethyst)
 [![Discord](https://img.shields.io/discord/724163890803638273.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/98pZ8YY3Cq)
 
-*From [Boardwalk](https://github.com/zhuowei/Boardwalk)'s ashes and [PojavLauncher](https://github.com/PojavLauncherTeam/PojavLauncher)'s ruined reputation, here comes Amethyst!*
+*From [Boardwalk](https://github.com/zhuowei/Boardwalk)'s ashes and [SolCraftLauncher](https://github.com/SolCraftLauncherTeam/SolCraftLauncher)'s ruined reputation, here comes Amethyst!*
 
 Amethyst is a launcher that allows you to play Minecraft: Java Edition on your Android and [iOS](https://github.com/AngelAuraMC/Amethyst-iOS) devices.
 
@@ -43,7 +43,7 @@ For more details, check out our [wiki](https://angelauramc.dev/wiki)!
 
 ## Introduction
 
-* Amethyst is a Minecraft: Java Edition launcher for Android and iOS based on [Boardwalk](https://github.com/zhuowei/Boardwalk) and [PojavLauncher](https://github.com/PojavLauncherTeam/PojavLauncher)
+* Amethyst is a Minecraft: Java Edition launcher for Android and iOS based on [Boardwalk](https://github.com/zhuowei/Boardwalk) and [SolCraftLauncher](https://github.com/SolCraftLauncherTeam/SolCraftLauncher)
 * This launcher can launch almost all available Minecraft versions ranging from rd-132211 to 1.21 snapshots (including Combat Test versions)
 * Modding via Forge and Fabric are also supported.
 * This repository contains source code for Android. For iOS/iPadOS, check out [Amethyst-iOS](https://github.com/AngelAuraMC/Amethyst-iOS).
@@ -59,7 +59,7 @@ You can get Amethyst via two methods:
 
 ### Quick Build (Recommended)
 
-The easiest way to build PojavLauncher is to use the pre-built JREs provided by our CI.
+The easiest way to build SolCraftLauncher is to use the pre-built JREs provided by our CI.
 
 1. Clone the repository: `git clone --recursive https://github.com/AngelAuraMC/Amethyst-Android.git`
 2. Build the launcher: `./gradlew :app_pojavlauncher:assembleDebug` (Use `gradlew.bat` on Windows)
@@ -126,12 +126,12 @@ For support, please join our [Discord server](https://discord.com/invite/98pZ8YY
 
 ## License
 
-PojavLauncher is licensed under [GNU LGPLv3](https://github.com/AngelAuraMC/Amethyst-Android/blob/v3_openjdk/LICENSE).
+SolCraftLauncher is licensed under [GNU LGPLv3](https://github.com/AngelAuraMC/Amethyst-Android/blob/v3_openjdk/LICENSE).
 
 ## Credits & Dependencies
 
 * [Boardwalk](https://github.com/zhuowei/Boardwalk) (JVM Launcher): Unknown License/[Apache License 2.0](https://github.com/zhuowei/Boardwalk/blob/master/LICENSE) or GNU GPLv2.
-* [PojavLauncher](https://github.com/PojavLauncherTeam/PojavLauncher): [GLGPL](https://github.com/PojavLauncherTeam/PojavLauncher/blob/v3_openjdk/LICENSE)
+* [SolCraftLauncher](https://github.com/SolCraftLauncherTeam/SolCraftLauncher): [GLGPL](https://github.com/SolCraftLauncherTeam/SolCraftLauncher/blob/v3_openjdk/LICENSE)
 * Android Support Libraries: [Apache License 2.0](https://android.googlesource.com/platform/prebuilts/maven_repo/android/+/master/NOTICE.txt).
 * [GL4ES](https://github.com/AngelAuraMC/gl4es): [MIT License](https://github.com/ptitSeb/gl4es/blob/master/LICENSE).
 * [MobileGlues](https://github.com/MobileGL-Dev/MobileGlues): [LGPL-2.1 License](https://github.com/MobileGL-Dev/MobileGlues/blob/dev-es/LICENSE).

app_pojavlauncher/app_pojavlauncher.iml

@@ -103,9 +103,9 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\Admin\AndroidStudioProjects\PojavLauncher\app_pojavlauncher\libs\ExagearApacheCommons.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\Admin\AndroidStudioProjects\PojavLauncher\app_pojavlauncher\libs\gson-2.8.6.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\Admin\AndroidStudioProjects\PojavLauncher\app_pojavlauncher\libs\PointerCapture26Wrapper.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\Admin\AndroidStudioProjects\SolCraftLauncher\app_pojavlauncher\libs\ExagearApacheCommons.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\Admin\AndroidStudioProjects\SolCraftLauncher\app_pojavlauncher\libs\gson-2.8.6.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\Admin\AndroidStudioProjects\SolCraftLauncher\app_pojavlauncher\libs\PointerCapture26Wrapper.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: javax.annotation:javax.annotation-api:1.3.2@jar" level="project" />
     <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.14@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />

app_pojavlauncher/build.gradle

@@ -211,8 +211,8 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
 
     implementation 'com.github.duanhong169:checkerboarddrawable:1.0.2'
-    implementation 'com.github.PojavLauncherTeam:portrait-sdp:ed33e89cbc'
-    implementation 'com.github.PojavLauncherTeam:portrait-ssp:6c02fd739b'
+    implementation 'com.github.SolCraftLauncherTeam:portrait-sdp:ed33e89cbc'
+    implementation 'com.github.SolCraftLauncherTeam:portrait-ssp:6c02fd739b'
     implementation 'com.github.Mathias-Boulay:ExtendedView:1.0.0'
     implementation 'com.github.Mathias-Boulay:android_gamepad_remapper:2.0.3'
     implementation 'com.github.Mathias-Boulay:virtual-joystick-android:1.14'
@@ -222,7 +222,7 @@ dependencies {
 
     implementation 'org.tukaani:xz:1.8'
     // Our version of exp4j can be built from source at
-    // https://github.com/PojavLauncherTeam/exp4j
+    // https://github.com/SolCraftLauncherTeam/exp4j
     implementation 'net.sourceforge.htmlcleaner:htmlcleaner:2.6.1'
     implementation 'com.bytedance:bytehook:1.0.9'
 

app_pojavlauncher/src/main/assets/about_en.txt

@@ -1,7 +1,7 @@
 %s (Minecraft Java Launcher for Android), version %s by Tran Khanh Duy (based on "Boardwalk" app)<br>
 
 * License:<br>
- • This application is licensed under <a href="https://github.com/PojavLauncherTeam/PojavLauncher/blob/master/LICENSE">GNU GPLv3</a>.<br>
+ • This application is licensed under <a href="https://github.com/SolCraftLauncherTeam/SolCraftLauncher/blob/master/LICENSE">GNU GPLv3</a>.<br>
 
 * Credits / Third party components and their licenses:<br>
  • Apache Commons Compress (unknown or Apache License 2.0).<br>
@@ -12,8 +12,8 @@
  • LWJGL: <a href="http://legacy.lwjgl.org/license.php.html">LWJGL 2's License</a>.<br><br>
  • pro-gradle: <a href="https://github.com/pro-grade/pro-grade/blob/master/LICENSE.txt">Apache License 2.0</a>.<br>
  • xHook: <a href="https://github.com/iqiyi/xHook/blob/master/LICENSE">Mixed licenses</a>.<br>
- • <a href="https://github.com/PojavLauncherTeam/PojavLauncher#credits--third-party-components-and-their-licenses">More (check at GitHub)</a>.
- • <a href="https://raw.githubusercontent.com/PojavLauncherTeam/PojavLauncher/v3_openjdk/GPLAY_PRIVACY_POLICY">Privacy policy</a>.
+ • <a href="https://github.com/SolCraftLauncherTeam/SolCraftLauncher#credits--third-party-components-and-their-licenses">More (check at GitHub)</a>.
+ • <a href="https://raw.githubusercontent.com/SolCraftLauncherTeam/SolCraftLauncher/v3_openjdk/GPLAY_PRIVACY_POLICY">Privacy policy</a>.
  • Thanks to <a href="https://mc-heads.net">MCHeads</a> for providing Minecraft avatars.
 
 * Notes:<br>

app_pojavlauncher/src/main/assets/components/security/java_sandbox.policy

@@ -1,4 +1,4 @@
-// PojavLauncher JRE Sandbox
+// SolCraftLauncher JRE Sandbox
 // DO NOT EDIT THIS FILE WITHOUT KNOWLEDGE!
 // This file is important to protect you against viruses/malwares that could be come from unknown Java Programs (run on mod install) or a mod.
 

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavApplication.java

@@ -39,7 +39,7 @@ public void onCreate() {
 				// Write to file, since some devices may not able to show error
 				FileUtils.ensureParentDirectory(crashFile);
 				PrintStream crashStream = new PrintStream(crashFile);
-				crashStream.append("PojavLauncher crash report\n");
+				crashStream.append("SolCraftLauncher crash report\n");
 				crashStream.append(" - Time: ").append(DateFormat.getDateTimeInstance().format(new Date())).append("\n");
 				crashStream.append(" - Device: ").append(Build.PRODUCT).append(" ").append(Build.MODEL).append("\n");
 				crashStream.append(" - Android version: ").append(Build.VERSION.RELEASE).append("\n");

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java

@@ -171,7 +171,7 @@ public static void relocateLibPath(Runtime runtime, String jreHome) {
 
     public static void setJavaEnvironment(Activity activity, String jreHome) throws Throwable {
         Map<String, String> envMap = new ArrayMap<>();
-        envMap.put("POJAV_NATIVEDIR", NATIVE_LIB_DIR);
+        envMap.put("SOLCRAFT_NATIVEDIR", NATIVE_LIB_DIR);
         envMap.put("JAVA_HOME", jreHome);
         envMap.put("HOME", Tools.DIR_GAME_HOME);
         envMap.put("TMPDIR", Tools.DIR_CACHE.getAbsolutePath());
@@ -189,9 +189,9 @@ public static void setJavaEnvironment(Activity activity, String jreHome) throws
         if(PREF_DUMP_SHADERS)
             envMap.put("LIBGL_VGPU_DUMP", "1");
         if(PREF_VSYNC_IN_ZINK)
-            envMap.put("POJAV_VSYNC_IN_ZINK", "1");
+            envMap.put("SOLCRAFT_VSYNC_IN_ZINK", "1");
         if(Tools.deviceHasHangingLinker())
-            envMap.put("POJAV_EMUI_ITERATOR_MITIGATE", "1");
+            envMap.put("SOLCRAFT_EMUI_ITERATOR_MITIGATE", "1");
 
 
         // The OPEN GL version is changed according
@@ -209,20 +209,20 @@ public static void setJavaEnvironment(Activity activity, String jreHome) throws
         envMap.put("LD_LIBRARY_PATH", LD_LIBRARY_PATH);
         envMap.put("PATH", jreHome + "/bin:" + Os.getenv("PATH"));
         if(FFmpegPlugin.isAvailable) {
-            envMap.put("POJAV_FFMPEG_PATH", FFmpegPlugin.executablePath);
+            envMap.put("SOLCRAFT_FFMPEG_PATH", FFmpegPlugin.executablePath);
         }
 
         if(LOCAL_RENDERER != null) {
-            envMap.put("POJAV_RENDERER", LOCAL_RENDERER);
+            envMap.put("SOLCRAFT_RENDERER", LOCAL_RENDERER);
             if(LOCAL_RENDERER.equals("opengles3_ltw")) {
                 envMap.put("LIBGL_ES", "3");
-                envMap.put("POJAVEXEC_EGL","libltw.so"); // Use ANGLE EGL
+                envMap.put("SOLCRAFTEXEC_EGL","libltw.so"); // Use ANGLE EGL
             }
             if(LOCAL_RENDERER.equals("opengles_mobileglues")){
                 envMap.put("MG_DIR_PATH", Tools.DIR_DATA + "/MobileGlues");
             }
         }
-        if(LauncherPreferences.PREF_BIG_CORE_AFFINITY) envMap.put("POJAV_BIG_CORE_AFFINITY", "1");
+        if(LauncherPreferences.PREF_BIG_CORE_AFFINITY) envMap.put("SOLCRAFT_BIG_CORE_AFFINITY", "1");
         envMap.put("AWTSTUB_WIDTH", Integer.toString(CallbackBridge.windowWidth > 0 ? CallbackBridge.windowWidth : CallbackBridge.physicalWidth));
         envMap.put("AWTSTUB_HEIGHT", Integer.toString(CallbackBridge.windowHeight > 0 ? CallbackBridge.windowHeight : CallbackBridge.physicalHeight));
 
@@ -244,7 +244,7 @@ public static void setJavaEnvironment(Activity activity, String jreHome) throws
         }
 
         if(info.isAdreno() && !PREF_ZINK_PREFER_SYSTEM_DRIVER) {
-            envMap.put("POJAV_LOAD_TURNIP", "1");
+            envMap.put("SOLCRAFT_LOAD_TURNIP", "1");
         }
 
         readCustomEnv(envMap); // Must be last so it overrides anything the user sets for obvious reasons.

app_pojavlauncher/src/main/jni/ctxbridges/bridge_tbl.h

@@ -2,8 +2,8 @@
 // Created by maks on 18.10.2023.
 //
 
-#ifndef POJAVLAUNCHER_BRIDGE_TBL_H
-#define POJAVLAUNCHER_BRIDGE_TBL_H
+#ifndef SOLCRAFTLAUNCHER_BRIDGE_TBL_H
+#define SOLCRAFTLAUNCHER_BRIDGE_TBL_H
 
 #include <ctxbridges/common.h>
 #include <ctxbridges/gl_bridge.h>
@@ -42,4 +42,4 @@ void set_gl_bridge_tbl() {
     br_swap_interval = gl_swap_interval;
 }
 
-#endif //POJAVLAUNCHER_BRIDGE_TBL_H
+#endif //SOLCRAFTLAUNCHER_BRIDGE_TBL_H