From 3187fe5cdc6a6667a5efd9d3899c9161270ef5b0 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <40482367+khanhduytran0@users.noreply.github.com>
Date: Sun, 20 Dec 2020 10:24:36 +0700
Subject: [PATCH 1/2] Bug fixes - Pointer capture not working (partial fixes
#513). - Game brighter than normal.
---
...agearApacheCommons_jar_unspecified_jar.xml | 9 ++
...erCapture26Wrapper_jar_unspecified_jar.xml | 9 ++
...er_libs_gson_2_8_6_jar_unspecified_jar.xml | 9 ++
...droidx_annotation_annotation_1_0_0_jar.xml | 13 ++
...androidx_appcompat_appcompat_1_0_0_aar.xml | 15 +++
...droidx_arch_core_core_common_2_0_0_jar.xml | 11 ++
...roidx_arch_core_core_runtime_2_0_0_aar.xml | 12 ++
...inflater_asynclayoutinflater_1_0_0_aar.xml | 12 ++
...le__androidx_browser_browser_1_0_0_aar.xml | 15 +++
...__androidx_cardview_cardview_1_0_0_aar.xml | 12 ++
...droidx_collection_collection_1_0_0_jar.xml | 11 ++
...atorlayout_coordinatorlayout_1_0_0_aar.xml | 15 +++
.../Gradle__androidx_core_core_1_0_0_aar.xml | 15 +++
..._cursoradapter_cursoradapter_1_0_0_aar.xml | 12 ++
...droidx_customview_customview_1_0_0_aar.xml | 12 ++
...dx_documentfile_documentfile_1_0_0_aar.xml | 12 ++
...dx_drawerlayout_drawerlayout_1_0_0_aar.xml | 15 +++
...__androidx_fragment_fragment_1_0_0_aar.xml | 15 +++
...dx_interpolator_interpolator_1_0_0_aar.xml | 12 ++
...legacy_legacy_preference_v14_1_0_0_aar.xml | 12 ++
...egacy_legacy_support_core_ui_1_0_0_aar.xml | 12 ++
...cy_legacy_support_core_utils_1_0_0_aar.xml | 12 ++
...idx_legacy_legacy_support_v4_1_0_0_aar.xml | 12 ++
...x_lifecycle_lifecycle_common_2_0_0_jar.xml | 11 ++
...lifecycle_lifecycle_livedata_2_0_0_aar.xml | 12 ++
...ycle_lifecycle_livedata_core_2_0_0_aar.xml | 12 ++
..._lifecycle_lifecycle_runtime_2_0_0_aar.xml | 12 ++
...ifecycle_lifecycle_viewmodel_2_0_0_aar.xml | 12 ++
...adle__androidx_loader_loader_1_0_0_aar.xml | 12 ++
...anager_localbroadcastmanager_1_0_0_aar.xml | 12 ++
...Gradle__androidx_media_media_1_0_0_aar.xml | 15 +++
...droidx_preference_preference_1_0_0_aar.xml | 12 ++
...Gradle__androidx_print_print_1_0_0_aar.xml | 15 +++
...dx_recyclerview_recyclerview_1_0_0_aar.xml | 15 +++
...panelayout_slidingpanelayout_1_0_0_aar.xml | 12 ++
...eshlayout_swiperefreshlayout_1_0_0_aar.xml | 15 +++
...droidx_transition_transition_1_0_0_aar.xml | 15 +++
...ectordrawable_vectordrawable_1_0_0_aar.xml | 12 ++
...able_vectordrawable_animated_1_0_0_aar.xml | 12 ++
...rcelable_versionedparcelable_1_0_0_aar.xml | 12 ++
...androidx_viewpager_viewpager_1_0_0_aar.xml | 12 ++
...le_android_material_material_1_0_0_aar.xml | 13 ++
...__commons_codec_commons_codec_1_14_jar.xml | 13 ++
...otation_javax_annotation_api_1_3_2_jar.xml | 13 ++
...adle__net_objecthunter_exp4j_0_4_8_jar.xml | 13 ++
.../Gradle__org_tukaani_xz_1_8_jar.xml | 13 ++
app_pojavlauncher/app_pojavlauncher.iml | 111 ++++++++++--------
.../libs/PointerCapture26Wrapper.jar | Bin 2485 -> 0 bytes
.../net/kdt/pojavlaunch/BaseMainActivity.java | 47 ++++----
jre_securitymanager/jre_securitymanager.iml | 32 +++++
50 files changed, 695 insertions(+), 74 deletions(-)
create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_ExagearApacheCommons_jar_unspecified_jar.xml
create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_PointerCapture26Wrapper_jar_unspecified_jar.xml
create mode 100644 .idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_gson_2_8_6_jar_unspecified_jar.xml
create mode 100644 .idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml
create mode 100644 .idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml
create mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_browser_browser_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml
create mode 100644 .idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_core_core_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml
create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_preference_preference_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml
create mode 100644 .idea/libraries/Gradle__commons_codec_commons_codec_1_14_jar.xml
create mode 100644 .idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_3_2_jar.xml
create mode 100644 .idea/libraries/Gradle__net_objecthunter_exp4j_0_4_8_jar.xml
create mode 100644 .idea/libraries/Gradle__org_tukaani_xz_1_8_jar.xml
delete mode 100644 app_pojavlauncher/libs/PointerCapture26Wrapper.jar
create mode 100644 jre_securitymanager/jre_securitymanager.iml
diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_ExagearApacheCommons_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_ExagearApacheCommons_jar_unspecified_jar.xml
new file mode 100644
index 000000000..0e80bf8a4
--- /dev/null
+++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_ExagearApacheCommons_jar_unspecified_jar.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_PointerCapture26Wrapper_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_PointerCapture26Wrapper_jar_unspecified_jar.xml
new file mode 100644
index 000000000..948595e04
--- /dev/null
+++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_PointerCapture26Wrapper_jar_unspecified_jar.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_gson_2_8_6_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_gson_2_8_6_jar_unspecified_jar.xml
new file mode 100644
index 000000000..4045d5334
--- /dev/null
+++ b/.idea/libraries/Gradle____local_aars___C__Users_Admin_AndroidStudioProjects_PojavLauncher_app_pojavlauncher_libs_gson_2_8_6_jar_unspecified_jar.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml
new file mode 100644
index 000000000..374075171
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_aar.xml
new file mode 100644
index 000000000..64a7f08be
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml
new file mode 100644
index 000000000..83e1a45bf
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
new file mode 100644
index 000000000..0a3db8d40
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
new file mode 100644
index 000000000..a784c2327
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_browser_browser_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_browser_browser_1_0_0_aar.xml
new file mode 100644
index 000000000..a3284ee20
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_browser_browser_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
new file mode 100644
index 000000000..afb698eff
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml
new file mode 100644
index 000000000..2fee65b94
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
new file mode 100644
index 000000000..b98276bb3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_core_core_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_0_0_aar.xml
new file mode 100644
index 000000000..bce8a19dd
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_core_core_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
new file mode 100644
index 000000000..99bf6ae7f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
new file mode 100644
index 000000000..a60d9920c
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
new file mode 100644
index 000000000..8b5654a09
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
new file mode 100644
index 000000000..cd77561a1
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml
new file mode 100644
index 000000000..843849b53
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
new file mode 100644
index 000000000..e07bc26da
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_aar.xml
new file mode 100644
index 000000000..1ad44464a
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_preference_v14_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
new file mode 100644
index 000000000..da8ed2135
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
new file mode 100644
index 000000000..e69501c29
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
new file mode 100644
index 000000000..6ea49c303
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_v4_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml
new file mode 100644
index 000000000..f2e418b7a
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
new file mode 100644
index 000000000..09e3b63c0
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
new file mode 100644
index 000000000..6fc44214d
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml
new file mode 100644
index 000000000..1a81baace
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml
new file mode 100644
index 000000000..dff990642
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
new file mode 100644
index 000000000..ff332cbd2
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
new file mode 100644
index 000000000..e9c273033
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
new file mode 100644
index 000000000..a621f8333
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_media_media_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_preference_preference_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_preference_preference_1_0_0_aar.xml
new file mode 100644
index 000000000..0d3a3f3d3
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_preference_preference_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
new file mode 100644
index 000000000..95783fdf7
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
new file mode 100644
index 000000000..b12cb0eca
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
new file mode 100644
index 000000000..082c9234f
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
new file mode 100644
index 000000000..166e6a649
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml
new file mode 100644
index 000000000..5cd88cbed
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_transition_transition_1_0_0_aar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_aar.xml
new file mode 100644
index 000000000..9c041816a
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
new file mode 100644
index 000000000..c25f856e8
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml
new file mode 100644
index 000000000..600939820
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
new file mode 100644
index 000000000..844a6121c
--- /dev/null
+++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml
new file mode 100644
index 000000000..65ab91153
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_android_material_material_1_0_0_aar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__commons_codec_commons_codec_1_14_jar.xml b/.idea/libraries/Gradle__commons_codec_commons_codec_1_14_jar.xml
new file mode 100644
index 000000000..929eb8712
--- /dev/null
+++ b/.idea/libraries/Gradle__commons_codec_commons_codec_1_14_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_3_2_jar.xml b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_3_2_jar.xml
new file mode 100644
index 000000000..7c5147fcf
--- /dev/null
+++ b/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_3_2_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__net_objecthunter_exp4j_0_4_8_jar.xml b/.idea/libraries/Gradle__net_objecthunter_exp4j_0_4_8_jar.xml
new file mode 100644
index 000000000..fec4dec14
--- /dev/null
+++ b/.idea/libraries/Gradle__net_objecthunter_exp4j_0_4_8_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_tukaani_xz_1_8_jar.xml b/.idea/libraries/Gradle__org_tukaani_xz_1_8_jar.xml
new file mode 100644
index 000000000..09a42596a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_tukaani_xz_1_8_jar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app_pojavlauncher/app_pojavlauncher.iml b/app_pojavlauncher/app_pojavlauncher.iml
index 9f9c56085..c37fdf9c3 100644
--- a/app_pojavlauncher/app_pojavlauncher.iml
+++ b/app_pojavlauncher/app_pojavlauncher.iml
@@ -8,6 +8,11 @@
+
+
+
+
+
@@ -19,7 +24,7 @@
-
+
@@ -30,6 +35,8 @@
+
+
@@ -48,6 +55,7 @@
+
@@ -55,6 +63,7 @@
+
@@ -62,6 +71,7 @@
+
@@ -76,6 +86,7 @@
+
@@ -83,58 +94,60 @@
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/app_pojavlauncher/libs/PointerCapture26Wrapper.jar b/app_pojavlauncher/libs/PointerCapture26Wrapper.jar
deleted file mode 100644
index 5cbfc92c60df8224883fc00a798053328a5de8b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2485
zcmWIWW@Zs#W&na8!4Ux<8U|Q^jO6@W{Q#UQIG`%BQ%aCj{X{cI07+Frer8@tY7tyD
z2iVrkt)gEInHU&O1FbZ|rW&HlzbG|7yeP4tAhk%v&;Sbbl5-M^iJM%B!?c~WzpM5v;YW$OK{#hP9c0ZW^1Rk?~
zdrW_gNuk;9@@MaMrk|Tz{rvUz^YILC4yI*PC7!Q)n7v!xYpH9Bd~dF`(8J3e-+wD@
z`c^i1B4cvI&W;tC$Ic`%W~r#hb}xg
z)$jE3wzFp3E!kfYxmO?6+IF}Q*nv>)yrNejjg#^hPbgZi0$(7D^<_YiIsCLEJ
zwWXgl5)Ip#rg=2jP2K3q85vw)U8$3-+AXrq_({9XhNhO;4->k6)MuPd7R_$^$>yy2
zNBG!==u-VTYd`OP9hmX!L4n4UvaItG)9%D)nTQ0c)IK!O`PbU<>!glEn0m0$87||*
z8~^9~81Fb8F!P6X|Lh%G8+1cBzosnM@}{$|N7eLI?NX<+ljG(;pQrvP@TuRj%(?To
zpIPb4xIAa`@%2;fM5C%gUblB`*~%n$Tc!K2Y9lmkKI(HQ3
zE8bE2GvfpEHR-edE0%uz=Ib=wv%_K6vx^SKfq_cdC1-;Ip5EoKnKo7F`#FtP5nJvP
zliPGR-Cp^o9G0jd36Nv|6;%~R28Q22>_l7w^v`onEGQ{0N=*rXq)wmA;*!+7)FMcN
zYz_4FXEGG1-JHastt8)daq-6m;;Ym52>SShDPBx?wDygkPhqC{-KKwL{Qns0r)=zv
z`J-@Vq49g)_+M6^KmPp2_kbz(P-<4%Bg^7N242?NlD^DspLVu+s_VgT6)S#kDkwgE
zbJNTfmo}zFvkHFuuXS!&ks{~ExifE1Ss!w)#p`~G-O=XjQ@EG+=y6(iUaGO4?|b9k
zY0n*3{d}}OZ``8wK=r1Cr*`_A`w>F!uYJP>h55p))J>Y*Cwl)?X`8IMd|g+r)9F89
z0_XgNRvKrAsEKvOAGsmFcm9=LPJ1bxh~4*IDlh!pf2d!9;n2e@-Nebxjw|A`^Eb~w
zz3GXOl1s*qsf-~XlbwZIX1T|nZ_il#bf&=W7ZrL=N3RQ-ZFpY%rdn`YKz~*|Y8+%R
zN$6Ms3jsA&1_lkH;sBQQZ|7Zh5U`!CR{D6ybd@a&0~DqR6={|-?b*7jMQOqWr65fW
zj(cVwR}~fJY%b%fKfTG_Yr_vi0tH2Khz
zxcNQr8UC=0U-RC!In82MzCGqCr(57lQ(b$-u}U!O(Eo^W&jcR~gZ1e5P_RAe*WLGznxXsQM(;WXwty
z*<=qSlVMdZvJDK=g+GJbj!q-oj;&&b*`Uzyqp=K&4bXxRPc@C~23WYk+yLXFy8*Rq
zMs~w@U}*shKbSAExPd@PO^%yT%PM3yRkIM|CP>LeoXxCkz@TPe1HvUh|NaK^02*W9
A2><{9
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index bfdab191f..fe58914ea 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -11,7 +11,6 @@ import android.view.inputmethod.*;
import android.widget.*;
import androidx.drawerlayout.widget.*;
import com.google.android.material.navigation.*;
-import com.kdt.pointer.*;
import java.io.*;
import java.lang.reflect.*;
import java.util.*;
@@ -84,8 +83,6 @@ public class BaseMainActivity extends LoggableActivity {
private TextView debugText;
- private PointerOreoWrapper pointerSurface;
-
// private String mQueueText = new String();
protected JMinecraftVersionList.Version mVersionInfo;
@@ -245,12 +242,14 @@ public class BaseMainActivity extends LoggableActivity {
touchPad.setVisibility(View.GONE);
}
- if (isPointerCaptureSupported()) {
+ if (isAndroid8OrHigher()) {
if (!CallbackBridge.isGrabbing() && isCapturing) {
- pointerSurface.releaseCapture(); // minecraftGLView.releasePointerCapture();
+ minecraftGLView.releasePointerCapture();
+ minecraftGLView.clearFocus();
isCapturing = false;
} else if (CallbackBridge.isGrabbing() && !isCapturing) {
- pointerSurface.requestCapture(); // minecraftGLView.requestPointerCapture();
+ minecraftGLView.requestFocus();
+ minecraftGLView.requestPointerCapture();
isCapturing = true;
}
}
@@ -326,8 +325,7 @@ public class BaseMainActivity extends LoggableActivity {
// System.loadLibrary("Regal");
- minecraftGLView.setFocusable(false);
- minecraftGLView.setFocusableInTouchMode(false);
+ minecraftGLView.setFocusable(true);
// minecraftGLView.setEGLContextClientVersion(2);
glTouchListener = new OnTouchListener(){
@@ -550,24 +548,24 @@ public class BaseMainActivity extends LoggableActivity {
}
};
- if (isPointerCaptureSupported()) {
- this.pointerSurface = new PointerOreoWrapper(minecraftGLView);
- this.pointerSurface.setOnCapturedPointerListener(new PointerOreoWrapper.OnCapturedPointerListener(){
- private int x, y;
- private boolean debugErrored = false;
+ if (isAndroid8OrHigher()) {
+ minecraftGLView.setDefaultFocusHighlightEnabled(false);
+ minecraftGLView.setOnCapturedPointerListener(new View.OnCapturedPointerListener() {
+ private int x, y;
+ private boolean debugErrored = false;
- private String getMoving(float pos, boolean xOrY) {
- if (pos == 0) {
- return "STOPPED";
- } else if (pos > 0) {
- return xOrY ? "RIGHT" : "DOWN";
- } else { // if (pos3 < 0) {
- return xOrY ? "LEFT" : "UP";
- }
+ private String getMoving(float pos, boolean xOrY) {
+ if (pos == 0) {
+ return "STOPPED";
+ } else if (pos > 0) {
+ return xOrY ? "RIGHT" : "DOWN";
+ } else { // if (pos3 < 0) {
+ return xOrY ? "LEFT" : "UP";
}
+ }
- @Override
- public boolean onCapturedPointer(View view, MotionEvent e) {
+ @Override
+ public boolean onCapturedPointer (View view, MotionEvent e) {
x += ((int) e.getX()) / scaleFactor;
y -= ((int) e.getY()) / scaleFactor;
@@ -666,7 +664,6 @@ public class BaseMainActivity extends LoggableActivity {
}
});
minecraftGLView.setOnTouchListener(glTouchListener);
-
minecraftGLView.setSurfaceTextureListener(new TextureView.SurfaceTextureListener(){
private boolean isCalled = false;
@@ -805,7 +802,7 @@ public class BaseMainActivity extends LoggableActivity {
}
}
- private boolean isPointerCaptureSupported() {
+ private boolean isAndroid8OrHigher() {
return Build.VERSION.SDK_INT >= 26;
}
diff --git a/jre_securitymanager/jre_securitymanager.iml b/jre_securitymanager/jre_securitymanager.iml
new file mode 100644
index 000000000..abd55253e
--- /dev/null
+++ b/jre_securitymanager/jre_securitymanager.iml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 489199a980bef9ea69d8eaf22a60fd15f0649b4b Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
Date: Sun, 20 Dec 2020 16:14:43 +0700
Subject: [PATCH 2/2] Update GLFW lib
---
.../components/lwjgl3/lwjgl-glfw-classes.jar | Bin 418526 -> 418299 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar
index 74bac3b0463d9f260a7cec047fddb543795a6dc8..94d0859b21f6a9c0354ee580f5efddaeb3f60ea9 100644
GIT binary patch
delta 11382
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
jZyWg5eMC6bU0p0%rZ$*7-
delta 11525
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