diff --git a/app/build.gradle b/app/build.gradle index c032703d8..7c6231414 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,6 +28,7 @@ android { } dependencies { + compile 'javax.annotation:javax.annotation-api:1.3.2' compile 'commons-codec:commons-codec:1.14' compile 'com.wu-man:android-bsf-api:3.1.3' compile 'com.android.support:support-v4:24.0.0' diff --git a/app/build/bin/classes.dex b/app/build/bin/classes.dex index ae5eb6b43..009e7589b 100644 Binary files a/app/build/bin/classes.dex and b/app/build/bin/classes.dex differ diff --git a/app/build/bin/jardex/asm-tree-5.0.3.jar.dex b/app/build/bin/jardex/asm-tree-5.0.3.jar.dex index e54346f77..0a0e4bc1d 100644 Binary files a/app/build/bin/jardex/asm-tree-5.0.3.jar.dex and b/app/build/bin/jardex/asm-tree-5.0.3.jar.dex differ diff --git a/app/build/bin/jardex/boardwalk_lwjgl.jar.dex b/app/build/bin/jardex/boardwalk_lwjgl.jar.dex index d428ceac4..ecca1b979 100644 Binary files a/app/build/bin/jardex/boardwalk_lwjgl.jar.dex and b/app/build/bin/jardex/boardwalk_lwjgl.jar.dex differ diff --git a/app/build/bin/jardex/boardwalk_lzma.jar.dex b/app/build/bin/jardex/boardwalk_lzma.jar.dex index 9515bd5b1..c3635a4f1 100644 Binary files a/app/build/bin/jardex/boardwalk_lzma.jar.dex and b/app/build/bin/jardex/boardwalk_lzma.jar.dex differ diff --git a/app/build/bin/jardex/jopt-simple-5.0.4.jar.dex b/app/build/bin/jardex/jopt-simple-5.0.4.jar.dex index c1f197af7..8ce8064fa 100644 Binary files a/app/build/bin/jardex/jopt-simple-5.0.4.jar.dex and b/app/build/bin/jardex/jopt-simple-5.0.4.jar.dex differ diff --git a/app/build/bin/resources.ap_ b/app/build/bin/resources.ap_ index 2bea03bdf..face96cbb 100644 Binary files a/app/build/bin/resources.ap_ and b/app/build/bin/resources.ap_ differ diff --git a/app/src/main/assets/launcher_profiles.json b/app/src/main/assets/launcher_profiles.json index e69de29bb..82c2d1761 100644 --- a/app/src/main/assets/launcher_profiles.json +++ b/app/src/main/assets/launcher_profiles.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "(Default)": { + "name": "(Default)", + "lastVersionId": "Unknown" + } + }, + "selectedProfile": "(Default)" +} diff --git a/app/src/main/java/net/kdt/pojavlaunch/CancelException.java b/app/src/main/java/net/kdt/pojavlaunch/CancelException.java index 58b9cf995..4a5da1546 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/CancelException.java +++ b/app/src/main/java/net/kdt/pojavlaunch/CancelException.java @@ -5,6 +5,7 @@ public class CancelException extends RuntimeException @Override public CancelException() { super(); + // org.lwjgl.c } @Override diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 9f7bda338..083f556d0 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -388,6 +388,7 @@ public class MainActivity extends Activity implements OnTouchListener, OnClickLi } }); + // System.loadLibrary("gl04es"); System.loadLibrary("gl04es"); Bitmap awtGraphics = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888); diff --git a/app/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java b/app/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java index a305612de..63e35e2c3 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java +++ b/app/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java @@ -16,14 +16,14 @@ public class LauncherProfiles } else { mainProfileJson = new MinecraftLauncherProfiles(); } - insertMissing(); + // insertMissing(); return mainProfileJson; } catch (Throwable th) { throw new RuntimeException(th); } } - - public static String insert + /* + public static String insert; private static void insertMissing() { if (mainProfileJson.authenticationDatabase == null) { @@ -31,4 +31,5 @@ public class LauncherProfiles mainProfileJson.authenticationDatabase = mad; } } + */ } diff --git a/app/src/main/java/org/lwjgl/system/CheckIntrinsics.java b/app/src/main/java/org/lwjgl/system/CheckIntrinsics.java new file mode 100644 index 000000000..7ea7e01f6 --- /dev/null +++ b/app/src/main/java/org/lwjgl/system/CheckIntrinsics.java @@ -0,0 +1,38 @@ +/* + * Copyright LWJGL. All rights reserved. + * License terms: https://www.lwjgl.org/license + */ +package org.lwjgl.system; + +/** + * Simple index checks. + * + *
On Java 9 these checks are replaced with the corresponding {@link java.util.Objects} methods, which perform better.
+ */ +public final class CheckIntrinsics { + + private CheckIntrinsics() { + } + + public static int checkIndex(int index, int length) { + if (index < 0 || length <= index) { + throw new IndexOutOfBoundsException(); + } + return index; + } + + public static int checkFromToIndex(int fromIndex, int toIndex, int length) { + if (fromIndex < 0 || toIndex < fromIndex || length < toIndex) { + throw new IndexOutOfBoundsException(); + } + return fromIndex; + } + + public static int checkFromIndexSize(int fromIndex, int size, int length) { + if ((length | fromIndex | size) < 0 || length - fromIndex < size) { + throw new IndexOutOfBoundsException(); + } + return fromIndex; + } + +}