From 166d0ad27a558fa112e7e1d716dde2ac769ce2b8 Mon Sep 17 00:00:00 2001 From: longjunyu2 <877730493@qq.com> Date: Thu, 9 Apr 2020 18:33:13 +0800 Subject: [PATCH] MCinaBox Release v0.1.2 --- README.md | 71 +++++++++++++++++- .../java/cosine/boat/LauncherActivity.java | 4 +- mcinabox/build.gradle | 2 +- .../launcher/user/UserListAdapter.java | 14 ++-- mcinabox/src/main/res/drawable/bookshelf.png | Bin 7775 -> 6017 bytes mcinabox/src/main/res/drawable/command.png | Bin 8972 -> 6075 bytes .../src/main/res/drawable/craft_table.png | Bin 9581 -> 4165 bytes mcinabox/src/main/res/drawable/furnace.png | Bin 6659 -> 5738 bytes mcinabox/src/main/res/drawable/grass.png | Bin 11306 -> 4295 bytes mcinabox/src/main/res/drawable/steve_pic.bmp | Bin 4854 -> 3834 bytes .../src/main/res/layout/activity_main.xml | 12 +-- .../src/main/res/layout/dialog_configkey.xml | 2 +- .../src/main/res/layout/dialog_createuser.xml | 3 +- .../src/main/res/layout/dialog_loadmodel.xml | 1 + .../src/main/res/layout/dialog_savemodel.xml | 1 + .../src/main/res/layout/listview_user.xml | 1 + mcinabox/src/main/res/values-en/strings.xml | 17 +++-- mcinabox/src/main/res/values-ja/strings.xml | 9 ++- .../src/main/res/values-zh-rCN/strings.xml | 3 + .../src/main/res/values-zh-rTW/strings.xml | 3 + mcinabox/src/main/res/values/strings.xml | 21 +++--- .../sharedmodule/Data/DataPathManifest.java | 5 +- .../aof/sharedmodule/Tools/ColorUtils.java | 3 - 23 files changed, 126 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index de81fa2e..1212ab7d 100644 --- 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 index bacda14a..664d9f9b 100644 --- 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 index 6869abea..b7903699 100644 --- 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 index 197339ac..736aa8b2 100644 --- 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 index 326c7b80318cddf8df5dd6e0c85e340101361c53..a2a6c6889f1f87b1fd65bf055893f7d608384820 100644 GIT binary patch literal 6017 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 literal 7775 zcmeIy>01)m8US$IL68L05CK_a6%aQN5EMiO0mYTfa4R)SO>@k~jnquj+{)Zq)OxgC zGuOsjSvqAoX5Dsuw7Qkql#^vQr>gH8Fusd0T`X`@&lagW5|%FgB3H zP*)5m9EmW86FrXYQPpJ0cg6A@Fzft)Kx-JVJ}029SbcJDNPs6PSVCb@)}JbikaF>j z`2j!2duBv=Y>ROB34w^rO^@nSC@Nm)f=PuyR3b`rAQJ`!mZnL(-RuwTQjoE54g=-n z4x$qfYA*^8V#a6LHRlBtCVN+9`W@WuU$Ik~8p-wL5u+3=SE?!VdWf|^9>B#h$WU)AlL0qm!fnxZwtO_mnQkiNn&9nd`*-*?<|!OeXct?MjXTPUW5?vVyP;rErptwjNMAdIjEJKEO+|Qg z8kQolY-CiOUq=CTqXhH@r7(dq@i!WciV*$ z_*9XNqxw!*J|5Q(%TLC)zr67+b#}$=?)yOS z@_Ai4J@0w*p6Sq|F=L^=sqBD{LrjwtA+b$OWj85-#NVE;8!(PqmU(L8*<|Ecjl77k zc(cYgB%@&aDcY*n1zHY&eb)X)0BBV3sXHa-*AsBrQ1QQNl^5*+Y< z?yE@bFfBFq(B3nRt8Jdewlw>}&1G=YJ0@C_5>s-|B=T6oR>iB&V6L&jV0?H)z1mXs zwj&WPk9@tA-%^e9Yil}wyACG}t!=a1Jkxi>~Y+?=l#5=SO{%pt@9qEb|Qh76X0_T^yBx_VCy6p*t< z!cU%j!YaMyILkXi?Yeal)kqV&$_XVau`HEb;pDNa|F>xqqjmm=ue{l7?as<`f0eU11iBAB@J0DSdm@vP>q;N^>Vu4Z4|_xJ5SB8grt&f2lp zP2(C1&zbwhQ?%pS3M zY?^sHvFRk=8S|be5mpiu@PwW%Zw=7bzB)$KB0#NS0`NaQiiyHZ|I@c#eX@!c)=%)W zWh+agNOJa#gYi|-?bYoImGjA2>w5ar-YdsD^DLa?*XOdTf)3EU<3E{H9Y0l0dTlVc z(D)V@lbiqk>uK$q-IXb269NCo=?hz)dD4%>PWrWmThuj3Q^wOjzS_n;+V&-sTAy-Y zB7R5r=-8KTW75Rzvzf);ne+08Tj@u-rp+M#>#@rvyCani2btbbpvuJF-(&%pw`C-Ze%E?xTO z1c*V7&*iVKC;(TF#dl$4Q0+U{j~5oTU!}{}pLuz$0EW36oV#|nChqzs6oI4dpC>Gz zYo57S_olG_NB3pJ$%mI)p~HjquYH?JMVE)}TO=LyX^2nzKL5E>(f&(S`-8dcN5TUC zxf7xz9OjKxqm;4Rgqg*Q{cFD%K<*nT?Uck8{k_(QUO+FP7tjmn1@r=X0lk1;Krf&d b&500009a7bBm000XU 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 B}p{}bA0)aG$ z1P_`rn*Tf0)+pxz144*0tc^yIQ6Nx9>86#ib;`90kA_EsF5cCf2Z7drs3ZoK#7P>; zBzrlT(Hso&=uUm9o?bTk-VXZ&6o)K|JH3C?1=p3jZ$<@*ezd$z=4T4K=3L!c(w zFcY0D-~DM`HUUs$Wzht(i;(INhlP}};LRM=(J)+Raq^|Z39adj+Azfb>iT-XP}T;1 zE=Cwv}>VnPl5EmZva` zk{;>DON_l(7*Dd>OWtpbFx%ygwD&swWHj7|LT1pY z1nWJ%G-`GvowOejPj!vOT1JEhbMclue*!lmI602p%_CesAsm#owl$tgrn?0oA>l}~ zWF|&=H8LI>Lva<+oU6l;^$Fh92|g!cDfQKr#f5q2N{gFCSwu$@A|4C31-l|((OB!u z5br27*dK1fBUR;W(zV>lM=WAe&wNV{b`;hLHkQ1uw5l7^(hC$nMp1AaUIfg zL%m(Cb=7niV{a!D56e9;X9o(2m_dV~-H{ZWYtVkvKq`U7q$iS`!s$dd!GU0F6OV=P zqXS~u2YHd<=VCC@{FvTUVs{bu$N^|sAVQWz5c?xqa-v~ox(qTNheL&WA_{V|qrG59 zgWRNtA|pBe*}T}EV<}gwa~re5W$DzuLsl;CuJ>Xac(dM%8>wdgrn^6VDlI+7aql#!@x5LZjn@Uawz@Usk}>x*aRPn zfQ5`BV0+TM;yln5;ixJOaga~F!1d}V<2T0QMJ!BnQATfLMXltpB%farAJA4=(R8|| zAv~nzNI@pWi3S0)S+qlFN-mMskHHTbVb@6>{TeC99Lo&*X}d60p(a zvu1_pnMkCQxo;1pxj#|e!+0DYKWCkkjy_yg=3cC} zR&6A2K#-IU`EdQHHW<6uliCy{<|Dqnf2Sd{!_BW|-1|7SJhfcA^yGfPu=}$OTiAJB zb#iz3!NM*2`y-n>Ve2@e1Rdy3We@#lGPa(4^24GLr{u!xo4%L}DHsQ%iO!QFFR#U) zzc&B+_56i~&ptUhAJ+S$;Qi~Z$<|~Is|V$Ddim@5l15c+?KRI+{ZY8)0x;MmfF7`h z(my+XZ;nJx>uTwlCJ^l$gUWr&t>RCP#*N=nJACSRL3Sypt#VE$W5# ziH64LxG!ghe?9rhd9XD%4?SCl6n+*^KjqCkhK>#2FFa~GbS8(D&cE^M6kGd)qNm_XC)zdbKgvHUa*e*7$ zY82~92s%AcGXlM=7>8KSqbTlR!w6|2sy&x1ZO~ zFf))==3%AzRu2bN#OAX9MBLR}^82|>HL3Sj>D)Ktz=ou#oDh-L<-U`(ws| zEPZkQ&dD&_E02;>jj!tVt&}33N1gcmyK&Rs)k~Dy{T6Xic6ubkBWIiRYV{%-b6R&W z5i0FJ`)TJ_UM}}v@C?}m)d@6^LAr0e;Ns)Wp{!^_f7g z!9LA%?P@s(eXdmGx|EO~kE;(2B`%{4rt6;j`g-lyC($#s+q`-G;_k(^8l*eO9XBcH zQwZMFT%)43EVoLBgAyAv*H7rwA@s+_A|w;Px36eSs;_E}T?;lZpqm?i{ou;484oOX zT`sD$n2MKvs|EkOJilS*r|94xe}X;^E>HiO{BuTses0&~im&nm1QD^`9v9J}x&P)s z0|Wp8KmZT`1ONd*01yBK00BS%5C8-K0YCr{00aO5KmZT`1ONd*01yBK{;vZ61=~cc A?EnA( diff --git a/mcinabox/src/main/res/drawable/craft_table.png b/mcinabox/src/main/res/drawable/craft_table.png index 8d0e5633fbd03068144e4060eaa21b794a1e870c..8638adf7b0cb5c49c0d48ad0b8f4db64d1945dc1 100644 GIT binary patch literal 4165 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 J5cq!*_#eq=S|tDg diff --git a/mcinabox/src/main/res/drawable/furnace.png b/mcinabox/src/main/res/drawable/furnace.png index 73a55322ffc292275d3cb0a528ea9a9ce326999f..d0c346f310dfc6dcb0e6561847a196537f0c441b 100644 GIT binary patch literal 5738 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 literal 6659 zcmeH{iCfay8pm;82rWTHv}Ciyy>d%UMRCCe6%jQ>OmoK_A(soJm5-xYYL=zXXt&8F zFH}=WtL0c)Sxu9+D5-6Cw1sS*()*N2_nnzPV>r*l@4V-ncl&w(G!Jqm&sEfRNp{dV@e{HbzIVf+BK? zO-xMe?d`ExtfQl&rKKerjkdP7hE0pVhN-D3olb|H_3PJLSy?$dJL7OT3^7OH@Qt*tFIX>M-5VZ#P9Gc#zw&(Ck&x^>_T6}`N?yuH0$ zTwHv8ec=?3$5SX2XdB!h7NVk}qT=J@!2vd*Juv>R1=*l96on*^4fa6`9D!aMjTRaj z8XO$FY11Z12>n1Re}8{y7+?kl27;oHkPu)3je!<7H#aDnnwkpgKo^-zhP2Q;lqe}F zDJm)g36YVJTefV04ndclon2vJVMayIS2o{T#o}QkQlf&h5V`5@Jf{%|62n0F65Xft4YHDk1 zZ{NPXpr8N<>6bb+$ zk;vra#Keki9~5>X=~Q3iH(ijwQE;(b+v(kL1ks7P$;aet*xu86Bq}0 z1KA`#lM#y$lS%q2vWC9CSgxT@lFL;JT{%&#P${P5a>#yAw(y$Egu*AKLi775;i(mm>9Lsz%8AiW zpR#^j5H@=hvZa?Q?})bu-uGrdS_%IAG0Kk}xAJXxptUc1acQAbD+Du0YOQ70vs0t2 zeVPr825hGan7bDwKB$-)a?H9a0K(s#o&st;>fex#!Cy^I4LEHrFFe;qfV4a_gd7vs>tgnEZnkmN^ZL>jrX)7 zOx4y&mTisRFn3U-~9Zaybr(ntv8iT)@z-0lE33Qp@;d-@t7AQqZ6kO zdA2M%pJPPakKpo+p5cnlV>*z?KxKL5^Hp8GzkPX7qq+Om>1{@#$i43zl^U04WPS>- z#I|$GN{tDv=RA@Ee|@pN%Xh|X@$JDCbp7zxj(;T_!`}WfJ;^c~$|b)y=znr4PEt7b zif$|&KEC~kr{~rprLbn^O_626(#RVpdgNN3tGka4?OI;=XzTB^&H*aw(b4K*86is) zu!bTy%RiYTIYgbAKGB#={89VtN<+irAv@nA2D()^lPvGN=M~stmKFDVb|0zsh6%x8 zQ=BF7+@jl}|EdXEVm%FoD0!O6Dn1Y=vGiz44QSk7kr9^RFw!q|$v^k=<7_O+rJddV z8ebM-AVO};9NQTyJWlTT7}IeN+d8rPh1ZeEyT4U=-3WAl_krmuG4T*N-tQad9B@rR z2HAMEHjUsJHk&JV&IAU}COG@Y9p&*p7)h1rl>&^f=nY8sk(a`^ew z0*{a)+dbM|&u7)M?WKovQ;%+N{b^rp32y%n?!J`k_aYLEHJ=gf7o*4ZWtzRZZGgR`qo)KWli$I}n!Hv&qrIqLQ-ewksiplyR~@ zvg?A`%%xRxv4b-WebWb;E4rs%;_8ANds+!L3Chhu*o{wn&_*|>hUuMctTCzGh!RJ` zY7RRtmN?aYUTTll)rld??1RL%%5gUV_rt|sPEK_&bcoWkuBoXD^jK|b42Igq=TN@7 zv<|p-zNPps*yHwy=96_Z^Ka3|Ep(~=tEo4bXBiUH!lPT8{}@l74!UEKSUXD|Eni

@ zp7wBy*W>9M!I*>QwQ1pv%||sZ@J6-XsV>^n^4xs}PlTuCSXqaAU$3x2AMd(=H7qQD z%@~L{JRsmJG;JFLF?KfiSJ&jz7Z-2JEPwXDTiNF diff --git a/mcinabox/src/main/res/drawable/grass.png b/mcinabox/src/main/res/drawable/grass.png index b4dce8740237c159c58c5dc2b57574498d3e9ef2..087094547046544cea6158c53ec37acbb5104dad 100644 GIT binary patch literal 4295 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 pVv|R`4#{G002ovPDHLkV1l8JV-WxV literal 11306 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 @@ -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" /> diff --git a/mcinabox/src/main/res/layout/dialog_configkey.xml b/mcinabox/src/main/res/layout/dialog_configkey.xml index 77078776..3d879844 100644 --- 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">