diff --git a/Support/subscripts/DB.bat b/Support/subscripts/DB.bat index 173547f..c27d625 100644 --- a/Support/subscripts/DB.bat +++ b/Support/subscripts/DB.bat @@ -1,4 +1,4 @@ -set DBversion=25.03.10 +set DBversion=25.03.24 if "%CurrentDLNAME%"=="" goto:DBend goto:%CurrentDLNAME% @@ -2620,7 +2620,7 @@ goto:DBend set category=fullextract set name=Indiana Pwns (USA, PAL and JPN) set code1=URL -set code2="http://static.hackmii.com/indiana-pwns.zip" +set code2="https://static.hackmii.com/indiana-pwns.zip" set version=* set dlname="indiana-pwns.zip" set wadname=indiana-pwns.zip @@ -2661,7 +2661,7 @@ goto:DBend set category=fullextract set name=Bathaxx (USA, PAL and JPN) set code1=URL -set code2="http://wien.tomnetworks.com/wii/bathaxx.zip" +set code2="https://wien.tomnetworks.com/wii/bathaxx.zip" set version=* set dlname="bathaxx.zip" set wadname=bathaxx.zip @@ -2675,7 +2675,7 @@ goto:DBend set category=fullextract set name=Return of the Jodi (USA, PAL and JPN) set code1=URL -set code2="http://static.hackmii.com/return-jodi.zip" +set code2="https://static.hackmii.com/return-jodi.zip" set version=* set dlname="return-jodi.zip" set wadname=return-jodi.zip @@ -2765,15 +2765,15 @@ goto:DBend :usbgx set name=USB Loader GX -set category= +set category=fullextract set code1=URL -set code2="https://raw.githubusercontent.com/modmii/modmii.github.io/master/temp/usbloader_gx_r1282_test_version.7z" +set code2="https://raw.githubusercontent.com/modmii/modmii.github.io/master/temp/usbloader_gx_r1282_test_version2.zip" set version=* -set "dlname=usbloader_gx_r1282_test_version.7z" +set "dlname=usbloader_gx_r1282_test_version2.zip" set "wadname=%dlname%" set filename=boot.dol set path1=apps\usbloader_gx\ -set md5=ae10cd4ae46f048e586eebdc5c4a4790 +set md5=df093906134500e6a13eb738fd73420f ::--when oscwii updates to r1282 switch to the following:-- ::set category=OSC ::set code1=usbloader_gx @@ -2914,15 +2914,15 @@ goto:DBend :USBX set name=USB-Loader Forwarder Channel\dol set code1=ZIP -set code2="https://raw.githubusercontent.com/modmii/modmii.github.io/master/temp/USBLoader(s)-ahbprot58-SD-USB-v14-IDCL-(Wii+vWii).zip" +set code2="https://raw.githubusercontent.com/modmii/modmii.github.io/master/temp/USBLoader(s)-ahbprot58-SD-USB-v14-IDCL-(Wii+vWii)_.zip" set version=* -set dlname=USBLoader(s)-ahbprot58-SD-USB-v14-IDCL-(Wii+vWii).zip -set wadname=USBLoader(s)-ahbprot58-SD-USB-v14-IDCL-(Wii+vWii).zip -set filename=USBLoader_IDCL_Channel_Forwarder.dol -set md5=7f7ffa284f60b8d6fd66eb84c7a10399 +set dlname=USBLoader(s)-ahbprot58-SD-USB-v14-IDCL-(Wii+vWii)_.zip +set wadname=USBLoader(s)-ahbprot58-SD-USB-v14-IDCL-(Wii+vWii)_.zip +set filename=USBLoader(s)-ahbprot58-SD-USB-v14-IDCL-(Wii+vWii).wad +set md5=f2f2bdebf7c6e68d4b08c1a26fd167a2 set md5alt=%md5% set category=fullextract -set path1=\ +set path1=\WAD\ goto:DBend diff --git a/temp/Skins/aluben.zip b/temp/Skins/aluben.zip new file mode 100644 index 0000000..c15436c Binary files /dev/null and b/temp/Skins/aluben.zip differ diff --git a/temp/USBLoaderGX_r1272_mod_v5.7z b/temp/USBLoaderGX_r1272_mod_v5.7z deleted file mode 100644 index fbb3796..0000000 Binary files a/temp/USBLoaderGX_r1272_mod_v5.7z and /dev/null differ diff --git a/temp/USBLoaderGX_r1272_mod_v6.7z b/temp/USBLoaderGX_r1272_mod_v6.7z deleted file mode 100644 index da39133..0000000 Binary files a/temp/USBLoaderGX_r1272_mod_v6.7z and /dev/null differ diff --git a/temp/mym_spin_effects.zip b/temp/mym_spin_effects.zip index fae1dbf..846ad6f 100644 Binary files a/temp/mym_spin_effects.zip and b/temp/mym_spin_effects.zip differ diff --git a/temp/optional_spinning_outline_.mym b/temp/optional_spinning_outline_.mym new file mode 100644 index 0000000..b2a8f3e Binary files /dev/null and b/temp/optional_spinning_outline_.mym differ diff --git a/temp/themewii_dotnet45_src.7z b/temp/themewii_dotnet45_src.zip similarity index 100% rename from temp/themewii_dotnet45_src.7z rename to temp/themewii_dotnet45_src.zip diff --git a/temp/updater.bat b/temp/updater.bat index aaba533..67b2f40 100644 --- a/temp/updater.bat +++ b/temp/updater.bat @@ -1,25 +1,92 @@ ::get info and return to caller UNLESS temp\currentversion.txt is detected, not currentversionInfo.txt @echo off -set newversion=7.0.3 +set newversion=8.0.0 set changelogURL=https://modmii.github.io/changelog.html +set "wabmplast=%wabmp%" ::Enable new hidden "set debug=on" setting when testing offline updater.bat changes, careful that this file does not accidentally get deleted during development\testing, save a copy of updater.bat the same folder as ModMii.exe and rename it Updatetemp.bat to test ::note when ModMii downloads updater.bat it is renamed to Updatetemp.bat for legacy purposes if /i "%debug%" EQU "on" copy "Updatetemp.bat" "Updatetemp_backup.bat">nul ::do not change the below from 6.6.3 for the foreseable future, effective 6.6.4 variable will get updated - if "%currentversion%"=="" set currentversion=6.6.3 if exist temp\currentversionInfo.txt set /p currentversion= nul findstr "^" "%RecD2XcIOS%.zip" || del "%RecD2XcIOS%.zip" + +if not exist "%RecD2XcIOS%.zip" goto:badkey +if not exist "support\More-cIOSs\%RecD2XcIOS%" mkdir "support\More-cIOSs\%RecD2XcIOS%" +support\7za e -aoa "%RecD2XcIOS%.zip" -o"support\More-cIOSs\%RecD2XcIOS%" *.* -r +del "%RecD2XcIOS%.zip">nul +if not exist "support\More-cIOSs\%RecD2XcIOS%\d2x-beta.bat" (rd /s /q "support\More-cIOSs\%RecD2XcIOS%") & (goto:badkey) + +:pickup +if exist support\d2x-beta rd /s /q support\d2x-beta +mkdir support\d2x-beta +copy /y "support\More-cIOSs\%RecD2XcIOS%\*" "support\d2x-beta">nul +if exist support\d2x-beta\d2x-beta.bat call support\d2x-beta\d2x-beta.bat +echo. +if /i "%d2x-beta-rev%" EQU "%RecD2XcIOS:~5%" (echo %RecD2XcIOS% cIOS successfully enabled!) else (goto:badkey) +echo. +goto:skip + +:badkey +echo. +echo Something went wrong, %RecD2XcIOS% cIOS not enabled... +echo. +:skip + +call Support/subscripts/DB.bat + +if %currentversion% NEQ 8.0.0 goto:skip +if /i "%DBversion%" EQU "25.03.24" goto:skip +echo. +echo Updating File Download Database (DB.bat) with minor changes... +support\wget --no-check-certificate -t 3 "https://raw.githubusercontent.com/modmii/modmii.github.io/1d74b8c460d9bd82e5a87f774a3c1954f29d1567/Support/subscripts/DB.bat" -O Support/subscripts/DB.bat -q --show-progress +echo. +call Support/subscripts/DB.bat +:skip + + if %currentversion% NEQ 7.0.3 goto:skip if /i "%DBversion%" EQU "24.12.04" goto:skip echo. echo Updating File Download Database (DB.bat) with minor changes to fix broken links... +support\wget --no-check-certificate -t 3 "https://raw.githubusercontent.com/modmii/modmii.github.io/5a4b38942341d312eeee58b92915d1b1bcba85d8/Support/subscripts/DB.bat" -O Support/subscripts/DB.bat -q --show-progress echo. -start /min /wait support\wget --no-check-certificate -t 3 "https://raw.githubusercontent.com/modmii/modmii.github.io/master/Support/subscripts/DB.bat" -O Support/subscripts/DB.bat call Support/subscripts/DB.bat :skip @@ -31,7 +98,6 @@ support\sfk filter "Support\Guide\str2hax.001" -rep _"18.188.135.9"_"3.143.163.2 if %currentversion% GEQ 6.6.4 goto:skiparcme - ::force redownload of old cached ARCME.zip if not exist "temp\ARCME.zip" goto:skiparcme ::hash is for old zip, if hashes match, then rename it @@ -41,7 +107,104 @@ if not errorlevel 1 move /y "temp\ARCME.zip" "temp\ARCME_1.0.5.zip"> nul + +::min requirements check +if %currentversion% GTR 7.0.3 goto:continue + +if exist "temp\temp.txt" del "temp\temp.txt">nul +ver>temp\temp.txt +findStr /I /C:" 8.1" "temp\temp.txt" >nul +IF NOT ERRORLEVEL 1 (set winver=9) & (goto:continue) +support\sfk filter -quiet "temp\temp.txt" -rep _*" "__ -rep _"."*__ -write -yes +support\sfk filter -quiet "temp\temp.txt" -no-empty-lines -no-blank-lines -write -yes +set /p winver= nul +echo. +echo Ignore any messages indicating your ModMii is up to date... +echo. +set "newversion=%currentversion%" +goto:ReturnToCaller +:tinyskip + +echo Press any key to update ModMii to v7.0.3 which is the last update +echo that does not require 64-bit Windows 8.1 or higher +echo. +pause +set newversion=7.0.3 +goto:continue + + +:skinWarning + +::make cmd window transparent and hidden +if /i "%ModMiiverbose%" NEQ "on" support\nircmd.exe win trans ititle "ModMiiUpdater" 0 +if /i "%ModMiiverbose%" NEQ "on" support\nircmd.exe win hide ititle "ModMiiUpdater" + + +if exist "Support\Skins\Default\UPDATECHECK.bmp" (set "wabmp=Support\Skins\Default\UPDATECHECK.bmp") else (set wabmp=support\bmp\UPDATECHECK.bmp) +if exist "Support\Skins\%skin%\UPDATECHECK.bmp" set "wabmp=Support\Skins\%skin%\UPDATECHECK.bmp" + +set watext=Unfortunately this PC does not meet ModMii's minimum system requirements.~~ModMii v8.0.0 and above requires 64-bit Windows 8.1 or higher.~~You can manually install the latest ModMii but many features will not work. + +if %currentversion% GEQ 7.0.3 set "watext=%watext%~~Click any button to return to ModMiiSkin v%currentversion%" + +if %currentversion% LSS 7.0.3 set "watext=%watext%~~Click Cancel to return to ModMiiSkin v%currentversion%, or click Next to update to v7.0.3 which is the last update that does not require 64-bit Windows 8.1 or higher." + +set "newversion=%currentversion%" + +start support\wizapp PB UPDATE 100 +start support\wizapp PB CLOSE + +start /w support\wizapp NOBACK TB +if not errorlevel 2 goto:not2 +goto:ReturnToCaller +:not2 + +if %currentversion% GEQ 7.0.3 goto:ReturnToCaller + +set newversion=7.0.3 +::goto:continue + + +:continue + + if not exist temp\currentversion.txt goto:ReturnToCaller + + + +setlocal +chcp 437>nul + + set /p currentversion= nul - if /i "%updatermode%" EQU "skin" goto:skin -setlocal -chcp 437>nul -::mode con cols=85 -color 1f - cls echo ModMii v%currentversion% echo by XFlak @@ -80,7 +241,7 @@ echo Please Wait... echo. if exist "%UPDATENAME%.zip" del "%UPDATENAME%.zip">nul -start /min /wait support\wget --no-check-certificate -t 3 https://github.com/modmii/modmii.github.io/releases/download/%newversion%/%UPDATENAME%.zip +support\wget --no-check-certificate -t 3 https://github.com/modmii/modmii.github.io/releases/download/%newversion%/%UPDATENAME%.zip -q --show-progress if not exist "%UPDATENAME%.zip" goto:updatefail ::if exist "support\ModMii.bat" ren "support\ModMii.bat" "ModMii-v%currentversion%.bat" @@ -98,6 +259,27 @@ goto:updatefail if exist %UPDATENAME%.zip del %UPDATENAME%.zip>nul del support\7za2.exe>nul + +::check to see if bundled d2x is toggled, if so erase d2x-beta folder (only difference is bundled d2x has version # set to 65535) +if not exist support\d2x-beta\d2x-beta.bat goto:skip +call support\d2x-beta\d2x-beta.bat +if /i "%d2x-beta-rev%" EQU "%BundledcIOS:~5%" rd /s /q support\d2x-beta +:skip + + +if %currentversion% GEQ 7.0.4 goto:skip +::check for legacy d2x-beta.bat's, if "magicword2" found no need for further checks +if not exist support\d2x-beta\d2x-beta.bat goto:skip +findStr "magicword2" "support\d2x-beta\d2x-beta.bat" >nul +IF ERRORLEVEL 1 goto:skip +rd /s /q support\d2x-beta +echo. +echo d2x cIOS version restored to default but you can change it again in Options +echo. +@ping 127.0.0.1 -n 2 -w 1000> nul +:skip + + if /i "%AudioOption%" EQU "on" start support\nircmd.exe mediaplay 3000 "%Success.mp3%" Start ModMii.exe exit @@ -123,10 +305,6 @@ if /i "%ModMiiverbose%" NEQ "on" support\nircmd.exe win hide ititle "ModMiiUpdat copy /y support\wizapp.exe support\wizapp2.exe>nul -setlocal -chcp 437>nul - - if exist "Support\Skins\Default\UPDATING.bmp" (set "wabmp=Support\Skins\Default\UPDATING.bmp") else (set wabmp=support\bmp\UPDATING.bmp) if exist "Support\Skins\%skin%\UPDATING.bmp" set "wabmp=Support\Skins\%skin%\UPDATING.bmp" @@ -142,7 +320,7 @@ taskkill /im ModMiiSkin.exe /f >nul if exist "%UPDATENAME%.zip" del "%UPDATENAME%.zip">nul -start /min /wait support\wget --no-check-certificate -t 3 https://github.com/modmii/modmii.github.io/releases/download/%newversion%/%UPDATENAME%.zip +support\wget --no-check-certificate -t 3 https://github.com/modmii/modmii.github.io/releases/download/%newversion%/%UPDATENAME%.zip -q --show-progress if not exist "%UPDATENAME%.zip" goto:updatefailskin @@ -168,6 +346,28 @@ start support\wizapp2.exe PB CLOSE del support\7za2.exe>nul del support\wizapp2.exe>nul if exist %UPDATENAME%.zip del %UPDATENAME%.zip>nul + +::check to see if bundled d2x is toggled, if so erase d2x-beta folder (only difference is bundled d2x has version # set to 65535) +if not exist support\d2x-beta\d2x-beta.bat goto:skip +call support\d2x-beta\d2x-beta.bat +if /i "%d2x-beta-rev%" EQU "%BundledcIOS:~5%" rd /s /q support\d2x-beta +:skip + + +if %currentversion% GEQ 7.0.4 goto:skip +::check for legacy d2x-beta.bat's, if "magicword2" found no need for further checks +if not exist support\d2x-beta\d2x-beta.bat goto:skip +findStr "magicword2" "support\d2x-beta\d2x-beta.bat" >nul +IF ERRORLEVEL 1 goto:skip +rd /s /q support\d2x-beta +::echo. +echo d2x cIOS version restored to default but you can change it again in Options +::echo. +::@ping 127.0.0.1 -n 2 -w 1000> nul +:skip + + + if /i "%AudioOption%" EQU "on" start support\nircmd.exe mediaplay 3000 "%Success.mp3%" Start ModMiiSkin.exe exit @@ -179,6 +379,8 @@ start support\wizapp PB CLOSE set watext=~~Update check has failed, check your internet connection and antivirus\firewall settings.~~Click any button to return to ModMiiSkin v%currentversion% if /i "%AudioOption%" EQU "on" start support\nircmd.exe mediaplay 3000 "%Fail.mp3%" +start support\wizapp PB UPDATE 100 +start support\wizapp PB CLOSE start /w support\wizapp NOBACK TB ::set wabmp=%wabmplast% @@ -186,5 +388,8 @@ Start ModMiiSkin.exe exit -::ReturnToCaller should be the last line -:ReturnToCaller \ No newline at end of file +::ReturnToCaller should be kept at the end +:ReturnToCaller +if not "%wabmplast%"=="" set "wabmp=%wabmplast%" +if exist temp\currentversionInfo.txt del temp\currentversionInfo.txt>nul +if exist temp\skin.txt del temp\skin.txt>nul diff --git a/temp/usbloader_gx_r1282_test_version.7z b/temp/usbloader_gx_r1282_test_version2.zip similarity index 50% rename from temp/usbloader_gx_r1282_test_version.7z rename to temp/usbloader_gx_r1282_test_version2.zip index b18e209..e2cef7c 100644 Binary files a/temp/usbloader_gx_r1282_test_version.7z and b/temp/usbloader_gx_r1282_test_version2.zip differ