Merge zink

app_pojavlauncher/build.gradle

@@ -187,6 +187,7 @@ dependencies {
     implementation 'com.github.PojavLauncherTeam:portrait-ssp:6c02fd739b'
     implementation 'com.github.Mathias-Boulay:ExtendedView:1.0.0'
     implementation 'com.github.Mathias-Boulay:android_gamepad_remapper:eb92e3a5bb'
+    implementation 'com.github.Mathias-Boulay:virtual-joystick-android:cb7bf45ba5'
 
 
     // implementation 'com.intuit.sdp:sdp-android:1.0.5'

app_pojavlauncher/src/main/assets/components/lwjgl3/version

@@ -1 +1 @@
-1689180036097
+1687078018167

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

@@ -12,6 +12,7 @@
 
 import net.kdt.pojavlaunch.customcontrols.ControlData;
 import net.kdt.pojavlaunch.customcontrols.ControlDrawerData;
+import net.kdt.pojavlaunch.customcontrols.ControlJoystickData;
 import net.kdt.pojavlaunch.customcontrols.ControlLayout;
 import net.kdt.pojavlaunch.customcontrols.EditorExitable;
 import net.kdt.pojavlaunch.prefs.LauncherPreferences;
@@ -43,11 +44,11 @@ protected void onCreate(Bundle savedInstanceState) {
 			switch(position) {
 				case 0: mControlLayout.addControlButton(new ControlData("New")); break;
 				case 1: mControlLayout.addDrawer(new ControlDrawerData()); break;
-				//case 2: mControlLayout.addJoystickButton(new ControlData()); break;
-				case 2: mControlLayout.openLoadDialog(); break;
-				case 3: mControlLayout.openSaveDialog(this); break;
-				case 4: mControlLayout.openSetDefaultDialog(); break;
-				case 5: // Saving the currently shown control
+				case 2: mControlLayout.addJoystickButton(new ControlJoystickData()); break;
+				case 3: mControlLayout.openLoadDialog(); break;
+				case 4: mControlLayout.openSaveDialog(this); break;
+				case 5: mControlLayout.openSetDefaultDialog(); break;
+				case 6: // Saving the currently shown control
 					try {
 						Uri contentUri = DocumentsContract.buildDocumentUri(getString(R.string.storageProviderAuthorities), mControlLayout.saveToDirectory(mControlLayout.mLayoutFileName));
 

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

@@ -39,6 +39,7 @@ public static class Version extends FileProperties {
     public static class JavaVersionInfo {
         public String component;
         public int majorVersion;
+        public int version; // parameter used by LabyMod 4
     }
     @Keep
     public static class LoggingConfig {

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

@@ -446,9 +446,11 @@ public boolean dispatchCapturedPointerEvent(MotionEvent e) {
         CallbackBridge.mouseX += (e.getX()* mScaleFactor);
         CallbackBridge.mouseY += (e.getY()* mScaleFactor);
 
+        // Position is updated by many events, hence it is send regardless of the event value
+        CallbackBridge.sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
+
         switch (e.getActionMasked()) {
             case MotionEvent.ACTION_MOVE:
-                CallbackBridge.sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
                 return true;
             case MotionEvent.ACTION_BUTTON_PRESS:
                 return sendMouseButtonUnconverted(e.getActionButton(), true);

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

@@ -618,6 +618,34 @@ private static boolean checkRules(JMinecraftVersionList.Arguments.ArgValue.ArgRu
         }
         return true; // allow if none match
     }
+
+    private static void preProcessLibraries(DependentLibrary[] libraries) {
+        for (int i = 0; i < libraries.length; i++) {
+            DependentLibrary libItem = libraries[i];
+            String[] version = libItem.name.split(":")[2].split("\\.");
+            if (libItem.name.startsWith("net.java.dev.jna:jna:")) {
+                // Special handling for LabyMod 1.8.9, Forge 1.12.2(?) and oshi
+                // we have libjnidispatch 5.13.0 in jniLibs directory
+                if (Integer.parseInt(version[0]) >= 5 && Integer.parseInt(version[1]) >= 13) return;
+                Log.d(APP_NAME, "Library " + libItem.name + " has been changed to version 5.13.0");
+                libItem.name = "net.java.dev.jna:jna:5.13.0";
+                libItem.downloads.artifact.path = "net/java/dev/jna/jna/5.13.0/jna-5.13.0.jar";
+                libItem.downloads.artifact.sha1 = "1200e7ebeedbe0d10062093f32925a912020e747";
+                libItem.downloads.artifact.url = "https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.13.0/jna-5.13.0.jar";
+            } else if (libItem.name.startsWith("com.github.oshi:oshi-core:")) {
+                //if (Integer.parseInt(version[0]) >= 6 && Integer.parseInt(version[1]) >= 3) return;
+                // FIXME: ensure compatibility
+
+                if (Integer.parseInt(version[0]) != 6 || Integer.parseInt(version[1]) != 2) return;
+                Log.d(APP_NAME, "Library " + libItem.name + " has been changed to version 6.3.0");
+                libItem.name = "com.github.oshi:oshi-core:6.3.0";
+                libItem.downloads.artifact.path = "com/github/oshi/oshi-core/6.3.0/oshi-core-6.3.0.jar";
+                libItem.downloads.artifact.sha1 = "9e98cf55be371cafdb9c70c35d04ec2a8c2b42ac";
+                libItem.downloads.artifact.url = "https://repo1.maven.org/maven2/com/github/oshi/oshi-core/6.3.0/oshi-core-6.3.0.jar";
+            }
+        }
+    }
+
     public static String[] generateLibClasspath(JMinecraftVersionList.Version info) {
         List<String> libDir = new ArrayList<>();
         for (DependentLibrary libItem: info.libraries) {
@@ -636,7 +664,7 @@ public static JMinecraftVersionList.Version getVersionInfo(String versionName, b
         try {
             JMinecraftVersionList.Version customVer = Tools.GLOBAL_GSON.fromJson(read(DIR_HOME_VERSION + "/" + versionName + "/" + versionName + ".json"), JMinecraftVersionList.Version.class);
             if (skipInheriting || customVer.inheritsFrom == null || customVer.inheritsFrom.equals(customVer.id)) {
-                return customVer;
+                preProcessLibraries(customVer.libraries);
             } else {
                 JMinecraftVersionList.Version inheritsVer;
                 //If it won't download, just search for it
@@ -674,6 +702,7 @@ public static JMinecraftVersionList.Version getVersionInfo(String versionName, b
                     }
                 } finally {
                     inheritsVer.libraries = libList.toArray(new DependentLibrary[0]);
+                    preProcessLibraries(inheritsVer.libraries);
                 }
 
                 // Inheriting Minecraft 1.13+ with append custom args
@@ -711,8 +740,14 @@ public static JMinecraftVersionList.Version getVersionInfo(String versionName, b
                     inheritsVer.arguments.game = totalArgList.toArray(new Object[0]);
                 }
 
-                return inheritsVer;
+                customVer = inheritsVer;
+            }
+
+            // LabyMod 4 sets version instead of majorVersion
+            if (customVer.javaVersion.majorVersion == 0) {
+                customVer.javaVersion.majorVersion = customVer.javaVersion.version;
             }
+            return customVer;
         } catch (Exception e) {
             throw new RuntimeException(e);
         }