MCinaBox Release v0.1.2

AOF-Dev · Apr 9, 2020 · 166d0ad · 166d0ad
1 parent 77e6186
commit 166d0ad
Show file tree

Hide file tree

Showing 23 changed files with 126 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 ## Table of Contents
 - [Background](#Background)
 - [Change Log](#Change-Log)
-- [Install](#Install)
+- [Build](#Build)
 - [Usage](#Usage)
 - [Preview](#Preview)
 - [Known Issues](#Known-Issues)
@@ -19,8 +19,36 @@
 
 ## Change Log
 
+### v0.1.2
+- Fix reediting keys caused a crash while repairing virtual keyboard configurations
+- Fix some control behavior exceptions in Boat-3 mode
+- Add a new downloader to provide visual download progress feedback
+- Add the Minecraft Json Parsing Tool Library
+- Add multilingual support (preliminary)
+- Add Forge and LiteLoader support (see documentation)
+### v0.1.1
+- Fix crashes caused by asynchronous message manager refresh when memory is empty
+- Fix crashes caused by null values when adding custom keys
+- Fix downloader to duplicate download of existing files
+- Fix invalid custom keys with primary key value of mouse in boat-3 mode
+- Fix Gallery crash caused by Android media scanning minecraft folder
+- Change custom key dialog action button set top
+- Add drag to change position when adding custom keys
+- Add a status indicator to increase the limit on memory size settings
+- Remove temporary removal of integration package import function entry
+- Remove more options for temporarily removing Toolbar
 ### v0.1.0
 - First Release Version.
+
+Chinese Translation:
+
+### v0.1.2
+- 修复 虚拟键盘配置时重新编辑键导致的崩溃
+- 修正 Boat-3模式中的一些控制行为异常
+- 添加 新的下载程序以提供可视化的下载进度反馈
+- 添加 Minecraft Json解析工具库
+- 添加 多语言支持（初步）
+- 添加 Forge和LiteLoader支持（请参阅文档）
 ### v0.1.1
 - 修复 内存为空时因异步消息管理器刷新而引发的崩溃
 - 修复 添加自定义按键时一些值为空引发的崩溃
@@ -32,8 +60,10 @@
 - 添加 状态指示器增加对内存大小设置的限制
 - 移除 暂时移除整合包导入功能入口
 - 移除 暂时移除Toolbar 更多选项
+### v0.1.0
+-第一个发行版本
 
-## Install
+## Build
 
 ### Environment
 - Android Studio
@@ -52,8 +82,41 @@
 #### You can also get released apk from [here]().
 
 ## Usage
+
+### Install
+1. Download the lastest APK and runtime pack to your Android phone.
+2. Install APK and start it at least one time.
+3. Copy the runtime to ```/sdcard/Android/data/com.aof.mcinabox/files/MCinaBox/runtimepack/```
+4. Then start APK and find ```Launcher Set``` to import the runtime pack.
+### Play
+1. Before you start the game, you need to configure the starter according to the instructions in the software. Until the indicator changes from red to blue.
+2. What you need to do includes creating users, modifying the maximum memory, downloading game versions, and creating your own virtual keyboard templates.
+### Forge
+In theory, forge is supported, but we need to make some changes to start it.
+1. Copy an installed version of forge from your computer to ```/sdcard/mcinabox/.minecraft/```, including ```libraries``` and ```versions```
+2. Launch it in MCinaBox at least one time. (As a result, it can't be started)
+3. Edit ```/sdcard/MCinaBox/.minecraft/config/splash.properties``` to change ```enabled=true``` to ```enabled=false``` to close forge loading animation.
+4. Try to launch forge again.It's going to be black for a while, but it's usually useful
+### Matters needing attention
+1. Mipmap will cause rendering problems. Please turn it off in Minecraft ```settings - video settings - mipmap=0```
+
 ## Preview
+
 ## Known Issues
+
+### Launcher
+1. Asynchronous message manager at risk of crashing
+2. Language options can not be reloaded well
+3. Unable to request more memory from the system, the upper limit is determined by the system
+4. Sometimes the downloader gets stuck at 99%. It can be solved by canceling and retrying
+
+### Launch Minecraft
+1. Forge's loading animation will cause a crash
+2. It seems that there will be an X11 error when starting the Minecraft version below 1.6
+3. Unable to initialize Minecraft 1.13.x
+4. Minecraft 1.14.X ~ 1.15.X has rendering problems
+5. Too fast key input may cause lwjgl to crash
+
 ## Maintainers
 [@longjunyu2](https://github.com/longjunyu2)
 
@@ -71,6 +134,10 @@ Chinese Translation:
 ## Contribution
 This project exists thanks to all the people who contribute.
 
+### List of contributors:
+- wjyue2001 provides Japanese translation
+- MCredbear provides new English translation.(will be used)
+
 If you want to submit a pull request, there're some requirements:
 * IDE: Android Studio
 * TargetSDK: 28

diff --git a/boat/src/main/java/cosine/boat/LauncherActivity.java b/boat/src/main/java/cosine/boat/LauncherActivity.java
@@ -24,8 +24,8 @@ public void onCreate(Bundle savedInstance) {
         //初始化日志
         //【release版暂时不开启】
 
-        final String logPath = BOAT_HOME + "/log.txt";
-        Logcat.initializeOutOfProcess(this, logPath, LogcatService.class);
+        //final String logPath = BOAT_HOME + "/log.txt";
+        //Logcat.initializeOutOfProcess(this, logPath, LogcatService.class);
 
 
         final String reportPath = BOAT_HOME + "/crash.txt";

diff --git a/mcinabox/build.gradle b/mcinabox/build.gradle
@@ -12,7 +12,7 @@ android {
         applicationId "com.aof.mcinabox"
         minSdkVersion 21
         targetSdkVersion 21
-        versionCode 1
+        versionCode 3
         versionName '0.1.2'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/mcinabox/src/main/java/com/aof/mcinabox/launcher/user/UserListAdapter.java b/mcinabox/src/main/java/com/aof/mcinabox/launcher/user/UserListAdapter.java
@@ -76,11 +76,11 @@ public View getView(final int position, View convertView, ViewGroup parent) {
         }
         viewHolder.username.setText(userlist.get(position).getUser_name());
         if(userlist.get(position).getUser_model().equals("offline")){
-            viewHolder.userstate.setText("离线模式");
+            viewHolder.userstate.setText(viewHolder.context.getString(R.string.title_offline));
         }else if(userlist.get(position).getUser_model().equals("online")){
-            viewHolder.userstate.setText("在线模式");
+            viewHolder.userstate.setText(viewHolder.context.getString(R.string.title_online));
         }else{
-            viewHolder.userstate.setText("无法解析");
+            viewHolder.userstate.setText(viewHolder.context.getString(R.string.title_unknown));
         }
         viewHolder.removeuser.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -92,11 +92,11 @@ public void onClick(View v) {
                 //    设置Title的图标
                 //builder.setIcon(R.drawable.ic_launcher);
                 //    设置Title的内容
-                builder.setTitle("警告");
+                builder.setTitle(viewHolder.context.getString(R.string.title_warn));
                 //    设置Content来显示一个信息
-                builder.setMessage("您确定要删除这个用户吗？");
+                builder.setMessage(viewHolder.context.getString(R.string.tips_user_remove_warning));
                 //    设置一个PositiveButton
-                builder.setPositiveButton("确定", new DialogInterface.OnClickListener()
+                builder.setPositiveButton(viewHolder.context.getString(R.string.tips_ok), new DialogInterface.OnClickListener()
                 {
                     @Override
                     public void onClick(DialogInterface dialog, int which)
@@ -106,7 +106,7 @@ public void onClick(DialogInterface dialog, int which)
                     }
                 });
                 //    设置一个NegativeButton
-                builder.setNegativeButton("取消", new DialogInterface.OnClickListener()
+                builder.setNegativeButton(viewHolder.context.getString(R.string.tips_no), new DialogInterface.OnClickListener()
                 {
                     @Override
                     public void onClick(DialogInterface dialog, int which)

diff --git a/mcinabox/src/main/res/drawable/bookshelf.png b/mcinabox/src/main/res/drawable/bookshelf.png
diff --git a/mcinabox/src/main/res/drawable/command.png b/mcinabox/src/main/res/drawable/command.png
diff --git a/mcinabox/src/main/res/drawable/craft_table.png b/mcinabox/src/main/res/drawable/craft_table.png
diff --git a/mcinabox/src/main/res/drawable/furnace.png b/mcinabox/src/main/res/drawable/furnace.png
diff --git a/mcinabox/src/main/res/drawable/grass.png b/mcinabox/src/main/res/drawable/grass.png
diff --git a/mcinabox/src/main/res/drawable/steve_pic.bmp b/mcinabox/src/main/res/drawable/steve_pic.bmp
diff --git a/mcinabox/src/main/res/layout/activity_main.xml b/mcinabox/src/main/res/layout/activity_main.xml
@@ -83,8 +83,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="40dp"
-        android:paddingLeft="30dp"
-        android:paddingRight="20dp"
+        android:paddingLeft="20dp"
+        android:paddingRight="0dp"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
         android:background="@drawable/background_layout_startgame"
@@ -93,7 +93,7 @@
         app:layout_constraintEnd_toEndOf="parent">
 
         <LinearLayout
-            android:layout_marginLeft="30dp"
+            android:layout_marginLeft="20dp"
             android:id="@+id/main_button_startgame"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -123,7 +123,7 @@
             android:layout_weight="1" />
         <Spinner
             android:id="@+id/spinner_choice_version"
-            android:layout_width="80dp"
+            android:layout_width="130dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"/>
 
@@ -174,9 +174,9 @@
                     android:layout_height="wrap_content"
                     android:background="@drawable/layout_button_background"
                     android:drawableStart="@drawable/steve_pic_2"
-                    android:drawablePadding="6dp"
+                    android:drawablePadding="5dp"
                     android:gravity="center_vertical"
-                    android:paddingStart="15dp"
+                    android:paddingStart="10dp"
                     android:paddingEnd="0dp"
                     android:text="@string/title_user" />
             </LinearLayout>

diff --git a/mcinabox/src/main/res/layout/dialog_configkey.xml b/mcinabox/src/main/res/layout/dialog_configkey.xml
@@ -359,7 +359,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:layout_marginBottom="2dp"
+        android:layout_marginBottom="5dp"
         android:orientation="horizontal">
 
         <Button

diff --git a/mcinabox/src/main/res/layout/dialog_createuser.xml b/mcinabox/src/main/res/layout/dialog_createuser.xml
@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
             <TextView
-                android:layout_width="50dp"
+                android:layout_width="80dp"
                 android:layout_height="wrap_content"
                 android:textColor="@color/puredark"
                 android:text="@string/title_user_name"/>
@@ -81,6 +81,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
             android:orientation="horizontal">
             <Button
                 android:id="@+id/dialog_button_confirm_createuser"

diff --git a/mcinabox/src/main/res/layout/dialog_loadmodel.xml b/mcinabox/src/main/res/layout/dialog_loadmodel.xml
@@ -79,6 +79,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
             android:orientation="horizontal">
             <Button
                 android:id="@+id/dialog_button_load"

diff --git a/mcinabox/src/main/res/layout/dialog_savemodel.xml b/mcinabox/src/main/res/layout/dialog_savemodel.xml
@@ -81,6 +81,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
             android:orientation="horizontal">
             <Button
                 android:id="@+id/dialog_button_save"

diff --git a/mcinabox/src/main/res/layout/listview_user.xml b/mcinabox/src/main/res/layout/listview_user.xml
@@ -59,4 +59,5 @@
             android:layout_marginEnd="10dp"
             android:background="@drawable/ic_delete_black_24dp" />
     </LinearLayout>
+
 </LinearLayout>
diff --git a/mcinabox/src/main/res/values-en/strings.xml b/mcinabox/src/main/res/values-en/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="main_text_gamelist">Game List</string>
+	<string name="main_text_gamelist">All Versions</string>
 	<string name="main_text_gamedir">Current directory</string>
-	<string name="main_text_launchersetting">Starter Set</string>
+	<string name="main_text_launchersetting">Settings</string>
 	<string name="main_text_launchercontrol">Virtual Keyboard Settings</string>
 	<string name="main_text_defaultlayout">Home</string>
 	<string name="app_copyright">This non-release version, only after a holiday AOF software development team members to use inside!</string>
@@ -17,7 +17,7 @@
 	<string name="app_about_copyright_info">MCinaBox Copyright © 2020 longjunyu.</string>
 	<string name="app_about_developer_info">longjunyu (MCinaBox [email protected])\nand all project contributors</string>
 	<string name="app_about_contributor_info">No contributor</string>
-	<string name="app_about_thanks_info">CosineMath (BoatApp, https://github.com/CosineMath/) starter back-end support \ nbangbang93 (BMCLAPI, http://bmclapi2.bangbang93.com/)\nApp icon provider MC Red Bear \ nAOF software development team </string>
+	<string name="app_about_thanks_info">CosineMath (BoatApp, https://github.com/CosineMath/) Launcher back-end support \ nbangbang93 (BMCLAPI, http://bmclapi2.bangbang93.com/)\nApp icon provider MC Red Bear \ nAOF software development team </string>
 	<string name="app_about_details_info">Minecraft all copyright Mojang AB, the use of this software copyright issues arising, software producers are not responsible. </string>
 	<string name="app_about_opensource_info">https://github.com/longjunyu2/MCinaBox (GPLv3 open-source agreement to comply with this project, please comply with open source license requirements)</string>
 	<string name="title_setting">Set up</string>
@@ -41,7 +41,7 @@
 	<string name="title_install_newversion">Install version</string>
 	<string name="title_install_gamepack">Install integrated package</string>
 	<string name="title_setting_minecraft">Global Game Settings</string>
-	<string name="title_user_newuser">Adding new users</string>
+	<string name="title_user_newuser">Create new user</string>
 	<string name="title_launcher">Launcher</string>
 	<string name="title_gamedir">Game menu</string>
 	<string name="title_game">Game</string>
@@ -68,7 +68,7 @@
 	<string name="tips_minecraft_setting_extra_javaargs">Java virtual machine parameters (do not fill)</string>
 	<string name="tips_minecraft_setting_extra_mcargs">Minecraft additional parameters (do not fill)</string>
 	<string name="tips_import_runtime">Please suffix .tar.xz local runtime into /sdcard/Android/data/com.aof.mcinabox/files/MCinaBox/runtimepack folder\nPage then select and import runtime startup settings</string>
-	<string name="tips_check_setting">Please complete the configuration starter</string>
+	<string name="tips_check_setting">Please complete the configuration for launcher</string>
 	<string name="tips_reflash_finish">Refresh complete</string>
 	<string name="tips_online_version_reflash">Please refresh the list</string>
 	<string name="tips_online_version_select">Please select a version</string>
@@ -78,7 +78,7 @@
 	<string name="tips_online_version_nodata">No game inventory data</string>
 	<string name="tips_launcher_init_fail">Start initialization failed</string>
 	<string name="tips_launcher_save_fail">Initiator Configuration saving failed</string>
-	<string name="tips_launcher_new_fail">Starter configuration template creation failed</string>
+	<string name="tips_launcher_new_fail">Launcher configuration template creation failed</string>
 	<string name="tips_launcher_new_success">Initiator configuration profile is created</string>
 	<string name="tips_launcher_load_fail">Initiator Configuration failed to load</string>
 	<string name="tips_launcher_load_bad">Startup configuration file is damaged</string>
@@ -90,7 +90,7 @@
 	<string name="tips_runtime_install_success">Runtime installation was successful</string>
 	<string name="tips_runtime_install_fail">Runtime installation fails</string>
 	<string name="tips_runtime_install_fail_exeable">Reason: Failed to set permissions</string>
-	<string name="tips_ok">Determine</string>
+	<string name="tips_ok">OK</string>
 	<string name="tips_no">Cancel</string>
 	<string name="tips_button_name">Key name</string>
 	<string name="tips_button_location">Location (Dp)</string>
@@ -149,4 +149,7 @@
 	<string name="tips_download_failed">Download failed</string>
     <string name="title_version">Version:</string>
 	<string name="title_offline">Offline</string>
+    <string name="title_unknown">Unknow</string>
+	<string name="title_warn">Warning</string>
+	<string name="tips_user_remove_warning">Confirm to delete this user?</string>
 </resources>
diff --git a/mcinabox/src/main/res/values-ja/strings.xml b/mcinabox/src/main/res/values-ja/strings.xml
@@ -27,15 +27,15 @@
     <string name="title_minecraft_setting_basic">ベーシック設定</string>
     <string name="title_minecraft_setting_keyboard_layout">キーボード配列</string>
     <string name="title_minecraft_setting_memory_max">メモリ最大値 (MB)</string>
-    <string name="title_minecraft_setting_memory_hardware">物理メモリのサイズ:</string>
+    <string name="title_minecraft_setting_memory_hardware">空きメモリ:</string>
     <string name="title_minecraft_setting_profession">高度な設定</string>
     <string name="title_minecraft_setting_notcheck_jvm">JVMの互換性を無視する</string> <!--不检查JVM架构的兼容性 翻译为 忽略JVM架构的兼容性-->
     <string name="title_minecraft_setting_notcheck_mc">Minecraftの完全性を無視する</string> <!--不检查Minecraft的完整性 翻译为 忽略Minecraft架构的完整性-->
     <string name="title_backspace">戻る</string>
     <string name="title_refresh">更新する</string>
     <string name="title_download">ダウンロードする</string>
     <string name="title_downloader_selected_version">選択したゲームは: </string>
-    <string name="title_downloader_warn">如果长时间未显示列表，请手动点击"刷新"\n由于这版本调用了系统下载器，可能存在下载不稳定的情况，请自行根据状态栏进度判断下载状态。</string>
+    <string name="title_downloader_warn">長い間リストが表示されない場合は、手動で「更新する」をクリックしてください。</string>
     <string name="title_minecraft_version_stable">安定版</string>
     <string name="title_minecraft_version_snapshot">スナップショット</string>
     <string name="title_minecraft_version_old">古いバージョン</string> <!--采用官方翻译-->
@@ -140,7 +140,7 @@
     <string name="tips_keyboard_button_notfound">キーボード配列は必ず導入してください</string>		<!-- 模板不能为空 翻译为　键盘模板必须导入  -->
     <string name="tips_gamecheck_file_notfull">ファイルの完全性チェックが失敗しました。縂起動構成で完全性を無視するまたはこのバージョンを再ダウンロードしてください。</string>
     <string name="tips_gamecheck_platform_uncorrect">このランタイムパッケージは互換性がありません。縂起動構成でJVMの互換性を無視するまたは正しいランタイムパッケージを導入してください。</string>
-    <string name="tips_keyboard_config">ヒント1：クリックしてドラッグするとボタンを指の方向に移動させます。\nヒント：2.ボタンを長押ししてドラッグしないと、選択ボタンを編集または削除できます。</string>
+    <string name="tips_keyboard_config">ヒント1：クリックしてドラッグするとボタンを指の方向に移動させます。\nヒント2：ボタンを長押ししてドラッグしないと、選択ボタンを編集または削除できます。</string>
     <string name="tips_gamecheck_version_notfound">Forge使用する前に対応バージョンのMinecraftをダウンロードしてください</string>
     <string name="tips_gamecheck_jar_notfound">ゲームのメインファイルが不完全です。必要なjarファイルがありません</string>
 
@@ -158,6 +158,9 @@
     <string name="tips_download_failed">下载失败</string>
     <string name="title_version">ゲームバージョン:</string>
     <string name="title_offline">オフラインモード</string>
+    <string name="tips_user_remove_warning">本当に現在のユーザを削除しますか？</string>
+    <string name="title_unknown">不明</string>
+    <string name="title_warn">警告</string>
 
     <!-- 翻訳者wjyue2001 -->
 </resources>
diff --git a/mcinabox/src/main/res/values-zh-rCN/strings.xml b/mcinabox/src/main/res/values-zh-rCN/strings.xml
@@ -159,4 +159,7 @@
     <string name="tips_download_failed">下载失败</string>
     <string name="title_version">游戏版本:</string>
     <string name="title_offline">离线模式</string>
+    <string name="title_unknown">未知</string>
+    <string name="title_warn">警告</string>
+    <string name="tips_user_remove_warning">你确定要删除当前用户吗？</string>
 </resources>