Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…ncher into gl4es
  • Loading branch information
khanhduytran0 committed Oct 11, 2020
2 parents 3bcf2df + 17ce185 commit e609dae
Show file tree
Hide file tree
Showing 6 changed files with 233 additions and 11 deletions.
22 changes: 16 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![badge](https://api.travis-ci.com/PojavLauncherTeam/PojavLauncher.svg?branch=gl4es)](https://travis-ci.com/github/PojavLauncherTeam/PojavLauncher)
[![Crowdin](https://badges.crowdin.net/pojavlauncher/localized.svg)](https://crowdin.com/project/pojavlauncher)
# PojavLauncher
An open source Minecraft: Java Edition launcher for Android based from Boardwalk. Support up-to Minecraft 1.11
(Codes has not been sorted yet, it contains ton of classes without packing to module).
Expand All @@ -18,6 +19,7 @@ Not implemented yet.
## Known issues
- Some Huawei devices can't run Minecraft or OptiFine.
- Can't run multiple versions at same time.
- V2 will not work on Android 6 and return error `ClassNotFoundException`.

## FAQ
### • Unable to drag item in inventory?
Expand All @@ -33,7 +35,7 @@ Increase max DX references. Launcher Options -> Settings -> Increase max DX refe
- Device name
- Android version

## Minecraft versions worked in PojavLauncher 2.4.2
## Minecraft versions worked in PojavLauncher [2.5.3](https://github.com/PojavLauncherTeam/PojavLauncher/releases/tag/untagged-4e80a0c1513abab0c480)

<table>
<thead>
Expand Down Expand Up @@ -90,8 +92,8 @@ Increase max DX references. Launcher Options -> Settings -> Increase max DX refe
<td align="center"><b>Yes</b></td>
<td align="center"><b>Yes</b></td>
<td align="center"><b>Yes</b></td>
<td align="center">???</td>
<td align="center">???</td>
<td align="center"><b>Yes</b></td>
<td align="center"><b>Yes</b></td>
<td align="center"><a href="https://stackoverflow.com/a/57861173">Java8</a></td>
<td align="center"><a href="https://stackoverflow.com/a/57861173">Java8</a></td>
</tr>
Expand All @@ -117,11 +119,21 @@ Increase max DX references. Launcher Options -> Settings -> Increase max DX refe
<td align="center"><a href="https://stackoverflow.com/a/57861173">Java8</a></td>
<td align="center"><a href="https://stackoverflow.com/a/57861173">Java8</a></td>
</tr>
<tr>
<td>11.0</td>
<td align="center"><a href="https://github.com/khanhduytran0/PojavLauncher/issues/7#issue-586928527"><b>Yes</b></a></td>
<td align="center"><a href="https://github.com/khanhduytran0/PojavLauncher/issues/7#issue-586928527"><b>Yes</b></a></td>
<td align="center"><a href="https://github.com/khanhduytran0/PojavLauncher/issues/7#issue-586928527"><b>Yes</b></a></td>
<td align="center"><a href="https://github.com/khanhduytran0/PojavLauncher/issues/7#issue-586928527"><b>Yes</b></a></td>
<td align="center"><a href="https://github.com/khanhduytran0/PojavLauncher/issues/7#issue-586928527"><b>Yes</b></a></td>
<td align="center"><a href="https://stackoverflow.com/a/57861173">Java8</a></td>
<td align="center"><a href="https://stackoverflow.com/a/57861173">Java8</a></td>
</tr>
</tbody>
</table>


## OptiFine worked in PojavLauncher 2.4.2
## OptiFine worked in PojavLauncher [2.5.3](https://github.com/PojavLauncherTeam/PojavLauncher/releases/tag/untagged-4e80a0c1513abab0c480)
|Android version | 9.0 |???|???|Manually Android 10|9.0|
|-----------------|------|---|---|-----|-----|
|Minecraft version|1.7.10|1.8|1.9| 1.10| 1.11|
Expand All @@ -139,8 +151,6 @@ Increase max DX references. Launcher Options -> Settings -> Increase max DX refe
- (v2) LegacyLauncher: (unknown license).<br>
- (all) Android Support Libraries & DX Dexer: [Apache License 2.0](https://android.googlesource.com/platform/prebuilts/maven_repo/android/+/master/NOTICE.txt).
- (all) gl4es: [MIT License](https://github.com/ptitSeb/gl4es/blob/master/LICENSE).<br>
- (v3) BusyBox: [GNU GPLv2 License](https://busybox.net/license.html).<br>
- (v3) OpenJDK: [GNU GPLv2 License](https://openjdk.java.net/legal/gplv2+ce.html).<br>
- (v3) PRoot: [GNU GPLv2 License](https://github.com/termux/proot/blob/master/COPYING).<br>
- (v3) XVnc: [GNU GPLv3 License](https://github.com/theqvd/qvd-client-android/blob/master/LICENSE.txt).
- (all) LWJGL 2: [Legacy LWJGL License](http://legacy.lwjgl.org/license.php.html).<br>
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
}
defaultConfig {
applicationId "net.kdt.pojavlaunch"
minSdkVersion 21
minSdkVersion 19
targetSdkVersion 26
versionCode 156235
versionName "2.5.3_6400b_20200802"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -1272,8 +1272,8 @@ private static synchronized Map<Provider, Provider.Service> getCipherServicesMap
ProviderList providerList = Providers.getProviderList();
Map<Provider, Provider.Service> services = null;

// Android 10
if (Build.VERSION.SDK_INT >= 29) {
// Android 6.0.0 and above
if (Build.VERSION.SDK_INT >= 24) {
services = new ArrayMap<>();
Provider.Service service = providerList.getService(type, algorithm);
services.put(service.getProvider(), service);
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
<string name="toast_permission_denied">Требуется разрешение на чтение/запись в хранилище!</string>
<string name="toast_login_error">После входа что-то пошло не так. Пожалуйста, сообщите об этом разработчику.\nОшибка: %s</string>
<string name="toast_optifine_success">Установка прошла успешно</string>
<string name="toast_shiftmode">Режим кнопки Shift (крадся) изменен на %s</string>
<string name="toast_shiftmode_hold">режим удержания</string>
<string name="toast_shiftmode_toggle">режим переключения</string>
<!--
<string name="toast_3">Exit</string>
-->
Expand Down Expand Up @@ -180,7 +183,8 @@
<string name="control_adebug">Откладка PointerCapture</string>
<string name="control_customkey">Отправить потловательскую раскладку</string>

<string name="control_more3"></string>
<string name="control_shiftmodechg">Изменить режим кнопки Shift (крадся)</string>

<string name="control_more4"></string>

<string name="customctrl_keyname">Код клавиши</string>
Expand All @@ -200,4 +204,4 @@
<string name="main_version_">Версия:</string>
<string name="main_nocrash">Сбоев не обнаружено</string>
<string name="main_nolog">Нет записей</string>
</resources>
</resources>
205 changes: 205 additions & 0 deletions app/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- App name part -->
<string name="app_name">PojavLauncher(适用于 Android 的 Java 版 Minecraft)</string>
<string name="app_short_name">PojavLauncher</string>
<string name="app_motd">在您的设备上启动 Java 版 Minecraft!</string>

<!-- Action bar part -->
<string name="actionbar_help">帮助</string>

<!-- Languages list part -->
<string name="language_name">SIMPLIFIED CHINESE - CN</string>

<!-- Logging output -->
<string name="log_title">日志输出</string>

<!-- Login strings -->
<string name="login_online_username_hint">电子邮件或用户名</string>
<string name="login_online_username_question">(使用哪个?)</string>
<string name="login_online_password_hint">密码</string>
<string name="login_online_password_question">忘记密码?</string>
<string name="login_online_remember">记住我</string>
<string name="login_online_check_keeplogin">保持登录状态</string>
<string name="login_online_login_label">登录</string>
<string name="login_online_create_account">(创建新账号?)</string>

<string name="login_offline_switch">离线登录?</string>
<string name="login_offline_label">以离线账号登录</string>
<string name="login_offline_alert_skip">跳过</string>

<string name="login_error_short_username">用户名至少为3字符长</string>
<string name="login_error_exist_username">用户名已存在</string>

<string name="login_select_account">选择账号</string>

<!-- Hint -->
<string name="hint_select_account">点击选择账号,长按删除。</string>
<string name="hint_control_mapping">"此项功能尚未完善,暂时无法应用自定义控制键位!\n左滑打开菜单 ◀\n长按按键以自定义:编辑,缩放或删除。"</string>

<!-- Warning -->
<string name="warning_title">警告</string>
<string name="warning_msg">本应用可能与您的 Android 版本(大于等于 Android 7.0)不兼容。作为替代,您可以安装虚拟大师并在其中安装本应用。但由于虚拟大师已从 Play 商店移除,您必须手动安装。</string>
<string name="warning_noshowagain">不再提示</string>
<string name="warning_action_install">安装虚拟大师</string>
<string name="warning_action_tryanyway">仍然尝试</string>
<string name="warning_action_exit">退出</string>
<string name="warning_remove_account">此账号将被移除!</string>

<!-- AlertDialog title -->
<string name="alerttitle_selectkeymap">选择 .json 键位文件</string>
<string name="alerttitle_installmod">选择要添加的 Mod</string>
<string name="alerttitle_installoptifine">选择 OptiFine .jar 文件</string>

<!-- Error messages -->
<string name="error_fatal">PojavLauncher 意外崩溃</string>
<string name="error_checklog">错误!检查下方日志: %s</string>
<string name="error_no_version">无版本!</string>
<string name="error_load_version">无法加载版本 %s</string>
<string name="error_convert_lib">无法转换运行库 %s</string>
<string name="error_convert_client">无法转换 Minecraft %s</string>
<string name="error_show_more">显示细节</string>
<string name="error_show_less">隐藏细节</string>

<!-- Toast messages -->
<string name="toast_permission_denied">需要存储读写权限!</string>
<string name="toast_login_error">登录后出现问题。请向开发者反馈。\n错误: %s</string>
<string name="toast_optifine_success">安装成功</string>
<string name="toast_shiftmode">Shift(潜行)键已修改为 %s 模式</string>
<string name="toast_shiftmode_hold">保持模式</string>
<string name="toast_shiftmode_toggle">点按切换模式</string>
<!--
<string name="toast_3">Exit</string>
-->

<!-- MCLauncherActivity: Tabs -->
<string name="mcl_tab_news">启动器新闻</string>
<string name="mcl_tab_console">开发控制台</string>
<string name="mcl_tab_crash">崩溃日志</string>

<!-- MCLauncherActivity: Strings -->
<string name="mcl_version_msg">Minecraft %s 就绪</string>
<string name="mcl_launch_cleancache">正在清理缓存</string>
<string name="mcl_launch_downloading">正在下载 %s</string>
<string name="mcl_launch_download_lib">正在下载运行库 %s</string>
<string name="mcl_launch_download_client">正在下载 Minecraft %s</string>
<string name="mcl_launch_convert_lib">正在转换运行库 %s</string>
<string name="mcl_launch_convert_client">正在转换 Minecraft %s</string>
<string name="mcl_launch_patch_client">正在为 Minecraft %s 打补丁</string>
<string name="mcl_launch_download_assets">正在准备下载资源</string>

<string name="mcl_options">选项</string>
<string name="mcl_option_modmgr">Mod 管理器(无功能)</string>
<string name="mcl_option_optifineinstall">安装 OptiFine</string>
<string name="mcl_option_checkupdate">检查更新</string>
<string name="mcl_option_customcontrol">自定义控制键</string>
<string name="mcl_option_settings">设置</string>
<string name="mcl_option_about">关于</string>

<string name="mcl_setting_title_setmaxdxref">设定最大 DX 引用值</string>
<string name="mcl_setting_subtitle_setmaxdxref">若转换时出现错误:“Too many ... references. You may try multi-dex option.”则调高此值。建议的值:4096或8192。</string>
<string name="mcl_setting_title_freeform">以自由式模式启动 Minecraft</string>
<string name="mcl_setting_subtitle_freeform">在浮动窗口中启动 Minecraft。需要 Android 7.0+</string>
<string name="mcl_setting_title_longpresstrigger">长按触发时长</string>
<string name="mcl_setting_subtitle_longpresstrigger">修改长按摧毁方块、丢弃物品的触发时长</string>
<string name="mcl_setting_title_controlsize">设定控制键大小</string>
<string name="mcl_setting_title_forgetoptifpath">阻止 OptiFine 定位自身</string>
<string name="mcl_setting_subtitle_forgetoptifpath">可能使 OptiFine 在某些设备上可以启动。</string>
<string name="mcl_setting_category_general">通用设置</string>
<string name="mcl_setting_category_veroption">版本类型将在版本列表中显示</string>
<string name="mcl_setting_veroption_release">Release</string>
<string name="mcl_setting_veroption_snapshot">Snapshot</string>
<string name="mcl_setting_veroption_oldalpha">Old-alpha</string>
<string name="mcl_setting_veroption_oldbeta">Old-beta</string>

<string name="mcl_version_clone">复制</string>

<!-- Global strings -->
<string name="global_add">添加</string>
<string name="global_edit">修改</string>
<string name="global_error">错误</string>
<string name="global_load">加载</string>
<string name="global_name">名称</string>
<string name="global_remove">移除</string>
<string name="global_restart">重启</string>
<string name="global_save">保存</string>
<string name="global_error_field_empty">此处表单不能为空</string>

<!--
<string name="mcl_about">
%1$s BETA (Minecraft Java launcher for Android), version " + PathTools.usingVerName + "\n" +
" - by Khanh Duy Tran (based from \"Boardwalk\" app)\n" +
"Using libraries:\n" +
" • LWJGL " + org.lwjgl.Sys.getVersion() + "\n" +
//" • Boardwalk memory manager (not used now).\n" +
" • gl4es: OpenGL for OpenGL ES devices by lunixbochs and ptitSeb.\n" +
" • dx: tool to convert.\n" +
" • Java AWT Implementation includes:\n" +
" - Boardwalk's makeshift.\n" +
" - Apache Harmony AWT Framework.\n" +
" - OpenJDK 7 codes implementation.\n" +
" - Developer code implement (copy text, open browser,...)\n" +
"\n" +
"* Notes:\n" +
" - This app is currently BETA, it will not be stable.\n" +
//"* This app will unstable on Android 7.0 or higher devices.\n" +
" - This app only use LWJGL2 and don't have a JRE8 desugar, so doesn't support 1.13 or higher versions.\n" +
" - This app is not affiliated with Minecraft, Mojang or Microsoft.\n")
</string>
-->
<!-- MainActivity: strings -->
<string name="mcn_exit_title">游戏退出</string>
<string name="mcn_exit_call">退出</string>
<string name="mcn_exit_crash">检测到游戏崩溃!按确定键退出。</string>
<string name="mcn_exit_errcrash">无法定位崩溃!您可以忽略这条消息。</string>
<string name="mcn_exit_confirm">确定强制关闭?</string>

<!-- MainActivity: Control buttons -->
<string name="controls">控制</string>
<string name="control_toggle">GUI</string>
<string name="control_keyboard">键盘</string>
<string name="control_chat">聊天</string>
<string name="control_debug">调试</string>
<string name="control_zoom">缩放 (C)</string>
<string name="control_primary">主</string>
<string name="control_secondary">副</string>
<string name="control_shift">◇</string>
<string name="control_inventory">背包</string>
<string name="control_up">▲</string>
<string name="control_left">◀</string>
<string name="control_right">▶</string>
<string name="control_down">▼</string>
<string name="control_jump">⬛</string>
<string name="control_thirdperson">3rd</string>
<string name="control_listplayers">Tab</string>
<string name="control_mouse">鼠标</string>
<string name="control_mouseoff">鼠标:关</string>
<string name="control_mouseon">鼠标:开</string>

<!-- MainActivity: Menu advanced controls -->
<string name="control_forceclose">强制关闭</string>
<string name="control_viewout">日志输出</string>
<string name="control_adebug">指针捕捉调试</string>
<string name="control_customkey">发送自定义键码</string>
<string name="control_shiftmodechg">修改 Shift(潜行)模式</string>

<string name="control_more4"></string>

<string name="customctrl_keyname">键码</string>
<string name="customctrl_specialkey">特殊键</string>
<string name="customctrl_hidden">隐藏</string>
<string name="customctrl_addbutton">添加按键</string>
<string name="customctrl_title_selectctrl">选择默认 .json 控制键位</string>
<string name="customctrl_selectdefault">选择默认 .json 控制键位</string>

<!-- Update part (unused now) -->
<string name="update_console">更新控制台</string>
<string name="main_options">选项</string>
<string name="main_play">启动游戏</string>
<string name="main_welcome">欢迎,</string>
<string name="main_infodev">信息(开发)</string>
<string name="main_switchuser">切换账号</string>
<string name="main_version_">版本:</string>
<string name="main_nocrash">未检测到崩溃</string>
<string name="main_nolog">无日志。</string>
</resources>
3 changes: 3 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
files:
- source: /app/src/main/res/values/strings.xml
translation: /app/src/main/res/values-%osx_locale%/%original_file_name%

0 comments on commit e609dae

Please sign in to comment.