Beta 1.0 Release

2009scape · Aug 2, 2023 · d37941e · d37941e
1 parent 920bcb7
commit d37941e
Show file tree

Hide file tree

Showing 62 changed files with 232 additions and 1,317 deletions.
diff --git a/app_pojavlauncher/src/main/AndroidManifest.xml b/app_pojavlauncher/src/main/AndroidManifest.xml
@@ -50,7 +50,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".DummyLauncher"
+            android:name=".ScapeLauncher"
             android:screenOrientation="sensorLandscape"
             android:label="@string/app_short_name" />
         <activity
@@ -66,7 +66,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|keyboard|navigation|uiMode"
             android:screenOrientation="sensorLandscape" />
         <activity
-            android:name=".CustomControlsActivity"
+            android:name=".customcontrols.CustomControlsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize|keyboard|navigation"
             android:exported="false"
             android:screenOrientation="sensorLandscape">

diff --git a/app_pojavlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar b/app_pojavlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar
diff --git a/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version b/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version
diff --git a/app_pojavlauncher/src/main/assets/components/forge_installer/forge_installer.jar b/app_pojavlauncher/src/main/assets/components/forge_installer/forge_installer.jar
diff --git a/app_pojavlauncher/src/main/assets/components/forge_installer/version b/app_pojavlauncher/src/main/assets/components/forge_installer/version
diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/version
@@ -1 +1 @@
-1690859739558
+1690945073108
diff --git a/app_pojavlauncher/src/main/assets/default.json b/app_pojavlauncher/src/main/assets/default.json
@@ -1 +1,145 @@
-{"mControlDataList":[{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin} * 3 + ${width} * 2","dynamicY":"${margin}","height":30,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[-1,0,0,0],"name":"Keyboard","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":80},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin}","dynamicY":"${bottom} - ${margin}","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[-2,0,0,0],"name":"GUI","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin}","dynamicY":"${screen_height} - ${margin} * 3 - ${height} * 3","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[-3,0,0,0],"name":"PRI","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin} * 3 + ${width} * 2","dynamicY":"${screen_height} - ${margin} * 3 - ${height} * 3","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[-4,0,0,0],"name":"SEC","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${right}","dynamicY":"${margin}","height":30,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[-5,0,0,0],"name":"Mouse","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":80},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin}","dynamicY":"${margin}","height":30,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[292,0,0,0],"name":"Debug","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":80},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin} * 2 + ${width}","dynamicY":"${margin}","height":30,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[84,0,0,0],"name":"Chat","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":80},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin} * 4 + ${width} * 3","dynamicY":"${margin}","height":30,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[258,0,0,0],"name":"Tab","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":80},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin}","dynamicY":"${height} + ${margin}","height":30,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[294,0,0,0],"name":"3rd","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":80},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin} * 2 + ${width}","dynamicY":"${bottom} - ${margin} * 3 - ${height} * 2","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[87,0,0,0],"name":"▲","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin}","dynamicY":"${bottom} - ${margin} * 2 - ${height}","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[65,0,0,0],"name":"◀","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin} * 2 + ${width}","dynamicY":"${bottom} - ${margin}","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[83,0,0,0],"name":"▼","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin} * 3 + ${width} * 2","dynamicY":"${bottom} - ${margin} * 2 - ${height}","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[68,0,0,0],"name":"▶","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin} * 3 + ${width} * 2","dynamicY":"${bottom} - ${margin}","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[69,0,0,0],"name":"Inv","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${margin} * 2 + ${width}","dynamicY":"${screen_height} - ${margin} * 2 - ${height} * 2","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":true,"keycodes":[340,0,0,0],"name":"◇","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50},{"bgColor":1291845632,"cornerRadius":0,"dynamicX":"${right} - ${margin} * 2 - ${width}","dynamicY":"${bottom} - ${margin} * 2 - ${height}","height":50,"isDynamicBtn":false,"isHideable":false,"isSwipeable":false,"isToggle":false,"keycodes":[32,0,0,0],"name":"⬛","opacity":1,"passThruEnabled":false,"strokeColor":-1,"strokeWidth":0,"width":50}],"mDrawerDataList":[],"scaledAt":100,"version":4}
+{
+  "mControlDataList": [
+    {
+      "bgColor": 1291845632,
+      "cornerRadius": 0.0,
+      "dynamicX": "0.36371607 * ${screen_width} - (px(68.57143) / 100.0 * ${preferred_scale}) - ${margin} - (px(79.61905) / 100.0 * ${preferred_scale}) - ${margin} - ${width} - ${margin}",
+      "dynamicY": "0.0037037036 * ${screen_height}",
+      "height": 29.714285,
+      "isDynamicBtn": false,
+      "isHideable": true,
+      "isSwipeable": false,
+      "isToggle": false,
+      "keycodes": [
+        -1,
+        0,
+        0,
+        0
+      ],
+      "name": "Keyboard",
+      "opacity": 1.0,
+      "passThruEnabled": false,
+      "strokeColor": -1,
+      "strokeWidth": 0,
+      "width": 79.2381
+    },
+    {
+      "bgColor": 1291845632,
+      "cornerRadius": 0.0,
+      "dynamicX": "0.097283095 * ${screen_width} + (px(49.904762) / 100.0 * ${preferred_scale}) + ${margin} - ${width} - ${margin}",
+      "dynamicY": "0.0037037036 * ${screen_height} + (px(29.714285) /100.0 * ${preferred_scale}) + ${margin}",
+      "height": 49.904762,
+      "isDynamicBtn": false,
+      "isHideable": true,
+      "isSwipeable": false,
+      "isToggle": false,
+      "keycodes": [
+        -3,
+        0,
+        0,
+        0
+      ],
+      "name": "PRI",
+      "opacity": 1.0,
+      "passThruEnabled": false,
+      "strokeColor": -1,
+      "strokeWidth": 0,
+      "width": 49.904762
+    },
+    {
+      "bgColor": 1291845632,
+      "cornerRadius": 0.0,
+      "dynamicX": "0.097283095 * ${screen_width} + (px(49.904762) / 100.0 * ${preferred_scale}) + ${margin}",
+      "dynamicY": "0.0037037036 * ${screen_height} + (px(29.714285) /100.0 * ${preferred_scale}) + ${margin}",
+      "height": 49.904762,
+      "isDynamicBtn": false,
+      "isHideable": true,
+      "isSwipeable": false,
+      "isToggle": false,
+      "keycodes": [
+        -4,
+        0,
+        0,
+        0
+      ],
+      "name": "SEC",
+      "opacity": 1.0,
+      "passThruEnabled": false,
+      "strokeColor": -1,
+      "strokeWidth": 0,
+      "width": 49.904762
+    },
+    {
+      "bgColor": 1291845632,
+      "cornerRadius": 0.0,
+      "dynamicX": "0.36371607 * ${screen_width} - (px(68.57143) / 100.0 * ${preferred_scale}) - ${margin} - ${width} - ${margin}",
+      "dynamicY": "0.0037037036 * ${screen_height}",
+      "height": 29.714285,
+      "isDynamicBtn": false,
+      "isHideable": false,
+      "isSwipeable": false,
+      "isToggle": false,
+      "keycodes": [
+        -5,
+        0,
+        0,
+        0
+      ],
+      "name": "Mouse",
+      "opacity": 1.0,
+      "passThruEnabled": false,
+      "strokeColor": -1,
+      "strokeWidth": 0,
+      "width": 79.61905
+    },
+    {
+      "bgColor": 1291845632,
+      "cornerRadius": 0.0,
+      "dynamicX": "0.36371607 * ${screen_width}",
+      "dynamicY": "0.0037037036 * ${screen_height}",
+      "height": 29.714285,
+      "isDynamicBtn": false,
+      "isHideable": true,
+      "isSwipeable": false,
+      "isToggle": false,
+      "keycodes": [
+        258,
+        0,
+        0,
+        0
+      ],
+      "name": "Tab",
+      "opacity": 1.0,
+      "passThruEnabled": false,
+      "strokeColor": -1,
+      "strokeWidth": 0,
+      "width": 68.57143
+    },
+    {
+      "bgColor": 1291845632,
+      "cornerRadius": 0.0,
+      "dynamicX": "0.36371607 * ${screen_width} - ${width} - ${margin}",
+      "dynamicY": "0.0037037036 * ${screen_height}",
+      "height": 29.714285,
+      "isDynamicBtn": false,
+      "isHideable": true,
+      "isSwipeable": false,
+      "isToggle": true,
+      "keycodes": [
+        340,
+        0,
+        0,
+        0
+      ],
+      "name": "SHIFT",
+      "opacity": 1.0,
+      "passThruEnabled": false,
+      "strokeColor": -1,
+      "strokeWidth": 0,
+      "width": 68.57143
+    }
+  ],
+  "mDrawerDataList": [],
+  "scaledAt": 100.0,
+  "version": 4
+}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AWTCanvasView.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AWTCanvasView.java
@@ -7,6 +7,8 @@
 import android.view.*;
 
 import java.util.*;
+
+import net.kdt.pojavlaunch.Tools;
 import net.kdt.pojavlaunch.utils.*;
 
 public class AWTCanvasView extends TextureView implements TextureView.SurfaceTextureListener, Runnable {

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java
@@ -24,7 +24,7 @@ protected void onCreate(Bundle savedInstanceState) {
 			.setTitle(R.string.error_fatal)
 			.setMessage(errHeader + "\n\n" + stackTrace)
 			.setPositiveButton(android.R.string.ok, (p1, p2) -> finish())
-			.setNegativeButton(R.string.global_restart, (p1, p2) -> startActivity(new Intent(FatalErrorActivity.this, DummyLauncher.class)))
+			.setNegativeButton(R.string.global_restart, (p1, p2) -> startActivity(new Intent(FatalErrorActivity.this, ScapeLauncher.class)))
 			.setNeutralButton(android.R.string.copy, (p1, p2) -> {
 				ClipboardManager mgr = (ClipboardManager) FatalErrorActivity.this.getSystemService(CLIPBOARD_SERVICE);
 				mgr.setPrimaryClip(ClipData.newPlainText("error", stackTrace));

diff --git a/...t/kdt/pojavlaunch/MinecraftGLSurface.java → ...va/net/kdt/pojavlaunch/GLFWGLSurface.java b/...t/kdt/pojavlaunch/MinecraftGLSurface.java → ...va/net/kdt/pojavlaunch/GLFWGLSurface.java
@@ -1,6 +1,5 @@
 package net.kdt.pojavlaunch;
 
-import static net.kdt.pojavlaunch.MainActivity.touchCharInput;
 import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_DISABLE_SWAP_HAND;
 import static net.kdt.pojavlaunch.utils.MCOptionUtils.getMcScale;
 import static org.lwjgl.glfw.CallbackBridge.sendKeyPress;
@@ -36,7 +35,9 @@
 import net.kdt.pojavlaunch.customcontrols.ControlLayout;
 import net.kdt.pojavlaunch.customcontrols.gamepad.Gamepad;
 import net.kdt.pojavlaunch.prefs.LauncherPreferences;
+import net.kdt.pojavlaunch.utils.EfficientAndroidLWJGLKeycode;
 import net.kdt.pojavlaunch.utils.JREUtils;
+import net.kdt.pojavlaunch.utils.LwjglGlfwKeycode;
 import net.kdt.pojavlaunch.utils.MCOptionUtils;
 import net.kdt.pojavlaunch.utils.MathUtils;
 
@@ -48,7 +49,7 @@
 /**
  * Class dealing with showing minecraft surface and taking inputs to dispatch them to minecraft
  */
-public class MinecraftGLSurface extends View implements GrabListener {
+public class GLFWGLSurface extends View implements GrabListener {
     /* Gamepad object for gamepad inputs, instantiated on need */
     private Gamepad mGamepad = null;
 
@@ -141,11 +142,11 @@ public void handleMessage(Message msg) {
 
 
 
-    public MinecraftGLSurface(Context context) {
+    public GLFWGLSurface(Context context) {
         this(context, null);
     }
 
-    public MinecraftGLSurface(Context context, AttributeSet attributeSet) {
+    public GLFWGLSurface(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         setFocusable(true);
 
@@ -225,7 +226,7 @@ public void onLongPress(MotionEvent e) {
                     super.onLongPress(e);
                     if(!isDragClicking) {
                         isDragClicking = true;
-                        AWTInputBridge.sendKey((char)AWTInputEvent.VK_F5, AWTInputEvent.VK_F5);
+                        AWTInputBridge.sendKey((char) AWTInputEvent.VK_F5, AWTInputEvent.VK_F5);
                     }
                 }
 

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java