From 72c14ccbfd0e7608a65c9c5f5bacefb3b4f18a0e Mon Sep 17 00:00:00 2001 From: Xenovyy Date: Thu, 19 Mar 2026 18:33:48 -0400 Subject: [PATCH 1/4] Added Dark Highlight on f3 menu for better visibility f3 menu now has dark highlight over text (simmilar to java) that makes it significantly easier to read text on white background. --- Minecraft.Client/Gui.cpp | 14 +++++++------- Minecraft.Client/GuiComponent.cpp | 6 ++++-- Minecraft.Client/GuiComponent.h | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp index f0d44319a1..9a5150f641 100644 --- a/Minecraft.Client/Gui.cpp +++ b/Minecraft.Client/Gui.cpp @@ -1175,13 +1175,13 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) } #endif - int yPos = debugTop; - for (const auto &line : lines) - { - drawString(font, line, debugLeft, yPos, 0xffffff); - yPos += 10; - } - + int yPos = debugTop; + for (const auto& line : lines) + { + fill(debugLeft - 1, yPos - 1, debugLeft + font->width(line) + 1, yPos + 8 + 1, 0x80303030, true); + drawString(font, line, debugLeft, yPos, 0xffffff); + yPos += 10; + } glMatrixMode(GL_MODELVIEW); glPopMatrix(); glMatrixMode(GL_PROJECTION); diff --git a/Minecraft.Client/GuiComponent.cpp b/Minecraft.Client/GuiComponent.cpp index c6b5f518b6..4cfb5e9cd5 100644 --- a/Minecraft.Client/GuiComponent.cpp +++ b/Minecraft.Client/GuiComponent.cpp @@ -24,7 +24,7 @@ void GuiComponent::vLine(int x, int y0, int y1, int col) fill(x, y0 + 1, x + 1, y1, col); } -void GuiComponent::fill(int x0, int y0, int x1, int y1, int col) +void GuiComponent::fill(int x0, int y0, int x1, int y1, int col, bool blend) { if (x0 < x1) { @@ -54,7 +54,9 @@ void GuiComponent::fill(int x0, int y0, int x1, int y1, int col) t->vertex(static_cast(x0), static_cast(y0), static_cast(0)); t->end(); glEnable(GL_TEXTURE_2D); - glDisable(GL_BLEND); + if (blend == false) { + glDisable(GL_BLEND); + } } void GuiComponent::fillGradient(int x0, int y0, int x1, int y1, int col1, int col2) diff --git a/Minecraft.Client/GuiComponent.h b/Minecraft.Client/GuiComponent.h index 4149666484..6e21f92b60 100644 --- a/Minecraft.Client/GuiComponent.h +++ b/Minecraft.Client/GuiComponent.h @@ -9,7 +9,7 @@ class GuiComponent protected: void hLine(int x0, int x1, int y, int col); void vLine(int x, int y0, int y1, int col); - void fill(int x0, int y0, int x1, int y1, int col); + void fill(int x0, int y0, int x1, int y1, int col, bool blend = false); void fillGradient(int x0, int y0, int x1, int y1, int col1, int col2); public: GuiComponent(); // 4J added From 9a3dfd115fb54dd39dd480be03947337f72f172a Mon Sep 17 00:00:00 2001 From: Xenovyy Date: Thu, 19 Mar 2026 19:54:32 -0400 Subject: [PATCH 2/4] Revert "Added Dark Highlight on f3 menu for better visibility" This reverts commit 72c14ccbfd0e7608a65c9c5f5bacefb3b4f18a0e. --- Minecraft.Client/Gui.cpp | 14 +++++++------- Minecraft.Client/GuiComponent.cpp | 6 ++---- Minecraft.Client/GuiComponent.h | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp index 9a5150f641..f0d44319a1 100644 --- a/Minecraft.Client/Gui.cpp +++ b/Minecraft.Client/Gui.cpp @@ -1175,13 +1175,13 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) } #endif - int yPos = debugTop; - for (const auto& line : lines) - { - fill(debugLeft - 1, yPos - 1, debugLeft + font->width(line) + 1, yPos + 8 + 1, 0x80303030, true); - drawString(font, line, debugLeft, yPos, 0xffffff); - yPos += 10; - } + int yPos = debugTop; + for (const auto &line : lines) + { + drawString(font, line, debugLeft, yPos, 0xffffff); + yPos += 10; + } + glMatrixMode(GL_MODELVIEW); glPopMatrix(); glMatrixMode(GL_PROJECTION); diff --git a/Minecraft.Client/GuiComponent.cpp b/Minecraft.Client/GuiComponent.cpp index 4cfb5e9cd5..c6b5f518b6 100644 --- a/Minecraft.Client/GuiComponent.cpp +++ b/Minecraft.Client/GuiComponent.cpp @@ -24,7 +24,7 @@ void GuiComponent::vLine(int x, int y0, int y1, int col) fill(x, y0 + 1, x + 1, y1, col); } -void GuiComponent::fill(int x0, int y0, int x1, int y1, int col, bool blend) +void GuiComponent::fill(int x0, int y0, int x1, int y1, int col) { if (x0 < x1) { @@ -54,9 +54,7 @@ void GuiComponent::fill(int x0, int y0, int x1, int y1, int col, bool blend) t->vertex(static_cast(x0), static_cast(y0), static_cast(0)); t->end(); glEnable(GL_TEXTURE_2D); - if (blend == false) { - glDisable(GL_BLEND); - } + glDisable(GL_BLEND); } void GuiComponent::fillGradient(int x0, int y0, int x1, int y1, int col1, int col2) diff --git a/Minecraft.Client/GuiComponent.h b/Minecraft.Client/GuiComponent.h index 6e21f92b60..4149666484 100644 --- a/Minecraft.Client/GuiComponent.h +++ b/Minecraft.Client/GuiComponent.h @@ -9,7 +9,7 @@ class GuiComponent protected: void hLine(int x0, int x1, int y, int col); void vLine(int x, int y0, int y1, int col); - void fill(int x0, int y0, int x1, int y1, int col, bool blend = false); + void fill(int x0, int y0, int x1, int y1, int col); void fillGradient(int x0, int y0, int x1, int y1, int col1, int col2); public: GuiComponent(); // 4J added From eab42ba04c18cd5ad0f7bb7fd33ad2a1c7cfbf04 Mon Sep 17 00:00:00 2001 From: Xenovyy Date: Fri, 20 Mar 2026 15:33:22 -0400 Subject: [PATCH 3/4] Made tabs clickable in world settings! Added mouse click support for tabs "World Options" and "Game Options" in the more settings menu when creating a world. --- .../UI/UIScene_LaunchMoreOptionsMenu.cpp | 35 +++++++++++++++++++ .../Common/UI/UIScene_LaunchMoreOptionsMenu.h | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp index b2981ebf60..bca7e544ec 100644 --- a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp @@ -307,6 +307,9 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat, // Toggle tab index m_tabIndex = m_tabIndex == 0 ? 1 : 0; updateTooltips(); + app.DebugPrintf("WorldOptions: %i , %i\n", m_labelWorldOptions.getXPos(), m_labelWorldOptions.getYPos()); + app.DebugPrintf("GameOptions: %i , %i\n", m_labelGameOptions.getXPos(), m_labelGameOptions.getYPos()); + IggyDataValue result; IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , nullptr ); } @@ -314,6 +317,38 @@ void UIScene_LaunchMoreOptionsMenu::handleInput(int iPad, int key, bool repeat, } } +#ifdef _WINDOWS64 +bool UIScene_LaunchMoreOptionsMenu::handleMouseClick(F32 x, F32 y){ + + F32 tabHeight = (m_labelWorldOptions.getYPos() + 61) - m_labelWorldOptions.getYPos(); + F32 tabWidth = m_labelGameOptions.getXPos() - m_labelWorldOptions.getXPos(); + F32 WorldOptionsCenterX = m_labelWorldOptions.getXPos() + (tabWidth / 2); + F32 WorldOptionsCenterY = m_labelWorldOptions.getYPos() + (tabHeight / 2); + + if (x >= m_labelWorldOptions.getXPos() && x <= m_labelWorldOptions.getXPos() + tabWidth && y >= m_labelWorldOptions.getYPos() && y <= m_labelWorldOptions.getYPos() + tabHeight && m_tabIndex == 1) + { + m_tabIndex = 0; + updateTooltips(); + IggyDataValue result; + IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , nullptr ); + return true; + } + else if (x >= m_labelGameOptions.getXPos() && x <= m_labelGameOptions.getXPos() + tabWidth && y >= m_labelGameOptions.getYPos() && y <= m_labelGameOptions.getYPos() + tabHeight && m_tabIndex == 0) + { + m_tabIndex = 1; + updateTooltips(); + IggyDataValue result; + IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcChangeTab , 0 , nullptr ); + return true; + } + else + { + return false; + } + +} +#endif + #ifdef __PSVITA__ void UIScene_LaunchMoreOptionsMenu::handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased) { diff --git a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h index caf9a71f07..ccc55a66c5 100644 --- a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h @@ -42,7 +42,7 @@ class UIScene_LaunchMoreOptionsMenu : public UIScene eControl_Count }; -#ifdef __PSVITA__ +#ifdef __PSVITA__tab enum ETouchInput { ETouchInput_TabWorld = eControl_Count, @@ -142,6 +142,7 @@ class UIScene_LaunchMoreOptionsMenu : public UIScene virtual void handleDestroy(); #ifdef _WINDOWS64 virtual void getDirectEditInputs(vector &inputs); + virtual bool handleMouseClick(F32 x, F32 y); virtual void onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result); #endif // INPUT From 6b167832b693bde05642501e5215a41749842a34 Mon Sep 17 00:00:00 2001 From: Xenovyy Date: Fri, 20 Mar 2026 15:41:45 -0400 Subject: [PATCH 4/4] removed typo --- Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h index ccc55a66c5..ed930a5d72 100644 --- a/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.h @@ -42,7 +42,7 @@ class UIScene_LaunchMoreOptionsMenu : public UIScene eControl_Count }; -#ifdef __PSVITA__tab +#ifdef __PSVITA__ enum ETouchInput { ETouchInput_TabWorld = eControl_Count,