From e2316d061fb46c50114f5835aee7d7d0cd90a250 Mon Sep 17 00:00:00 2001
From: STALKER2010 <boyarshinand@gmail.com>
Date: Sun, 23 Mar 2014 22:17:24 +0700
Subject: [PATCH] Less Lint warnings, new strings for localizators, UI
 modifications, fixed Zhuowei's notices

---
 lint.xml                                      |  7 ++
 res/layout/nerdy_stuff.xml                    | 39 +++++-----
 res/values-de/strings.xml                     |  6 +-
 res/values-es/strings.xml                     |  4 +-
 res/values-fi/strings.xml                     |  4 +-
 res/values-fr/strings.xml                     |  8 +--
 res/values-hr/strings.xml                     |  4 +-
 res/values-in/strings.xml                     |  4 +-
 res/values-it/strings.xml                     |  6 +-
 res/values-ko/strings.xml                     |  8 +--
 res/values-pl/strings.xml                     |  4 +-
 res/values-pt/strings.xml                     |  4 +-
 res/values-ru-xlarge/strings.xml              |  6 +-
 res/values-ru/strings.xml                     | 21 ++++--
 res/values/strings.xml                        | 31 ++++++--
 res/xml/preferences.xml                       | 26 +------
 src/com/mojang/minecraftpe/MainActivity.java  | 21 +++---
 .../mcpelauncher/ModernWrapFactory.java       |  2 +
 .../mcpelauncher/PatchManager.java            |  4 +-
 .../mcpelauncher/ScriptManager.java           | 68 +++++++++++++-----
 src/net/zhuoweizhang/mcpelauncher/Utils.java  | 41 ++++++++++-
 .../mcpelauncher/patch/Patch.java             |  1 -
 .../mcpelauncher/ui/LauncherActivity.java     |  2 +-
 .../ui/MainMenuOptionsActivity.java           | 71 ++++++++++++++++++-
 .../mcpelauncher/ui/ManageAddonsActivity.java |  2 -
 .../ui/ManagePatchesActivity.java             | 13 +---
 .../ui/ManageScriptsActivity.java             | 13 ++--
 .../ui/ManageTexturepacksActivity.java        | 29 +++++---
 28 files changed, 292 insertions(+), 157 deletions(-)
 create mode 100644 lint.xml

diff --git a/lint.xml b/lint.xml
new file mode 100644
index 00000000..23ca6adc
--- /dev/null
+++ b/lint.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="Typos">
+        <ignore path="res/values-de/strings.xml" />
+        <ignore path="res/values-es/strings.xml" />
+    </issue>
+</lint>
\ No newline at end of file
diff --git a/res/layout/nerdy_stuff.xml b/res/layout/nerdy_stuff.xml
index db324b88..3359ad7a 100644
--- a/res/layout/nerdy_stuff.xml
+++ b/res/layout/nerdy_stuff.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-<LinearLayout
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-        <TextView android:text="@string/nerdy_stuff_are_useless"
+    android:layout_height="fill_parent" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textSize="16pt"/>
+            android:text="@string/nerdy_stuff_are_useless"
+            android:textSize="16pt" />
+
         <Button
             android:id="@+id/dump_libminecraftpe_button"
             android:layout_width="fill_parent"
@@ -24,24 +28,27 @@
             android:layout_margin="20dp"
             android:text="@string/restart_app" />
 
-        <Button android:id="@+id/set_skin_button"
+        <Button
+            android:id="@+id/dump_modpe_methods"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_margin="20dp"
-            android:text="Set skin to /sdcard/skin.png"/>
+            android:text="@string/nerdy_stuff_dump_modpe" />
 
-        <Button android:id="@+id/chef_special"
+        <Button
+            android:id="@+id/set_skin_button"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_margin="20dp"
-            android:text="Authorized personnel only"
-            android:visibility="gone"/>
+            android:text="@string/nerdy_stuff_set_skin" />
 
-        <Button android:id="@+id/dump_modpe_methods"
+        <Button
+            android:id="@+id/chef_special"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_margin="20dp"
-            android:text="Dump ModPE Script methods"/>
+            android:text="@string/nerdy_stuff_secret"
+            android:visibility="gone" />
+    </LinearLayout>
 
-</LinearLayout>
-</ScrollView>
+</ScrollView>
\ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bec02b54..e94ff409 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,7 +16,7 @@
     <string name="pref_zz_longvibration">Extra-lange Vibration</string>
     <string name="pref_zz_longvibration_summary">Verlängert die Vibrations Länge um 5x</string>
     <string name="pref_gfx_fancygraphics">Schöne Grafik</string>
-    <string name="pref_gfx_fancygraphics_summary">Macht Leaves... schöner</string>
+    <string name="pref_gfx_fancygraphics_summary">Macht Leaves&#8230; schöner</string>
     <string name="pref_gfx_lowquality">Niedrige Grafikquallität</string>
     <string name="pref_gfx_lowquality_summary">Dinge werden schlechter aussehen</string>
     <string name="pref_game_difficultypeaceful">Friedlicher Modus</string>
@@ -74,8 +74,8 @@
     <string name="skin_imported">Skin gesetzt</string>
     <string name="get_pro">Upgrade auf Pro</string>
     <string name="about_about">Über BlockLauncher</string>
-    <string name="about_copyright">Copyright (C) 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Copyright (C) 2013-2014 Zhuowei Zhang. Do not distribute without permission.</string>
+    <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. Do not distribute without permission.</string>
     <string name="about_librarycredits">Dieses Programm verwendet eine FileChooser library von Paul Burke. \n
 Dieses Programm beinhaltet Code von Snowbound \'s PTPatchTool, lizenziert unter der Eclipse Public License. \n
 This program contains a modified version of NathanX\'s Slickcraft texture pack: used with permission.\n
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ad70387b..1051d5c9 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -101,8 +101,8 @@
     <string name="manage_addons">Administrar complementos</string>
     <string name="get_pro">Actualizar a Pro</string>
     <string name="about_about">Acerca de BlockLauncher</string>
-    <string name="about_copyright">Copyright (C) 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Copyright (C) 2013-2014 Zhuowei Zhang. No distribuir sin permiso.</string>
+    <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. No distribuir sin permiso.</string>
     <string name="about_librarycredits">"Este programa utiliza la biblioteca aFileChooser por Paul Burke.\n
 Este programa contiene código de PTPatchTool sitiado por Snowbound's el licenciado bajo la Licencia Pública Eclipse.\n
 Este programa contiene una versión modificada de NathanX's Slickcraft texture pack: usado con permiso.\n
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 35a1ad45..0e84df5d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -102,8 +102,8 @@
     <string name="manage_addons">Hallitse lisäosia</string>
     <string name="get_pro">Päivitä Pro-versioon</string>
     <string name="about_about">Tietoja BlockLauncherista</string>
-    <string name="about_copyright">Tekijänoikeus &#169; 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Tekijänoikeus &#169; 2013-2014 Zhuowei Zhang. Älä jaa ilman lupaa.</string>
+    <string name="about_copyright">Tekijänoikeus &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Tekijänoikeus &#169; 2013&#8211;2014 Zhuowei Zhang. Älä jaa ilman lupaa.</string>
     <string name="about_librarycredits">Tämä ohjelma käyttää Paul Burken aFileChooseria. \n
 Tämä ohjelma sisältää koodia Snowboundin PTPatchToolista, Eclipse Public Licensen lisenssistä. \n
 Tämä ohjelma sisältää muokatun version NathanX:n Slickcraft-tekstuuripaketista:
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b6c6d686..8eab6930 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -99,8 +99,8 @@ Voulez-vous continuer en mode sans échec sans rien ou revenir en mode de correc
     <string name="manage_addons">Gérer add-on</string>
     <string name="get_pro">Acheter la PRO</string>
     <string name="about_about">A propos de BlockLauncher</string>
-    <string name="about_copyright">Copyright  2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Droits d\'auteur 2013-2014 Zhuowei Zhang. Ne pas distribuer sans autorisation.</string>
+    <string name="about_copyright">Copyright  2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Droits d\'auteur 2013&#8211;2014 Zhuowei Zhang. Ne pas distribuer sans autorisation.</string>
     <string name="about_librarycredits">Ce programme utilise la bibliothèque aFileChooser par Paul Burke.\n
 Ce programme contient le code de l \'Snowbound \ PTPatchTool, sous licence publique Eclipse.\n
 Ce programme contient une version modifiée de l \'NathanX \ Slickcraft pack de texture:. Utilisés avec la permission \ n
@@ -114,7 +114,7 @@ Pour des informations complètes de licences, consultez les forums Minecraft fil
     <string name="about_go_to_forums">Ouvrir les sujet minecraft pour BlockLauncher</string>
     <string name="no_minecraft_installed">BlockLauncher ne peut pas trouver une copie de Minecraft PE sur votre appareil. Cette application est conçue pour patcher la version complète de Minecraft Pocket Edition par Mojang.</string>
     <string name="firstlaunch_title">Bienvenue sur BlockLauncher!</string>
-    <string name="firstlaunch_generic_intro">Merci d\'utiliser block launcher... Merci à vous de contribuer à l\'app</string>
+    <string name="firstlaunch_generic_intro">Merci d\'utiliser block launcher&#8230; Merci à vous de contribuer à l\'app</string>
     <string name="firstlaunch_jelly_bean">Votre appareil fonctionne avec Android Jelly Bean ou plus récent, de sorte BlockLauncher ne peut pas accéder les textures par défaut. Le pack de texture de démonstration a été activé afin que vous puissiez tester le lanceur.</string>
     <string name="firstlaunch_see_options">Pour commencer à BlockLauncher, appuyez sur l\'icône de la clé en haut de l\'écran. Pour plus d\'aide, visitez le fil Minecraft Forum.</string>
     <string name="firstlaunch_help">Aide</string>
@@ -152,7 +152,7 @@ Pour des informations complètes de licences, consultez les forums Minecraft fil
     <string name="script_minecraft_version_incompatible">Le script n\'est pas compatible avec votre version,veuillez le désactiver si vous ne voulez pas de crash. </string>
     <string name="script_import_from_intent_warning">Voulez vous importer un script ? ils peuvent peut-être récupérer des mdp (pas sûr)</string>
     <string name="script_view_source">Voir source</string>
-    <string name="script_too_many_errors">Désactivés désolé...</string>
+    <string name="script_too_many_errors">Désactivés désolé&#8230;</string>
     <string name="take_screenshot">Prendre un screenshot</string>
     <string name="take_screenshot_requires_modpe_script">L\'option modPE doit être activée pour prendre un screenshot.\nVous pouvez l\'activer dans les options de block launcher</string>
     <string name="screenshot_saved_as">Screenshot sauvergardé dans:</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8bb25bc0..385bdf9c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -96,8 +96,8 @@ Da li želite nastaviti u opciji sigurnosti bez patchova ili se vratiti na norma
     <string name="manage_addons">Upravljaj addonima</string>
     <string name="get_pro">Upgrade to Pro</string>
     <string name="about_about">O BlockLauncheru</string>
-    <string name="about_copyright">Copyright &#169; 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Copyright &#169; 2013-2014 Zhuowei Zhang. Ne distributiraj bez dopuštenja.</string>
+    <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. Ne distributiraj bez dopuštenja.</string>
     <string name="about_librarycredits">Ovaj program koristi aFileChooser library koji je napravio Paul Burke. \n
 Ovaj program koristi dio koda koji je napravio Snowbound\'s PTPatchTool, licenciran pod Eclipse Public License. \n
 Ovaj program koristi modificianu verziju NathanX\'s Slickcraft texture packa: korišten s dopuštenjem.\n
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index da008b87..55e741d8 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -112,8 +112,8 @@ Apakah kamu mau melanjutkan di Safe Mode tanpa patch atau kembali ke mode normal
     <string name="manage_addons">Kelola addons</string>
     <string name="get_pro">Upgrade ke Pro</string>
     <string name="about_about">Tentang BlockLauncher</string>
-    <string name="about_copyright">Copyright &#169; 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Copyright &#169; 2013-2014 Zhuowei Zhang. Jangan mendistribusikan tanpa izin.</string>
+    <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. Jangan mendistribusikan tanpa izin.</string>
     <string name="about_librarycredits">Program ini menggunakan library aFileChooser oleh Paul Burke. \n
 Program ini berisi kode dari Snowbound\'s PTPatchTool, berlisensi di bawah Eclipse Public License. \n
 Program ini berisi versi modifikasi NathanX\'s Slickcraft tekstur pack: digunakan dengan izin.\n
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0cf2e65a..e9d1e70b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -44,7 +44,7 @@
     <string name="texture_pack_unable_to_load">Impossibile caricare Pacchetto grafico.</string>
     <string name="pref_zz_extract_original_textures">Estrai il Pacchetto grafico originale con i permessi di root</string>
     <string name="pref_zz_extract_original_textures_summary">Backup l\'APK originale con i permessi di root e impostalo come Pacchetto Grafico</string>
-    <string name="extracting_textures">Backup dell\'APK orginale in corso...</string>
+    <string name="extracting_textures">Backup dell\'APK orginale in corso&#8230;</string>
     <string name="extract_textures_success">Impostato con successo l\'APK originale come Pacchetto grafico.</string>
     <string name="extract_textures_error">Impossibile accedere all\'APK originale.</string>
     <string name="extract_textures_no_root">Impossibile avere l\'accesso come SuperUser - hai i permessi root?</string>
@@ -75,8 +75,8 @@
     <string name="skin_imported">Imposta Skin</string>
     <string name="get_pro">Compra la versione Pro</string>
     <string name="about_about">Info su BlockLauncher</string>
-    <string name="about_copyright">Copyright (C) 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Copyright (C) 2013-2014 Zhuowei Zhang. Non distribuire senza permesso.</string>
+    <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. Non distribuire senza permesso.</string>
     <string name="about_librarycredits">Questo programma usa la aFileChooser library di Paul Burke. \n
 Questo programma contiene codice da Snowbound\'s PTPatchTool, licenza sotto l\' Eclipse Public License. \n
 This program contains a modified version of NathanX\'s Slickcraft texture pack: used with permission.\n
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d3c1571f..6ec8cb8c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -53,7 +53,7 @@ Scroll to the bottom and see notice. -->
     <string name="texture_pack_unable_to_load">텍스쳐팩 불러오기 실패</string>
     <string name="pref_zz_extract_original_textures">루팅 권한으로 기존 텍스쳐팩 백업</string>
     <string name="pref_zz_extract_original_textures_summary">텍스쳐팩을 설정하기 위해 루팅 권한을 이용해 기존 APK 파일을 백업합니다.</string>
-    <string name="extracting_textures">기존 APK 백업 중...</string>
+    <string name="extracting_textures">기존 APK 백업 중&#8230;</string>
     <string name="extract_textures_success">성공적으로 기존 APK 패키지를 텍스쳐팩으로 설정하였습니다.</string>
     <string name="extract_textures_error">기존 APK 패키지를 찾을 수 없습니다.</string>
     <string name="extract_textures_no_root">기존 APK 패키지를 찾을 수 없습니다. 루팅되어 있습니까?</string>
@@ -78,7 +78,7 @@ Scroll to the bottom and see notice. -->
     <string name="pref_zz_skin_download_source">스킨 다운로드 소스 선택</string>
     <string name="skin_download_do_not_download">스킨 다운로드하지 않기</string>
     <string name="skin_download_download_pc">컴퓨터 닉네임에 따라 스킨을 다운로드 합니다.</string>
-    <string name="nerdy_stuff_page">그 외...</string>
+    <string name="nerdy_stuff_page">그 외&#8230;</string>
     <string name="dump_libminecraftpe">메모리에서 libminecraftpe.so 덤프하기</string>
     <string name="nerdy_stuff_are_useless">이 기능은 거의 쓸모가 없습니다. 그러나 버그 해결에 많은 도움이 될 것입니다.</string>
     <string name="restart_app">어플리케이션 재시작</string>
@@ -114,8 +114,8 @@ Scroll to the bottom and see notice. -->
     <string name="manage_addons">애드온 관리</string>
     <string name="get_pro">Pro 버전으로 업그레이드</string> <!-- 정식버전은 마인크래프트 PE에나 쓰고, 이 어플리케이션에는 Pro가 맞습니다. -->
     <string name="about_about">BlockLauncher 소개</string>
-    <string name="about_copyright">Copyright &#169; 2013-2014 Zhuowei Zhang.</string> <!-- 일반적으로 저작권은 영어로 작성합니다. -->
-    <string name="about_copyright_pro">Copyright &#169; 2013-2014 Zhuowei Zhang. 아무 권한 없이 수정 및 배포하지 마십시오.</string>
+    <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang.</string> <!-- 일반적으로 저작권은 영어로 작성합니다. -->
+    <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. 아무 권한 없이 수정 및 배포하지 마십시오.</string>
     <string name="about_librarycredits">이 어플은 Paul Burke의 aFileChooser 라이브러리를 사용합니다. \n
 이 어플리케이션은 Snowbound의 PTPatchTool 코드를 사용하였고, Eclipse Public License를 따릅니다. \n
 이 어플리케이션은 NathanX의 Slickcraft 텍스쳐팩에서 수정된 버전이 포함되어 있습니다.\n
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a816c4a1..bec12099 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -97,8 +97,8 @@ Chcesz kontynuować grę w trybie bezpiecznym czy powrócić do normalnego?</str
     <string name="manage_addons">Zarządzaj dodatkami</string>
     <string name="get_pro">Ulepsz do wersji Pro</string>
     <string name="about_about">O BlockLauncher</string>
-    <string name="about_copyright">Prawo autorskie &#169; 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Prawo autorskie &#169; 2013-2014 Zhuowei Zhang. Nie wolno rozpowszechniać bez zgody.</string>
+    <string name="about_copyright">Prawo autorskie &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Prawo autorskie &#169; 2013&#8211;2014 Zhuowei Zhang. Nie wolno rozpowszechniać bez zgody.</string>
     <string name="about_librarycredits">Ten program używa bibliotekę aFileChooser stworzoną przez Paul Burke. \n
 Ten program zawiera kod z Snowbound\'s PTPatchTool, na licencji Eclipse Public License. \n
 Ten program zawiera zmodyfikowaną wersję NathanX\'s Slickcraft texture pack: wykorzystane za zgodą.\n
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d253710e..e3fea10d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -54,8 +54,8 @@
   <string name="manage_patches_crash_safe_mode">BlockLauncher detectou uma parada recente. O modo de segurança foi ativado para prenevir futuros problemas com os patches.</string>
   <string name="get_pro">Atualizar para versão Pro</string>
   <string name="about_about">Sobre BlockLauncher</string>
-  <string name="about_copyright">Copyright (C) 2013-2014 Zhuowei Zhang</string>
-  <string name="about_copyright_pro">Copyright (C) 2013-2014 Zhuowei Zhang. Não distribua sem permissão.</string>
+  <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+  <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. Não distribua sem permissão.</string>
   <string name="about_librarycredits">Esse programa usa a biblioteca aFileChooser por Paul Burke. \n
 Esse programa contém códigos do Snowbound\'s PTPatchTool, licenciado pela Eclipse Public License. \n
 This program contains a modified version of NathanX\'s Slickcraft texture pack: used with permission.\n
diff --git a/res/values-ru-xlarge/strings.xml b/res/values-ru-xlarge/strings.xml
index 058d9daf..460ce05b 100644
--- a/res/values-ru-xlarge/strings.xml
+++ b/res/values-ru-xlarge/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Russian translation by MelomanCool of 4PDA. -->
+<!-- Russian translation by MelomanCool -->
 <resources>
     <string name="select_file">Выберите файл с SD карты</string>
     <string name="pref_ctrl_touchscreen">Использовать тачскрин</string>
@@ -99,8 +99,8 @@
     <string name="manage_addons">Управление аддонами</string>
     <string name="get_pro">Обновить до Pro</string>
     <string name="about_about">О BlockLauncher</string>
-    <string name="about_copyright">Copyright &#169; 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Copyright &#169; 2013-2014 Zhuowei Zhang. Do not distribute without permission.</string>
+    <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. Do not distribute without permission.</string>
     <string name="about_librarycredits">Эта программа использует библиотеку aFileChooser от Пола Берка.\n
 Эта программа содержит код из PTPatchTool от Snowbound\'а под Общественной Лицензией Eclipse.\n
 Эта программа содержит модифицированную версию текстурпака Slickcraft от NathanX\'а, который используется с его разрешения.\n
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ae8555ce..cea5a3c3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Russian translation by MelomanCool -->
+<!-- Shorter Russian translation by STALKER_2010 -->
 <resources>
-    <string name="select_file">Выберите файл с SD карты</string>
+    <string name="select_file">Выбор файла</string>
     <string name="pref_texture_pack">Текстурпак</string>
     <string name="pref_texture_pack_summary">Выбор текстурпака</string>
     <string name="pref_zz_longvibration">Долгая вибрация</string>
@@ -49,7 +49,7 @@
     <string name="dump_libminecraftpe">Дамп libminecraftpe.so</string>
     <string name="nerdy_stuff_are_useless">Не нужно обычным пользователям. Для разработчиков.</string>
     <string name="restart_app">Рестарт</string>
-    <string name="manage_patches">PTPatch</string>
+    <string name="manage_patches">Патчи PTPatch</string>
     <string name="manage_patches_import">Добавить</string>
     <string name="manage_patches_import_error">Не удалось испортировать патч</string>
     <string name="manage_patches_too_many">Купите BlockLauncher Pro для использования более 3 патчей</string>
@@ -74,8 +74,8 @@
     <string name="manage_addons">Аддоны BL</string>
     <string name="get_pro">Купить BlockLauncher Pro</string>
     <string name="about_about">О BlockLauncher</string>
-    <string name="about_copyright">Copyright &#169; 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Copyright &#169; 2013-2014 Zhuowei Zhang. Не распостраняйте без разрешения.</string>
+    <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. Не распостраняйте без разрешения.</string>
     <string name="about_librarycredits">Программа содержит aFileChooser от Paul Burke. \n
 Программа содержит PTPatchTool от Snowbound, лицензированноe под Eclipse Public License. \n
 Программа содержит модификацию текстурпака Slickcraft от NathanX с его разрешения.\n
@@ -87,7 +87,7 @@
 </string>
     <string name="about_pro_library_credits"></string>
     <string name="about_thankscommunity">Без работы многих переводчиков, разработчиков и тестировщиков BL не существовал бы. Благодарю Вас.\nПосетите GitHub для получения информации о их вкладе.</string>
-    <string name="about_go_to_forums">Открыть тему BlockLauncher на Minecraft Forums</string>
+    <string name="about_go_to_forums">BlockLauncher на Minecraft Forums</string>
     <string name="no_minecraft_installed">BlockLauncher не обнаружил Minecraft PE на устройстве. Установите полную версию Minecraft Pocket Edition от Mojang.</string>
     <string name="firstlaunch_title">Добро пожаловать!</string>
     <string name="firstlaunch_generic_intro">Спасибо за интерес к BlockLauncher. BlockLauncher запускает Minecraft Pocket Edition и добавляет возможность установки патчей, аддонов, скриптов, скинов и текстур.</string>
@@ -130,4 +130,13 @@
     <string name="textures_select">Импорт</string>
     <string name="textures_demo">Демо</string>
     <string name="textures_extract">Оригинальные</string>
+    <string name="plurals_patches_one">патча</string>
+    <string name="plurals_patches_more">патчей</string>
+    <string name="plurals_patches_no">Нет патчей</string>
+    <string name="plurals_scripts_one">скрипта</string>
+    <string name="plurals_scripts_more">скриптов</string>
+    <string name="plurals_scripts_no">Нет скриптов</string>
+    <string name="nerdy_stuff_dump_modpe">Дамп методов ModPE Script</string>
+    <string name="nerdy_stuff_set_skin">Установить скин /sdcard/skin.png</string>
+    <string name="nerdy_stuff_secret">Вход воспрещен!</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7be3fbe0..f056fe9e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-    <string name="textOn">ON</string>
-    <string name="textOff">OFF</string>
+    <string name="textOn" translatable="false" tools:ignore="MissingTranslation">ON</string>
+    <string name="textOff" translatable="false" tools:ignore="MissingTranslation">OFF</string>
     <!-- Do not translate the app name, as I prefer the name to be consistent. Just remove the app_name line in the translations. -->
-    <string name="app_name">BlockLauncher</string>
+    <string name="app_name" translatable="false" tools:ignore="MissingTranslation">BlockLauncher</string>
     <string name="pref_ctrl_touchscreen">Use Touchscreen</string>
     <string name="pref_ctrl_touchscreen_summary">If you are not using an Xperia Play, check this</string>
     <string name="pref_mp_username">Multiplayer Username</string>
     <string name="pref_mp_username_summary">Your name, duh</string>
     <string name="pref_texture_pack">Texture Pack</string>
     <string name="pref_texture_pack_summary">Change your texture pack</string>
+    <!--
     <string name="pref_ctrl_usetouchjoypad">Split touch</string>
     <string name="pref_ctrl_islefthanded">Lefty</string>
     <string name="pref_ctrl_islefthanded_summary">Mirrors the control scheme</string>
@@ -18,8 +19,10 @@
     <string name="pref_ctrl_invertmouse_summary">Meanwhile in Australia :)</string>
     <string name="pref_feedback_vibration">Vibrate</string>
     <string name="pref_feedback_vibration_summary">Vibrate when a block is destroyed</string>
+    -->
     <string name="pref_zz_longvibration">Extra-long vibration</string>
     <string name="pref_zz_longvibration_summary">Increase the vibration length by 5x</string>
+    <!--
     <string name="pref_gfx_fancygraphics">Fancy graphics</string>
     <string name="pref_gfx_fancygraphics_summary">Make stuff look better</string>
     <string name="pref_gfx_lowquality">Low quality graphics</string>
@@ -28,14 +31,17 @@
     <string name="pref_game_difficultypeaceful_summary">Health regeneration, no monsters</string>
     <string name="pref_ctrl_sensitivity">Sensitivity</string>
     <string name="pref_ctrl_sensitivity_summary">Touch sensitivity</string>
+    -->
     <string name="pref_zz_safe_mode">Safe mode</string>
     <string name="pref_zz_safe_mode_summary">Disables all patches</string>
+    <!--
     <string name="pref_zz_patch_ip_enable">Redirect Multiplayer</string>
     <string name="pref_zz_patch_ip_enable_summary">Redirects multiplayer connections to an online server</string>
     <string name="pref_zz_patch_ip">Server IP</string>
     <string name="pref_zz_patch_ip_summary">The IP address of the online server</string>
     <string name="pref_zz_patch_ip_port">Server Port</string>
     <string name="pref_zz_patch_ip_port_summary">The port of the online server (usually 19132)</string>
+    -->
     <string name="pref_zz_texture_pack_enable">Use texture pack</string>
     <string name="pref_zz_custom_dpi">Custom DPI</string>
     <string name="pref_zz_custom_dpi_summary">Change the reported screen density to change size of controls - leave blank to disable</string>
@@ -115,8 +121,8 @@ Do you want to continue in Safe Mode without patches or return to normal patchin
     <string name="manage_addons">Manage addons</string>
     <string name="get_pro">Upgrade to Pro</string>
     <string name="about_about">About BlockLauncher</string>
-    <string name="about_copyright">Copyright &#169; 2013-2014 Zhuowei Zhang</string>
-    <string name="about_copyright_pro">Copyright &#169; 2013-2014 Zhuowei Zhang. Do not distribute without permission.</string>
+    <string name="about_copyright">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang</string>
+    <string name="about_copyright_pro">Copyright &#169; 2013&#8211;2014 Zhuowei Zhang. Do not distribute without permission.</string>
     <string name="about_librarycredits">This program uses the aFileChooser library by Paul Burke. \n
 This program contains code from Snowbound\'s PTPatchTool, licensed under the Eclipse Public License. \n
 This program contains a modified version of NathanX\'s Slickcraft texture pack: used with permission.\n
@@ -140,11 +146,14 @@ For full licensing information, check the Minecraft Forums thread.\n
</string>
     <string name="hovercar_live_patch">Patch mods in-game</string>
     <string name="hovercar_options">Launcher options (restart required)</string>
     <string name="hovercar_insert_text">Insert text (keyboard issue workaround)</string>
+    <!--
     <string name="mco_redirect_none">Don\'t redirect</string>
     <string name="mco_redirect_pocketmine">Use PocketMine\'s server list</string>
     <string name="mco_redirect_minepocket">Use MinePocket\'s server list</string>
+    -->
     <string name="safe_mode_exit">Return to normal</string>
     <string name="safe_mode_continue">Continue</string>
+    <!--
     <string name="server_list_add">Add server</string>
     <string name="pref_zz_server_list">Server list</string>
     <string name="pref_zz_server_list_summary">Select from or add a server to your saved server list</string>
@@ -152,6 +161,7 @@ For full licensing information, check the Minecraft Forums thread.\n
</string>
     <string name="server_list_name_prompt">Name: </string>
     <string name="server_list_address_prompt">Address: </string>
     <string name="server_list_port_prompt">Port: </string>
+    -->
     <string name="script_import_from">Import script from</string>
     <string name="script_import_from_local">Local storage</string>
     <string name="script_import_from_cfgy">Treebl\'s official repo</string>
@@ -180,5 +190,14 @@ We are working on a fix for this, but in the meantime, BlockLauncher functions a
     <string name="textures_select">Select</string>
     <string name="textures_demo">Demo</string>
     <string name="textures_extract">Extract original</string>
+    <string name="plurals_patches_one">patch</string>
+    <string name="plurals_patches_more">patches</string>
+    <string name="plurals_patches_no">No patches</string>
+    <string name="plurals_scripts_one">script</string>
+    <string name="plurals_scripts_more">scripts</string>
+    <string name="plurals_scripts_no">No scripts</string>
+    <string name="nerdy_stuff_dump_modpe">Dump ModPE Script methods</string>
+    <string name="nerdy_stuff_set_skin">Set skin to /sdcard/skin.png</string>
+    <string name="nerdy_stuff_secret">Authorized personnel only</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 25e00e2e..2e22c157 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -24,21 +24,6 @@
             android:defaultValue="false"
             android:key="zz_texture_pack_enable"
             android:title="@string/pref_texture_pack" />
-        <!--
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="zz_texture_pack_demo"
-            android:summary="@string/pref_zz_texture_pack_demo_summary"
-            android:title="@string/pref_zz_texture_pack_demo" />
-        <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="zz_texture_pack_enable"
-            android:title="@string/pref_zz_texture_pack_enable_extracted" />
-        <Preference
-            android:key="zz_extract_original_textures"
-            android:summary="@string/pref_zz_extract_original_textures_summary"
-            android:title="@string/pref_zz_extract_original_textures" />
-        -->
 
         <net.zhuoweizhang.mcpelauncher.ui.SwitchPreference
             android:defaultValue="false"
@@ -69,15 +54,6 @@
             android:defaultValue="true"
             android:key="zz_script_enable"
             android:title="@string/pref_zz_script_enable" />
-
-
-        <!--
-            <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="zz_script_paranoid_mode"
-            android:summary="@string/pref_zz_script_paranoid_mode_summary"
-            android:title="@string/pref_zz_script_paranoid_mode" />
-        -->
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="zz_show_insert_text"
@@ -91,7 +67,7 @@
     <PreferenceCategory android:title="@string/pref_support_title" >
         <Preference android:title="@string/nerdy_stuff_page" >
             <intent
-                android:targetClass="net.zhuoweizhang.mcpelauncher.NerdyStuffActivity"
+                android:targetClass="net.zhuoweizhang.mcpelauncher.ui.NerdyStuffActivity"
                 android:targetPackage="net.zhuoweizhang.mcpelauncher" />
         </Preference>
 
diff --git a/src/com/mojang/minecraftpe/MainActivity.java b/src/com/mojang/minecraftpe/MainActivity.java
index 8f829ec5..a688b640 100644
--- a/src/com/mojang/minecraftpe/MainActivity.java
+++ b/src/com/mojang/minecraftpe/MainActivity.java
@@ -57,6 +57,8 @@
 import net.zhuoweizhang.mcpelauncher.ui.NoMinecraftActivity;
 import net.zhuoweizhang.pokerface.PokerFace;
 
+@SuppressLint("SdCardPath")
+@SuppressWarnings("deprecation")
 public class MainActivity extends NativeActivity {
 
 	public static final String TAG = "BlockLauncher/MainActivity";
@@ -178,12 +180,7 @@ public void onCreate(Bundle savedInstanceState) {
 
 		try {
 			mcPkgInfo = getPackageManager().getPackageInfo("com.mojang.minecraftpe", 0);
-			mcAppInfo = mcPkgInfo.applicationInfo;/*
-												 * getPackageManager().
-												 * getApplicationInfo
-												 * ("com.mojang.minecraftpe",
-												 * 0);
-												 */
+			mcAppInfo = mcPkgInfo.applicationInfo;
 			MC_NATIVE_LIBRARY_DIR = mcAppInfo.nativeLibraryDir;
 			MC_NATIVE_LIBRARY_LOCATION = MC_NATIVE_LIBRARY_DIR + "/libminecraftpe.so";
 			System.out.println("libminecraftpe.so is at " + MC_NATIVE_LIBRARY_LOCATION);
@@ -427,7 +424,6 @@ private void prePatch() throws Exception {
 		File patched = getDir("patched", 0);
 		File originalLibminecraft = new File(mcAppInfo.nativeLibraryDir + "/libminecraftpe.so");
 		File newMinecraft = new File(patched, "libminecraftpe.so");
-		File patchesDir = this.getDir(PT_PATCHES_DIR, 0);
 		boolean forcePrePatch = getSharedPreferences(MainMenuOptionsActivity.PREFERENCES_NAME, 0)
 				.getBoolean("force_prepatch", true);
 		if (!hasPrePatched && (!newMinecraft.exists() || forcePrePatch)) {
@@ -443,9 +439,8 @@ private void prePatch() throws Exception {
 
 			int patchedCount = 0;
 			int maxPatchNum = getMaxNumPatches();
-			PatchManager patchMgr = PatchManager.getPatchManager(this);
 
-			Set<String> patchLocs = patchMgr.getEnabledPatches();
+			Set<String> patchLocs = Utils.getEnabledPatches();
 
 			for (String patchLoc : patchLocs) {
 				if (maxPatchNum >= 0 && patchedCount >= maxPatchNum)
@@ -800,7 +795,6 @@ public void onClick(DialogInterface dialogI, int button) {
 				}).setCancelable(false).create();
 	}
 
-	@SuppressWarnings("deprecation")
 	protected Dialog createInsertTextDialog() {
 		final EditText editText = new EditText(this);
 		editText.setSingleLine(false);
@@ -1129,7 +1123,7 @@ public void openLoginWindow() {
 			public void run() {
 				loginWebView = new WebView(MainActivity.this);
 				loginWebView.setLayoutParams(new ViewGroup.LayoutParams(
-						ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT));
+						ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 				loginWebView.setWebViewClient(new LoginWebViewClient());
 				WebSettings settings = loginWebView.getSettings();
 				settings.setJavaScriptEnabled(true); // at least on Firefox, the
@@ -1147,8 +1141,8 @@ public void run() {
 				loginDialog.setCancelable(true);
 				loginDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
 				loginDialog.setContentView(loginWebView);
-				loginDialog.getWindow().setLayout(ViewGroup.LayoutParams.FILL_PARENT,
-						ViewGroup.LayoutParams.FILL_PARENT);
+				loginDialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT,
+						ViewGroup.LayoutParams.MATCH_PARENT);
 				loginDialog.show();
 
 				loginWebView.loadUrl(getRealmsRedirectInfo().loginUrl);
@@ -1859,6 +1853,7 @@ public HurlRunner(int requestId, long timestamp, String url, String method, Stri
 			}
 		}
 
+		@SuppressWarnings("resource")
 		public void run() {
 			InputStream is = null;
 			String content = null;
diff --git a/src/net/zhuoweizhang/mcpelauncher/ModernWrapFactory.java b/src/net/zhuoweizhang/mcpelauncher/ModernWrapFactory.java
index afc3d48a..6e046d2f 100644
--- a/src/net/zhuoweizhang/mcpelauncher/ModernWrapFactory.java
+++ b/src/net/zhuoweizhang/mcpelauncher/ModernWrapFactory.java
@@ -1,6 +1,7 @@
 package net.zhuoweizhang.mcpelauncher;
 
 import org.mozilla.javascript.*;
+
 import android.util.Log;
 
 /**
@@ -8,6 +9,7 @@
 Disables wrapping of Java class objects
 */
 
+@SuppressWarnings("rawtypes")
 public class ModernWrapFactory extends WrapFactory {
 
 	public static final String TAG = "BlockLauncher/ModernWrapFactory";
diff --git a/src/net/zhuoweizhang/mcpelauncher/PatchManager.java b/src/net/zhuoweizhang/mcpelauncher/PatchManager.java
index 308f5db1..553e4304 100644
--- a/src/net/zhuoweizhang/mcpelauncher/PatchManager.java
+++ b/src/net/zhuoweizhang/mcpelauncher/PatchManager.java
@@ -73,9 +73,7 @@ public void removeDeadEntries(Collection<String> allPossibleFiles) {
 	}
 
 	protected void loadEnabledPatches() {
-		SharedPreferences sharedPrefs = context.getSharedPreferences(MainMenuOptionsActivity.PREFERENCES_NAME, 0);
-		String enabledPatchesStr = sharedPrefs.getString("enabledPatches", "");
-		enabledPatches = new HashSet<String>(Arrays.asList(enabledPatchesStr.split(";")));
+		enabledPatches = Utils.getEnabledPatches();
 	}
 
 	protected void saveEnabledPatches() {
diff --git a/src/net/zhuoweizhang/mcpelauncher/ScriptManager.java b/src/net/zhuoweizhang/mcpelauncher/ScriptManager.java
index 6b585703..5ed840b0 100644
--- a/src/net/zhuoweizhang/mcpelauncher/ScriptManager.java
+++ b/src/net/zhuoweizhang/mcpelauncher/ScriptManager.java
@@ -20,6 +20,7 @@
 
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.os.Environment;
 import android.util.Log;
 import net.zhuoweizhang.mcpelauncher.ui.MainMenuOptionsActivity;
 
@@ -254,7 +255,7 @@ public static void setLevelCallback(boolean hasLevel, boolean isRemote) {
 			ScriptManager.scriptingEnabled = true; // all local worlds get ModPE
 													// support
 		nativeSetGameSpeed(20.0f);
-		//entityList.clear();
+		// entityList.clear();
 		callScriptMethod("newLevel", hasLevel);
 		if (MainActivity.currentMainActivity != null) {
 			MainActivity main = MainActivity.currentMainActivity.get();
@@ -361,7 +362,7 @@ public static void entityRemovedCallback(int entity) {
 		int entityIndex = allentities.indexOf(entity);
 		if (entityIndex >= 0) allentities.remove(entityIndex);
 		callScriptMethod("entityRemovedHook", entity);
-		//entityList.remove(Integer.valueOf(entity));
+		// entityList.remove(Integer.valueOf(entity));
 	}
 
 	public static void entityAddedCallback(int entity) {
@@ -371,7 +372,7 @@ public static void entityAddedCallback(int entity) {
 		}
 		allentities.add(entity);
 		callScriptMethod("entityAddedHook", entity);
-		//entityList.put(entityList.getLength(), entityList, entity);
+		// entityList.put(entityList.getLength(), entityList, entity);
 	}
 
 	public static void levelEventCallback(int player, int eventType, int x, int y, int z, int data) {
@@ -601,7 +602,7 @@ public static File getScriptFile(String scriptId) {
 
 	// end script manager controls
 
-	private static String[] getAllJsFunctions(Class clazz) {
+	private static String[] getAllJsFunctions(Class<? extends ScriptableObject> clazz) {
 		List<String> allList = new ArrayList<String>();
 		for (Method met : clazz.getMethods()) {
 			if (met.getAnnotation(JSFunction.class) != null) {
@@ -684,7 +685,7 @@ private static void appendApiMethodDescription(StringBuilder builder, Method met
 		}
 		builder.append(met.getName());
 		builder.append('(');
-		Class[] params = met.getParameterTypes();
+		Class<?>[] params = met.getParameterTypes();
 		for (int i = 0; i < params.length; i++) {
 			builder.append("par");
 			builder.append(i + 1);
@@ -870,7 +871,8 @@ public static void processDebugCommand(String cmd) {
 	}
 
 	private static void debugDumpItems() throws IOException {
-		PrintWriter out = new PrintWriter(new File("/sdcard/items.csv"));
+		PrintWriter out = new PrintWriter(new File(Environment.getExternalStorageDirectory(),
+				"/items.csv"));
 		float[] textureUVbuf = new float[6];
 		for (int i = 0; i < 512; i++) {
 			String itemName = nativeGetItemName(i, 0, true);
@@ -933,7 +935,8 @@ private static int[] expandShapelessRecipe(Scriptable inArrayScriptable) {
 		int[] endArray = null;
 		if (firstObj instanceof Number) {
 			if (inArrayLength % 3 != 0) {
-				throw new IllegalArgumentException("Array length must be multiple of 3 (this was changed in 1.6.8): [itemid, itemCount, itemdamage, ...]");
+				throw new IllegalArgumentException(
+						"Array length must be multiple of 3 (this was changed in 1.6.8): [itemid, itemCount, itemdamage, ...]");
 			} else {
 				endArray = new int[inArrayLength];
 				for (int i = 0; i < endArray.length; i++) {
@@ -1022,9 +1025,12 @@ public static native int nativeSpawnEntity(float x, float y, float z, int entity
 	// 0.5
 	public static native void nativeOnGraphicsReset();
 
-	//0.6
-	public static native void nativeDefineItem(int itemId, String iconName, int iconId, String name, int maxStackSize);
-	public static native void nativeDefineFoodItem(int itemId, String iconName, int iconId, int hearts, String name, int maxStackSize);
+	// 0.6
+	public static native void nativeDefineItem(int itemId, String iconName, int iconId,
+			String name, int maxStackSize);
+
+	public static native void nativeDefineFoodItem(int itemId, String iconName, int iconId,
+			int hearts, String name, int maxStackSize);
 
 	// nonstandard
 	public static native void nativeSetFov(float degrees);
@@ -1114,9 +1120,13 @@ public static native void nativeAddShapelessRecipe(int id, int count, int damage
 	public static native void nativeSendChat(String message);
 
 	public static native String nativeEntityGetNameTag(int entityId);
+
 	public static native int nativeEntityGetRiding(int entityId);
+
 	public static native int nativeEntityGetRider(int entityId);
+
 	public static native String nativeEntityGetMobSkin(int entityId);
+
 	public static native int nativeEntityGetRenderType(int entityId);
 	public static native void nativeSetCameraEntity(int entityId);
 
@@ -1984,7 +1994,8 @@ public static void resetImages() {
 		}
 
 		@JSStaticFunction
-		public static void setItem(int id, String iconName, int iconSubindex, String name, int maxStackSize) {
+		public static void setItem(int id, String iconName, int iconSubindex, String name,
+				int maxStackSize) {
 			try {
 				Integer.parseInt(iconName);
 				Log.i("MCPELauncher", "The item icon for " + name.trim()
@@ -1998,7 +2009,8 @@ public static void setItem(int id, String iconName, int iconSubindex, String nam
 		}
 
 		@JSStaticFunction
-		public static void setFoodItem(int id, String iconName, int iconSubindex, int halfhearts, String name, int maxStackSize) {
+		public static void setFoodItem(int id, String iconName, int iconSubindex, int halfhearts,
+				String name, int maxStackSize) {
 			try {
 				Integer.parseInt(iconName);
 				Log.i("MCPELauncher", "The item icon for " + name.trim()
@@ -2129,12 +2141,29 @@ public static void addCraftRecipe(int id, int count, int damage, Scriptable ingr
 			int[] expanded = expandShapelessRecipe(ingredients);
 			nativeAddShapelessRecipe(id, count, damage, expanded);
 		}
-		
+
 		@JSStaticFunction
-		public static void addFurnaceRecipe(int inputId, int outputId, int outputDamage) { // Do I need a count? If not, should I just fill it with null, or skip it completely?
+		public static void addFurnaceRecipe(int inputId, int outputId, int outputDamage) { // Do
+																							// I
+																							// need
+																							// a
+																							// count?
+																							// If
+																							// not,
+																							// should
+																							// I
+																							// just
+																							// fill
+																							// it
+																							// with
+																							// null,
+																							// or
+																							// skip
+																							// it
+																							// completely?
 			nativeAddFurnaceRecipe(inputId, outputId, outputDamage);
 		}
-		
+
 		@Override
 		public String getClassName() {
 			return "Item";
@@ -2213,11 +2242,11 @@ public String getClassName() {
 			return "Block";
 		}
 	}
-	
+
 	private static class NativeServerApi extends ScriptableObject {
 		public NativeServerApi() {
 		}
-		
+
 		@JSStaticFunction
 		public static void joinServer(String serverAddress, int port) {
 			requestLeaveGame = true;
@@ -2225,10 +2254,11 @@ public static void joinServer(String serverAddress, int port) {
 			requestJoinServer.serverAddress = serverAddress;
 			requestJoinServer.serverPort = port;
 		}
-		
+
 		@JSStaticFunction
 		public static void sendChat(String message) {
-			if (!isRemote) return;
+			if (!isRemote)
+				return;
 			nativeSendChat(message);
 		}
 
diff --git a/src/net/zhuoweizhang/mcpelauncher/Utils.java b/src/net/zhuoweizhang/mcpelauncher/Utils.java
index 16ff4378..8fd7585f 100644
--- a/src/net/zhuoweizhang/mcpelauncher/Utils.java
+++ b/src/net/zhuoweizhang/mcpelauncher/Utils.java
@@ -10,14 +10,17 @@
 import android.content.res.Resources;
 import android.util.DisplayMetrics;
 
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Locale;
+import java.util.Set;
 
 public class Utils {
 	protected static Context mContext = null;
-
-	public Utils(Context con) {
-		mContext = con;
+	
+	public static void setContext(Context context) {
+		mContext = context;
 	}
 
 	public static void clearDirectory(File dir) {
@@ -66,6 +69,38 @@ public static String join(Collection<?> list, String replacement) {
 		return r;
 	}
 
+	public static boolean hasTooManyPatches() {
+		int maxPatchCount = getMaxPatches();
+		return maxPatchCount >= 0 && getEnabledPatches().size() >= maxPatchCount;
+	}
+
+	public static boolean hasTooManyScripts() {
+		int maxPatchCount = getMaxScripts();
+		return maxPatchCount >= 0 && getEnabledScripts().size() >= maxPatchCount;
+	}
+	
+	public static int getMaxPatches() {
+		return mContext.getResources().getInteger(R.integer.max_num_patches);
+	}
+	
+	public static int getMaxScripts() {
+		return mContext.getResources().getInteger(R.integer.max_num_scripts);
+	}
+
+	public static Set<String> getEnabledPatches() {
+		return new HashSet<String>(Arrays.asList(Utils.getPrefs(1).getString("enabledPatches", "")
+				.split(";")));
+	}
+
+	public static Set<String> getEnabledScripts() {
+		return new HashSet<String>(Arrays.asList(Utils.getPrefs(1).getString("enabledScripts", "")
+				.split(";")));
+	}
+	
+	public static boolean isPro() {
+		return mContext.getPackageName().equals("net.zhuoweizhang.mcpelauncher.pro");
+	}
+
 	/**
 	 * Returns SharedPreferences of type in argument
 	 * 
diff --git a/src/net/zhuoweizhang/mcpelauncher/patch/Patch.java b/src/net/zhuoweizhang/mcpelauncher/patch/Patch.java
index 03ac97d7..195b46e6 100644
--- a/src/net/zhuoweizhang/mcpelauncher/patch/Patch.java
+++ b/src/net/zhuoweizhang/mcpelauncher/patch/Patch.java
@@ -1,6 +1,5 @@
 package net.zhuoweizhang.mcpelauncher.patch;
 
-import java.io.*;
 import java.util.*;
 
 public abstract class Patch {
diff --git a/src/net/zhuoweizhang/mcpelauncher/ui/LauncherActivity.java b/src/net/zhuoweizhang/mcpelauncher/ui/LauncherActivity.java
index b64bd67d..2522c445 100644
--- a/src/net/zhuoweizhang/mcpelauncher/ui/LauncherActivity.java
+++ b/src/net/zhuoweizhang/mcpelauncher/ui/LauncherActivity.java
@@ -6,7 +6,7 @@
 public class LauncherActivity extends com.mojang.minecraftpe.MainActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
-		new Utils(getApplicationContext());
+		Utils.setContext(getApplicationContext());
 		super.onCreate(savedInstanceState);
 	}
 }
diff --git a/src/net/zhuoweizhang/mcpelauncher/ui/MainMenuOptionsActivity.java b/src/net/zhuoweizhang/mcpelauncher/ui/MainMenuOptionsActivity.java
index 79ec0b25..efcf6670 100644
--- a/src/net/zhuoweizhang/mcpelauncher/ui/MainMenuOptionsActivity.java
+++ b/src/net/zhuoweizhang/mcpelauncher/ui/MainMenuOptionsActivity.java
@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import com.mojang.minecraftpe.MainActivity;
+
 import net.zhuoweizhang.mcpelauncher.R;
 import net.zhuoweizhang.mcpelauncher.ScriptManager;
 import net.zhuoweizhang.mcpelauncher.Utils;
@@ -39,7 +41,7 @@ public class MainMenuOptionsActivity extends PreferenceActivity implements
 	private SwitchPreference scriptsPreference;
 	private SwitchPreference skinPreference;
 	private Preference patchesPreference;
-	private Preference safeModePreference;
+	private CheckBoxPreference safeModePreference;
 	private ListPreference languagePreference;
 	private Preference goToForumsPreference;
 	private Preference getProPreference;
@@ -55,6 +57,8 @@ public void run() {
 			while (activity.get() != null) {
 				updateTP();
 				updateSkin();
+				updatePatches();
+				updateScripts();
 				synchronized (ui) {
 					try {
 						ui.wait();
@@ -107,6 +111,62 @@ public void run() {
 			});
 			a = null;
 		}
+
+		protected void updatePatches() {
+			MainMenuOptionsActivity a = activity.get();
+			final Preference p = a.patchesPreference;
+			String sum = null;
+			if ((a.safeModePreference != null) && (a.safeModePreference.isChecked())) {
+				int count = getDir(MainActivity.PT_PATCHES_DIR, 0).listFiles().length;
+				if (!Utils.isPro() && (Utils.getMaxPatches() != -1)) {
+					count = Math.min(Utils.getMaxPatches(), count);
+				}
+				String descr = getString(R.string.plurals_patches_more);
+				if (count == 1)
+					descr = getString(R.string.plurals_patches_one);
+				if (count == 0) {
+					sum = getString(R.string.plurals_patches_no);
+				} else {
+					sum = Utils.getEnabledPatches().size() + "/" + count + " " + descr;
+				}
+			}
+			final String sm = sum;
+			a.runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					p.setSummary(sm);
+				}
+			});
+			a = null;
+		}
+
+		protected void updateScripts() {
+			MainMenuOptionsActivity a = activity.get();
+			final SwitchPreference p = a.scriptsPreference;
+			String sum = null;
+			if ((p.content != null) && (p.content.isChecked())) {
+				int count = getDir(ScriptManager.SCRIPTS_DIR, 0).listFiles().length;
+				if (!Utils.isPro() && (Utils.getMaxScripts() != -1)) {
+					count = Math.min(Utils.getMaxScripts(), count);
+				}
+				String descr = getString(R.string.plurals_scripts_more);
+				if (count == 1)
+					descr = getString(R.string.plurals_scripts_one);
+				if (count == 0) {
+					sum = getString(R.string.plurals_scripts_no);
+				} else {
+					sum = Utils.getEnabledScripts().size() + "/" + count + " " + descr;
+				}
+			}
+			final String sm = sum;
+			a.runOnUiThread(new Runnable() {
+				@Override
+				public void run() {
+					p.setSummary(sm);
+				}
+			});
+			a = null;
+		}
 	});
 
 	@SuppressWarnings("deprecation")
@@ -127,7 +187,7 @@ public void onCreate(Bundle savedInstanceState) {
 			patchesPreference.setOnPreferenceClickListener(this);
 		}
 
-		safeModePreference = findPreference("zz_safe_mode");
+		safeModePreference = (CheckBoxPreference) findPreference("zz_safe_mode");
 		if (safeModePreference != null) {
 			safeModePreference.setOnPreferenceClickListener(this);
 		}
@@ -176,7 +236,7 @@ public void onCreate(Bundle savedInstanceState) {
 		if (paranoidPreference != null) {
 			paranoidPreference.setOnPreferenceClickListener(this);
 		}
-		
+
 		ui.start();
 	}
 
@@ -238,6 +298,11 @@ public void onCheckedChange(Switch data) {
 			if (!data.isChecked())
 				f = ManageTexturepacksActivity.REQUEST_DISABLE;
 			ManageTexturepacksActivity.setTexturepack(f, null);
+		} else if (data == skinPreference.content) {
+			File f = ManageSkinsActivity.REQUEST_ENABLE;
+			if (!data.isChecked())
+				f = ManageSkinsActivity.REQUEST_DISABLE;
+			ManageSkinsActivity.setSkin(f, null);
 		}
 	}
 
diff --git a/src/net/zhuoweizhang/mcpelauncher/ui/ManageAddonsActivity.java b/src/net/zhuoweizhang/mcpelauncher/ui/ManageAddonsActivity.java
index fb6725e9..36195dd7 100644
--- a/src/net/zhuoweizhang/mcpelauncher/ui/ManageAddonsActivity.java
+++ b/src/net/zhuoweizhang/mcpelauncher/ui/ManageAddonsActivity.java
@@ -7,7 +7,6 @@
 import net.zhuoweizhang.mcpelauncher.Utils;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ListActivity;
@@ -19,7 +18,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.view.Menu;
 import android.view.View;
diff --git a/src/net/zhuoweizhang/mcpelauncher/ui/ManagePatchesActivity.java b/src/net/zhuoweizhang/mcpelauncher/ui/ManagePatchesActivity.java
index 0b24677a..15e26b6e 100644
--- a/src/net/zhuoweizhang/mcpelauncher/ui/ManagePatchesActivity.java
+++ b/src/net/zhuoweizhang/mcpelauncher/ui/ManagePatchesActivity.java
@@ -100,9 +100,6 @@ public void importPatch() {
 	 * gets the maximum number of patches this application can patch. A negative
 	 * value indicates unlimited amount.
 	 */
-	protected int getMaxPatchCount() {
-		return this.getResources().getInteger(R.integer.max_num_patches);
-	}
 
 	protected void setPatchListModified() {
 		setResult(RESULT_OK);
@@ -121,8 +118,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 					File to = new File(getDir(PT_PATCHES_DIR, 0), file.getName());
 					PatchUtils.copy(file, to);
 					PatchManager.getPatchManager(this).setEnabled(to, false);
-					int maxPatchCount = getMaxPatchCount();
-					if (maxPatchCount >= 0 && getEnabledCount() >= maxPatchCount) {
+					if (Utils.hasTooManyPatches()) {
 						Toast.makeText(this, R.string.manage_patches_too_many, Toast.LENGTH_SHORT).show();
 					} else {
 						PatchManager.getPatchManager(this).setEnabled(to, true);
@@ -185,8 +181,7 @@ public void onPrepareDialog(int dialogId, Dialog dialog) {
 	}
 
 	public void togglePatch(ContentListItem patch) {
-		int maxPatchCount = getMaxPatchCount();
-		if (!patch.enabled && maxPatchCount >= 0 && getEnabledCount() >= maxPatchCount) {
+		if (!patch.enabled && Utils.hasTooManyPatches()) {
 			Toast.makeText(this, R.string.manage_patches_too_many, Toast.LENGTH_SHORT).show();
 			return;
 		}
@@ -252,10 +247,6 @@ public boolean canLivePatch(ContentListItem patch) {
 		}
 	}
 
-	public int getEnabledCount() {
-		return PatchManager.getPatchManager(this).getEnabledPatches().size();
-	}
-
 	public void deletePatch(ContentListItem patch) throws Exception {
 		patch.enabled = false;
 		if (!prePatchConfigure) {
diff --git a/src/net/zhuoweizhang/mcpelauncher/ui/ManageScriptsActivity.java b/src/net/zhuoweizhang/mcpelauncher/ui/ManageScriptsActivity.java
index df422c8b..a47459f3 100644
--- a/src/net/zhuoweizhang/mcpelauncher/ui/ManageScriptsActivity.java
+++ b/src/net/zhuoweizhang/mcpelauncher/ui/ManageScriptsActivity.java
@@ -212,7 +212,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 						}
 						ScriptManager.setEnabled(to, false);
 						int maxPatchCount = getMaxPatchCount();
-						if (maxPatchCount >= 0 && getEnabledCount() >= maxPatchCount) {
+						if (Utils.hasTooManyScripts()) {
 							Toast.makeText(this, R.string.script_import_too_many, Toast.LENGTH_SHORT).show();
 						} else {
 							ScriptManager.setEnabled(to, true);
@@ -297,7 +297,7 @@ public void onPrepareDialog(int dialogId, Dialog dialog) {
 
 	public void togglePatch(ContentListItem patch) {
 		int maxPatchCount = getMaxPatchCount();
-		if (!patch.enabled && maxPatchCount >= 0 && getEnabledCount() >= maxPatchCount) {
+		if (!patch.enabled && Utils.hasTooManyScripts()) {
 			Toast.makeText(this, R.string.script_import_too_many, Toast.LENGTH_SHORT).show();
 			return;
 		}
@@ -318,10 +318,6 @@ private void reportScriptLoadError(Exception e) {
 	private void afterPatchToggle(ContentListItem patch) {
 	}
 
-	public int getEnabledCount() {
-		return ScriptManager.getEnabledScripts().size();
-	}
-
 	public void deletePatch(ContentListItem patch) throws Exception {
 		patch.enabled = false;
 		try {
@@ -594,7 +590,7 @@ private void importFromClipboard(String code) {
 
 			ScriptManager.setEnabled(scriptFile, false);
 			int maxPatchCount = getMaxPatchCount();
-			if (maxPatchCount >= 0 && getEnabledCount() >= maxPatchCount) {
+			if (Utils.hasTooManyScripts()) {
 				Toast.makeText(ManageScriptsActivity.this, R.string.script_import_too_many, Toast.LENGTH_SHORT).show();
 			} else {
 				ScriptManager.setEnabled(scriptFile, true);
@@ -641,7 +637,7 @@ protected void onPostExecute(File file) {
 			try {
 				ScriptManager.setEnabled(file, false);
 				int maxPatchCount = getMaxPatchCount();
-				if (maxPatchCount >= 0 && getEnabledCount() >= maxPatchCount) {
+				if (Utils.hasTooManyScripts()) {
 					Toast.makeText(ManageScriptsActivity.this, R.string.script_import_too_many, Toast.LENGTH_SHORT).show();
 				} else {
 					ScriptManager.setEnabled(file, true);
@@ -658,6 +654,7 @@ protected void onPostExecute(File file) {
 
 	/** Import a script from Treebl's repo. */
 	private class ImportScriptFromCfgyTask extends ImportScriptTask<String> {
+		@SuppressWarnings("resource")
 		protected File doInBackground(String... ids) {
 			String id = ids[0];
 
diff --git a/src/net/zhuoweizhang/mcpelauncher/ui/ManageTexturepacksActivity.java b/src/net/zhuoweizhang/mcpelauncher/ui/ManageTexturepacksActivity.java
index eb7142e5..3d817165 100644
--- a/src/net/zhuoweizhang/mcpelauncher/ui/ManageTexturepacksActivity.java
+++ b/src/net/zhuoweizhang/mcpelauncher/ui/ManageTexturepacksActivity.java
@@ -181,6 +181,18 @@ protected void setTexturepack(File f) {
 		setTexturepack(f, this);
 	}
 
+	CompoundButton.OnCheckedChangeListener ls = new CompoundButton.OnCheckedChangeListener() {
+		@Override
+		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+			if (isChecked) {
+				setTexturepack(REQUEST_ENABLE);
+			} else {
+				setTexturepack(REQUEST_DISABLE);
+			}
+			loadHistory();
+		}
+	};
+
 	@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
@@ -189,17 +201,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 			master = (CompoundButton) menu.findItem(R.id.ab_switch_container).getActionView()
 					.findViewById(R.id.ab_switch);
 			if (master != null) {
-				master.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-					@Override
-					public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-						if (isChecked) {
-							setTexturepack(REQUEST_ENABLE);
-						} else {
-							setTexturepack(REQUEST_DISABLE);
-						}
-						loadHistory();
-					}
-				});
+				master.setOnCheckedChangeListener(ls);
 				refreshABToggle();
 			} else {
 				System.err.println("WTF?");
@@ -212,7 +214,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
 	protected void refreshABToggle() {
 		if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) && (master != null)) {
+			master.setOnCheckedChangeListener(null);
 			master.setChecked(isEnabled());
+			master.setOnCheckedChangeListener(ls);
 		}
 	}
 
@@ -287,6 +291,9 @@ protected Void doInBackground(Void... params) {
 		protected void onPostExecute(Void result) {
 			dialog.dismiss();
 			if (outFile.exists()) {
+				adapter.add(outFile);
+				adapter.notifyDataSetChanged();
+				saveHistory();
 				setTexturepack(outFile);
 				Toast.makeText(ManageTexturepacksActivity.this, R.string.extract_textures_success,
 						Toast.LENGTH_SHORT).show();