Some updates

2024-11-23 04:19:41 +00:00 · 2023-10-18 12:00:56 +02:00 · 2023-10-18 12:00:56 +02:00 · 60988087ae
commit 60988087ae
parent a97a42ef6a
73 changed files with 51 additions and 30 deletions
--- a/assets/icons/flags/PAL-PL.png
+++ b/assets/icons/flags/PAL-PL.png
--- a/builder/lib/nethersx2.xdelta
+++ b/builder/lib/nethersx2.xdelta
--- a/patch-apk.bat
+++ b/patch-apk.bat
@ -1,4 +1,6 @@
@echo off
+:: Sets the window's title
+Title NetherSX2 Patcher
 :: Allows for Terminal Colors to be used
 set col=lib\cmdcolor.exe
 set md5hash=c98b0e4152d3b02fbfb9f62581abada5
@ -8,6 +10,10 @@ echo \033[91m======================== | %col%
 echo \033[91m NetherSX2 Patcher v1.7  | %col%
 echo \033[91m======================== | %col%

+:: Makes sure Java is installed and in the PATH
+java >nul 2>&1
+if %errorlevel%==9009 goto nojava
+
 :: Check if the NetherSX2 APK exists and if it's named correctly
 if not exist 15210-v1.5-4248-noads.apk goto nofile
 :: Check if the NetherSX2 APK isn't just a renamed AetherSX2 4248 APK
@ -17,67 +23,67 @@ for /f %%f in ('""lib\md5sum.exe" "15210-v1.5-4248-noads.apk""') do (

 :: Ad Services Cleanup
 <nul set /p "=\033[96mRemoving the \033[91mAd Services leftovers...         " | %col%
-lib\aapt r 15210-v1.5-4248-noads.apk user-messaging-platform.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-tasks.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-measurement-sdk-api.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-measurement-base.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-basement.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-base.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-appset.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-ads.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-ads-lite.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-ads-identifier.properties > nul
-lib\aapt r 15210-v1.5-4248-noads.apk play-services-ads-base.properties > nul
+lib\aapt r 15210-v1.5-4248-noads.apk user-messaging-platform.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-tasks.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-measurement-sdk-api.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-measurement-base.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-basement.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-base.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-appset.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-ads.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-ads-lite.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-ads-identifier.properties >nul
+lib\aapt r 15210-v1.5-4248-noads.apk play-services-ads-base.properties >nul
 echo \033[92m[Done] | %col%

 :: Adds Additional Options to App Settings
 <nul set /p "=\033[96mAdding more options to \033[91mApp Settings...        " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk res/xml/advanced_preferences.xml
-lib\aapt a 15210-v1.5-4248-noads.apk res/xml/advanced_preferences.xml > nul
+lib\aapt a 15210-v1.5-4248-noads.apk res/xml/advanced_preferences.xml >nul
 lib\aapt r 15210-v1.5-4248-noads.apk res/xml/graphics_preferences.xml
-lib\aapt a 15210-v1.5-4248-noads.apk res/xml/graphics_preferences.xml > nul
+lib\aapt a 15210-v1.5-4248-noads.apk res/xml/graphics_preferences.xml >nul
 echo \033[92m[Done] | %col%

 :: Updates the FAQ to show that we're using the latest version of NetherSX2
 <nul set /p "=\033[96mUpdating the \033[91mFAQ...                           " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/faq.html
-lib\aapt a 15210-v1.5-4248-noads.apk assets/faq.html > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/faq.html >nul
 echo \033[92m[Done] | %col%

 :: Updates to Latest GameDB with features removed that are not supported by the libemucore.so from March 13th
 <nul set /p "=\033[96mUpdating the \033[91mGameDB...                        " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/GameIndex.yaml
-lib\aapt a 15210-v1.5-4248-noads.apk assets/GameIndex.yaml > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/GameIndex.yaml >nul
 echo \033[92m[Done] | %col%

 :: Updates the Game Controller Database
 <nul set /p "=\033[96mUpdating the \033[91mController Database...           " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/game_controller_db.txt
-lib\aapt a 15210-v1.5-4248-noads.apk assets/game_controller_db.txt > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/game_controller_db.txt >nul
 echo \033[92m[Done] | %col%

 :: Updates the Widescreen Patches
 <nul set /p "=\033[96mUpdating the \033[91mWidescreen Patches...            " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/cheats_ws.zip
-lib\aapt a 15210-v1.5-4248-noads.apk assets/cheats_ws.zip > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/cheats_ws.zip >nul
 echo \033[92m[Done] | %col%

 :: Updates the No-Interlacing Patches
 <nul set /p "=\033[96mUpdating the \033[91mNo-Interlacing Patches...        " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/cheats_ni.zip
-lib\aapt a 15210-v1.5-4248-noads.apk assets/cheats_ni.zip > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/cheats_ni.zip >nul
 echo \033[92m[Done] | %col%

 :: Fixes License Compliancy Issue
 <nul set /p "=\033[96mFixing the \033[91mLicense Compliancy Issue...        " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/3rdparty.html
-lib\aapt a 15210-v1.5-4248-noads.apk assets/3rdparty.html > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/3rdparty.html >nul
 echo \033[92m[Done] | %col%

 :: Adds the placeholder file that makes RetroAchievements Notifications work
 <nul set /p "=\033[96mFixing the \033[91mRetroAchievements Notifications... " | %col%
-lib\aapt r 15210-v1.5-4248-noads.apk assets/placeholder.png > nul
-lib\aapt a 15210-v1.5-4248-noads.apk assets/placeholder.png > nul
+lib\aapt r 15210-v1.5-4248-noads.apk assets/placeholder.png >nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/placeholder.png >nul
 echo \033[92m[Done] | %col%

 :: Resigns the APK before exiting
@ -89,8 +95,13 @@ echo \033[92m[Done] | %col%
 goto end

 :nofile
-echo \033[31mError: No APK found or wrong one provided! | %col%
-echo \033[31mPlease provide a copy of NetherSX2 named 15210-v1.5-4248-noads.apk! | %col%
+echo \033[91mError: No APK found or wrong one provided! | %col%
+echo \033[91mPlease provide a copy of NetherSX2 named 15210-v1.5-4248-noads.apk! | %col%
+goto end
+
+:nojava
+echo \033[91mError: The Java Development Kit is not installed or a restart required! | %col%
+echo \033[91mPlease download and install the JDK from https://www.oracle.com/java/technologies/downloads/#jdk21-windows | %col%
 goto end

 :end
--- a/res/drawable-og/ic_controller_a_button.xml
+++ b/res/drawable-og/ic_controller_a_button.xml
--- a/res/drawable-og/ic_controller_analog_base.xml
+++ b/res/drawable-og/ic_controller_analog_base.xml
--- a/res/drawable-og/ic_controller_analog_button.xml
+++ b/res/drawable-og/ic_controller_analog_button.xml
--- a/res/drawable-og/ic_controller_analog_stick.xml
+++ b/res/drawable-og/ic_controller_analog_stick.xml
--- a/res/drawable-og/ic_controller_b_button.xml
+++ b/res/drawable-og/ic_controller_b_button.xml
--- a/res/drawable-og/ic_controller_c_button.xml
+++ b/res/drawable-og/ic_controller_c_button.xml
--- a/res/drawable-og/ic_controller_calibrate_button.xml
+++ b/res/drawable-og/ic_controller_calibrate_button.xml
--- a/res/drawable-og/ic_controller_circle_button.xml
+++ b/res/drawable-og/ic_controller_circle_button.xml
--- a/res/drawable-og/ic_controller_cross_button.xml
+++ b/res/drawable-og/ic_controller_cross_button.xml
--- a/res/drawable-og/ic_controller_down_button.xml
+++ b/res/drawable-og/ic_controller_down_button.xml
--- a/res/drawable-og/ic_controller_l1_button.xml
+++ b/res/drawable-og/ic_controller_l1_button.xml
--- a/res/drawable-og/ic_controller_l2_button.xml
+++ b/res/drawable-og/ic_controller_l2_button.xml
--- a/res/drawable-og/ic_controller_l3_button.xml
+++ b/res/drawable-og/ic_controller_l3_button.xml
--- a/res/drawable-og/ic_controller_left_button.xml
+++ b/res/drawable-og/ic_controller_left_button.xml
--- a/res/drawable-og/ic_controller_m1_button.xml
+++ b/res/drawable-og/ic_controller_m1_button.xml
--- a/res/drawable-og/ic_controller_m2_button.xml
+++ b/res/drawable-og/ic_controller_m2_button.xml
--- a/res/drawable-og/ic_controller_m3_button.xml
+++ b/res/drawable-og/ic_controller_m3_button.xml
--- a/res/drawable-og/ic_controller_m4_button.xml
+++ b/res/drawable-og/ic_controller_m4_button.xml
--- a/res/drawable-og/ic_controller_pause_button.xml
+++ b/res/drawable-og/ic_controller_pause_button.xml
--- a/res/drawable-og/ic_controller_pressure_modifier.xml
+++ b/res/drawable-og/ic_controller_pressure_modifier.xml
--- a/res/drawable-og/ic_controller_quick_load_button.xml
+++ b/res/drawable-og/ic_controller_quick_load_button.xml
--- a/res/drawable-og/ic_controller_quick_save_button.xml
+++ b/res/drawable-og/ic_controller_quick_save_button.xml
--- a/res/drawable-og/ic_controller_r1_button.xml
+++ b/res/drawable-og/ic_controller_r1_button.xml
--- a/res/drawable-og/ic_controller_r2_button.xml
+++ b/res/drawable-og/ic_controller_r2_button.xml
--- a/res/drawable-og/ic_controller_r3_button.xml
+++ b/res/drawable-og/ic_controller_r3_button.xml
--- a/res/drawable-og/ic_controller_right_button.xml
+++ b/res/drawable-og/ic_controller_right_button.xml
--- a/res/drawable-og/ic_controller_select_button.xml
+++ b/res/drawable-og/ic_controller_select_button.xml
--- a/res/drawable-og/ic_controller_square_button.xml
+++ b/res/drawable-og/ic_controller_square_button.xml
--- a/res/drawable-og/ic_controller_start_button.xml
+++ b/res/drawable-og/ic_controller_start_button.xml
--- a/res/drawable-og/ic_controller_toggle_slowmo.xml
+++ b/res/drawable-og/ic_controller_toggle_slowmo.xml
--- a/res/drawable-og/ic_controller_toggle_speed_limit.xml
+++ b/res/drawable-og/ic_controller_toggle_speed_limit.xml
--- a/res/drawable-og/ic_controller_toggle_turbo.xml
+++ b/res/drawable-og/ic_controller_toggle_turbo.xml
--- a/res/drawable-og/ic_controller_triangle_button.xml
+++ b/res/drawable-og/ic_controller_triangle_button.xml
--- a/res/drawable-og/ic_controller_up_button.xml
+++ b/res/drawable-og/ic_controller_up_button.xml
--- a/res/drawable/ic_controller_analog_base.png
+++ b/res/drawable/ic_controller_analog_base.png
--- a/res/drawable/ic_controller_analog_button.png
+++ b/res/drawable/ic_controller_analog_button.png
--- a/res/drawable/ic_controller_analog_stick.png
+++ b/res/drawable/ic_controller_analog_stick.png
--- a/res/drawable/ic_controller_circle_button.png
+++ b/res/drawable/ic_controller_circle_button.png
--- a/res/drawable/ic_controller_cross_button.png
+++ b/res/drawable/ic_controller_cross_button.png
--- a/res/drawable/ic_controller_down_button.png
+++ b/res/drawable/ic_controller_down_button.png
--- a/res/drawable/ic_controller_l1_button.png
+++ b/res/drawable/ic_controller_l1_button.png
--- a/res/drawable/ic_controller_l2_button.png
+++ b/res/drawable/ic_controller_l2_button.png
--- a/res/drawable/ic_controller_l3_button.png
+++ b/res/drawable/ic_controller_l3_button.png
--- a/res/drawable/ic_controller_left_button.png
+++ b/res/drawable/ic_controller_left_button.png
--- a/res/drawable/ic_controller_m1_button.png
+++ b/res/drawable/ic_controller_m1_button.png
--- a/res/drawable/ic_controller_m2_button.png
+++ b/res/drawable/ic_controller_m2_button.png
--- a/res/drawable/ic_controller_m3_button.png
+++ b/res/drawable/ic_controller_m3_button.png
--- a/res/drawable/ic_controller_m4_button.png
+++ b/res/drawable/ic_controller_m4_button.png
--- a/res/drawable/ic_controller_r1_button.png
+++ b/res/drawable/ic_controller_r1_button.png
--- a/res/drawable/ic_controller_r2_button.png
+++ b/res/drawable/ic_controller_r2_button.png
--- a/res/drawable/ic_controller_r3_button.png
+++ b/res/drawable/ic_controller_r3_button.png
--- a/res/drawable/ic_controller_right_button.png
+++ b/res/drawable/ic_controller_right_button.png
--- a/res/drawable/ic_controller_select_button.png
+++ b/res/drawable/ic_controller_select_button.png
--- a/res/drawable/ic_controller_square_button.png
+++ b/res/drawable/ic_controller_square_button.png
--- a/res/drawable/ic_controller_start_button.png
+++ b/res/drawable/ic_controller_start_button.png
--- a/res/drawable/ic_controller_triangle_button.png
+++ b/res/drawable/ic_controller_triangle_button.png
--- a/res/drawable/ic_controller_up_button.png
+++ b/res/drawable/ic_controller_up_button.png
--- a/theme/lib/android.jks
+++ b/theme/lib/android.jks
--- a/theme/lib/apksigner.jar
+++ b/theme/lib/apksigner.jar
--- a/theme/lib/apktool.jar
+++ b/theme/lib/apktool.jar
--- a/theme/lib/cmdcolor.exe
+++ b/theme/lib/cmdcolor.exe
--- a/theme/lib/md5sum.exe
+++ b/theme/lib/md5sum.exe
--- a/theme/lib/public.jks
+++ b/theme/lib/public.jks
--- a/theme/lib/zipalign.exe
+++ b/theme/lib/zipalign.exe
--- a/theme/res/drawable/ic_controller_down_button.png
+++ b/theme/res/drawable/ic_controller_down_button.png
--- a/theme/res/drawable/ic_controller_left_button.png
+++ b/theme/res/drawable/ic_controller_left_button.png
--- a/theme/res/drawable/ic_controller_right_button.png
+++ b/theme/res/drawable/ic_controller_right_button.png
--- a/theme/res/drawable/ic_controller_up_button.png
+++ b/theme/res/drawable/ic_controller_up_button.png
--- a/theme/theme-apply.bat
+++ b/theme/theme-apply.bat
@ -16,7 +16,7 @@ for /f %%f in ('""lib\md5sum.exe" "15210-v1.5-4248-noads.apk""') do (
 )

 :: Adds UI Theme to APK
-<nul set /p "=\033[96mApplying the \033[91mCustom UI Theme...               " | %col%
+<nul set /p "=\033[96mApplying the \033[91mCustom UI Theme..." | %col%
 for /r %%i in (res\drawable\*.png) do (
  lib\aapt r 15210-v1.5-4248-noads.apk res/drawable/%%~nxi > nul
  lib\aapt a 15210-v1.5-4248-noads.apk res/drawable/%%~nxi > nul
--- a/update-files.bat
+++ b/update-files.bat
@ -1,4 +1,5 @@
@echo off
+Title NetherSX2 Updater
 :: Allows for Terminal Colors to be used
 set col=lib\cmdcolor.exe
 set md5hash=c98b0e4152d3b02fbfb9f62581abada5
@ -8,6 +9,10 @@ echo \033[91m======================== | %col%
 echo \033[91m NetherSX2 Updater v1.7  | %col%
 echo \033[91m======================== | %col%

+:: Makes sure Java is installed and in the PATH
+java >nul 2>&1
+if %errorlevel%==9009 goto nojava
+
 :: Check if the NetherSX2 APK exists and if it's named correctly
 if not exist 15210-v1.5-4248-noads.apk goto nofile
 :: Check if the NetherSX2 APK isn't just a renamed AetherSX2 4248 APK
@ -18,25 +23,25 @@ for /f %%f in ('""lib\md5sum.exe" "15210-v1.5-4248-noads.apk""') do (
 :: Updates to Latest GameDB with features removed that are not supported by the libemucore.so from March 13th
 <nul set /p "=\033[96mUpdating the \033[91mGameDB...                 " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/GameIndex.yaml
-lib\aapt a 15210-v1.5-4248-noads.apk assets/GameIndex.yaml > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/GameIndex.yaml >nul
 echo \033[92m[Done] | %col%

 :: Updates the Controller Database
 <nul set /p "=\033[96mUpdating the \033[91mController Database...    " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/game_controller_db.txt
-lib\aapt a 15210-v1.5-4248-noads.apk assets/game_controller_db.txt > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/game_controller_db.txt >nul
 echo \033[92m[Done] | %col%

 :: Updates the Widescreen Patches
 <nul set /p "=\033[96mUpdating the \033[91mWidescreen Patches...     " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/cheats_ws.zip
-lib\aapt a 15210-v1.5-4248-noads.apk assets/cheats_ws.zip > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/cheats_ws.zip >nul
 echo \033[92m[Done] | %col%

 :: Updates the No-Interlacing Patches
 <nul set /p "=\033[96mUpdating the \033[91mNo-Interlacing Patches... " | %col%
 lib\aapt r 15210-v1.5-4248-noads.apk assets/cheats_ni.zip
-lib\aapt a 15210-v1.5-4248-noads.apk assets/cheats_ni.zip > nul
+lib\aapt a 15210-v1.5-4248-noads.apk assets/cheats_ni.zip >nul
 echo \033[92m[Done] | %col%

 :: Resigns the APK before exiting
@ -48,8 +53,13 @@ echo \033[92m[Done] | %col%
 goto end

 :nofile
-echo \033[31mError: No APK found or wrong one provided! | %col%
-echo \033[31mPlease provide a copy of NetherSX2 named 15210-v1.5-4248-noads.apk! | %col%
+echo \033[91mError: No APK found or wrong one provided! | %col%
+echo \033[91mPlease provide a copy of NetherSX2 named 15210-v1.5-4248-noads.apk! | %col%
+goto end
+
+:nojava
+echo \033[91mError: The Java Development Kit is not installed or a restart required! | %col%
+echo \033[91mPlease download and install the JDK from https://www.oracle.com/java/technologies/downloads/#jdk21-windows | %col%
 goto end

 :end