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

format more things i missed

Browse source
This commit is contained in:
Tropical 2026-03-30 02:19:38 -05:00
parent c9b90cae2c
commit 826862e79e
10 changed files with 76 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Commands/TeleportCommand.cpp
View file

@ -81,7 +81,7 @@ void TeleportCommand::execute(std::shared_ptr<CommandSender> source,
// victim.connection.teleport(destination.x, destination.y, // victim.connection.teleport(destination.x, destination.y,
// destination.z, destination.yRot, destination.xRot); // destination.z, destination.yRot, destination.xRot);
// logAdminAction(source, "commands.tp.success", victim.getAName(), // logAdminAction(source, "commands.tp.success", victim.getAName(),
//destination.getAName()); // destination.getAName());
// } // }
//} //}
} }

112
Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h
View file

@ -87,67 +87,73 @@ UI_MAP_ELEMENT(m_labelsPad[e_PadBack], "LabelBack") UI_MAP_ELEMENT(
"LabelRS_2") UI_MAP_ELEMENT(m_labelsPad[e_PadTouch], "LabelRS_2") UI_MAP_ELEMENT(m_labelsPad[e_PadTouch],
"LabelTouch") "LabelTouch")
UI_MAP_ELEMENT(m_controlLines[e_PadBack], "LineBack") UI_MAP_ELEMENT( UI_MAP_ELEMENT(
m_controlLines[e_PadLT], m_controlLines[e_PadBack],
"LineLT") UI_MAP_ELEMENT(m_controlLines[e_PadLB], "LineBack") UI_MAP_ELEMENT(m_controlLines[e_PadLT],
"LineLB") UI_MAP_ELEMENT(m_controlLines "LineLT")
[e_PadDPadLeft], UI_MAP_ELEMENT(m_controlLines[e_PadLB], "LineLB") UI_MAP_ELEMENT(
"Line" m_controlLines[e_PadDPadLeft],
"Dpad" "Line"
"Lef" "Dpad"
"t") "Lef"
UI_MAP_ELEMENT( "t") UI_MAP_ELEMENT(m_controlLines[e_PadDPadRight],
m_controlLines[e_PadDPadRight], "LineDpadRight")
"LineDpadRight") UI_MAP_ELEMENT(m_controlLines
[e_PadDPadUp],
"LineDpadUp")
UI_MAP_ELEMENT( UI_MAP_ELEMENT(
m_controlLines[e_PadDPadDown], m_controlLines[e_PadDPadUp],
"LineDpadDown") UI_MAP_ELEMENT(m_controlLines "LineDpadUp") UI_MAP_ELEMENT(m_controlLines
[e_PadLS_1], [e_PadDPadDown],
"LineL3") "LineDpadDown")
UI_MAP_ELEMENT( UI_MAP_ELEMENT(
m_controlLines[e_PadLS_2], m_controlLines[e_PadLS_1],
"LineLeftStick") UI_MAP_ELEMENT(m_controlLines "LineL3") UI_MAP_ELEMENT(m_controlLines
[e_PadStart], [e_PadLS_2],
"LineStart") "LineLeftStick")
UI_MAP_ELEMENT( UI_MAP_ELEMENT(
m_controlLines[e_PadRT], m_controlLines[e_PadStart],
"LineRT") UI_MAP_ELEMENT(m_controlLines "LineStart") UI_MAP_ELEMENT(m_controlLines
[e_PadRB], [e_PadRT],
"LineRB") "LineRT")
UI_MAP_ELEMENT( UI_MAP_ELEMENT(
m_controlLines[e_PadY], m_controlLines[e_PadRB],
"LineY") UI_MAP_ELEMENT(m_controlLines "LineRB") UI_MAP_ELEMENT(m_controlLines
[e_PadB], [e_PadY],
"LineB") "LineY")
UI_MAP_ELEMENT( UI_MAP_ELEMENT(
m_controlLines[e_PadA], m_controlLines[e_PadB],
"LineA") UI_MAP_ELEMENT(m_controlLines "LineB") UI_MAP_ELEMENT(m_controlLines
[e_PadX], [e_PadA],
"LineX") "LineA")
UI_MAP_ELEMENT( UI_MAP_ELEMENT(
m_controlLines[e_PadRS_1], m_controlLines[e_PadX],
"LineR3") UI_MAP_ELEMENT(m_controlLines "LineX") UI_MAP_ELEMENT(m_controlLines
[e_PadRS_2], [e_PadRS_1],
"L" "Li"
"i" "ne"
"n" "R"
"e" "3")
"R"
"i"
"g"
"h"
"t"
"S"
"t"
"i"
"c"
"k")
UI_MAP_ELEMENT( UI_MAP_ELEMENT(
m_controlLines m_controlLines
[e_PadTouch], [e_PadRS_2],
"LineTouch") "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( UI_MAP_ELEMENT(
m_checkboxInvert, m_checkboxInvert,

5
Minecraft.Client/Platform/Extrax64Stubs.cpp
View file

@ -353,8 +353,9 @@ void C_4JProfile::Initialise(std::uint32_t dwTitleID, std::uint32_t dwOfferID,
GAMESETTING_CLOUDS; // eGameSetting_Clouds - on GAMESETTING_CLOUDS; // eGameSetting_Clouds - on
pGameSettings->uiBitmaskValues |= pGameSettings->uiBitmaskValues |=
GAMESETTING_ONLINE; // eGameSetting_GameSetting_Online - on GAMESETTING_ONLINE; // eGameSetting_GameSetting_Online - on
pGameSettings->uiBitmaskValues |= GAMESETTING_FRIENDSOFFRIENDS; // eGameSetting_GameSetting_FriendsOfFriends pGameSettings->uiBitmaskValues |=
// - on GAMESETTING_FRIENDSOFFRIENDS; // eGameSetting_GameSetting_FriendsOfFriends
// - on
pGameSettings->uiBitmaskValues |= pGameSettings->uiBitmaskValues |=
GAMESETTING_DISPLAYUPDATEMSG; // eGameSetting_DisplayUpdateMessage GAMESETTING_DISPLAYUPDATEMSG; // eGameSetting_DisplayUpdateMessage
// (counter) // (counter)

4
Minecraft.Client/Platform/Linux/Iggy/include/gdraw.h
View file

@ -424,8 +424,8 @@ IDOC typedef enum gdraw_texture_format {
// $gdraw_make_texture_begin as // $gdraw_make_texture_begin as
// $gdraw_texture_type) // $gdraw_texture_type)
GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel. GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel.
// Data is submitted as 8 bits/pixel, conversion // Data is submitted as 8 bits/pixel, conversion
// (if necessary) done by GDraw. // (if necessary) done by GDraw.
// First platform-specific format index (for reference) // First platform-specific format index (for reference)
GDRAW_TEXTURE_FORMAT__platform = 16, GDRAW_TEXTURE_FORMAT__platform = 16,

2
Minecraft.Client/Platform/Windows64/Iggy/gdraw/gdraw_wgl.c
View file

@ -23,7 +23,7 @@
// //
#define GDRAW_GL_EXTENSION_LIST \ #define GDRAW_GL_EXTENSION_LIST \
/* identifier import procname */ \ /* identifier import procname */ \
/* GL_ARB_multitexture */ \ /* GL_ARB_multitexture */ \
GLE(ActiveTexture, "ActiveTextureARB", ACTIVETEXTUREARB) \ GLE(ActiveTexture, "ActiveTextureARB", ACTIVETEXTUREARB) \
/* GL_ARB_texture_compression */ \ /* GL_ARB_texture_compression */ \

4
Minecraft.Client/Platform/Windows64/Iggy/include/gdraw.h
View file

@ -424,8 +424,8 @@ IDOC typedef enum gdraw_texture_format {
// $gdraw_make_texture_begin as // $gdraw_make_texture_begin as
// $gdraw_texture_type) // $gdraw_texture_type)
GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel. GDRAW_TEXTURE_FORMAT_font, // Alpha-only data with at least 4 bits/pixel.
// Data is submitted as 8 bits/pixel, conversion // Data is submitted as 8 bits/pixel, conversion
// (if necessary) done by GDraw. // (if necessary) done by GDraw.
// First platform-specific format index (for reference) // First platform-specific format index (for reference)
GDRAW_TEXTURE_FORMAT__platform = 16, GDRAW_TEXTURE_FORMAT__platform = 16,

2
Minecraft.Client/Platform/Windows64/Sentient/DynamicConfigurations.h
View file

@ -84,7 +84,7 @@ private:
#define DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME \ #define DYNAMIC_CONFIG_DEFAULT_TRIAL_TIME \
2400 // 40 mins 1200 // 20 mins //300; // 5 minutes 2400 // 40 mins 1200 // 20 mins //300; // 5 minutes
class MinecraftDynamicConfigurations { class MinecraftDynamicConfigurations {
private: private:
enum EDynamic_Configs { enum EDynamic_Configs {
eDynamic_Config_Trial, eDynamic_Config_Trial,

6
Minecraft.Client/Platform/Windows64/Windows64_App.cpp
View file

@ -37,7 +37,7 @@ void CConsoleMinecraftApp::GetScreenshot(int iPad,
void CConsoleMinecraftApp::TemporaryCreateGameStart() { void CConsoleMinecraftApp::TemporaryCreateGameStart() {
////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////
///From CScene_Main::OnInit /// From CScene_Main::OnInit
app.setLevelGenerationOptions(nullptr); app.setLevelGenerationOptions(nullptr);
@ -49,7 +49,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart() {
app.ApplyGameSettingsChanged(0); app.ApplyGameSettingsChanged(0);
////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////
///From CScene_MultiGameJoinLoad::OnInit /// From CScene_MultiGameJoinLoad::OnInit
MinecraftServer::resetFlags(); MinecraftServer::resetFlags();
// From CScene_MultiGameJoinLoad::OnNotifyPressEx // From CScene_MultiGameJoinLoad::OnNotifyPressEx
@ -57,7 +57,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart() {
app.SetCorruptSaveDeleted(false); app.SetCorruptSaveDeleted(false);
////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////
///From CScene_MultiGameCreate::CreateGame /// From CScene_MultiGameCreate::CreateGame
app.ClearTerrainFeaturePosition(); app.ClearTerrainFeaturePosition();
std::wstring wWorldName = L"TestWorld"; std::wstring wWorldName = L"TestWorld";

2
Minecraft.Client/Rendering/LevelRenderer.cpp
View file

@ -157,7 +157,7 @@ LevelRenderer::LevelRenderer(Minecraft* mc, Textures* textures) {
emptyChunks = 0; emptyChunks = 0;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
// sortedChunks[i] = nullptr; // 4J - removed - not // sortedChunks[i] = nullptr; // 4J - removed - not
//sorting // sorting
// our chunks anymore // our chunks anymore
chunks[i] = ClipChunkArray(); chunks[i] = ClipChunkArray();
lastPlayerCount[i] = 0; lastPlayerCount[i] = 0;

5
Minecraft.World/IO/Files/FileHeader.cpp
View file

@ -187,8 +187,9 @@ void FileHeader::ReadHeader(
// : Bumped it to 6 for PS3 v1 to update map data mappings to use larger // : Bumped it to 6 for PS3 v1 to update map data mappings to use larger
// PlayerUID : Bumped // PlayerUID : Bumped
// it to 7 for Durango v1 to update map data mappings to use string // 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 // based PlayerUID
// chunks in a different compressed format // : 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_COMPRESSED_CHUNK_STORAGE:
case SAVE_FILE_VERSION_DURANGO_CHANGE_MAP_DATA_MAPPING_SIZE: case SAVE_FILE_VERSION_DURANGO_CHANGE_MAP_DATA_MAPPING_SIZE:
case SAVE_FILE_VERSION_CHANGE_MAP_DATA_MAPPING_SIZE: case SAVE_FILE_VERSION_CHANGE_MAP_DATA_MAPPING_SIZE: