diff --git a/app/build.gradle b/app/build.gradle index eedd79f25..c032703d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,14 +9,22 @@ android { minSdkVersion 21 targetSdkVersion 26 versionCode 156230 - versionName "2.4.2_preview10b2_6392b_20200405" + versionName "2.4.2_preview10b2_6392b_20200409" } + buildTypes { release { + // Don't set to true or java.awt will be a.a or something similar. minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + // Keep the following configuration in order to target Java 8. + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/app/build/bin/classes.dex b/app/build/bin/classes.dex index d7f17b06f..6cee736a7 100644 Binary files a/app/build/bin/classes.dex and b/app/build/bin/classes.dex differ diff --git a/app/build/bin/injected/AndroidManifest.xml b/app/build/bin/injected/AndroidManifest.xml index 1fa281534..7e550ed6c 100644 --- a/app/build/bin/injected/AndroidManifest.xml +++ b/app/build/bin/injected/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" package="net.kdt.pojavlaunch" android:versionCode="156230" - android:versionName="2.4.2_preview10b2_6392b_20200405"> + android:versionName="2.4.2_preview10b2_6392b_20200409"> + android:versionName="2.4.2_preview10b2_6392b_20200409" > */ - public static final int control_more3=0x7f0a007c; - public static final int control_more4=0x7f0a007d; - public static final int control_mouseoff=0x7f0a0076; - public static final int control_mouseon=0x7f0a0077; - public static final int control_primary=0x7f0a006b; - public static final int control_right=0x7f0a0071; - public static final int control_screenshot=0x7f0a0069; - public static final int control_secondary=0x7f0a006c; - public static final int control_shift=0x7f0a006d; - public static final int control_thirdperson=0x7f0a0074; - public static final int control_up=0x7f0a006f; - public static final int control_viewout=0x7f0a0079; - public static final int controls=0x7f0a006a; + public static final int control_more3=0x7f0a007d; + public static final int control_more4=0x7f0a007e; + public static final int control_mouseoff=0x7f0a0077; + public static final int control_mouseon=0x7f0a0078; + public static final int control_primary=0x7f0a006c; + public static final int control_right=0x7f0a0072; + public static final int control_screenshot=0x7f0a006a; + public static final int control_secondary=0x7f0a006d; + public static final int control_shift=0x7f0a006e; + public static final int control_thirdperson=0x7f0a0075; + public static final int control_up=0x7f0a0070; + public static final int control_viewout=0x7f0a007a; + public static final int controls=0x7f0a006b; /** Error messages */ public static final int error_checklog=0x7f0a003e; @@ -2916,6 +2919,7 @@ containing a value of this type. public static final int mcl_options=0x7f0a0055; public static final int mcl_setting_enablefreeform=0x7f0a005d; public static final int mcl_setting_subtitle_setmaxdxref=0x7f0a005c; + public static final int mcl_setting_title_controlsize=0x7f0a005e; public static final int mcl_setting_title_setmaxdxref=0x7f0a005b; public static final int mcl_tab_console=0x7f0a004a; public static final int mcl_tab_crash=0x7f0a004b; @@ -2925,16 +2929,16 @@ containing a value of this type. MCLauncherActivity: Tabs */ public static final int mcl_tab_news=0x7f0a0049; - public static final int mcl_version_clone=0x7f0a005e; - public static final int mcl_version_edit=0x7f0a005f; + public static final int mcl_version_clone=0x7f0a005f; + public static final int mcl_version_edit=0x7f0a0060; /** MCLauncherActivity: Strings */ public static final int mcl_version_msg=0x7f0a004c; - public static final int mcl_version_remove=0x7f0a0060; - public static final int mcn_exit_call=0x7f0a0062; - public static final int mcn_exit_confirm=0x7f0a0065; - public static final int mcn_exit_crash=0x7f0a0063; - public static final int mcn_exit_errcrash=0x7f0a0064; + public static final int mcl_version_remove=0x7f0a0061; + public static final int mcn_exit_call=0x7f0a0063; + public static final int mcn_exit_confirm=0x7f0a0066; + public static final int mcn_exit_crash=0x7f0a0064; + public static final int mcn_exit_errcrash=0x7f0a0065; /** %1$s BETA (Minecraft Java launcher for Android), version " + PathTools.usingVerName + "\n" + @@ -2960,7 +2964,7 @@ containing a value of this type. MainActivity: strings */ - public static final int mcn_exit_title=0x7f0a0061; + public static final int mcn_exit_title=0x7f0a0062; public static final int status_bar_notification_info_overflow=0x7f0a0016; public static final int toast_login_error=0x7f0a0047; public static final int toast_optifine_success=0x7f0a0048; @@ -2969,7 +2973,7 @@ containing a value of this type. public static final int toast_permission_denied=0x7f0a0046; /** Update part (unused now) */ - public static final int update_console=0x7f0a007e; + public static final int update_console=0x7f0a007f; public static final int warning_action_exit=0x7f0a003c; public static final int warning_action_install=0x7f0a003a; public static final int warning_action_tryanyway=0x7f0a003b; diff --git a/app/build/gen/android/support/v7/appcompat/R.java b/app/build/gen/android/support/v7/appcompat/R.java index 24dc271af..7f9c41f10 100644 --- a/app/build/gen/android/support/v7/appcompat/R.java +++ b/app/build/gen/android/support/v7/appcompat/R.java @@ -2512,7 +2512,7 @@ containing a value of this type. public static final int toggle_log=0x7f020060; } public static final class id { - public static final int action0=0x7f06009c; + public static final int action0=0x7f06009d; public static final int action_bar=0x7f06005d; public static final int action_bar_activity_content=0x7f060002; public static final int action_bar_container=0x7f06005c; @@ -2521,7 +2521,7 @@ containing a value of this type. public static final int action_bar_subtitle=0x7f06003d; public static final int action_bar_title=0x7f06003c; public static final int action_context_bar=0x7f06005e; - public static final int action_divider=0x7f0600a0; + public static final int action_divider=0x7f0600a1; public static final int action_menu_divider=0x7f060004; public static final int action_menu_presenter=0x7f060005; public static final int action_mode_bar=0x7f06005a; @@ -2537,38 +2537,39 @@ containing a value of this type. public static final int bottombar_author_logo=0x7f06006d; public static final int bottombar_version_view=0x7f06006c; public static final int buttonPanel=0x7f060046; - public static final int cancel_action=0x7f06009d; + public static final int cancel_action=0x7f06009e; public static final int center=0x7f060011; public static final int center_horizontal=0x7f060012; public static final int center_vertical=0x7f060013; public static final int checkbox=0x7f060054; - public static final int chronometer=0x7f0600a3; + public static final int chronometer=0x7f0600a4; public static final int clip_horizontal=0x7f06001d; public static final int clip_vertical=0x7f06001e; public static final int collapseActionView=0x7f060038; public static final int contentPanel=0x7f06004c; public static final int content_frame=0x7f060090; - public static final int content_log_close_button=0x7f060097; - public static final int content_log_layout=0x7f060096; - public static final int content_log_scroll=0x7f060099; - public static final int content_log_toggle_log=0x7f060098; - public static final int content_text_debug=0x7f06009a; - public static final int control_debug=0x7f0600a9; - public static final int control_down=0x7f0600af; - public static final int control_inventory=0x7f0600b7; - public static final int control_jump=0x7f0600b3; - public static final int control_keyboard=0x7f0600ab; - public static final int control_left=0x7f0600b1; - public static final int control_listplayers=0x7f0600ae; - public static final int control_mouse_toggle=0x7f0600b8; - public static final int control_primary=0x7f0600b4; - public static final int control_right=0x7f0600b2; - public static final int control_screenshot=0x7f0600ad; - public static final int control_secondary=0x7f0600b5; - public static final int control_shift=0x7f0600b6; - public static final int control_talk=0x7f0600aa; - public static final int control_thirdperson=0x7f0600ac; - public static final int control_up=0x7f0600b0; + public static final int content_log_close_button=0x7f060098; + public static final int content_log_layout=0x7f060097; + public static final int content_log_scroll=0x7f06009a; + public static final int content_log_toggle_log=0x7f060099; + public static final int content_text_debug=0x7f06009b; + public static final int control_debug=0x7f0600aa; + public static final int control_down=0x7f0600b0; + public static final int control_inventory=0x7f0600b8; + public static final int control_jump=0x7f0600b4; + public static final int control_keyboard=0x7f0600ac; + public static final int control_left=0x7f0600b2; + public static final int control_listplayers=0x7f0600af; + public static final int control_mouse_toggle=0x7f0600b9; + public static final int control_primary=0x7f0600b5; + public static final int control_right=0x7f0600b3; + public static final int control_screenshot=0x7f0600ae; + public static final int control_secondary=0x7f0600b6; + public static final int control_shift=0x7f0600b7; + public static final int control_talk=0x7f0600ab; + public static final int control_thirdperson=0x7f0600ad; + public static final int control_togglecontrol=0x7f060096; + public static final int control_up=0x7f0600b1; public static final int custom=0x7f060052; public static final int customPanel=0x7f060051; public static final int decor_content_parent=0x7f06005b; @@ -2581,7 +2582,7 @@ containing a value of this type. public static final int disableHome=0x7f060028; public static final int edit_query=0x7f06005f; public static final int end=0x7f060014; - public static final int end_padder=0x7f0600a8; + public static final int end_padder=0x7f0600a9; public static final int enterAlways=0x7f06000b; public static final int enterAlwaysCollapsed=0x7f06000c; public static final int exitUntilCollapsed=0x7f06000d; @@ -2596,7 +2597,7 @@ containing a value of this type. public static final int icon=0x7f060044; public static final int ifRoom=0x7f060039; public static final int image=0x7f060041; - public static final int info=0x7f0600a7; + public static final int info=0x7f0600a8; public static final int item_touch_helper_previous_elevation=0x7f060000; public static final int lMTVVer=0x7f060082; public static final int launcherAccEmail=0x7f060077; @@ -2618,8 +2619,8 @@ containing a value of this type. public static final int launcherupdateLogView=0x7f06008a; public static final int launcherupdateProgressBar=0x7f060089; public static final int left=0x7f060016; - public static final int line1=0x7f0600a1; - public static final int line3=0x7f0600a5; + public static final int line1=0x7f0600a2; + public static final int line3=0x7f0600a6; public static final int listMode=0x7f060026; public static final int list_item=0x7f060043; public static final int lmaintabconsoleLogCrashTextView=0x7f06008d; @@ -2630,16 +2631,16 @@ containing a value of this type. public static final int main_game_render_view=0x7f060092; public static final int main_log_behind_GL=0x7f060091; public static final int main_mouse_pointer=0x7f060094; - public static final int main_navigation_view=0x7f06009b; + public static final int main_navigation_view=0x7f06009c; public static final int main_touchpad=0x7f060093; - public static final int media_actions=0x7f06009f; + public static final int media_actions=0x7f0600a0; public static final int middle=0x7f060036; public static final int mini=0x7f060022; public static final int multiply=0x7f06002f; - public static final int nav_customkey=0x7f0600c7; - public static final int nav_debug=0x7f0600c6; - public static final int nav_forceclose=0x7f0600c4; - public static final int nav_viewlog=0x7f0600c5; + public static final int nav_customkey=0x7f0600ca; + public static final int nav_debug=0x7f0600c9; + public static final int nav_forceclose=0x7f0600c7; + public static final int nav_viewlog=0x7f0600c8; public static final int navigation_header_container=0x7f060072; public static final int never=0x7f06003a; public static final int none=0x7f06001a; @@ -2670,9 +2671,11 @@ containing a value of this type. public static final int search_src_text=0x7f060066; public static final int search_voice_btn=0x7f06006a; public static final int select_dialog_listview=0x7f06006b; - public static final int setting_seektext_progress=0x7f0600ba; - public static final int settings_seekbar_setmaxdxref=0x7f0600b9; - public static final int settings_switch_enablefreeform=0x7f0600bb; + public static final int setting_progressseek_control=0x7f0600bd; + public static final int setting_progressseek_maxdxref=0x7f0600bb; + public static final int settings_seekbar_controlsize=0x7f0600bc; + public static final int settings_seekbar_setmaxdxref=0x7f0600ba; + public static final int settings_switch_enablefreeform=0x7f0600be; public static final int shortcut=0x7f060055; public static final int showCustom=0x7f06002a; public static final int showHome=0x7f06002b; @@ -2686,32 +2689,32 @@ containing a value of this type. public static final int src_in=0x7f060032; public static final int src_over=0x7f060033; public static final int start=0x7f060018; - public static final int startscreenLinearLayout1=0x7f0600bc; - public static final int startscreenProgress=0x7f0600bd; - public static final int status_bar_latest_event_content=0x7f06009e; + public static final int startscreenLinearLayout1=0x7f0600bf; + public static final int startscreenProgress=0x7f0600c0; + public static final int status_bar_latest_event_content=0x7f06009f; public static final int submenuarrow=0x7f060057; public static final int submit_area=0x7f060068; public static final int tabMode=0x7f060027; - public static final int text=0x7f0600a6; - public static final int text2=0x7f0600a4; + public static final int text=0x7f0600a7; + public static final int text2=0x7f0600a5; public static final int textSpacerNoButtons=0x7f06004f; - public static final int time=0x7f0600a2; + public static final int time=0x7f0600a3; public static final int title=0x7f060045; public static final int title_template=0x7f06004a; public static final int top=0x7f060019; public static final int topPanel=0x7f060049; - public static final int topbar_earth_icon=0x7f0600be; - public static final int topbar_help_text=0x7f0600c0; - public static final int topbar_language_text=0x7f0600bf; - public static final int topbar_logo=0x7f0600c1; - public static final int topbar_navmenu_icon=0x7f0600c2; - public static final int topbar_undertop_view=0x7f0600c3; + public static final int topbar_earth_icon=0x7f0600c1; + public static final int topbar_help_text=0x7f0600c3; + public static final int topbar_language_text=0x7f0600c2; + public static final int topbar_logo=0x7f0600c4; + public static final int topbar_navmenu_icon=0x7f0600c5; + public static final int topbar_undertop_view=0x7f0600c6; public static final int touch_outside=0x7f06006e; public static final int up=0x7f06000a; public static final int useLogo=0x7f06002d; - public static final int ver_clone=0x7f0600c8; - public static final int ver_edit=0x7f0600c9; - public static final int ver_remove=0x7f0600ca; + public static final int ver_clone=0x7f0600cb; + public static final int ver_edit=0x7f0600cc; + public static final int ver_remove=0x7f0600cd; public static final int view_offset_helper=0x7f060001; public static final int withText=0x7f06003b; public static final int wrap_content=0x7f060034; @@ -2835,36 +2838,36 @@ containing a value of this type. public static final int appbar_scrolling_view_behavior=0x7f0a0000; public static final int bottom_sheet_behavior=0x7f0a0001; public static final int character_counter_pattern=0x7f0a0002; - public static final int control_adebug=0x7f0a007a; - public static final int control_chat=0x7f0a0067; - public static final int control_customkey=0x7f0a007b; - public static final int control_debug=0x7f0a0068; - public static final int control_down=0x7f0a0072; + public static final int control_adebug=0x7f0a007b; + public static final int control_chat=0x7f0a0068; + public static final int control_customkey=0x7f0a007c; + public static final int control_debug=0x7f0a0069; + public static final int control_down=0x7f0a0073; /** MainActivity: Menu advanced controls */ - public static final int control_forceclose=0x7f0a0078; - public static final int control_inventory=0x7f0a006e; - public static final int control_jump=0x7f0a0073; + public static final int control_forceclose=0x7f0a0079; + public static final int control_inventory=0x7f0a006f; + public static final int control_jump=0x7f0a0074; /** MainActivity: Control buttons */ - public static final int control_keyboard=0x7f0a0066; - public static final int control_left=0x7f0a0070; - public static final int control_listplayers=0x7f0a0075; + public static final int control_keyboard=0x7f0a0067; + public static final int control_left=0x7f0a0071; + public static final int control_listplayers=0x7f0a0076; /** PointerCapture debug */ - public static final int control_more3=0x7f0a007c; - public static final int control_more4=0x7f0a007d; - public static final int control_mouseoff=0x7f0a0076; - public static final int control_mouseon=0x7f0a0077; - public static final int control_primary=0x7f0a006b; - public static final int control_right=0x7f0a0071; - public static final int control_screenshot=0x7f0a0069; - public static final int control_secondary=0x7f0a006c; - public static final int control_shift=0x7f0a006d; - public static final int control_thirdperson=0x7f0a0074; - public static final int control_up=0x7f0a006f; - public static final int control_viewout=0x7f0a0079; - public static final int controls=0x7f0a006a; + public static final int control_more3=0x7f0a007d; + public static final int control_more4=0x7f0a007e; + public static final int control_mouseoff=0x7f0a0077; + public static final int control_mouseon=0x7f0a0078; + public static final int control_primary=0x7f0a006c; + public static final int control_right=0x7f0a0072; + public static final int control_screenshot=0x7f0a006a; + public static final int control_secondary=0x7f0a006d; + public static final int control_shift=0x7f0a006e; + public static final int control_thirdperson=0x7f0a0075; + public static final int control_up=0x7f0a0070; + public static final int control_viewout=0x7f0a007a; + public static final int controls=0x7f0a006b; /** Error messages */ public static final int error_checklog=0x7f0a003e; @@ -2916,6 +2919,7 @@ containing a value of this type. public static final int mcl_options=0x7f0a0055; public static final int mcl_setting_enablefreeform=0x7f0a005d; public static final int mcl_setting_subtitle_setmaxdxref=0x7f0a005c; + public static final int mcl_setting_title_controlsize=0x7f0a005e; public static final int mcl_setting_title_setmaxdxref=0x7f0a005b; public static final int mcl_tab_console=0x7f0a004a; public static final int mcl_tab_crash=0x7f0a004b; @@ -2925,16 +2929,16 @@ containing a value of this type. MCLauncherActivity: Tabs */ public static final int mcl_tab_news=0x7f0a0049; - public static final int mcl_version_clone=0x7f0a005e; - public static final int mcl_version_edit=0x7f0a005f; + public static final int mcl_version_clone=0x7f0a005f; + public static final int mcl_version_edit=0x7f0a0060; /** MCLauncherActivity: Strings */ public static final int mcl_version_msg=0x7f0a004c; - public static final int mcl_version_remove=0x7f0a0060; - public static final int mcn_exit_call=0x7f0a0062; - public static final int mcn_exit_confirm=0x7f0a0065; - public static final int mcn_exit_crash=0x7f0a0063; - public static final int mcn_exit_errcrash=0x7f0a0064; + public static final int mcl_version_remove=0x7f0a0061; + public static final int mcn_exit_call=0x7f0a0063; + public static final int mcn_exit_confirm=0x7f0a0066; + public static final int mcn_exit_crash=0x7f0a0064; + public static final int mcn_exit_errcrash=0x7f0a0065; /** %1$s BETA (Minecraft Java launcher for Android), version " + PathTools.usingVerName + "\n" + @@ -2960,7 +2964,7 @@ containing a value of this type. MainActivity: strings */ - public static final int mcn_exit_title=0x7f0a0061; + public static final int mcn_exit_title=0x7f0a0062; public static final int status_bar_notification_info_overflow=0x7f0a0016; public static final int toast_login_error=0x7f0a0047; public static final int toast_optifine_success=0x7f0a0048; @@ -2969,7 +2973,7 @@ containing a value of this type. public static final int toast_permission_denied=0x7f0a0046; /** Update part (unused now) */ - public static final int update_console=0x7f0a007e; + public static final int update_console=0x7f0a007f; public static final int warning_action_exit=0x7f0a003c; public static final int warning_action_install=0x7f0a003a; public static final int warning_action_tryanyway=0x7f0a003b; diff --git a/app/build/gen/android/support/v7/recyclerview/R.java b/app/build/gen/android/support/v7/recyclerview/R.java index 2e4f0118c..6ba1189e3 100644 --- a/app/build/gen/android/support/v7/recyclerview/R.java +++ b/app/build/gen/android/support/v7/recyclerview/R.java @@ -2512,7 +2512,7 @@ containing a value of this type. public static final int toggle_log=0x7f020060; } public static final class id { - public static final int action0=0x7f06009c; + public static final int action0=0x7f06009d; public static final int action_bar=0x7f06005d; public static final int action_bar_activity_content=0x7f060002; public static final int action_bar_container=0x7f06005c; @@ -2521,7 +2521,7 @@ containing a value of this type. public static final int action_bar_subtitle=0x7f06003d; public static final int action_bar_title=0x7f06003c; public static final int action_context_bar=0x7f06005e; - public static final int action_divider=0x7f0600a0; + public static final int action_divider=0x7f0600a1; public static final int action_menu_divider=0x7f060004; public static final int action_menu_presenter=0x7f060005; public static final int action_mode_bar=0x7f06005a; @@ -2537,38 +2537,39 @@ containing a value of this type. public static final int bottombar_author_logo=0x7f06006d; public static final int bottombar_version_view=0x7f06006c; public static final int buttonPanel=0x7f060046; - public static final int cancel_action=0x7f06009d; + public static final int cancel_action=0x7f06009e; public static final int center=0x7f060011; public static final int center_horizontal=0x7f060012; public static final int center_vertical=0x7f060013; public static final int checkbox=0x7f060054; - public static final int chronometer=0x7f0600a3; + public static final int chronometer=0x7f0600a4; public static final int clip_horizontal=0x7f06001d; public static final int clip_vertical=0x7f06001e; public static final int collapseActionView=0x7f060038; public static final int contentPanel=0x7f06004c; public static final int content_frame=0x7f060090; - public static final int content_log_close_button=0x7f060097; - public static final int content_log_layout=0x7f060096; - public static final int content_log_scroll=0x7f060099; - public static final int content_log_toggle_log=0x7f060098; - public static final int content_text_debug=0x7f06009a; - public static final int control_debug=0x7f0600a9; - public static final int control_down=0x7f0600af; - public static final int control_inventory=0x7f0600b7; - public static final int control_jump=0x7f0600b3; - public static final int control_keyboard=0x7f0600ab; - public static final int control_left=0x7f0600b1; - public static final int control_listplayers=0x7f0600ae; - public static final int control_mouse_toggle=0x7f0600b8; - public static final int control_primary=0x7f0600b4; - public static final int control_right=0x7f0600b2; - public static final int control_screenshot=0x7f0600ad; - public static final int control_secondary=0x7f0600b5; - public static final int control_shift=0x7f0600b6; - public static final int control_talk=0x7f0600aa; - public static final int control_thirdperson=0x7f0600ac; - public static final int control_up=0x7f0600b0; + public static final int content_log_close_button=0x7f060098; + public static final int content_log_layout=0x7f060097; + public static final int content_log_scroll=0x7f06009a; + public static final int content_log_toggle_log=0x7f060099; + public static final int content_text_debug=0x7f06009b; + public static final int control_debug=0x7f0600aa; + public static final int control_down=0x7f0600b0; + public static final int control_inventory=0x7f0600b8; + public static final int control_jump=0x7f0600b4; + public static final int control_keyboard=0x7f0600ac; + public static final int control_left=0x7f0600b2; + public static final int control_listplayers=0x7f0600af; + public static final int control_mouse_toggle=0x7f0600b9; + public static final int control_primary=0x7f0600b5; + public static final int control_right=0x7f0600b3; + public static final int control_screenshot=0x7f0600ae; + public static final int control_secondary=0x7f0600b6; + public static final int control_shift=0x7f0600b7; + public static final int control_talk=0x7f0600ab; + public static final int control_thirdperson=0x7f0600ad; + public static final int control_togglecontrol=0x7f060096; + public static final int control_up=0x7f0600b1; public static final int custom=0x7f060052; public static final int customPanel=0x7f060051; public static final int decor_content_parent=0x7f06005b; @@ -2581,7 +2582,7 @@ containing a value of this type. public static final int disableHome=0x7f060028; public static final int edit_query=0x7f06005f; public static final int end=0x7f060014; - public static final int end_padder=0x7f0600a8; + public static final int end_padder=0x7f0600a9; public static final int enterAlways=0x7f06000b; public static final int enterAlwaysCollapsed=0x7f06000c; public static final int exitUntilCollapsed=0x7f06000d; @@ -2596,7 +2597,7 @@ containing a value of this type. public static final int icon=0x7f060044; public static final int ifRoom=0x7f060039; public static final int image=0x7f060041; - public static final int info=0x7f0600a7; + public static final int info=0x7f0600a8; public static final int item_touch_helper_previous_elevation=0x7f060000; public static final int lMTVVer=0x7f060082; public static final int launcherAccEmail=0x7f060077; @@ -2618,8 +2619,8 @@ containing a value of this type. public static final int launcherupdateLogView=0x7f06008a; public static final int launcherupdateProgressBar=0x7f060089; public static final int left=0x7f060016; - public static final int line1=0x7f0600a1; - public static final int line3=0x7f0600a5; + public static final int line1=0x7f0600a2; + public static final int line3=0x7f0600a6; public static final int listMode=0x7f060026; public static final int list_item=0x7f060043; public static final int lmaintabconsoleLogCrashTextView=0x7f06008d; @@ -2630,16 +2631,16 @@ containing a value of this type. public static final int main_game_render_view=0x7f060092; public static final int main_log_behind_GL=0x7f060091; public static final int main_mouse_pointer=0x7f060094; - public static final int main_navigation_view=0x7f06009b; + public static final int main_navigation_view=0x7f06009c; public static final int main_touchpad=0x7f060093; - public static final int media_actions=0x7f06009f; + public static final int media_actions=0x7f0600a0; public static final int middle=0x7f060036; public static final int mini=0x7f060022; public static final int multiply=0x7f06002f; - public static final int nav_customkey=0x7f0600c7; - public static final int nav_debug=0x7f0600c6; - public static final int nav_forceclose=0x7f0600c4; - public static final int nav_viewlog=0x7f0600c5; + public static final int nav_customkey=0x7f0600ca; + public static final int nav_debug=0x7f0600c9; + public static final int nav_forceclose=0x7f0600c7; + public static final int nav_viewlog=0x7f0600c8; public static final int navigation_header_container=0x7f060072; public static final int never=0x7f06003a; public static final int none=0x7f06001a; @@ -2670,9 +2671,11 @@ containing a value of this type. public static final int search_src_text=0x7f060066; public static final int search_voice_btn=0x7f06006a; public static final int select_dialog_listview=0x7f06006b; - public static final int setting_seektext_progress=0x7f0600ba; - public static final int settings_seekbar_setmaxdxref=0x7f0600b9; - public static final int settings_switch_enablefreeform=0x7f0600bb; + public static final int setting_progressseek_control=0x7f0600bd; + public static final int setting_progressseek_maxdxref=0x7f0600bb; + public static final int settings_seekbar_controlsize=0x7f0600bc; + public static final int settings_seekbar_setmaxdxref=0x7f0600ba; + public static final int settings_switch_enablefreeform=0x7f0600be; public static final int shortcut=0x7f060055; public static final int showCustom=0x7f06002a; public static final int showHome=0x7f06002b; @@ -2686,32 +2689,32 @@ containing a value of this type. public static final int src_in=0x7f060032; public static final int src_over=0x7f060033; public static final int start=0x7f060018; - public static final int startscreenLinearLayout1=0x7f0600bc; - public static final int startscreenProgress=0x7f0600bd; - public static final int status_bar_latest_event_content=0x7f06009e; + public static final int startscreenLinearLayout1=0x7f0600bf; + public static final int startscreenProgress=0x7f0600c0; + public static final int status_bar_latest_event_content=0x7f06009f; public static final int submenuarrow=0x7f060057; public static final int submit_area=0x7f060068; public static final int tabMode=0x7f060027; - public static final int text=0x7f0600a6; - public static final int text2=0x7f0600a4; + public static final int text=0x7f0600a7; + public static final int text2=0x7f0600a5; public static final int textSpacerNoButtons=0x7f06004f; - public static final int time=0x7f0600a2; + public static final int time=0x7f0600a3; public static final int title=0x7f060045; public static final int title_template=0x7f06004a; public static final int top=0x7f060019; public static final int topPanel=0x7f060049; - public static final int topbar_earth_icon=0x7f0600be; - public static final int topbar_help_text=0x7f0600c0; - public static final int topbar_language_text=0x7f0600bf; - public static final int topbar_logo=0x7f0600c1; - public static final int topbar_navmenu_icon=0x7f0600c2; - public static final int topbar_undertop_view=0x7f0600c3; + public static final int topbar_earth_icon=0x7f0600c1; + public static final int topbar_help_text=0x7f0600c3; + public static final int topbar_language_text=0x7f0600c2; + public static final int topbar_logo=0x7f0600c4; + public static final int topbar_navmenu_icon=0x7f0600c5; + public static final int topbar_undertop_view=0x7f0600c6; public static final int touch_outside=0x7f06006e; public static final int up=0x7f06000a; public static final int useLogo=0x7f06002d; - public static final int ver_clone=0x7f0600c8; - public static final int ver_edit=0x7f0600c9; - public static final int ver_remove=0x7f0600ca; + public static final int ver_clone=0x7f0600cb; + public static final int ver_edit=0x7f0600cc; + public static final int ver_remove=0x7f0600cd; public static final int view_offset_helper=0x7f060001; public static final int withText=0x7f06003b; public static final int wrap_content=0x7f060034; @@ -2835,36 +2838,36 @@ containing a value of this type. public static final int appbar_scrolling_view_behavior=0x7f0a0000; public static final int bottom_sheet_behavior=0x7f0a0001; public static final int character_counter_pattern=0x7f0a0002; - public static final int control_adebug=0x7f0a007a; - public static final int control_chat=0x7f0a0067; - public static final int control_customkey=0x7f0a007b; - public static final int control_debug=0x7f0a0068; - public static final int control_down=0x7f0a0072; + public static final int control_adebug=0x7f0a007b; + public static final int control_chat=0x7f0a0068; + public static final int control_customkey=0x7f0a007c; + public static final int control_debug=0x7f0a0069; + public static final int control_down=0x7f0a0073; /** MainActivity: Menu advanced controls */ - public static final int control_forceclose=0x7f0a0078; - public static final int control_inventory=0x7f0a006e; - public static final int control_jump=0x7f0a0073; + public static final int control_forceclose=0x7f0a0079; + public static final int control_inventory=0x7f0a006f; + public static final int control_jump=0x7f0a0074; /** MainActivity: Control buttons */ - public static final int control_keyboard=0x7f0a0066; - public static final int control_left=0x7f0a0070; - public static final int control_listplayers=0x7f0a0075; + public static final int control_keyboard=0x7f0a0067; + public static final int control_left=0x7f0a0071; + public static final int control_listplayers=0x7f0a0076; /** PointerCapture debug */ - public static final int control_more3=0x7f0a007c; - public static final int control_more4=0x7f0a007d; - public static final int control_mouseoff=0x7f0a0076; - public static final int control_mouseon=0x7f0a0077; - public static final int control_primary=0x7f0a006b; - public static final int control_right=0x7f0a0071; - public static final int control_screenshot=0x7f0a0069; - public static final int control_secondary=0x7f0a006c; - public static final int control_shift=0x7f0a006d; - public static final int control_thirdperson=0x7f0a0074; - public static final int control_up=0x7f0a006f; - public static final int control_viewout=0x7f0a0079; - public static final int controls=0x7f0a006a; + public static final int control_more3=0x7f0a007d; + public static final int control_more4=0x7f0a007e; + public static final int control_mouseoff=0x7f0a0077; + public static final int control_mouseon=0x7f0a0078; + public static final int control_primary=0x7f0a006c; + public static final int control_right=0x7f0a0072; + public static final int control_screenshot=0x7f0a006a; + public static final int control_secondary=0x7f0a006d; + public static final int control_shift=0x7f0a006e; + public static final int control_thirdperson=0x7f0a0075; + public static final int control_up=0x7f0a0070; + public static final int control_viewout=0x7f0a007a; + public static final int controls=0x7f0a006b; /** Error messages */ public static final int error_checklog=0x7f0a003e; @@ -2916,6 +2919,7 @@ containing a value of this type. public static final int mcl_options=0x7f0a0055; public static final int mcl_setting_enablefreeform=0x7f0a005d; public static final int mcl_setting_subtitle_setmaxdxref=0x7f0a005c; + public static final int mcl_setting_title_controlsize=0x7f0a005e; public static final int mcl_setting_title_setmaxdxref=0x7f0a005b; public static final int mcl_tab_console=0x7f0a004a; public static final int mcl_tab_crash=0x7f0a004b; @@ -2925,16 +2929,16 @@ containing a value of this type. MCLauncherActivity: Tabs */ public static final int mcl_tab_news=0x7f0a0049; - public static final int mcl_version_clone=0x7f0a005e; - public static final int mcl_version_edit=0x7f0a005f; + public static final int mcl_version_clone=0x7f0a005f; + public static final int mcl_version_edit=0x7f0a0060; /** MCLauncherActivity: Strings */ public static final int mcl_version_msg=0x7f0a004c; - public static final int mcl_version_remove=0x7f0a0060; - public static final int mcn_exit_call=0x7f0a0062; - public static final int mcn_exit_confirm=0x7f0a0065; - public static final int mcn_exit_crash=0x7f0a0063; - public static final int mcn_exit_errcrash=0x7f0a0064; + public static final int mcl_version_remove=0x7f0a0061; + public static final int mcn_exit_call=0x7f0a0063; + public static final int mcn_exit_confirm=0x7f0a0066; + public static final int mcn_exit_crash=0x7f0a0064; + public static final int mcn_exit_errcrash=0x7f0a0065; /** %1$s BETA (Minecraft Java launcher for Android), version " + PathTools.usingVerName + "\n" + @@ -2960,7 +2964,7 @@ containing a value of this type. MainActivity: strings */ - public static final int mcn_exit_title=0x7f0a0061; + public static final int mcn_exit_title=0x7f0a0062; public static final int status_bar_notification_info_overflow=0x7f0a0016; public static final int toast_login_error=0x7f0a0047; public static final int toast_optifine_success=0x7f0a0048; @@ -2969,7 +2973,7 @@ containing a value of this type. public static final int toast_permission_denied=0x7f0a0046; /** Update part (unused now) */ - public static final int update_console=0x7f0a007e; + public static final int update_console=0x7f0a007f; public static final int warning_action_exit=0x7f0a003c; public static final int warning_action_install=0x7f0a003a; public static final int warning_action_tryanyway=0x7f0a003b; diff --git a/app/build/gen/net/kdt/pojavlaunch/BuildConfig.java b/app/build/gen/net/kdt/pojavlaunch/BuildConfig.java index e69de29bb..bb43d4f6d 100644 --- a/app/build/gen/net/kdt/pojavlaunch/BuildConfig.java +++ b/app/build/gen/net/kdt/pojavlaunch/BuildConfig.java @@ -0,0 +1,6 @@ +/** Automatically generated file. DO NOT MODIFY */ +package net.kdt.pojavlaunch; + +public final class BuildConfig { + public final static boolean DEBUG = true; +} \ No newline at end of file diff --git a/app/build/gen/net/kdt/pojavlaunch/R.java b/app/build/gen/net/kdt/pojavlaunch/R.java index d10f69217..f5f28568b 100644 --- a/app/build/gen/net/kdt/pojavlaunch/R.java +++ b/app/build/gen/net/kdt/pojavlaunch/R.java @@ -2512,7 +2512,7 @@ containing a value of this type. public static final int toggle_log=0x7f020060; } public static final class id { - public static final int action0=0x7f06009c; + public static final int action0=0x7f06009d; public static final int action_bar=0x7f06005d; public static final int action_bar_activity_content=0x7f060002; public static final int action_bar_container=0x7f06005c; @@ -2521,7 +2521,7 @@ containing a value of this type. public static final int action_bar_subtitle=0x7f06003d; public static final int action_bar_title=0x7f06003c; public static final int action_context_bar=0x7f06005e; - public static final int action_divider=0x7f0600a0; + public static final int action_divider=0x7f0600a1; public static final int action_menu_divider=0x7f060004; public static final int action_menu_presenter=0x7f060005; public static final int action_mode_bar=0x7f06005a; @@ -2537,38 +2537,39 @@ containing a value of this type. public static final int bottombar_author_logo=0x7f06006d; public static final int bottombar_version_view=0x7f06006c; public static final int buttonPanel=0x7f060046; - public static final int cancel_action=0x7f06009d; + public static final int cancel_action=0x7f06009e; public static final int center=0x7f060011; public static final int center_horizontal=0x7f060012; public static final int center_vertical=0x7f060013; public static final int checkbox=0x7f060054; - public static final int chronometer=0x7f0600a3; + public static final int chronometer=0x7f0600a4; public static final int clip_horizontal=0x7f06001d; public static final int clip_vertical=0x7f06001e; public static final int collapseActionView=0x7f060038; public static final int contentPanel=0x7f06004c; public static final int content_frame=0x7f060090; - public static final int content_log_close_button=0x7f060097; - public static final int content_log_layout=0x7f060096; - public static final int content_log_scroll=0x7f060099; - public static final int content_log_toggle_log=0x7f060098; - public static final int content_text_debug=0x7f06009a; - public static final int control_debug=0x7f0600a9; - public static final int control_down=0x7f0600af; - public static final int control_inventory=0x7f0600b7; - public static final int control_jump=0x7f0600b3; - public static final int control_keyboard=0x7f0600ab; - public static final int control_left=0x7f0600b1; - public static final int control_listplayers=0x7f0600ae; - public static final int control_mouse_toggle=0x7f0600b8; - public static final int control_primary=0x7f0600b4; - public static final int control_right=0x7f0600b2; - public static final int control_screenshot=0x7f0600ad; - public static final int control_secondary=0x7f0600b5; - public static final int control_shift=0x7f0600b6; - public static final int control_talk=0x7f0600aa; - public static final int control_thirdperson=0x7f0600ac; - public static final int control_up=0x7f0600b0; + public static final int content_log_close_button=0x7f060098; + public static final int content_log_layout=0x7f060097; + public static final int content_log_scroll=0x7f06009a; + public static final int content_log_toggle_log=0x7f060099; + public static final int content_text_debug=0x7f06009b; + public static final int control_debug=0x7f0600aa; + public static final int control_down=0x7f0600b0; + public static final int control_inventory=0x7f0600b8; + public static final int control_jump=0x7f0600b4; + public static final int control_keyboard=0x7f0600ac; + public static final int control_left=0x7f0600b2; + public static final int control_listplayers=0x7f0600af; + public static final int control_mouse_toggle=0x7f0600b9; + public static final int control_primary=0x7f0600b5; + public static final int control_right=0x7f0600b3; + public static final int control_screenshot=0x7f0600ae; + public static final int control_secondary=0x7f0600b6; + public static final int control_shift=0x7f0600b7; + public static final int control_talk=0x7f0600ab; + public static final int control_thirdperson=0x7f0600ad; + public static final int control_togglecontrol=0x7f060096; + public static final int control_up=0x7f0600b1; public static final int custom=0x7f060052; public static final int customPanel=0x7f060051; public static final int decor_content_parent=0x7f06005b; @@ -2581,7 +2582,7 @@ containing a value of this type. public static final int disableHome=0x7f060028; public static final int edit_query=0x7f06005f; public static final int end=0x7f060014; - public static final int end_padder=0x7f0600a8; + public static final int end_padder=0x7f0600a9; public static final int enterAlways=0x7f06000b; public static final int enterAlwaysCollapsed=0x7f06000c; public static final int exitUntilCollapsed=0x7f06000d; @@ -2596,7 +2597,7 @@ containing a value of this type. public static final int icon=0x7f060044; public static final int ifRoom=0x7f060039; public static final int image=0x7f060041; - public static final int info=0x7f0600a7; + public static final int info=0x7f0600a8; public static final int item_touch_helper_previous_elevation=0x7f060000; public static final int lMTVVer=0x7f060082; public static final int launcherAccEmail=0x7f060077; @@ -2618,8 +2619,8 @@ containing a value of this type. public static final int launcherupdateLogView=0x7f06008a; public static final int launcherupdateProgressBar=0x7f060089; public static final int left=0x7f060016; - public static final int line1=0x7f0600a1; - public static final int line3=0x7f0600a5; + public static final int line1=0x7f0600a2; + public static final int line3=0x7f0600a6; public static final int listMode=0x7f060026; public static final int list_item=0x7f060043; public static final int lmaintabconsoleLogCrashTextView=0x7f06008d; @@ -2630,16 +2631,16 @@ containing a value of this type. public static final int main_game_render_view=0x7f060092; public static final int main_log_behind_GL=0x7f060091; public static final int main_mouse_pointer=0x7f060094; - public static final int main_navigation_view=0x7f06009b; + public static final int main_navigation_view=0x7f06009c; public static final int main_touchpad=0x7f060093; - public static final int media_actions=0x7f06009f; + public static final int media_actions=0x7f0600a0; public static final int middle=0x7f060036; public static final int mini=0x7f060022; public static final int multiply=0x7f06002f; - public static final int nav_customkey=0x7f0600c7; - public static final int nav_debug=0x7f0600c6; - public static final int nav_forceclose=0x7f0600c4; - public static final int nav_viewlog=0x7f0600c5; + public static final int nav_customkey=0x7f0600ca; + public static final int nav_debug=0x7f0600c9; + public static final int nav_forceclose=0x7f0600c7; + public static final int nav_viewlog=0x7f0600c8; public static final int navigation_header_container=0x7f060072; public static final int never=0x7f06003a; public static final int none=0x7f06001a; @@ -2670,9 +2671,11 @@ containing a value of this type. public static final int search_src_text=0x7f060066; public static final int search_voice_btn=0x7f06006a; public static final int select_dialog_listview=0x7f06006b; - public static final int setting_seektext_progress=0x7f0600ba; - public static final int settings_seekbar_setmaxdxref=0x7f0600b9; - public static final int settings_switch_enablefreeform=0x7f0600bb; + public static final int setting_progressseek_control=0x7f0600bd; + public static final int setting_progressseek_maxdxref=0x7f0600bb; + public static final int settings_seekbar_controlsize=0x7f0600bc; + public static final int settings_seekbar_setmaxdxref=0x7f0600ba; + public static final int settings_switch_enablefreeform=0x7f0600be; public static final int shortcut=0x7f060055; public static final int showCustom=0x7f06002a; public static final int showHome=0x7f06002b; @@ -2686,32 +2689,32 @@ containing a value of this type. public static final int src_in=0x7f060032; public static final int src_over=0x7f060033; public static final int start=0x7f060018; - public static final int startscreenLinearLayout1=0x7f0600bc; - public static final int startscreenProgress=0x7f0600bd; - public static final int status_bar_latest_event_content=0x7f06009e; + public static final int startscreenLinearLayout1=0x7f0600bf; + public static final int startscreenProgress=0x7f0600c0; + public static final int status_bar_latest_event_content=0x7f06009f; public static final int submenuarrow=0x7f060057; public static final int submit_area=0x7f060068; public static final int tabMode=0x7f060027; - public static final int text=0x7f0600a6; - public static final int text2=0x7f0600a4; + public static final int text=0x7f0600a7; + public static final int text2=0x7f0600a5; public static final int textSpacerNoButtons=0x7f06004f; - public static final int time=0x7f0600a2; + public static final int time=0x7f0600a3; public static final int title=0x7f060045; public static final int title_template=0x7f06004a; public static final int top=0x7f060019; public static final int topPanel=0x7f060049; - public static final int topbar_earth_icon=0x7f0600be; - public static final int topbar_help_text=0x7f0600c0; - public static final int topbar_language_text=0x7f0600bf; - public static final int topbar_logo=0x7f0600c1; - public static final int topbar_navmenu_icon=0x7f0600c2; - public static final int topbar_undertop_view=0x7f0600c3; + public static final int topbar_earth_icon=0x7f0600c1; + public static final int topbar_help_text=0x7f0600c3; + public static final int topbar_language_text=0x7f0600c2; + public static final int topbar_logo=0x7f0600c4; + public static final int topbar_navmenu_icon=0x7f0600c5; + public static final int topbar_undertop_view=0x7f0600c6; public static final int touch_outside=0x7f06006e; public static final int up=0x7f06000a; public static final int useLogo=0x7f06002d; - public static final int ver_clone=0x7f0600c8; - public static final int ver_edit=0x7f0600c9; - public static final int ver_remove=0x7f0600ca; + public static final int ver_clone=0x7f0600cb; + public static final int ver_edit=0x7f0600cc; + public static final int ver_remove=0x7f0600cd; public static final int view_offset_helper=0x7f060001; public static final int withText=0x7f06003b; public static final int wrap_content=0x7f060034; @@ -2835,36 +2838,36 @@ containing a value of this type. public static final int appbar_scrolling_view_behavior=0x7f0a0000; public static final int bottom_sheet_behavior=0x7f0a0001; public static final int character_counter_pattern=0x7f0a0002; - public static final int control_adebug=0x7f0a007a; - public static final int control_chat=0x7f0a0067; - public static final int control_customkey=0x7f0a007b; - public static final int control_debug=0x7f0a0068; - public static final int control_down=0x7f0a0072; + public static final int control_adebug=0x7f0a007b; + public static final int control_chat=0x7f0a0068; + public static final int control_customkey=0x7f0a007c; + public static final int control_debug=0x7f0a0069; + public static final int control_down=0x7f0a0073; /** MainActivity: Menu advanced controls */ - public static final int control_forceclose=0x7f0a0078; - public static final int control_inventory=0x7f0a006e; - public static final int control_jump=0x7f0a0073; + public static final int control_forceclose=0x7f0a0079; + public static final int control_inventory=0x7f0a006f; + public static final int control_jump=0x7f0a0074; /** MainActivity: Control buttons */ - public static final int control_keyboard=0x7f0a0066; - public static final int control_left=0x7f0a0070; - public static final int control_listplayers=0x7f0a0075; + public static final int control_keyboard=0x7f0a0067; + public static final int control_left=0x7f0a0071; + public static final int control_listplayers=0x7f0a0076; /** PointerCapture debug */ - public static final int control_more3=0x7f0a007c; - public static final int control_more4=0x7f0a007d; - public static final int control_mouseoff=0x7f0a0076; - public static final int control_mouseon=0x7f0a0077; - public static final int control_primary=0x7f0a006b; - public static final int control_right=0x7f0a0071; - public static final int control_screenshot=0x7f0a0069; - public static final int control_secondary=0x7f0a006c; - public static final int control_shift=0x7f0a006d; - public static final int control_thirdperson=0x7f0a0074; - public static final int control_up=0x7f0a006f; - public static final int control_viewout=0x7f0a0079; - public static final int controls=0x7f0a006a; + public static final int control_more3=0x7f0a007d; + public static final int control_more4=0x7f0a007e; + public static final int control_mouseoff=0x7f0a0077; + public static final int control_mouseon=0x7f0a0078; + public static final int control_primary=0x7f0a006c; + public static final int control_right=0x7f0a0072; + public static final int control_screenshot=0x7f0a006a; + public static final int control_secondary=0x7f0a006d; + public static final int control_shift=0x7f0a006e; + public static final int control_thirdperson=0x7f0a0075; + public static final int control_up=0x7f0a0070; + public static final int control_viewout=0x7f0a007a; + public static final int controls=0x7f0a006b; /** Error messages */ public static final int error_checklog=0x7f0a003e; @@ -2916,6 +2919,7 @@ containing a value of this type. public static final int mcl_options=0x7f0a0055; public static final int mcl_setting_enablefreeform=0x7f0a005d; public static final int mcl_setting_subtitle_setmaxdxref=0x7f0a005c; + public static final int mcl_setting_title_controlsize=0x7f0a005e; public static final int mcl_setting_title_setmaxdxref=0x7f0a005b; public static final int mcl_tab_console=0x7f0a004a; public static final int mcl_tab_crash=0x7f0a004b; @@ -2925,16 +2929,16 @@ containing a value of this type. MCLauncherActivity: Tabs */ public static final int mcl_tab_news=0x7f0a0049; - public static final int mcl_version_clone=0x7f0a005e; - public static final int mcl_version_edit=0x7f0a005f; + public static final int mcl_version_clone=0x7f0a005f; + public static final int mcl_version_edit=0x7f0a0060; /** MCLauncherActivity: Strings */ public static final int mcl_version_msg=0x7f0a004c; - public static final int mcl_version_remove=0x7f0a0060; - public static final int mcn_exit_call=0x7f0a0062; - public static final int mcn_exit_confirm=0x7f0a0065; - public static final int mcn_exit_crash=0x7f0a0063; - public static final int mcn_exit_errcrash=0x7f0a0064; + public static final int mcl_version_remove=0x7f0a0061; + public static final int mcn_exit_call=0x7f0a0063; + public static final int mcn_exit_confirm=0x7f0a0066; + public static final int mcn_exit_crash=0x7f0a0064; + public static final int mcn_exit_errcrash=0x7f0a0065; /** %1$s BETA (Minecraft Java launcher for Android), version " + PathTools.usingVerName + "\n" + @@ -2960,7 +2964,7 @@ containing a value of this type. MainActivity: strings */ - public static final int mcn_exit_title=0x7f0a0061; + public static final int mcn_exit_title=0x7f0a0062; public static final int status_bar_notification_info_overflow=0x7f0a0016; public static final int toast_login_error=0x7f0a0047; public static final int toast_optifine_success=0x7f0a0048; @@ -2969,7 +2973,7 @@ containing a value of this type. public static final int toast_permission_denied=0x7f0a0046; /** Update part (unused now) */ - public static final int update_console=0x7f0a007e; + public static final int update_console=0x7f0a007f; public static final int warning_action_exit=0x7f0a003c; public static final int warning_action_install=0x7f0a003a; public static final int warning_action_tryanyway=0x7f0a003b; diff --git a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java index 7960d55b8..a1925581d 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java +++ b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java @@ -12,7 +12,11 @@ public class AndroidLWJGLKeycode { private static final ArrayMap androidToLwjglMap; private static String[] androidKeyNameArray; static { - // OOPS I waste my time to map this, but already have another. + /* + * There are already have mapped in + * org.lwjgl.opengl.AndroidKeyCodes + * but this key map is more than. + */ // Mapping Android Keycodes to LWJGL Keycodes diff --git a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java index d6823475e..3b34dea00 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java @@ -1133,11 +1133,11 @@ public class MCLauncherActivity extends AppCompatActivity try { final int myVer = Tools.usingVerCode; - final String myChamVer = Tools.usingVerName; + // final String currVerName = Tools.usingVerName; - String[] totalNewVer = DownloadUtils.downloadString(Tools.mhomeUrl + "/minever.txt").split(";"); + String[] totalNewVer = DownloadUtils.downloadString(Tools.mhomeUrl + "/update.txt").split(";"); final int newVer = Integer.parseInt(totalNewVer[1]); - final String newChamVer = totalNewVer[0]; + final String newVerName = totalNewVer[0]; //int myVer = 102; @@ -1159,8 +1159,7 @@ public class MCLauncherActivity extends AppCompatActivity } alUp.setMessage( - "Current version: " + myChamVer + "\n" + - "Latest version: " + newChamVer + "\n" + + "Received version " + newVerName + "\n" + isNewVerAvailable ); if(isAvailable){ @@ -1168,7 +1167,7 @@ public class MCLauncherActivity extends AppCompatActivity @Override public void onClick(DialogInterface p1, int p2) { - updateAppProcess(newChamVer); + updateAppProcess(newVerName); } }); } diff --git a/app/src/main/java/net/kdt/pojavlaunch/MCProfile.java b/app/src/main/java/net/kdt/pojavlaunch/MCProfile.java index 98c8388af..5f16c29c1 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MCProfile.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MCProfile.java @@ -74,7 +74,7 @@ public class MCProfile builder.setAccessToken(acct); builder.setUsername(name); builder.setVersion(vers); - builder.setIsAccount(Boolean.parseBoolean(isAc)); + builder.setIsMojangAccount(Boolean.parseBoolean(isAc)); return builder; } @@ -107,7 +107,7 @@ public class MCProfile public static class Builder implements Serializable { private String[] fullArgs = new String[6]; - private boolean isAccount = true; + private boolean isMojangAccount = true; public Builder() { @@ -119,7 +119,7 @@ public class MCProfile public boolean isMojangAccount() { - return isAccount; + return isMojangAccount; } public String getVersion() @@ -147,9 +147,9 @@ public class MCProfile return fullArgs[4]; } - public void setIsAccount(boolean value) + public void setIsMojangAccount(boolean value) { - isAccount = value; + isMojangAccount = value; } public void setVersion(String value) diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index a43be2960..2c7478c02 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -35,8 +35,9 @@ import android.graphics.drawable.Drawable; import java.security.Provider.*; import org.apache.harmony.security.fortress.*; import optifine.*; +import net.kdt.pojavlaunch.prefs.*; -public class MainActivity extends Activity implements OnTouchListener +public class MainActivity extends Activity implements OnTouchListener, OnClickListener { public static final String initText = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA "; @@ -84,7 +85,8 @@ public class MainActivity extends Activity implements OnTouchListener debugButton, shiftButton, keyboardButton, inventoryButton, talkButton, thirdPersonButton, - screenshotButton, listPlayersButton; + screenshotButton, listPlayersButton, + toggleControlButton; private LinearLayout touchPad; private ImageView mousePointer; //private EditText hiddenEditor; @@ -235,9 +237,10 @@ public class MainActivity extends Activity implements OnTouchListener this.thirdPersonButton = findButton(R.id.control_thirdperson); this.screenshotButton = findButton(R.id.control_screenshot); this.listPlayersButton = findButton(R.id.control_listplayers); + this.toggleControlButton = findButton(R.id.control_togglecontrol); this.overlayView = (ViewGroup) findViewById(R.id.main_control_overlay); this.secondaryButtonDefaultBackground = this.secondaryButton.getBackground(); - this.secondaryButtonColorBackground = new ColorDrawable(-65536); + this.secondaryButtonColorBackground = new ColorDrawable(-65536 /* color ??? */); //this.hiddenEditor = findViewById(R.id.hiddenTextbox); @@ -267,10 +270,13 @@ public class MainActivity extends Activity implements OnTouchListener this.debugText = (TextView) findViewById(R.id.content_text_debug); + this.toggleControlButton.setOnClickListener(this); + this.glSurfaceView = (MinecraftGLView) findViewById(R.id.main_game_render_view); - - toggleGui(null); + + // toggleGui(null); + onClick(toggleControlButton); this.drawerLayout.closeDrawers(); AndroidLWJGLKeycode.isBackspaceAfterChar = mVersionInfo.minimumLauncherVersion >= 18; @@ -714,6 +720,61 @@ public class MainActivity extends Activity implements OnTouchListener } super.onPause(); } + + @Override + public void onClick(View view) { + switch (view.getId()) { + case R.id.control_togglecontrol: { + switch(overlayView.getVisibility()){ + case View.VISIBLE: overlayView.setVisibility(View.GONE); + break; + case View.GONE: overlayView.setVisibility(View.VISIBLE); + } + } + } + } + + public boolean onTouch(View v, MotionEvent e) { + boolean isDown; + switch (e.getActionMasked()) { + case TessState.T_DORMANT /*0*/: + case AppletLoader.STATE_CHECKING_FOR_UPDATES /*5*/: + isDown = true; + break; + case TessState.T_IN_POLYGON /*1*/: + case AppletLoader.STATE_DETERMINING_PACKAGES /*3*/: + case AppletLoader.STATE_DOWNLOADING /*6*/: + isDown = false; + break; + default: + return false; + } + + switch (v.getId()) { + case R.id.control_up: sendKeyPress(Keyboard.KEY_W, isDown); break; + case R.id.control_left: sendKeyPress(Keyboard.KEY_A, isDown); break; + case R.id.control_down: sendKeyPress(Keyboard.KEY_S, isDown); break; + case R.id.control_right: sendKeyPress(Keyboard.KEY_D, isDown); break; + case R.id.control_jump: sendKeyPress(Keyboard.KEY_SPACE, isDown); break; + case R.id.control_primary: sendMouseButton(0, isDown); break; + case R.id.control_secondary: + if (AndroidDisplay.grab) { + sendMouseButton(1, isDown); + } else { + setRightOverride(isDown); + } break; + case R.id.control_debug: sendKeyPress(Keyboard.KEY_F3, isDown); break; + case R.id.control_shift: sendKeyPress(Keyboard.KEY_LSHIFT, isDown); break; + case R.id.control_inventory: sendKeyPress(Keyboard.KEY_E, isDown); break; + case R.id.control_talk: sendKeyPress(Keyboard.KEY_T, isDown); break; + case R.id.control_keyboard: showKeyboard(); break; + case R.id.control_thirdperson: sendKeyPress(Keyboard.KEY_F5, isDown); break; + case R.id.control_screenshot: sendKeyPress(Keyboard.KEY_F2, isDown); break; + case R.id.control_listplayers: sendKeyPress(Keyboard.KEY_TAB, isDown); break; + } + + return false; + } public static void fullyExit() { ExitManager.stopExitLoop(); @@ -874,34 +935,38 @@ public class MainActivity extends Activity implements OnTouchListener mainMethod.setAccessible(true); mainMethod.invoke(null, new Object[]{launchArgs}); } - - // Method v6: - - /** - * Pojav Execute arguments. - * - * [0] = argOptdir (eg. "/dir") - * [1] = argNative (eg. "/dir/lib/arm64") - * [2] = classpath (eg. "mc.jar:lib1.jar:...") - * [3] = mainclass (eg. "net.minecraft.client.Minecraft") - */ } public void fixRSAPadding() throws Exception { // welcome to the territory of YOLO; I'll be your tour guide for today. try { +/* System.out.println(Cipher.getInstance("RSA")); System.out.println(Cipher.getInstance("RSA/ECB/PKCS1Padding")); - if (android.os.Build.VERSION.SDK_INT >= 23) { // Marshmallow - // return; // FUUUUU I DON'T KNOW FIXME +*/ + if (true) { // android.os.Build.VERSION.SDK_INT >= 23) { // Marshmallow + // FUUUUU I DON'T KNOW FIXME + Cipher rsaPkcs1Cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding"); + Cipher.getInstance("RSA", rsaPkcs1Cipher.getProvider()); + + Cipher newRSACipher = Cipher.getInstance("RSA"); + + Field fieldPKCS1 = Provider.class.getDeclaredField("serviceMap"); + fieldPKCS1.setAccessible(true); + Map /* */ mapPKCS1 = (Map) fieldPKCS1.get(newRSACipher.getProvider()); + + Field fieldRSA = Provider.class.getDeclaredField("serviceMap"); + fieldRSA.setAccessible(true); + Map /* */ mapRSA = (Map) fieldRSA.get(newRSACipher.getProvider()); + mapRSA.clear(); + mapRSA.putAll(mapPKCS1); + } else { + ArrayList rsaList = Services.getServices("Cipher.RSA"); + ArrayList rsaPkcs1List = Services.getServices("Cipher.RSA/ECB/PKCS1PADDING"); + rsaList.clear(); + rsaList.addAll(rsaPkcs1List); } - - ArrayList rsaList = Services.getServices("Cipher.RSA"); - ArrayList rsaPkcs1List = Services.getServices("Cipher.RSA/ECB/PKCS1PADDING"); - - rsaList.clear(); - rsaList.addAll(rsaPkcs1List); } catch (Throwable th) { // Tools.dialogOnUiThread(MainActivity.this, "Warning: can't fix RSA Padding", Log.getStackTraceString(th)); th.printStackTrace(); @@ -1053,14 +1118,6 @@ public class MainActivity extends Activity implements OnTouchListener this.mousePointer.setTranslationY(y); } - public void toggleGui(View view) { - switch(overlayView.getVisibility()){ - case View.VISIBLE: overlayView.setVisibility(View.GONE); - break; - case View.GONE: overlayView.setVisibility(View.VISIBLE); - } - } - public void toggleMouse(View view) { if (AndroidDisplay.grab) return; @@ -1096,64 +1153,12 @@ public class MainActivity extends Activity implements OnTouchListener private Button findButton(int id) { Button button = (Button) findViewById(id); + button.setWidth((int) (button.getWidth() * PojavPreferenceActivity.PREF_BUTTONSIZE)); + button.setHeight((int) (button.getHeight() * PojavPreferenceActivity.PREF_BUTTONSIZE)); button.setOnTouchListener(this); return button; } - public boolean onTouch(View v, MotionEvent e) { - boolean isDown; - switch (e.getActionMasked()) { - case TessState.T_DORMANT /*0*/: - case AppletLoader.STATE_CHECKING_FOR_UPDATES /*5*/: - isDown = true; - break; - case TessState.T_IN_POLYGON /*1*/: - case AppletLoader.STATE_DETERMINING_PACKAGES /*3*/: - case AppletLoader.STATE_DOWNLOADING /*6*/: - isDown = false; - break; - default: - return false; - } - - if (v == this.upButton) { - sendKeyPress(Keyboard.KEY_W, isDown); - } else if (v == this.downButton) { - sendKeyPress(Keyboard.KEY_S, isDown); - } else if (v == this.leftButton) { - sendKeyPress(Keyboard.KEY_A, isDown); - } else if (v == this.rightButton) { - sendKeyPress(Keyboard.KEY_D, isDown); - } else if (v == this.jumpButton) { - sendKeyPress(Keyboard.KEY_SPACE, isDown); - } else if (v == this.primaryButton) { - sendMouseButton(0, isDown); - } else if (v == this.secondaryButton) { - if (AndroidDisplay.grab) { - sendMouseButton(1, isDown); - } else { - setRightOverride(isDown); - } - } else if (v == debugButton) { - sendKeyPress(Keyboard.KEY_F3, isDown); - } else if (v == shiftButton) { - sendKeyPress(Keyboard.KEY_LSHIFT, isDown); - } else if (v == inventoryButton) { - sendKeyPress(Keyboard.KEY_E, isDown); - } else if (v == talkButton) { - sendKeyPress(Keyboard.KEY_T, isDown); - } else if (v == keyboardButton) { - showKeyboard(); - } else if (v == thirdPersonButton) { - sendKeyPress(Keyboard.KEY_F5, isDown); - } else if (v == this.screenshotButton) { - sendKeyPress(Keyboard.KEY_F2, isDown); - } else if (v == this.listPlayersButton) { - sendKeyPress(Keyboard.KEY_TAB, isDown); - } - return false; - } - @Override public void onBackPressed() { // Prevent back diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index ba217f84e..e135cc986 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -466,7 +466,7 @@ public class PojavLoginActivity extends MineActivity edit2.setError(getResources().getString(R.string.login_error_exist_username)); } else{ MCProfile.Builder builder = new MCProfile.Builder(); - builder.setIsAccount(false); + builder.setIsMojangAccount(false); builder.setUsername(text); return builder; @@ -545,13 +545,8 @@ public class PojavLoginActivity extends MineActivity { // TODO: Implement this method if(result[0].equals("ERROR")){ - new AlertDialog.Builder(PojavLoginActivity.this) - .setTitle(R.string.error_title) - .setMessage(strArrToString(result)) - .setPositiveButton(android.R.string.ok, null) - .show(); - } - else{ + Tools.dialogOnUiThread(PojavLoginActivity.this, getResources().getString(R.string.error_title), strArrToString(result)); + } else{ MCProfile.Builder builder = new MCProfile.Builder(); builder.setAccessToken(result[1]); builder.setClientID(result[2]); diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index 166b89b46..8c6983cdf 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -35,7 +35,7 @@ public final class Tools public static int usingVerCode = 1; public static String usingVerName = "2.4.2"; - public static String mhomeUrl = "http://mineup.eu5.net"; // "http://kdtjavacraft.eu5.net"; + public static String mhomeUrl = "https://khanhduytran0.github.io/PojavLauncher"; // "http://kdtjavacraft.eu5.net"; public static String datapath = "/data/data/net.kdt.pojavlaunch"; public static String worksDir = datapath + "/app_working_dir"; @@ -222,8 +222,7 @@ public final class Tools }); } - public static void dialogOnUiThread(final Activity ctx, final CharSequence title, final CharSequence message) - { + public static void dialogOnUiThread(final Activity ctx, final CharSequence title, final CharSequence message) { ctx.runOnUiThread(new Runnable(){ @Override diff --git a/app/src/main/java/net/kdt/pojavlaunch/prefs/PojavPreferenceActivity.java b/app/src/main/java/net/kdt/pojavlaunch/prefs/PojavPreferenceActivity.java index 0d7b0b380..fbdccc0fb 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/prefs/PojavPreferenceActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/prefs/PojavPreferenceActivity.java @@ -11,9 +11,10 @@ import com.kdt.mcgui.app.*; public class PojavPreferenceActivity extends MineActivity { public static boolean PREF_FREEFORM = false; + public static float PREF_BUTTONSIZE = 1.0f; - private SeekBar viewSeekDxRef; - private TextView viewSeekProgress; + private SeekBar viewSeekDxRef, viewSeekControlSize; + private TextView viewSeekProgressDxRef, viewSeekProgressControl; private Switch viewSwitchFreeform; private SharedPreferences mainPreference; @@ -21,16 +22,21 @@ public class PojavPreferenceActivity extends MineActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.settings); + + /* Unable to setting to PreferenceActivity: + * + * - Unable to set custom Views. + * - Having trouble setting. + */ PojavPreferenceActivity.loadPreferences(this); mainPreference = getSharedPreferences("pojav_preferences", MODE_PRIVATE); final SharedPreferences.Editor mainPrefEdit = mainPreference.edit(); + // DX Refs viewSeekDxRef = (SeekBar) findViewById(R.id.settings_seekbar_setmaxdxref); - viewSeekProgress = (TextView) findViewById(R.id.setting_seektext_progress); - viewSwitchFreeform = (Switch) findViewById(R.id.settings_switch_enablefreeform); - + viewSeekProgressDxRef = (TextView) findViewById(R.id.setting_progressseek_maxdxref); viewSeekDxRef.setMax(0xFFFF - 0xFFF); viewSeekDxRef.setProgress(DexFormat.MAX_MEMBER_IDX - 0xFFF); viewSeekDxRef.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener(){ @@ -38,7 +44,7 @@ public class PojavPreferenceActivity extends MineActivity @Override public void onProgressChanged(SeekBar bar, int progress, boolean p3) { currProgress = 0xFFF + progress; - viewSeekProgress.setText(currProgress + "/" + 0xFFFF); + viewSeekProgressDxRef.setText(currProgress + "/" + 0xFFFF); } @Override @@ -52,8 +58,38 @@ public class PojavPreferenceActivity extends MineActivity mainPrefEdit.commit(); } }); - viewSeekProgress.setText((viewSeekDxRef.getProgress() + 0xFFF) + "/" + 0xFFFF); + viewSeekProgressDxRef.setText((viewSeekDxRef.getProgress() + 0xFFF) + "/" + 0xFFFF); + + // Control size + viewSeekControlSize = (SeekBar) findViewById(R.id.settings_seekbar_controlsize); + viewSeekProgressControl = (TextView) findViewById(R.id.setting_progressseek_control); + viewSeekControlSize.setMax(200); + viewSeekControlSize.setProgress((int) (PREF_BUTTONSIZE * 100)); + viewSeekControlSize.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener(){ + private float currProgress = 1.0f; + @Override + public void onProgressChanged(SeekBar bar, int progress, boolean p3) { + currProgress = (float) progress / 100; + String progressStr = Float.toString(currProgress); + if (progressStr.length() == 3) progressStr = progressStr + "0"; + viewSeekProgressControl.setText(currProgress + "/2.00"); + } + + @Override + public void onStartTrackingTouch(SeekBar bar) { + // Unused + } + + @Override + public void onStopTrackingTouch(SeekBar bar) { + mainPrefEdit.putFloat("controlSize", currProgress); + mainPrefEdit.commit(); + } + }); + viewSeekProgressControl.setText(((float) viewSeekControlSize.getProgress() / 100f) + "/2"); + // Freeform mode + viewSwitchFreeform = (Switch) findViewById(R.id.settings_switch_enablefreeform); viewSwitchFreeform.setOnCheckedChangeListener(new Switch.OnCheckedChangeListener(){ @Override @@ -80,6 +116,7 @@ public class PojavPreferenceActivity extends MineActivity DexFormat.MAX_MEMBER_IDX = maxDxPref; DexFormat.MAX_TYPE_IDX = maxDxPref; + PREF_BUTTONSIZE = mainPreference.getFloat("controlSize", 1f); PREF_FREEFORM = mainPreference.getBoolean("freeform", false); } } diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 81b15c5e7..63638c58e 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -50,15 +50,15 @@ layout="@layout/overlay"/>