backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-08 02:33:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #300 from ViniciusCruzMoura/java_exit_btn_behaviour
Some checks failed
Publish Documentation / build (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux (push) Has been cancelled
Details
Build (Linux, x86_64) / build-linux-debug (push) Has been cancelled
Details
Clang Format / clang-format (push) Has been cancelled
Details

Browse source 
TitleScreen: Fix main menu quit button for JAVA_GUIS, (same issue as #277)
This commit is contained in:
ffqq 2026-03-22 01:29:07 +03:00 committed by GitHub
parent 4cdea50a5a 7775c59e3c
commit 37dff30878
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Minecraft.Client/Minecraft.cpp
View file

@ -2322,6 +2322,7 @@ void Minecraft::renderFpsMeter(__int64 tickTime) {
}
void Minecraft::stop() {
app.DebugPrintf("Minecraft::stop() SET running = false;\n");
running = false;
// keepPolling = false;
}

8
Minecraft.Client/UI/Screens/TitleScreen.cpp
View file

@ -57,6 +57,7 @@ void TitleScreen::tick() {
void TitleScreen::keyPressed(wchar_t eventCharacter, int eventKey) {}
void TitleScreen::init() {
app.DebugPrintf("TitleScreen::init() START\n");
/* 4J - removed
Calendar c = Calendar.getInstance();
c.setTime(new Date());
@ -103,20 +104,25 @@ if (c.get(Calendar.MONTH) + 1 == 11 && c.get(Calendar.DAY_OF_MONTH) == 9) {
void TitleScreen::buttonClicked(Button* button) {
if (button->id == 0) {
app.DebugPrintf("TitleScreen::buttonClicked() 'Options...' if (button->id == 0)\n");
minecraft->setScreen(new OptionsScreen(this, minecraft->options));
}
if (button->id == 1) {
app.DebugPrintf("TitleScreen::buttonClicked() 'Singleplayer' if (button->id == 1)\n");
minecraft->setScreen(new SelectWorldScreen(this));
}
if (button->id == 2) {
app.DebugPrintf("TitleScreen::buttonClicked() 'Multiplayer' if (button->id == 2)\n");
minecraft->setScreen(new JoinMultiplayerScreen(this));
}
if (button->id == 3) {
app.DebugPrintf("TitleScreen::buttonClicked() 'Texture Pack' if (button->id == 3)\n");
// minecraft->setScreen(new TexturePackSelectScreen(this));
// // 4J - TODO put back in
}
if (button->id == 4) {
minecraft->stop();
app.DebugPrintf("TitleScreen::buttonClicked() Exit Game if (button->id == 4)\n");
RenderManager.Close(); //minecraft->stop();
}
}