From 65f1de276f6ca95f2b5dc317cabd39ed4dde7f3a Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Fri, 24 Jul 2020 12:51:55 +0700 Subject: [PATCH] UI now scaled correctly; Fix compile errors on SDK 26; Ignore download LWJGL 3 --- .../com/kdt/handleview/ActionPopupWindow.java | 20 +++++++++++-------- .../java/com/kdt/handleview/HandleView.java | 20 +++++++++++-------- .../kdt/pojavlaunch/MCLauncherActivity.java | 2 +- .../net/kdt/pojavlaunch/MainActivity.java | 7 ++++++- .../main/res/drawable/bitmap_wool_dark.xml | 3 ++- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java b/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java index d4fbdaa3b..c5b4c224b 100644 --- a/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java +++ b/app/src/main/java/com/kdt/handleview/ActionPopupWindow.java @@ -41,16 +41,20 @@ public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListe } private static int getInternalId(String type, String name) { - for (Class perType : com.android.internal.R.class.getDeclaredClasses()) { - if (perType.getSimpleName().equals(type)) { - try { - Field f = perType.getDeclaredField(name); - f.setAccessible(true); - return f.get(null); - } catch (Throwable th) { - th.printStackTrace(); + try { + for (Class perType : Class.forName("com.android.internal.R").getDeclaredClasses()) { + if (perType.getSimpleName().equals(type)) { + try { + Field f = perType.getDeclaredField(name); + f.setAccessible(true); + return f.get(null); + } catch (Throwable th) { + th.printStackTrace(); + } } } + } catch (ClassNotFoundException e) { + e.printStackTrace(); } // If unable to find in com.android.internal.R, go find in android.R diff --git a/app/src/main/java/com/kdt/handleview/HandleView.java b/app/src/main/java/com/kdt/handleview/HandleView.java index ec46492db..76036de66 100644 --- a/app/src/main/java/com/kdt/handleview/HandleView.java +++ b/app/src/main/java/com/kdt/handleview/HandleView.java @@ -74,16 +74,20 @@ public abstract class HandleView extends View implements ViewPositionListener, V } private int getInternalId(String type, String name) { - for (Class perType : com.android.internal.R.class.getDeclaredClasses()) { - if (perType.getSimpleName().equals(type)) { - try { - Field f = perType.getDeclaredField(name); - f.setAccessible(true); - return f.get(null); - } catch (Throwable th) { - th.printStackTrace(); + try { + for (Class perType : Class.forName("com.android.internal.R").getDeclaredClasses()) { + if (perType.getSimpleName().equals(type)) { + try { + Field f = perType.getDeclaredField(name); + f.setAccessible(true); + return f.get(null); + } catch (Throwable th) { + th.printStackTrace(); + } } } + } catch (ClassNotFoundException e) { + e.printStackTrace(); } return -1; } diff --git a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java index 53bd24e57..479f151ed 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java @@ -533,7 +533,7 @@ public class MCLauncherActivity extends AppCompatActivity libItem.name.startsWith("com.mojang:realms") || libItem.name.startsWith("net.java.jinput") || libItem.name.startsWith("net.minecraft.launchwrapper") || - libItem.name.startsWith("org.lwjgl.lwjgl:lwjgl") || + libItem.name.startsWith("org.lwjgl") || libItem.name.startsWith("tv.twitch") ) { // Black list publishProgress("1", "Ignored " + libItem.name); diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index a64f8d90d..c347a4715 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -52,6 +52,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, private int fingerStillThreshold = 8; private int initialX; private int initialY; + private boolean mIsResuming = false; private static final int MSG_LEFT_MOUSE_BUTTON_CHECK = 1028; private static final int MSG_DROP_ITEM_BUTTON_CHECK = 1029; private static boolean triggeredLeftMouseButton = false; @@ -614,7 +615,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, glSurfaceView.setOnHoverListener(new View.OnHoverListener(){ @Override public boolean onHover(View p1, MotionEvent p2) { - if (!AndroidDisplay.grab && isResumed()) { + if (!AndroidDisplay.grab && mIsResuming) { return glTouchListener.onTouch(p1, p2); } return true; @@ -724,6 +725,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, @Override public void onResume() { super.onResume(); + mIsResuming = true; glSurfaceView.requestRender(); } @@ -743,6 +745,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, if (AndroidDisplay.grab){ sendKeyPress(Keyboard.KEY_ESCAPE); } + mIsResuming = false; super.onPause(); } @@ -1070,10 +1073,12 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, private void openLogOutput() { contentLog.setVisibility(View.VISIBLE); + mIsResuming = false; } public void closeLogOutput(View view) { contentLog.setVisibility(View.GONE); + mIsResuming = true; } /* private void openCanvasOutput() { diff --git a/app/src/main/res/drawable/bitmap_wool_dark.xml b/app/src/main/res/drawable/bitmap_wool_dark.xml index d9063f00b..6c966c626 100644 --- a/app/src/main/res/drawable/bitmap_wool_dark.xml +++ b/app/src/main/res/drawable/bitmap_wool_dark.xml @@ -2,4 +2,5 @@ + android:gravity="top" + android:tileMode="repeat"/>