diff --git a/build.bat b/build.bat index e6ee637..8134197 100644 --- a/build.bat +++ b/build.bat @@ -4,4 +4,4 @@ call cmake -DCMAKE_BUILD_TYPE=Release -A x64 -Ssrc -Brelease call cmake --build release --config Release -call zip -r release/ImageToMapMC-1.3.2-Windows-x64.zip release/Release +call zip -r release/ImageToMapMC-1.3.3-Windows-x64.zip release/Release diff --git a/build.sh b/build.sh index 9c6a107..2dd9951 100755 --- a/build.sh +++ b/build.sh @@ -8,13 +8,13 @@ cmake --build release --config Release rm -rf release/bin || true -rm -rf release/ImageToMapMC-1.3.2-linux-x64.tar.gz || true +rm -rf release/ImageToMapMC-1.3.3-linux-x64.tar.gz || true mkdir release/bin cp release/mcmap release/bin/mcmap cp release/mcmap-gui release/bin/mcmap-gui -tar -cvzf release/ImageToMapMC-1.3.2-linux-x64.tar.gz release/bin +tar -cvzf release/ImageToMapMC-1.3.3-linux-x64.tar.gz release/bin -echo "DONE: Created release ImageToMapMC-1.3.2-linux-x64.tar.gz" +echo "DONE: Created release ImageToMapMC-1.3.3-linux-x64.tar.gz" diff --git a/build32.bat b/build32.bat index b0752bc..92b9842 100644 --- a/build32.bat +++ b/build32.bat @@ -4,4 +4,4 @@ call cmake -DCMAKE_BUILD_TYPE=Release -A Win32 -Ssrc -Brelease32 call cmake --build release32 --config Release -call zip -r release32/ImageToMapMC-1.3.2-Windows-Win32.zip release32/Release +call zip -r release32/ImageToMapMC-1.3.3-Windows-Win32.zip release32/Release diff --git a/src/minecraft/mc_common.cpp b/src/minecraft/mc_common.cpp index 61c3568..a16fa6c 100644 --- a/src/minecraft/mc_common.cpp +++ b/src/minecraft/mc_common.cpp @@ -71,6 +71,11 @@ minecraft::McVersion minecraft::getVersionFromText(std::string versionStr) return McVersion::MC_1_19; } + if (versionStr.substr(0, 4).compare("1.20") == 0) + { + return McVersion::MC_1_20; + } + if (versionStr.compare("last") == 0) { return MC_LAST_VERSION; @@ -99,6 +104,8 @@ std::string minecraft::versionToString(minecraft::McVersion version) return std::string("1.18.2"); case McVersion::MC_1_19: return std::string("1.19.4"); + case McVersion::MC_1_20: + return std::string("1.20.1"); default: return std::string("???"); } @@ -124,6 +131,8 @@ int minecraft::versionToDataVersion(minecraft::McVersion version) return 2975; case McVersion::MC_1_19: return 3337; + case McVersion::MC_1_20: + return 3465; default: return 1343; } diff --git a/src/minecraft/mc_common.h b/src/minecraft/mc_common.h index 3ea40e5..bcdd108 100644 --- a/src/minecraft/mc_common.h +++ b/src/minecraft/mc_common.h @@ -23,7 +23,7 @@ #pragma once -#define MC_LAST_VERSION (minecraft::McVersion::MC_1_19) +#define MC_LAST_VERSION (minecraft::McVersion::MC_1_20) #include @@ -45,6 +45,7 @@ namespace minecraft MC_1_17 = 17, MC_1_18 = 18, MC_1_19 = 19, + MC_1_20 = 20, }; /** diff --git a/src/wx/main_window.cpp b/src/wx/main_window.cpp index ab6be98..173e6f1 100644 --- a/src/wx/main_window.cpp +++ b/src/wx/main_window.cpp @@ -251,7 +251,8 @@ MainWindow::MainWindow() : wxFrame(NULL, wxID_ANY, string("Minecraft Map Art Too // Version wxMenu *menuVersion = new wxMenu(); - menuVersion->AppendRadioItem(getIdForVersionMenu(McVersion::MC_1_19), "&1.19.4", "Version: 1.19.4")->Check(true); + menuVersion->AppendRadioItem(getIdForVersionMenu(McVersion::MC_1_20), "&1.20.1", "Version: 1.20.1")->Check(true); + menuVersion->AppendRadioItem(getIdForVersionMenu(McVersion::MC_1_19), "&1.19.4", "Version: 1.19.4"); menuVersion->AppendRadioItem(getIdForVersionMenu(McVersion::MC_1_18), "&1.18.2", "Version: 1.18.2"); menuVersion->AppendRadioItem(getIdForVersionMenu(McVersion::MC_1_17), "&1.17.1", "Version: 1.17.1"); menuVersion->AppendRadioItem(getIdForVersionMenu(McVersion::MC_1_16), "&1.16.5", "Version: 1.16.5"); diff --git a/wix/Product.wxs b/wix/Product.wxs index bc9f392..09c9e32 100644 --- a/wix/Product.wxs +++ b/wix/Product.wxs @@ -2,7 +2,7 @@ - + diff --git a/wix/make-wix-installer.bat b/wix/make-wix-installer.bat index 30966f4..fd9382b 100644 --- a/wix/make-wix-installer.bat +++ b/wix/make-wix-installer.bat @@ -8,4 +8,4 @@ call candle -ext WixUIExtension -ext WixUtilExtension -arch x64 "HeatFile.wxs" - call candle -ext WixUIExtension -ext WixUtilExtension -arch x64 "Product.wxs" -o "Product.wixobj" -call light "Product.wixobj" -spdb "HeatFile.wixobj" -b ImageToMapMC -o "ImageToMapMC-1.3.2-x64.msi" -ext WixUIExtension -ext WixUtilExtension +call light "Product.wixobj" -spdb "HeatFile.wixobj" -b ImageToMapMC -o "ImageToMapMC-1.3.3-x64.msi" -ext WixUIExtension -ext WixUtilExtension