backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-07-13 09:47:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into upstream-merge

Browse source 
# Conflicts:
#	Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
#	Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
#	Minecraft.Client/Common/UI/UIScene_LoadMenu.h
This commit is contained in:
George V. 2026-04-11 23:36:43 +03:00
parent 18f7d9a219 a58b14a2ea
commit 1a78363ee5
No known key found for this signature in database
GPG key ID: 1DB61094F2DD4982
8 changed files with 126 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.gitea/banner.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 526 KiB

After

Width:  |  Height:  |  Size: 656 KiB

BIN
.gitea/roadmap.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 195 KiB

BIN
Minecraft.Client/Common/Media/MediaWindows64.arc
View file

Binary file not shown.

75
Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
View file

@ -35,6 +35,12 @@ int UIScene_CreateWorldMenu::m_iDifficultyTitleSettingA[4]=
IDS_DIFFICULTY_TITLE_NORMAL,
IDS_DIFFICULTY_TITLE_HARD
};
int UIScene_CreateWorldMenu::m_iGamemodes[3] =
{
IDS_GAMEMODE_SURVIVAL,
IDS_GAMEMODE_CREATIVE,
IDS_GAMEMODE_ADVENTURE
};
UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILayer *parentLayer) : IUIScene_StartGame(iPad, parentLayer)
{
@ -50,7 +56,7 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
m_editWorldName.init(m_worldName, eControl_EditWorldName);
m_buttonGamemode.init(app.GetString(IDS_GAMEMODE_SURVIVAL),eControl_GameModeToggle);
m_sliderGamemode.init(app.GetString(IDS_GAMEMODE_SURVIVAL), eControl_GameModeToggle, 0, 2, 0);
m_buttonMoreOptions.init(app.GetString(IDS_MORE_OPTIONS),eControl_MoreOptions);
m_buttonCreateWorld.init(app.GetString(IDS_CREATE_NEW_WORLD),eControl_NewWorld);
@ -460,27 +466,27 @@ void UIScene_CreateWorldMenu::handlePress(F64 controlId, F64 childId)
#endif
}
break;
case eControl_GameModeToggle:
if (s_bHardcore)
break; // Hardcore mode locks game mode to Survival
switch(m_iGameModeId)
{
case 0: // Creative
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
m_iGameModeId = GameType::CREATIVE->getId();
m_bGameModeCreative = true;
break;
case 1: // Adventure
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
m_iGameModeId = GameType::ADVENTURE->getId();
m_bGameModeCreative = false;
break;
case 2: // Survival
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
m_iGameModeId = GameType::SURVIVAL->getId();
m_bGameModeCreative = false;
};
break;
// case eControl_GameModeToggle:
// if (s_bHardcore)
// break; // Hardcore mode locks game mode to Survival
// switch(m_iGameModeId)
// {
// case 0: // Creative
// m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
// m_iGameModeId = GameType::CREATIVE->getId();
// m_bGameModeCreative = true;
// break;
// case 1: // Adventure
// m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
// m_iGameModeId = GameType::ADVENTURE->getId();
// m_bGameModeCreative = false;
// break;
// case 2: // Survival
// m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
// m_iGameModeId = GameType::SURVIVAL->getId();
// m_bGameModeCreative = false;
// };
// break;
case eControl_MoreOptions:
ui.NavigateToScene(m_iPad, eUIScene_LaunchMoreOptionsMenu, &m_MoreOptionsParams);
break;
@ -673,9 +679,32 @@ void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue)
{
m_iGameModeId = GameType::SURVIVAL->getId();
m_bGameModeCreative = false;
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
m_sliderGamemode.handleSliderMove(GameType::SURVIVAL->getId());
}
break;
case eControl_GameModeToggle:
m_sliderGamemode.handleSliderMove(value);
switch (value)
{
case 0: // Survival
m_iGameModeId = GameType::SURVIVAL->getId();
m_bGameModeCreative = false;
break;
case 1: // Creative
m_iGameModeId = GameType::CREATIVE->getId();
m_bGameModeCreative = true;
break;
#ifdef _ADVENTURE_MODE_ENABLED
case 2: // Adventure
m_iGameModeId = GameType::ADVENTURE->getId();
m_bGameModeCreative = false;
break;
#endif
};
//app.SetGameSettings(m_iPad, eGameSetting_GameMode, value);
swprintf((WCHAR*)TempString, 256, L"%ls", app.GetString(m_iGamemodes[value]));
m_sliderGamemode.setLabel(TempString);
break;
}
}

8
Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.h
View file

@ -17,16 +17,16 @@ private:
};
static int m_iDifficultyTitleSettingA[4];
static int m_iGamemodes[3];
wstring m_worldName;
wstring m_seed;
UIControl m_controlMainPanel;
UIControl_Label m_labelWorldName;
UIControl_Button m_buttonGamemode, m_buttonMoreOptions, m_buttonCreateWorld;
UIControl_Button m_buttonMoreOptions, m_buttonCreateWorld;
UIControl_TextInput m_editWorldName;
UIControl_Slider m_sliderDifficulty;
UIControl_Slider m_sliderDifficulty, m_sliderGamemode;
UIControl_CheckBox m_checkboxOnline;
UIControl_BitmapIcon m_bitmapIcon, m_bitmapComparison;
@ -37,7 +37,7 @@ private:
UI_MAP_ELEMENT( m_labelWorldName, "WorldName")
UI_MAP_ELEMENT( m_editWorldName, "EditWorldName")
UI_MAP_ELEMENT( m_texturePackList, "TexturePackSelector")
UI_MAP_ELEMENT( m_buttonGamemode, "GameModeToggle")
UI_MAP_ELEMENT( m_sliderGamemode, "GameModeToggle")
UI_MAP_ELEMENT( m_checkboxOnline, "CheckboxOnline")
UI_MAP_ELEMENT( m_buttonMoreOptions, "MoreOptions")
UI_MAP_ELEMENT( m_buttonCreateWorld, "NewWorld")

93
Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
View file

@ -32,6 +32,12 @@ int UIScene_LoadMenu::m_iDifficultyTitleSettingA[5]=
IDS_DIFFICULTY_TITLE_HARD,
IDS_GAMEMODE_HARDCORE
};
int UIScene_LoadMenu::m_iGamemodes[3] =
{
IDS_GAMEMODE_SURVIVAL,
IDS_GAMEMODE_CREATIVE,
IDS_GAMEMODE_ADVENTURE
};
int UIScene_LoadMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
{
@ -71,7 +77,7 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
m_labelSeed.init(L"");
m_labelCreatedMode.init(app.GetString(IDS_CREATED_IN_SURVIVAL));
m_buttonGamemode.init(app.GetString(IDS_GAMEMODE_SURVIVAL),eControl_GameMode);
m_sliderGamemode.init(app.GetString(IDS_GAMEMODE_SURVIVAL),eControl_GameMode,0,2,0);
m_buttonMoreOptions.init(app.GetString(IDS_MORE_OPTIONS),eControl_MoreOptions);
m_buttonLoadWorld.init(app.GetString(IDS_LOAD),eControl_LoadWorld);
m_texturePackList.init(app.GetString(IDS_DLC_MENU_TEXTUREPACKS), eControl_TexturePackList);
@ -548,20 +554,23 @@ void UIScene_LoadMenu::tick()
switch(app.GetGameHostOption(uiHostOptions,eGameHostOption_GameType))
{
case 1: // Creative
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
m_sliderGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
m_sliderGamemode.handleSliderMove(1);
m_bGameModeCreative=true;
m_iGameModeId = GameType::CREATIVE->getId();
break;
#ifdef _ADVENTURE_MODE_ENABLED
case 2: // Adventure
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
m_sliderGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
m_sliderGamemode.handleSliderMove(2);
m_bGameModeCreative=false;
m_iGameModeId = GameType::ADVENTURE->getId();
break;
#endif
case 0: // Survival
default:
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
m_sliderGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
m_sliderGamemode.handleSliderMove(0);
m_bGameModeCreative=false;
m_iGameModeId = GameType::SURVIVAL->getId();
break;
@ -583,7 +592,8 @@ void UIScene_LoadMenu::tick()
// Hardcore locks game mode to Survival
m_iGameModeId = GameType::SURVIVAL->getId();
m_bGameModeCreative = false;
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
m_sliderGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
m_sliderGamemode.handleSliderMove(0);
}
}
@ -737,30 +747,30 @@ void UIScene_LoadMenu::handlePress(F64 controlId, F64 childId)
switch(static_cast<int>(controlId))
{
case eControl_GameMode:
if (m_bHardcore)
break; // Hardcore mode locks game mode to Survival
switch(m_iGameModeId)
{
case 0: // Survival
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
m_iGameModeId = GameType::CREATIVE->getId();
m_bGameModeCreative = true;
break;
case 1: // Creative
#ifdef _ADVENTURE_MODE_ENABLED
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
m_iGameModeId = GameType::ADVENTURE->getId();
m_bGameModeCreative = false;
break;
case 2: // Adventure
#endif
m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
m_iGameModeId = GameType::SURVIVAL->getId();
m_bGameModeCreative = false;
break;
};
break;
// case eControl_GameMode:
// if (m_bHardcore)
// break; // Hardcore mode locks game mode to Survival
// switch(m_iGameModeId)
// {
// case 0: // Survival
// m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_CREATIVE));
// m_iGameModeId = GameType::CREATIVE->getId();
// m_bGameModeCreative = true;
// break;
// case 1: // Creative
// #ifdef _ADVENTURE_MODE_ENABLED
// m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_ADVENTURE));
// m_iGameModeId = GameType::ADVENTURE->getId();
// m_bGameModeCreative = false;
// break;
// case 2: // Adventure
// #endif
// m_buttonGamemode.setLabel(app.GetString(IDS_GAMEMODE_SURVIVAL));
// m_iGameModeId = GameType::SURVIVAL->getId();
// m_bGameModeCreative = false;
// break;
// };
// break;
case eControl_MoreOptions:
ui.NavigateToScene(m_iPad, eUIScene_LaunchMoreOptionsMenu, &m_MoreOptionsParams);
break;
@ -1002,6 +1012,31 @@ void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue)
swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value]));
m_sliderDifficulty.setLabel(TempString);
break;
case eControl_GameMode:
if (m_bHardcore)
break; // Hardcore mode locks game mode to Survival
m_sliderGamemode.handleSliderMove(value);
switch (value)
{
case 0: // Survival
m_iGameModeId = GameType::SURVIVAL->getId();
m_bGameModeCreative = false;
break;
case 1: // Creative
m_iGameModeId = GameType::CREATIVE->getId();
m_bGameModeCreative = true;
break;
#ifdef _ADVENTURE_MODE_ENABLED
case 2: // Adventure
m_iGameModeId = GameType::ADVENTURE->getId();
m_bGameModeCreative = false;
break;
#endif
};
//app.SetGameSettings(m_iPad, eGameSetting_GameMode, value);
swprintf((WCHAR*)TempString, 256, L"%ls", app.GetString(m_iGamemodes[value]));
m_sliderGamemode.setLabel(TempString);
break;
}
}

9
Minecraft.Client/Common/UI/UIScene_LoadMenu.h
View file

@ -15,12 +15,13 @@ private:
eControl_OnlineGame,
};
static int m_iDifficultyTitleSettingA[5];
static int m_iDifficultyTitleSettingA[5];
static int m_iGamemodes[3];
UIControl m_controlMainPanel;
UIControl_Label m_labelGameName, m_labelSeed, m_labelCreatedMode;
UIControl_Button m_buttonGamemode, m_buttonMoreOptions, m_buttonLoadWorld;
UIControl_Slider m_sliderDifficulty;
UIControl_Button m_buttonMoreOptions, m_buttonLoadWorld;
UIControl_Slider m_sliderDifficulty, m_sliderGamemode;
UIControl_BitmapIcon m_bitmapIcon;
UIControl_CheckBox m_checkboxOnline;
@ -32,7 +33,7 @@ private:
UI_MAP_ELEMENT( m_labelCreatedMode, "CreatedMode")
UI_MAP_ELEMENT( m_labelSeed, "Seed")
UI_MAP_ELEMENT( m_texturePackList, "TexturePackSelector")
UI_MAP_ELEMENT( m_buttonGamemode, "GameModeToggle")
UI_MAP_ELEMENT( m_sliderGamemode, "GameModeToggle")
UI_MAP_ELEMENT( m_checkboxOnline, "CheckboxOnline")
UI_MAP_ELEMENT( m_buttonMoreOptions, "MoreOptions")
UI_MAP_ELEMENT( m_buttonLoadWorld, "LoadSettings")

2
README.md
View file

@ -1,5 +1,5 @@
![banner](.gitea/banner.png)
# LegacyEvolved (Legacy Console Edition)
# neoLegacy (Legacy Console Edition)
This project aims to backport the newer title updates back to Legacy Console Edition (which is based on TU19).
[![Discord](https://img.shields.io/badge/Discord-Join%20Server-5865F2?logo=discord&logoColor=white)](https://discord.gg/D6hEPNYeyn)