From 826862e79e0fe3ff3f831c52ad93d4ec9d32e03d Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Mon, 30 Mar 2026 02:19:38 -0500 Subject: [PATCH] format more things i missed --- Minecraft.Client/Commands/TeleportCommand.cpp | 2 +- .../Platform/Common/UI/UIScene_ControlsMenu.h | 112 +++++++++--------- Minecraft.Client/Platform/Extrax64Stubs.cpp | 5 +- .../Platform/Linux/Iggy/include/gdraw.h | 4 +- .../Platform/Windows64/Iggy/gdraw/gdraw_wgl.c | 2 +- .../Platform/Windows64/Iggy/include/gdraw.h | 4 +- .../Sentient/DynamicConfigurations.h | 2 +- .../Platform/Windows64/Windows64_App.cpp | 6 +- Minecraft.Client/Rendering/LevelRenderer.cpp | 2 +- Minecraft.World/IO/Files/FileHeader.cpp | 5 +- 10 files changed, 76 insertions(+), 68 deletions(-) diff --git a/Minecraft.Client/Commands/TeleportCommand.cpp b/Minecraft.Client/Commands/TeleportCommand.cpp index dab978392..4c6a39236 100644 --- a/Minecraft.Client/Commands/TeleportCommand.cpp +++ b/Minecraft.Client/Commands/TeleportCommand.cpp @@ -81,7 +81,7 @@ void TeleportCommand::execute(std::shared_ptr source, // victim.connection.teleport(destination.x, destination.y, // destination.z, destination.yRot, destination.xRot); // logAdminAction(source, "commands.tp.success", victim.getAName(), - //destination.getAName()); + // destination.getAName()); // } //} } diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h index 9bdb85118..a3733cae7 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h @@ -87,67 +87,73 @@ UI_MAP_ELEMENT(m_labelsPad[e_PadBack], "LabelBack") UI_MAP_ELEMENT( "LabelRS_2") UI_MAP_ELEMENT(m_labelsPad[e_PadTouch], "LabelTouch") - UI_MAP_ELEMENT(m_controlLines[e_PadBack], "LineBack") UI_MAP_ELEMENT( - m_controlLines[e_PadLT], - "LineLT") UI_MAP_ELEMENT(m_controlLines[e_PadLB], - "LineLB") UI_MAP_ELEMENT(m_controlLines - [e_PadDPadLeft], - "Line" - "Dpad" - "Lef" - "t") - UI_MAP_ELEMENT( - m_controlLines[e_PadDPadRight], - "LineDpadRight") UI_MAP_ELEMENT(m_controlLines - [e_PadDPadUp], - "LineDpadUp") + UI_MAP_ELEMENT( + m_controlLines[e_PadBack], + "LineBack") UI_MAP_ELEMENT(m_controlLines[e_PadLT], + "LineLT") + UI_MAP_ELEMENT(m_controlLines[e_PadLB], "LineLB") UI_MAP_ELEMENT( + m_controlLines[e_PadDPadLeft], + "Line" + "Dpad" + "Lef" + "t") UI_MAP_ELEMENT(m_controlLines[e_PadDPadRight], + "LineDpadRight") UI_MAP_ELEMENT( - m_controlLines[e_PadDPadDown], - "LineDpadDown") UI_MAP_ELEMENT(m_controlLines - [e_PadLS_1], - "LineL3") + m_controlLines[e_PadDPadUp], + "LineDpadUp") UI_MAP_ELEMENT(m_controlLines + [e_PadDPadDown], + "LineDpadDown") UI_MAP_ELEMENT( - m_controlLines[e_PadLS_2], - "LineLeftStick") UI_MAP_ELEMENT(m_controlLines - [e_PadStart], - "LineStart") + m_controlLines[e_PadLS_1], + "LineL3") UI_MAP_ELEMENT(m_controlLines + [e_PadLS_2], + "LineLeftStick") UI_MAP_ELEMENT( - m_controlLines[e_PadRT], - "LineRT") UI_MAP_ELEMENT(m_controlLines - [e_PadRB], - "LineRB") + m_controlLines[e_PadStart], + "LineStart") UI_MAP_ELEMENT(m_controlLines + [e_PadRT], + "LineRT") UI_MAP_ELEMENT( - m_controlLines[e_PadY], - "LineY") UI_MAP_ELEMENT(m_controlLines - [e_PadB], - "LineB") + m_controlLines[e_PadRB], + "LineRB") UI_MAP_ELEMENT(m_controlLines + [e_PadY], + "LineY") UI_MAP_ELEMENT( - m_controlLines[e_PadA], - "LineA") UI_MAP_ELEMENT(m_controlLines - [e_PadX], - "LineX") + m_controlLines[e_PadB], + "LineB") UI_MAP_ELEMENT(m_controlLines + [e_PadA], + "LineA") UI_MAP_ELEMENT( - m_controlLines[e_PadRS_1], - "LineR3") UI_MAP_ELEMENT(m_controlLines - [e_PadRS_2], - "L" - "i" - "n" - "e" - "R" - "i" - "g" - "h" - "t" - "S" - "t" - "i" - "c" - "k") + m_controlLines[e_PadX], + "LineX") UI_MAP_ELEMENT(m_controlLines + [e_PadRS_1], + "Li" + "ne" + "R" + "3") UI_MAP_ELEMENT( m_controlLines - [e_PadTouch], - "LineTouch") + [e_PadRS_2], + "L" + "i" + "n" + "e" + "R" + "i" + "g" + "h" + "t" + "S" + "t" + "i" + "c" + "k") UI_MAP_ELEMENT(m_controlLines + [e_PadTouch], + "Li" + "ne" + "To" + "uc" + "h") UI_MAP_ELEMENT( m_checkboxInvert, diff --git a/Minecraft.Client/Platform/Extrax64Stubs.cpp b/Minecraft.Client/Platform/Extrax64Stubs.cpp index 958d7ad7a..68656798a 100644 --- a/Minecraft.Client/Platform/Extrax64Stubs.cpp +++ b/Minecraft.Client/Platform/Extrax64Stubs.cpp @@ -353,8 +353,9 @@ void C_4JProfile::Initialise(std::uint32_t dwTitleID, std::uint32_t dwOfferID, GAMESETTING_CLOUDS; // eGameSetting_Clouds - on pGameSettings->uiBitmaskValues |= GAMESETTING_ONLINE; // eGameSetting_GameSetting_Online - on - pGameSettings->uiBitmaskValues |= GAMESETTING_FRIENDSOFFRIENDS; // eGameSetting_GameSetting_FriendsOfFriends - // - on + pGameSettings->uiBitmaskValues |= + GAMESETTING_FRIENDSOFFRIENDS; // eGameSetting_GameSetting_FriendsOfFriends + // - on pGameSettings->uiBitmaskValues |= GAMESETTING_DISPLAYUPDATEMSG; // eGameSetting_DisplayUpdateMessage // (counter) diff --git a/Minecraft.Client/Platform/Linux/Iggy/include/gdraw.h b/Minecraft.Client/Platform/Linux/Iggy/include/gdraw.h index fce9065cf..7ca675cdf 100644 --- a/Minecraft.Client/Platform/Linux/Iggy/include/gdraw.h +++ b/Minecraft.Client/Platform/Linux/Iggy/include/gdraw.h @@ -424,8 +424,8 @@ IDOC typedef enum gdraw_texture_format { // $gdraw_make_texture_begin as // $gdraw_texture_type) GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel. - // Data is submitted as 8 bits/pixel, conversion - // (if necessary) done by GDraw. + // Data is submitted as 8 bits/pixel, conversion + // (if necessary) done by GDraw. // First platform-specific format index (for reference) GDRAW_TEXTURE_FORMAT__platform = 16, diff --git a/Minecraft.Client/Platform/Windows64/Iggy/gdraw/gdraw_wgl.c b/Minecraft.Client/Platform/Windows64/Iggy/gdraw/gdraw_wgl.c index 7b5fae1f3..df2a78e90 100644 --- a/Minecraft.Client/Platform/Windows64/Iggy/gdraw/gdraw_wgl.c +++ b/Minecraft.Client/Platform/Windows64/Iggy/gdraw/gdraw_wgl.c @@ -23,7 +23,7 @@ // #define GDRAW_GL_EXTENSION_LIST \ - /* identifier import procname */ \ + /* identifier import procname */ \ /* GL_ARB_multitexture */ \ GLE(ActiveTexture, "ActiveTextureARB", ACTIVETEXTUREARB) \ /* GL_ARB_texture_compression */ \ diff --git a/Minecraft.Client/Platform/Windows64/Iggy/include/gdraw.h b/Minecraft.Client/Platform/Windows64/Iggy/include/gdraw.h index aa4dc236f..ab41d5075 100644 --- a/Minecraft.Client/Platform/Windows64/Iggy/include/gdraw.h +++ b/Minecraft.Client/Platform/Windows64/Iggy/include/gdraw.h @@ -424,8 +424,8 @@ IDOC typedef enum gdraw_texture_format { // $gdraw_make_texture_begin as // $gdraw_texture_type) GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel. - // Data is submitted as 8 bits/pixel, conversion - // (if necessary) done by GDraw. + // Data is submitted as 8 bits/pixel, conversion + // (if necessary) done by GDraw. // First platform-specific format index (for reference) GDRAW_TEXTURE_FORMAT__platform = 16, diff --git a/Minecraft.Client/Platform/Windows64/Sentient/DynamicConfigurations.h b/Minecraft.Client/Platform/Windows64/Sentient/DynamicConfigurations.h index eaedf23ca..be7e8a869 100644 --- a/Minecraft.Client/Platform/Windows64/Sentient/DynamicConfigurations.h +++ b/Minecraft.Client/Platform/Windows64/Sentient/DynamicConfigurations.h @@ -84,7 +84,7 @@ private: #define DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME \ 2400 // 40 mins 1200 // 20 mins //300; // 5 minutes - class MinecraftDynamicConfigurations { +class MinecraftDynamicConfigurations { private: enum EDynamic_Configs { eDynamic_Config_Trial, diff --git a/Minecraft.Client/Platform/Windows64/Windows64_App.cpp b/Minecraft.Client/Platform/Windows64/Windows64_App.cpp index 14a263414..8bccd39a6 100644 --- a/Minecraft.Client/Platform/Windows64/Windows64_App.cpp +++ b/Minecraft.Client/Platform/Windows64/Windows64_App.cpp @@ -37,7 +37,7 @@ void CConsoleMinecraftApp::GetScreenshot(int iPad, void CConsoleMinecraftApp::TemporaryCreateGameStart() { ////////////////////////////////////////////////////////////////////////////////////////////// - ///From CScene_Main::OnInit + /// From CScene_Main::OnInit app.setLevelGenerationOptions(nullptr); @@ -49,7 +49,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart() { app.ApplyGameSettingsChanged(0); ////////////////////////////////////////////////////////////////////////////////////////////// - ///From CScene_MultiGameJoinLoad::OnInit + /// From CScene_MultiGameJoinLoad::OnInit MinecraftServer::resetFlags(); // From CScene_MultiGameJoinLoad::OnNotifyPressEx @@ -57,7 +57,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart() { app.SetCorruptSaveDeleted(false); ////////////////////////////////////////////////////////////////////////////////////////////// - ///From CScene_MultiGameCreate::CreateGame + /// From CScene_MultiGameCreate::CreateGame app.ClearTerrainFeaturePosition(); std::wstring wWorldName = L"TestWorld"; diff --git a/Minecraft.Client/Rendering/LevelRenderer.cpp b/Minecraft.Client/Rendering/LevelRenderer.cpp index e5af80e96..4f0ccde53 100644 --- a/Minecraft.Client/Rendering/LevelRenderer.cpp +++ b/Minecraft.Client/Rendering/LevelRenderer.cpp @@ -157,7 +157,7 @@ LevelRenderer::LevelRenderer(Minecraft* mc, Textures* textures) { emptyChunks = 0; for (int i = 0; i < 4; i++) { // sortedChunks[i] = nullptr; // 4J - removed - not - //sorting + // sorting // our chunks anymore chunks[i] = ClipChunkArray(); lastPlayerCount[i] = 0; diff --git a/Minecraft.World/IO/Files/FileHeader.cpp b/Minecraft.World/IO/Files/FileHeader.cpp index a679e2ddc..2e69e4d27 100644 --- a/Minecraft.World/IO/Files/FileHeader.cpp +++ b/Minecraft.World/IO/Files/FileHeader.cpp @@ -187,8 +187,9 @@ void FileHeader::ReadHeader( // : Bumped it to 6 for PS3 v1 to update map data mappings to use larger // PlayerUID : Bumped // it to 7 for Durango v1 to update map data mappings to use string - // based PlayerUID : Bumped it to 8 for Durango v1 when to save the - // chunks in a different compressed format + // based PlayerUID + // : Bumped it to 8 for Durango v1 when to save the chunks in a + // different compressed format case SAVE_FILE_VERSION_COMPRESSED_CHUNK_STORAGE: case SAVE_FILE_VERSION_DURANGO_CHANGE_MAP_DATA_MAPPING_SIZE: case SAVE_FILE_VERSION_CHANGE_MAP_DATA_MAPPING_SIZE: