backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-12 01:52:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #407 from 4jcraft/fix/includes
Some checks are pending
Build (Linux, x86-64) / build-linux-amalgamate (push) Waiting to run
Details
Build (Linux, x86-64) / build-linux-full (push) Waiting to run
Details
Format Check / clang-format (push) Waiting to run
Details
Release Nightly (Linux, x86-64) / release-linux (push) Waiting to run
Details

Browse source 
fix: missing includes in MenuController/XuiActions
This commit is contained in:
MatthewBeshay 2026-04-07 12:55:07 +10:00 committed by GitHub
parent 5d9bcac156 2672ad5493
commit b88a89ae01
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 27 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
targets/app/common/GameSettingsManager.cpp
View file

@ -5,40 +5,27 @@
#include "minecraft/GameEnums.h"
#include "app/common/Console_Debug_enum.h"
#include "app/common/Network/GameNetworkManager.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Scenes/UIScene_FullscreenProgress.h"
#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "minecraft/GameHostOptions.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/Options.h"
#include "minecraft/client/gui/Gui.h"
#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/client/renderer/GameRenderer.h"
#include "minecraft/client/skins/DLCTexturePack.h"
#include "minecraft/client/skins/TexturePack.h"
#include "minecraft/client/skins/TexturePackRepository.h"
#include "minecraft/server/MinecraftServer.h"
#include "minecraft/server/PlayerList.h"
#include "minecraft/server/level/ServerPlayer.h"
#include "minecraft/stats/StatsCounter.h"
#include "minecraft/world/entity/player/Player.h"
#include "minecraft/world/level/tile/Tile.h"
#include "platform/sdl2/Input.h"
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"
#include "minecraft/network/packet/DisconnectPacket.h"
#include "app/common/Audio/SoundEngine.h"
#include "app/common/DLC/DLCPack.h"
#include "app/common/DLC/DLCManager.h"
#include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
#include <cstring>
#include <chrono>
#include <thread>
GameSettingsManager::GameSettingsManager() {
memset(GameSettingsA, 0, sizeof(GameSettingsA));

80
targets/app/common/Game_XuiActions.cpp
View file

@ -1,53 +1,37 @@
#include "minecraft/GameHostOptions.h"
#include "minecraft/GameHostOptions.h"
#include "app/common/Game.h"
#include "platform/PlatformTypes.h"
#include "platform/InputActions.h"
#include "platform/sdl2/Profile.h"
#include "platform/sdl2/Render.h"
#include "platform/sdl2/Storage.h"
#include "app/common/App_Defines.h"
#include "minecraft/GameEnums.h"
#include "app/common/App_structs.h"
#include "app/common/Console_Debug_enum.h"
#include "app/common/DLC/DLCManager.h"
#include "app/common/DLC/DLCSkinFile.h"
#include "app/common/Game.h"
#include "app/common/GameRules/GameRuleManager.h"
#include "app/common/Network/GameNetworkManager.h"
#include "app/common/Network/NetworkPlayerInterface.h"
#include "app/common/Tutorial/Tutorial.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Scenes/UIScene_FullscreenProgress.h"
#include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "platform/NetTypes.h"
#include "minecraft/client/model/SkinBox.h"
#include "platform/XboxStubs.h"
#include "platform/PlatformServices.h"
#include "java/Class.h"
#include "java/File.h"
#include "java/Random.h"
#include "minecraft/GameEnums.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/Options.h"
#include "minecraft/client/ProgressRenderer.h"
#include "minecraft/client/model/geom/Model.h"
#include "minecraft/client/User.h"
#include "minecraft/client/gui/Gui.h"
#include "minecraft/client/multiplayer/ClientConnection.h"
#include "minecraft/client/multiplayer/MultiPlayerGameMode.h"
#include "minecraft/client/multiplayer/MultiPlayerLevel.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/client/renderer/GameRenderer.h"
#include "minecraft/client/renderer/Textures.h"
#include "minecraft/client/renderer/entity/EntityRenderer.h"
#include "minecraft/client/skins/DLCTexturePack.h"
#include "minecraft/client/skins/TexturePack.h"
#include "minecraft/network/packet/DisconnectPacket.h"
#include "minecraft/client/skins/TexturePackRepository.h"
#include "minecraft/server/MinecraftServer.h"
#include "minecraft/stats/StatsCounter.h"
#include "minecraft/world/Container.h"
#include "minecraft/world/entity/item/MinecartHopper.h"
#include "minecraft/world/entity/player/Player.h"
#include "minecraft/world/item/crafting/Recipy.h"
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Profile.h"
#include "platform/sdl2/Storage.h"
#include "util/StringHelpers.h"
#include "app/common/Audio/SoundEngine.h"
void Game::HandleXuiActions(void) {
eXuiAction eAction;
@ -795,8 +779,7 @@ void Game::HandleXuiActions(void) {
g_NetworkManager.CorrectErrorIDS(
IDS_CONNECTION_LOST_LIVE),
uiIDA, 1, i,
&Game::
EthernetDisconnectReturned,
&Game::EthernetDisconnectReturned,
this);
} else {
// 2. Switch to offline
@ -823,8 +806,7 @@ void Game::HandleXuiActions(void) {
g_NetworkManager.CorrectErrorIDS(
IDS_CONNECTION_LOST_LIVE),
uiIDA, 1, i,
&Game::EthernetDisconnectReturned,
this);
&Game::EthernetDisconnectReturned, this);
}
}
}
@ -874,8 +856,7 @@ void Game::HandleXuiActions(void) {
LoadingInputParams* loadingParams =
new LoadingInputParams();
loadingParams->func =
&Game::SignoutExitWorldThreadProc;
loadingParams->func = &Game::SignoutExitWorldThreadProc;
UIFullscreenProgressCompletionData* completionData =
new UIFullscreenProgressCompletionData();
@ -923,9 +904,9 @@ void Game::HandleXuiActions(void) {
uiIDA[0] = IDS_UNLOCK_TITLE;
uiIDA[1] = IDS_EXIT_GAME;
ui.RequestErrorMessage(
IDS_TRIALOVER_TITLE, IDS_TRIALOVER_TEXT, uiIDA, 2, i,
&Game::TrialOverReturned, this);
ui.RequestErrorMessage(IDS_TRIALOVER_TITLE,
IDS_TRIALOVER_TEXT, uiIDA, 2, i,
&Game::TrialOverReturned, this);
} break;
// INVITES
@ -955,8 +936,7 @@ void Game::HandleXuiActions(void) {
ui.RequestAlertMessage(
IDS_EXIT_GAME, IDS_CONFIRM_LEAVE_VIA_INVITE, uiIDA,
3, i,
&Game::
ExitAndJoinFromInviteSaveDialogReturned,
&Game::ExitAndJoinFromInviteSaveDialogReturned,
this);
} else {
uiIDA[0] = IDS_CONFIRM_CANCEL;
@ -1218,8 +1198,7 @@ void Game::HandleXuiActions(void) {
}
loadingParams->completionData = completionData;
loadingParams->cancelFunc =
&Game::ExitGameFromRemoteSave;
loadingParams->cancelFunc = &Game::ExitGameFromRemoteSave;
loadingParams->cancelText = IDS_TOOLTIPS_EXIT;
ui.NavigateToScene(ProfileManager.GetPrimaryPad(),
@ -1293,9 +1272,8 @@ void Game::HandleXuiActions(void) {
C4JStorage::EMessageResult result =
ui.RequestErrorMessage(
IDS_BANNED_LEVEL_TITLE, IDS_PLAYER_BANNED_LEVEL,
uiIDA, 2, i,
&Game::BannedLevelDialogReturned, this,
wchFormat);
uiIDA, 2, i, &Game::BannedLevelDialogReturned,
this, wchFormat);
if (result != C4JStorage::EMessage_Busy)
SetAction(i, eAppAction_Idle);
} else {
@ -1470,15 +1448,5 @@ void Game::HandleXuiActions(void) {
}
}
// loadMediaArchive and loadStringTable moved to ArchiveManager/LocalizationManager
// loadMediaArchive and loadStringTable moved to
// ArchiveManager/LocalizationManager

2
targets/app/common/LocalizationManager.cpp
View file

@ -142,7 +142,7 @@ void LocalizationManager::initialiseTips() {
if (m_TipIDA[i] == 0) {
#if !defined(_CONTENT_PACKAGE)
__debugbreak();
assert(0);
#endif
}
}

1
targets/app/common/MenuController.cpp
View file

@ -9,6 +9,7 @@
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/ProgressRenderer.h"
#include "minecraft/client/renderer/GameRenderer.h"
#include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
#include "minecraft/server/MinecraftServer.h"
#include "minecraft/world/Container.h"
#include "minecraft/world/entity/item/MinecartHopper.h"

2
targets/minecraft/IGameServices.h
View file

@ -204,7 +204,7 @@ public:
[[nodiscard]] virtual DLCSkinFile* getDLCSkinFile(
const std::wstring& name) = 0;
[[nodiscard]] virtual bool dlcNeedsCorruptCheck() = 0;
[[nodiscard]] virtual unsigned int dlcCheckForCorrupt(bool showMessage = true) = 0;
virtual unsigned int dlcCheckForCorrupt(bool showMessage = true) = 0;
[[nodiscard]] virtual bool dlcReadDataFile(unsigned int& filesProcessed,
const std::wstring& path, DLCPack* pack,
bool fromArchive = false) = 0;