Remove Unity (Including Wrapper Submodule)

Still needs to have some things removed from the JNI bridge (i.e, callback to restart env if crash/close)
QuestCraftPlusPlus · Dec 8, 2024 · 65f6732 · 65f6732
1 parent 3ea2c22
commit 65f6732
Show file tree

Hide file tree

Showing 28 changed files with 432 additions and 248 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "wrapper"]
-	path = wrapper
-	url = https://github.com/QuestCraftPlusPlus/Wrapper-IL2CPP.git

diff --git a/build.gradle b/build.gradle
@@ -28,6 +28,13 @@ android {
     }
 
     buildToolsVersion = "30.0.3"
+    buildFeatures {
+        viewBinding true
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
 }
 
 build {
@@ -52,5 +59,9 @@ dependencies {
     implementation("androidx.core:core:1.13.1")
     implementation("com.microsoft.azure:msal4j:1.14.0")
     implementation("com.github.Mathias-Boulay:android_gamepad_remapper:2.0.3")
-    implementation("blank:unity-classes")
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.navigation:navigation-fragment:2.8.4'
+    implementation 'androidx.navigation:navigation-ui:2.8.4'
 }
diff --git a/libs/unity-classes.jar b/libs/unity-classes.jar
diff --git a/settings.gradle b/settings.gradle
@@ -22,13 +22,9 @@ dependencyResolutionManagement {
         maven {
             url = uri("https://jitpack.io")
         }
-        flatDir {
-            dirs("libs")
-            dirs("wrapper/unityLibrary/libs")
-        }
     }
 }
 
 rootProject.name = "Pojlib"
-include ":jre_lwjgl3glfw", ':wrapper', ':wrapper:launcher', "wrapper:unityLibrary", "wrapper:unityLibrary:xrmanifest.androidlib"
+include ":jre_lwjgl3glfw"
 
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -1,5 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="pojlib.android">
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <application android:allowNativeHeapPointerTagging="false"/>
+
+    <application android:allowNativeHeapPointerTagging="false">
+        <activity
+            android:name="pojlib.MainActivity"
+            android:exported="false"
+            android:theme="@style/Theme.Pojlib" />
+    </application>
+
 </manifest>
diff --git a/src/main/assets/lwjgl/version b/src/main/assets/lwjgl/version
@@ -1 +1 @@
-1729544610054
+1733683669279
diff --git a/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/src/main/java/org/lwjgl/glfw/CallbackBridge.java
@@ -9,7 +9,7 @@
 import java.util.ArrayList;
 
 import dalvik.annotation.optimization.CriticalNative;
-import pojlib.UnityPlayerActivity;
+import pojlib.MainActivity;
 import pojlib.input.GrabListener;
 import pojlib.input.LwjglGlfwKeycode;
 
@@ -108,12 +108,12 @@ public static boolean isGrabbing() {
     public static @Nullable String accessAndroidClipboard(int type, String copy) {
         switch (type) {
             case CLIPBOARD_COPY:
-                UnityPlayerActivity.GLOBAL_CLIPBOARD.setPrimaryClip(ClipData.newPlainText("Copy", copy));
+                MainActivity.GLOBAL_CLIPBOARD.setPrimaryClip(ClipData.newPlainText("Copy", copy));
                 return null;
 
             case CLIPBOARD_PASTE:
-                if (UnityPlayerActivity.GLOBAL_CLIPBOARD.hasPrimaryClip() && UnityPlayerActivity.GLOBAL_CLIPBOARD.getPrimaryClipDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
-                    return UnityPlayerActivity.GLOBAL_CLIPBOARD.getPrimaryClip().getItemAt(0).getText().toString();
+                if (MainActivity.GLOBAL_CLIPBOARD.hasPrimaryClip() && MainActivity.GLOBAL_CLIPBOARD.getPrimaryClipDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
+                    return MainActivity.GLOBAL_CLIPBOARD.getPrimaryClip().getItemAt(0).getText().toString();
                 } else {
                     return "";
                 }
@@ -179,8 +179,8 @@ private static void onGrabStateChanged(final boolean grabbing) {
     }
 
     public static void restartUnitySession(Activity activity) {
-        UnityPlayerActivity unity = (UnityPlayerActivity) activity;
-        unity.reinitUnity();
+//        Main unity = (UnityPlayerActivity) activity;
+//        unity.reinitUnity();
     }
 
     public static void addGrabListener(GrabListener listener) {

diff --git a/src/main/java/pojlib/API.java b/src/main/java/pojlib/API.java
@@ -164,7 +164,7 @@ public static void updateMods(MinecraftInstances instances, MinecraftInstances.I
      */
     public static void launchInstance(Activity activity, MinecraftAccount account, MinecraftInstances.Instance instance) {
         try {
-            UnityPlayerActivity.installLWJGL(activity);
+            MainActivity.installLWJGL(activity);
         } catch (IOException e) {
             Logger.getInstance().appendToLog("WARN! LWJGL install failed, " + e);
         }

diff --git a/src/main/java/pojlib/InstanceHandler.java b/src/main/java/pojlib/InstanceHandler.java
@@ -172,7 +172,7 @@ public static MinecraftInstances.Instance create(Activity activity, MinecraftIns
                 String clientClasspath = Installer.installClient(minecraftVersionInfo, gameDir);
                 String minecraftClasspath = Installer.installLibraries(minecraftVersionInfo, gameDir);
                 String modLoaderClasspath = Installer.installLibraries(finalModLoaderVersionInfo, gameDir);
-                String lwjgl = UnityPlayerActivity.installLWJGL(activity);
+                String lwjgl = MainActivity.installLWJGL(activity);
 
                 instance.classpath = clientClasspath + File.pathSeparator + minecraftClasspath + File.pathSeparator + modLoaderClasspath + File.pathSeparator + lwjgl;