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

fix(SelectWorldScreen): open Select World instead of Create New World

Browse source 
i restored the Select World scene so it no longer immediately opens
"Create New World"

i wrapped the not used code in if (0) so its ignored at runtime
but still compiled to catch build breaks. fixing the Select World scene
also fixed the Cancel button so you can go back to the previous scene
(before it was stuck on Create New World)

i didnt remove the weird code because i dont know why its there
left it disabled for now

Signed-off-by: ViniciusCruzMoura <contato.cruz.moura@gmail.com>
This commit is contained in:
ViniciusCruzMoura 2026-03-23 01:27:25 -04:00
parent 37dff30878
commit 94cabbe01b
2 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/UI/Screens/CreateWorldScreen.cpp
View file

@ -152,8 +152,10 @@ std::wstring CreateWorldScreen::findAvailableFolderName(
void CreateWorldScreen::removed() { Keyboard::enableRepeatEvents(false); } void CreateWorldScreen::removed() { Keyboard::enableRepeatEvents(false); }
void CreateWorldScreen::buttonClicked(Button* button) { void CreateWorldScreen::buttonClicked(Button* button) {
app.DebugPrintf("CreateWorldScreen::buttonClicked START\n");
if (!button->active) return; if (!button->active) return;
if (button->id == 1) { if (button->id == 1) {
app.DebugPrintf("CreateWorldScreen::buttonClicked 'Cancel' minecraft->setScreen(lastScreen)\n");
minecraft->setScreen(lastScreen); minecraft->setScreen(lastScreen);
} else if (button->id == 0) { } else if (button->id == 0) {
minecraft->setScreen( minecraft->setScreen(

60
Minecraft.Client/UI/Screens/SelectWorldScreen.cpp
View file

@ -24,6 +24,7 @@ SelectWorldScreen::SelectWorldScreen(Screen* lastScreen) {
} }
void SelectWorldScreen::init() { void SelectWorldScreen::init() {
app.DebugPrintf("SelectWorldScreen::init() START\n");
Language* language = Language::getInstance(); Language* language = Language::getInstance();
title = language->getElement(L"selectWorld.title"); title = language->getElement(L"selectWorld.title");
@ -84,6 +85,7 @@ void SelectWorldScreen::postInit() {
} }
void SelectWorldScreen::buttonClicked(Button* button) { void SelectWorldScreen::buttonClicked(Button* button) {
app.DebugPrintf("SelectWorldScreen::buttonClicked START\n");
if (!button->active) return; if (!button->active) return;
if (button->id == BUTTON_DELETE_ID) { if (button->id == BUTTON_DELETE_ID) {
std::wstring worldName = getWorldName(selectedWorld); std::wstring worldName = getWorldName(selectedWorld);
@ -125,6 +127,7 @@ void SelectWorldScreen::buttonClicked(Button* button) {
minecraft->setScreen( minecraft->setScreen(
new RenameWorldScreen(this, getWorldId(selectedWorld))); new RenameWorldScreen(this, getWorldId(selectedWorld)));
} else if (button->id == BUTTON_CANCEL_ID) { } else if (button->id == BUTTON_CANCEL_ID) {
app.DebugPrintf("SelectWorldScreen::buttonClicked 'Cancel' minecraft->setScreen(lastScreen)\n");
minecraft->setScreen(lastScreen); minecraft->setScreen(lastScreen);
} else { } else {
worldSelectionList->buttonClicked(button); worldSelectionList->buttonClicked(button);
@ -173,35 +176,38 @@ void SelectWorldScreen::render(int xm, int ym, float a) {
Screen::render(xm, ym, a); Screen::render(xm, ym, a);
// 4J - debug code - remove // 4J - debug code - remove
static int count = 0; if (0) {
static bool forceCreateLevel = false; static int count = 0;
if (count++ >= 100) { static bool forceCreateLevel = false;
if (!forceCreateLevel && levelList->size() > 0) { if (count++ >= 100) {
// 4J Stu - For some obscures reason the "delete" button is called if (!forceCreateLevel && levelList->size() > 0) {
// "renameButton" and vice versa. // 4J Stu - For some obscures reason the "delete" button is called
// if( levelList->size() > 2 && deleteButton->active ) // "renameButton" and vice versa.
//{ // if( levelList->size() > 2 && deleteButton->active )
// this->selectedWorld = 2; //{
// count = 0; // this->selectedWorld = 2;
// buttonClicked(deleteButton); // count = 0;
//} // buttonClicked(deleteButton);
// else //}
if (levelList->size() > 1 && renameButton->active) { // else
this->selectedWorld = 1; if (levelList->size() > 1 && renameButton->active) {
count = 0; this->selectedWorld = 1;
buttonClicked(renameButton); count = 0;
} else if (selectButton->active == true) { buttonClicked(renameButton);
this->selectedWorld = 0; } else if (selectButton->active == true) {
buttonClicked(selectButton); this->selectedWorld = 0;
// this->worldSelected( 0 ); buttonClicked(selectButton);
// this->worldSelected( 0 );
} else {
selectButton->active = true;
deleteButton->active = true;
renameButton->active = true;
count = 0;
}
} else { } else {
selectButton->active = true; app.DebugPrintf("SelectWorldScreen::render minecraft->setScreen(new CreateWorldScreen(this))\n");
deleteButton->active = true; minecraft->setScreen(new CreateWorldScreen(this));
renameButton->active = true;
count = 0;
} }
} else {
minecraft->setScreen(new CreateWorldScreen(this));
} }
} }
} }