diff --git a/Minecraft.Client/Common/App_enums.h b/Minecraft.Client/Common/App_enums.h index c2ef72c0..fc09c393 100644 --- a/Minecraft.Client/Common/App_enums.h +++ b/Minecraft.Client/Common/App_enums.h @@ -231,6 +231,7 @@ enum eMinecraftColour eMinecraftColour_Foliage_ExtremeHillsEdge, eMinecraftColour_Foliage_Jungle, eMinecraftColour_Foliage_JungleHills, + eMinecraftColour_Foliage_JungleEdge, eMinecraftColour_Foliage_Savanna, eMinecraftColour_Foliage_RoofedForest, eMinecraftColour_Foliage_Mesa, @@ -259,6 +260,7 @@ enum eMinecraftColour eMinecraftColour_Grass_ExtremeHillsEdge, eMinecraftColour_Grass_Jungle, eMinecraftColour_Grass_JungleHills, + eMinecraftColour_Grass_JungleEdge, eMinecraftColour_Grass_Savanna, eMinecraftColour_Grass_RoofedForest, eMinecraftColour_Grass_Mesa, @@ -286,6 +288,7 @@ enum eMinecraftColour eMinecraftColour_Water_ExtremeHillsEdge, eMinecraftColour_Water_Jungle, eMinecraftColour_Water_JungleHills, + eMinecraftColour_Water_JungleEdge, eMinecraftColour_Water_Mesa, eMinecraftColour_Sky_Ocean, @@ -311,6 +314,7 @@ enum eMinecraftColour eMinecraftColour_Sky_ExtremeHillsEdge, eMinecraftColour_Sky_Jungle, eMinecraftColour_Sky_JungleHills, + eMinecraftColour_Sky_JungleEdge, eMinecraftColour_Tile_RedstoneDust, eMinecraftColour_Tile_RedstoneDustUnlit, diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenu1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenu1080.swf index ae03e5c8..7e731522 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenu1080.swf and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenu1080.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenuSplit1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenuSplit1080.swf index 6115bf4f..99d2251b 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenuSplit1080.swf and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsAudioMenuSplit1080.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenu1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenu1080.swf index 05c6a296..39fc0dd4 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenu1080.swf and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenu1080.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenuSplit1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenuSplit1080.swf index 5f134779..0b3713ae 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenuSplit1080.swf and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsGraphicsMenuSplit1080.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenuSplit1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenuSplit1080.swf index 467b2e1f..35998343 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenuSplit1080.swf and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsMenuSplit1080.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenu1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenu1080.swf index 72057f27..dfefaf46 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenu1080.swf and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenu1080.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenuSplit1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenuSplit1080.swf index b435a238..cfceefcf 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenuSplit1080.swf and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsOptionsMenuSplit1080.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenu1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenu1080.swf index 2ac01d56..78b8aa2c 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenu1080.swf and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenu1080.swf differ diff --git a/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenuSplit1080.swf b/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenuSplit1080.swf index 18128a0e..055f36e8 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenuSplit1080.swf and b/Minecraft.Client/Common/Media/MediaWindows64/SettingsUIMenuSplit1080.swf differ diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp index 14c55b54..fdd57285 100644 --- a/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp @@ -89,24 +89,6 @@ UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void *initD // VSync and Exclusive Fullscreen are only available on PC removeControl(&m_checkboxVSync, true); removeControl(&m_checkboxExclusiveFullscreen, true); -#else - // The SWF's original focus chain skips VSync, Fullscreen, and RenderDistance - // (CustomSkinAnim -> Gamma). Rewire the navigation so all controls are reachable: - // CustomSkinAnim -> VSync -> Fullscreen -> RenderDistance -> Gamma - { - IggyName navDown = registerFastName(L"m_objNavDown"); - IggyName navUp = registerFastName(L"m_objNavUp"); - - IggyValueSetStringUTF8RS(m_checkboxCustomSkinAnim.getIggyValuePath(), navDown, nullptr, "VSync", -1); - - IggyValueSetStringUTF8RS(m_checkboxVSync.getIggyValuePath(), navUp, nullptr, "CustomSkinAnim", -1); - IggyValueSetStringUTF8RS(m_checkboxVSync.getIggyValuePath(), navDown, nullptr, "ExclusiveFullscreen", -1); - - IggyValueSetStringUTF8RS(m_checkboxExclusiveFullscreen.getIggyValuePath(), navUp, nullptr, "VSync", -1); - IggyValueSetStringUTF8RS(m_checkboxExclusiveFullscreen.getIggyValuePath(), navDown, nullptr, "RenderDistance", -1); - - IggyValueSetStringUTF8RS(m_sliderRenderDistance.getIggyValuePath(), navUp, nullptr, "ExclusiveFullscreen", -1); - } #endif const bool bInGame=(Minecraft::GetInstance()->level!=nullptr); diff --git a/Minecraft.World/BasicTypeContainers.cpp b/Minecraft.World/BasicTypeContainers.cpp index ba2359d8..7850d7f4 100644 --- a/Minecraft.World/BasicTypeContainers.cpp +++ b/Minecraft.World/BasicTypeContainers.cpp @@ -16,7 +16,7 @@ const double Double::MAX_VALUE = DBL_MAX; const double Double::MIN_NORMAL = DBL_MIN; -int Integer::parseInt(wstring &str, int radix /* = 10*/) +int Integer::parseInt(const wstring &str, int radix /* = 10*/) { return wcstol( str.c_str(), nullptr, radix ); } \ No newline at end of file diff --git a/Minecraft.World/BasicTypeContainers.h b/Minecraft.World/BasicTypeContainers.h index d2936ebe..656847a8 100644 --- a/Minecraft.World/BasicTypeContainers.h +++ b/Minecraft.World/BasicTypeContainers.h @@ -19,7 +19,7 @@ class Integer { public: static const int MAX_VALUE = INT_MAX; - static int parseInt(wstring &str, int radix = 10); + static int parseInt(const wstring &str, int radix = 10); }; class Float diff --git a/Minecraft.World/ChestTileEntity.cpp b/Minecraft.World/ChestTileEntity.cpp index 142013ae..4160e915 100644 --- a/Minecraft.World/ChestTileEntity.cpp +++ b/Minecraft.World/ChestTileEntity.cpp @@ -150,6 +150,7 @@ void ChestTileEntity::load(CompoundTag *base) Tag *idTag = tag->get(L"id"); int idType = idTag != nullptr ? idTag->getId() : -1; + /* if (idType == Tag::TAG_String) { app.DebugPrintf("[ChestTileEntity] Missing chest item at %d,%d,%d slot=%u idType=%d idStr=%ls count=%d damage=%d\n", x, y, z, slot, idType, tag->getString(L"id").c_str(), tag->getByte(L"Count"), tag->getShort(L"Damage")); @@ -162,6 +163,7 @@ void ChestTileEntity::load(CompoundTag *base) { app.DebugPrintf("[ChestTileEntity] Missing chest item at %d,%d,%d slot=%u idType=%d id=%d count=%d damage=%d\n", x, y, z, slot, idType, tag->getShort(L"id"), tag->getByte(L"Count"), tag->getShort(L"Damage")); } + */ } (*items)[slot] = loadedItem; }