diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp index c00466165..f3296c5a9 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp @@ -298,11 +298,9 @@ int UIScene_AnvilMenu::KeyboardCompleteCallback(void* lpParam, bool bRes) { pClass->setIgnoreInput(false); if (bRes) { - uint16_t pchText[128]; - ZeroMemory(pchText, 128 * sizeof(uint16_t)); - InputManager.GetText(pchText); - pClass->setEditNameValue(uint16_to_wstring(pchText)); - pClass->m_itemName = uint16_to_wstring(pchText); + std::wstring str = convStringToWstring(InputManager.GetText()); + pClass->setEditNameValue(str); + pClass->m_itemName = std::move(str); pClass->updateItemName(); } return 0; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp index 76beb132a..4a3c44c61 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp @@ -718,13 +718,10 @@ int UIScene_CreateWorldMenu::KeyboardCompleteWorldNameCallback(void* lpParam, pClass->m_bIgnoreInput = false; // 4J HEG - No reason to set value if keyboard was cancelled if (bRes) { - uint16_t pchText[128]; - ZeroMemory(pchText, 128 * sizeof(uint16_t)); - InputManager.GetText(pchText); - - if (pchText[0] != 0) { - pClass->m_editWorldName.setLabel(uint16_to_wstring(pchText)); - pClass->m_worldName = uint16_to_wstring(pchText); + std::wstring str = convStringToWstring(InputManager.GetText()); + if (!str.empty()) { + pClass->m_editWorldName.setLabel(str); + pClass->m_worldName = std::move(str); } pClass->m_buttonCreateWorld.setEnable(!pClass->m_worldName.empty()); diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp index 00b175887..6eb2c7bb4 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp @@ -141,12 +141,9 @@ int UIScene_DebugCreateSchematic::KeyboardCompleteCallback(void* lpParam, UIScene_DebugCreateSchematic* pClass = (UIScene_DebugCreateSchematic*)lpParam; - uint16_t pchText[128]; - ZeroMemory(pchText, 128 * sizeof(uint16_t)); - InputManager.GetText(pchText); - - if (pchText[0] != 0) { - std::wstring value = uint16_to_wstring(pchText); + const char* text = InputManager.GetText(); + if (text[0] != '\0') { + std::wstring value = convStringToWstring(text); int iVal = 0; if (!value.empty()) iVal = _fromString(value); switch (pClass->m_keyboardCallbackControl) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp index 1472864e3..74787f726 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp @@ -119,12 +119,9 @@ void UIScene_DebugSetCamera::handleCheckboxToggled(F64 controlId, int UIScene_DebugSetCamera::KeyboardCompleteCallback(void* lpParam, bool bRes) { UIScene_DebugSetCamera* pClass = (UIScene_DebugSetCamera*)lpParam; - uint16_t pchText[2048]; //[128]; - ZeroMemory(pchText, 2048 /*128*/ * sizeof(uint16_t)); - InputManager.GetText(pchText); - - if (pchText[0] != 0) { - std::wstring value = uint16_to_wstring(pchText); + const char* text = InputManager.GetText(); + if (text[0] != '\0') { + std::wstring value = convStringToWstring(text); double val = 0; if (!value.empty()) val = _fromString(value); switch (pClass->m_keyboardCallbackControl) { diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp index fdd814ab7..3aa26be48 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp @@ -592,17 +592,9 @@ int UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback(void* lpParam, (UIScene_LaunchMoreOptionsMenu*)lpParam; // 4J HEG - No reason to set value if keyboard was cancelled if (bRes) { -#ifdef __PSVITA__ - // CD - Changed to 2048 [SCE_IME_MAX_TEXT_LENGTH] - uint16_t pchText[2048]; - ZeroMemory(pchText, 2048 * sizeof(uint16_t)); -#else - uint16_t pchText[128]; - ZeroMemory(pchText, 128 * sizeof(uint16_t)); -#endif - InputManager.GetText(pchText); - pClass->m_editSeed.setLabel(uint16_to_wstring(pchText)); - pClass->m_params->seed = uint16_to_wstring(pchText); + std::wstring str = convStringToWstring(InputManager.GetText()); + pClass->m_editSeed.setLabel(str); + pClass->m_params->seed = std::move(str); } pClass->m_bIgnoreInput = false; return 0; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp index 31e09f0fb..73a87a38d 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp @@ -1177,12 +1177,9 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(void* lpParam, UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)lpParam; pClass->m_bIgnoreInput = false; if (bRes) { - std::uint16_t ui16Text[128]; - ZeroMemory(ui16Text, 128 * sizeof(std::uint16_t)); - InputManager.GetText(ui16Text); - + const char* text = InputManager.GetText(); // check the name is valid - if (ui16Text[0] != 0) { + if (text[0] != '\0') { #if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \ defined(__PSVITA__)) // open the save and overwrite the metadata diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp index ad79dc97a..e8a8cd848 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp @@ -143,10 +143,7 @@ int UIScene_SignEntryMenu::KeyboardCompleteCallback(void* lpParam, bool bRes) { UIScene_SignEntryMenu* pClass = (UIScene_SignEntryMenu*)lpParam; pClass->m_bIgnoreInput = false; if (bRes && pClass->m_iEditingLine >= 0 && pClass->m_iEditingLine < 4) { - uint16_t pchText[128]; - ZeroMemory(pchText, 128 * sizeof(uint16_t)); - InputManager.GetText(pchText); - std::wstring str = uint16_to_wstring(pchText); + std::wstring str = convStringToWstring(InputManager.GetText()); if (str.size() > 15) str.resize(15); pClass->m_textInputLines[pClass->m_iEditingLine].setLabel(str); } diff --git a/Minecraft.World/Util/StringHelpers.cpp b/Minecraft.World/Util/StringHelpers.cpp index 43cfb171a..da690b354 100644 --- a/Minecraft.World/Util/StringHelpers.cpp +++ b/Minecraft.World/Util/StringHelpers.cpp @@ -36,18 +36,6 @@ bool equalsIgnoreCase(const std::wstring& a, const std::wstring& b) { return out; } -size_t uint16_len(const uint16_t* str) { - return std::char_traits::length( - reinterpret_cast(str)); -} - -std::u16string uint16_to_u16string(const uint16_t* str) { - return std::u16string(reinterpret_cast(str), uint16_len(str)); -} - -std::wstring uint16_to_wstring(const uint16_t* str) { - return u16string_to_wstring(uint16_to_u16string(str)); -} std::wstring convStringToWstring(const std::string& converting) { std::wstring converted(converting.length(), L' '); diff --git a/Minecraft.World/Util/StringHelpers.h b/Minecraft.World/Util/StringHelpers.h index 4f41be369..8ed4bc987 100644 --- a/Minecraft.World/Util/StringHelpers.h +++ b/Minecraft.World/Util/StringHelpers.h @@ -29,9 +29,6 @@ T _fromHEXString(const std::wstring& s) { return t; } -size_t uint16_len(const uint16_t* str); -std::u16string uint16_to_u16string(const uint16_t* str); -std::wstring uint16_to_wstring(const uint16_t* str); std::wstring convStringToWstring(const std::string& converting); std::wstring u16string_to_wstring(const std::u16string& converting);