From 407ca647010b6bd7542792d423319e142c25652b Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Fri, 1 Jan 2021 09:20:56 +0700
Subject: [PATCH] Changes

- Try to fix crashing
- Update README
- Add .gitignore /packages
- Copy resource files
---
 .github/workflows/ios.yml |  1 +
 .gitignore                |  1 +
 Natives/CMakeLists.txt    |  6 +-----
 Natives/JavaLauncher.c    | 17 +++++------------
 README.md                 | 19 +++++--------------
 5 files changed, 13 insertions(+), 31 deletions(-)
 create mode 100644 .gitignore

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 0ec2f94e..a1baa36c 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -39,6 +39,7 @@ jobs:
           cd ../..
           mkdir -p Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks
           cp Natives/build/Release-iphoneos/libpojavexec.dylib Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks/
+          cp -R Natives/resources/* Natives/build/Release-iphoneos/PojavLauncher.app/
 
       - name: Java Build
         run: |
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..f36bf66a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/packages
diff --git a/Natives/CMakeLists.txt b/Natives/CMakeLists.txt
index 5cd5a6ac..fd0e20ac 100644
--- a/Natives/CMakeLists.txt
+++ b/Natives/CMakeLists.txt
@@ -4,9 +4,6 @@ project(PojavLauncher)
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 set(CMAKE_C_FLAGS "-x objective-c")
 
-set(RESOURCE_FILES
-  resources/*)
-
 add_executable(PojavLauncher main.m AppDelegate.m JavaLauncher.c)
 target_link_libraries(PojavLauncher
     "-framework UIKit"
@@ -15,8 +12,7 @@ target_link_libraries(PojavLauncher
 set_target_properties(PojavLauncher PROPERTIES
   MACOSX_BUNDLE TRUE
   MACOSX_FRAMEWORK_IDENTIFIER org.cmake.ExecutableTarget
-  MACOSX_BUNDLE_INFO_PLIST "../Info.plist"
-  RESOURCE "${RESOURCE_FILES}")
+  MACOSX_BUNDLE_INFO_PLIST "../Info.plist")
 
 add_library(pojavexec SHARED egl_bridge_ios.m egl_bridge.c input_bridge_v3.c utils.c)
 target_link_libraries(pojavexec
diff --git a/Natives/JavaLauncher.c b/Natives/JavaLauncher.c
index cf18f420..0c1e9537 100644
--- a/Natives/JavaLauncher.c
+++ b/Natives/JavaLauncher.c
@@ -44,19 +44,12 @@ void append(char* s, char* c) {
 
 int launchJVM() {
     printf("Beginning JVM launch\n");
-    char documentDir[1000], log_path[1000], main_jar[1000], args_path[1000];
-    append(documentDir, getenv("HOME"));
-    append(documentDir, "/Documents");
     
-    append(log_path, documentDir);
-    append(log_path, "/latestlog.txt");
-
-    append(args_path, documentDir);
-    append(args_path, "/overrideargs.txt");
-
-    append(main_jar, getenv("APPDIR"));
-    append(main_jar, "/launcher.jar");
-
+    mkdir("/var/mobile/Documents/minecraft", 0700);
+    char *args_path = "/var/mobile/Documents/minecraft/overrideargs.txt";
+    char *log_path = "/var/mobile/Documents/minecraft/latestlog.txt";
+    char *main_jar = "/Applications/PojavLauncher.app/launcher.jar";
+    
     printf("Staring logging STDIO as jrelog:V\n");
     // Redirect stdio to latestlog.txt
     FILE* logFile = fopen(log_path, "w");
diff --git a/README.md b/README.md
index 593bba1a..b42c6e77 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,6 @@ Minecraft: Java Edition launcher for iOS, based on [PojavLauncher Android](https
 
 ## How can it work?
 - Use OpenJDK 16 from Procursus to get real Java environment.
-- (Temporary) Use JavaFX to get a fresh GLES context.
 - Use GL4ES for OpenGL -> OpenGL ES translator.
 - Use our [LWJGL3 iOS port](https://github.com/PojavLauncherTeam/lwjgl3).
 - Use same launch method as PojavLauncher Android.
@@ -23,21 +22,13 @@ Minecraft: Java Edition launcher for iOS, based on [PojavLauncher Android](https
 ## Installing OpenJDK 16
 - Download [openjdk-16-jre • Procursus](https://www.ios-repo-updates.com/repository/procursus/package/openjdk-16-jre) .deb file (~40mb).
 
-### For jailbroken iOS device, install manually or add Procursus repo.
-- ssh to iOS or use a terminal, type these commands
-```
-# Grant root access
-su
-
-# Install use dpkg
-dpkg -i /path/to/openjdk-16-jre.deb
-
-# Verify if java is installed
-/usr/lib/jvm/java-16-openjdk/bin/java -version
-```
+### For jailbroken iOS device
+- Jailbreak use Odyssey
+- Add Procursus repository (https://apt.procurs.us).
+- Find and install `java-16-openjdk`.
 
 ### For non-jailbroken devices
-- idk maybe unpack deb file?
+- It’s not possible...
 
 ## Credits & Third party components and their licenses
 - [OpenJDK 16](https://www.ios-repo-updates.com/repository/procursus/package/openjdk-16-jre): GNU GPLv2 license.