Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/replace-4jlibs

Browse Source
This commit is contained in:
daoge_cmd
2026-03-03 16:30:57 +08:00
parent 64909f236e 7ce1fa3452
commit 323d4ec110
6 changed files with 6292 additions and 1852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
View File

@@ -845,8 +845,9 @@ IUIScene_CreativeMenu::TabSpec::TabSpec(LPCWSTR icon, int descriptionId, int sta
} }
} }
m_staticPerPage = MAX_SIZE - dynamicItems; m_staticPerPage = columns;
m_pages = (int)ceil((float)m_staticItems / m_staticPerPage); const int totalRows = (m_staticItems + columns - 1) / columns;
m_pages = std::max<int>(1, totalRows - 5 + 1);
} }
IUIScene_CreativeMenu::TabSpec::~TabSpec() IUIScene_CreativeMenu::TabSpec::~TabSpec()

2
Minecraft.Client/Extrax64Stubs.cpp
View File

@@ -200,7 +200,7 @@ DWORD IQNetPlayer::GetCurrentRtt() { return 0; }
bool IQNetPlayer::IsHost() { return m_isHostPlayer; } bool IQNetPlayer::IsHost() { return m_isHostPlayer; }
bool IQNetPlayer::IsGuest() { return false; } bool IQNetPlayer::IsGuest() { return false; }
bool IQNetPlayer::IsLocal() { return true; } bool IQNetPlayer::IsLocal() { return true; }
PlayerUID IQNetPlayer::GetXuid() { return INVALID_XUID; } PlayerUID IQNetPlayer::GetXuid() { return (PlayerUID)(0xe000d45248242f2e + m_smallId); } // todo: restore to INVALID_XUID once saves support this
extern wstring g_playerName; extern wstring g_playerName;
LPCWSTR IQNetPlayer::GetGamertag() { return g_playerName.empty() ? L"Windows" : g_playerName.c_str(); } LPCWSTR IQNetPlayer::GetGamertag() { return g_playerName.empty() ? L"Windows" : g_playerName.c_str(); }
int IQNetPlayer::GetSessionIndex() { return 0; } int IQNetPlayer::GetSessionIndex() { return 0; }

2
Minecraft.Client/LevelRenderer.h
View File

@@ -52,7 +52,7 @@ public:
static const int CHUNK_SIZE = 16; static const int CHUNK_SIZE = 16;
#endif #endif
static const int CHUNK_Y_COUNT = Level::maxBuildHeight / CHUNK_SIZE; static const int CHUNK_Y_COUNT = Level::maxBuildHeight / CHUNK_SIZE;
#if defined _XBOX_ONE #if (defined _XBOX_ONE || defined _WINDOWS64)
static const int MAX_COMMANDBUFFER_ALLOCATIONS = 2047 * 1024 * 1024; // Changed to 2047. 4J had set to 512. static const int MAX_COMMANDBUFFER_ALLOCATIONS = 2047 * 1024 * 1024; // Changed to 2047. 4J had set to 512.
#elif defined __ORBIS__ #elif defined __ORBIS__
static const int MAX_COMMANDBUFFER_ALLOCATIONS = 448 * 1024 * 1024; // 4J - added - hard limit is 512 so giving a lot of headroom here for fragmentation (have seen 16MB lost to fragmentation in multiplayer crash dump before) static const int MAX_COMMANDBUFFER_ALLOCATIONS = 448 * 1024 * 1024; // 4J - added - hard limit is 512 so giving a lot of headroom here for fragmentation (have seen 16MB lost to fragmentation in multiplayer crash dump before)

8124
Minecraft.Client/Minecraft.Client.vcxproj.filters
View File

File diff suppressed because it is too large Load Diff

10
Minecraft.Client/Windows64/Windows64_Minecraft.cpp
View File

@@ -1272,7 +1272,15 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
} }
} }
// F3 toggles the debug console overlay, F11 toggles fullscreen // F1 toggles the HUD, F3 toggles the debug console overlay, F11 toggles fullscreen
if (KMInput.IsKeyPressed(VK_F1))
{
int primaryPad = ProfileManager.GetPrimaryPad();
unsigned char displayHud = app.GetGameSettings(primaryPad, eGameSetting_DisplayHUD);
app.SetGameSettings(primaryPad, eGameSetting_DisplayHUD, displayHud ? 0 : 1);
app.SetGameSettings(primaryPad, eGameSetting_DisplayHand, displayHud ? 0 : 1);
}
if (KMInput.IsKeyPressed(VK_F3)) if (KMInput.IsKeyPressed(VK_F3))
{ {
static bool s_debugConsole = false; static bool s_debugConsole = false;

1
README.md
View File

@@ -61,6 +61,7 @@ This feature is based on [LCEMP](https://github.com/LCEMP/LCEMP/)
- **Select Item**: `Mouse Wheel` or keys `1` to `9` - **Select Item**: `Mouse Wheel` or keys `1` to `9`
- **Accept or Decline Tutorial hints**: `Enter` to accept and `B` to decline - **Accept or Decline Tutorial hints**: `Enter` to accept and `B` to decline
- **Game Info (Player list and Host Options)**: `TAB` - **Game Info (Player list and Host Options)**: `TAB`
- **Toggle HUD**: `F1`
- **Toggle Debug Info**: `F3` - **Toggle Debug Info**: `F3`
- **Open Debug Overlay**: `F4` - **Open Debug Overlay**: `F4`