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

yea

Browse source
This commit is contained in:
troglodyte9 2026-03-13 17:16:35 +02:00
parent 4d200a589d
commit 078b9516b3
7 changed files with 125 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Minecraft.Client/ClientConnection.cpp
View file

@ -322,7 +322,8 @@ void ClientConnection::handleLogin(shared_ptr<LoginPacket> packet)
if( m_userIndex == ProfileManager.GetPrimaryPad() )
{
if( app.GetTutorialMode() )
// Clients joining a server should never use tutorial mode - it blocks jump and other input
if( app.GetTutorialMode() && g_NetworkManager.IsLocalGame() )
{
minecraft->gameMode = new FullTutorialMode(ProfileManager.GetPrimaryPad(), minecraft, this);
}

3
Minecraft.Client/Minecraft.cpp
View file

@ -1021,7 +1021,8 @@ shared_ptr<MultiplayerLocalPlayer> Minecraft::createExtraLocalPlayer(int idx, co
mpLevel->addClientConnection( clientConnection );
}
if( app.GetTutorialMode() )
// Clients joining a server should never use tutorial mode - it blocks jump and other input
if( app.GetTutorialMode() && g_NetworkManager.IsLocalGame() )
{
localgameModes[idx] = new FullTutorialMode(idx, this, clientConnection);
}

21
Minecraft.Client/MinecraftServer.cpp
View file

@ -202,6 +202,10 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
if (action == L"stop")
{
server->info(L"Saving before stopping...");
if (playerList != NULL)
playerList->saveAll(NULL, false);
server->saveWorldToDisk();
server->info(L"Stopping server...");
MinecraftServer::HaltServer();
return true;
@ -238,6 +242,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
{
playerList->saveAll(nullptr, false);
}
server->saveWorldToDisk();
server->info(L"World saved.");
return true;
}
@ -542,6 +547,16 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
return false;
}
void MinecraftServer::saveWorldToDisk()
{
saveAllChunks();
saveGameRules();
if (levels[0] != NULL)
{
levels[0]->saveToDisc(Minecraft::GetInstance()->progressRenderer, false);
}
}
MinecraftServer::MinecraftServer()
{
// 4J - added initialisers
@ -733,6 +748,12 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DW
#else
seed = BiomeSource::findSeed(pLevelType);
#endif
// only save seed when creating a new world; when loading existing save, level.dat has the correct seed
if (seed != 0 && initData->saveData == nullptr)
{
settings->setStringAndSave(L"seed", std::to_wstring(seed));
printf("Saved generated seed to server.properties: %lld\n", (long long)seed);
}
}
setMaxBuildHeight(GetDedicatedServerInt(settings, L"max-build-height", Level::maxBuildHeight));

2
Minecraft.Client/MinecraftServer.h
View file

@ -178,7 +178,7 @@ public:
static int64_t getCurrentTimeMillis();
int getPlayerIdleTimeout();
void setPlayerIdleTimeout(int playerIdleTimeout);
void saveWorldToDisk();
public:
void halt();
void run(int64_t seed, void *lpParameter);

6
Minecraft.Client/Settings.cpp
View file

@ -124,4 +124,10 @@ void Settings::setBooleanAndSave(const wstring& key, bool value)
{
properties[key] = value ? L"true" : L"false";
saveProperties();
}
void Settings::setStringAndSave(const wstring& key, const wstring& value)
{
properties[key] = value;
saveProperties();
}

1
Minecraft.Client/Settings.h
View file

@ -18,4 +18,5 @@ public:
int getInt(const wstring& key, int defaultValue);
bool getBoolean(const wstring& key, bool defaultValue);
void setBooleanAndSave(const wstring& key, bool value);
void setStringAndSave(const wstring& key, const wstring& value);
};

94
Minecraft.Client/Windows64/Windows64_Minecraft.cpp
View file

@ -9,6 +9,7 @@
#include <shellapi.h>
#include "GameConfig\Minecraft.spa.h"
#include "..\MinecraftServer.h"
#include "..\PlayerList.h"
#include "..\LocalPlayer.h"
#include "..\..\Minecraft.World\ItemInstance.h"
#include "..\..\Minecraft.World\MapItem.h"
@ -1427,12 +1428,29 @@ static int RunHeadlessServer()
app.SetGameHostOption(eGameHostOption_HostCanBeInvisible, 1);
app.SetGameHostOption(eGameHostOption_MobGriefing, 1);
app.SetGameHostOption(eGameHostOption_KeepInventory, 0);
app.SetGameHostOption(eGameHostOption_DoMobSpawning, 1);
app.SetGameHostOption(eGameHostOption_DoMobSpawning, serverSettings.getBoolean(L"spawn-monsters", true) ? 1 : 0);
app.SetGameHostOption(eGameHostOption_DoMobLoot, 1);
app.SetGameHostOption(eGameHostOption_DoTileDrops, 1);
app.SetGameHostOption(eGameHostOption_NaturalRegeneration, 1);
app.SetGameHostOption(eGameHostOption_DoDaylightCycle, 1);
// World size: 0=classic, 1=small, 2=medium, 3=large
int worldSizeSetting = serverSettings.getInt(L"world-size", 3);
if (worldSizeSetting < 0) worldSizeSetting = 0;
if (worldSizeSetting > 3) worldSizeSetting = 3;
app.SetGameHostOption(eGameHostOption_WorldSize, worldSizeSetting + 1);
// Save name — defaults to "server", configurable via level-name in server.properties
wstring levelNameW = serverSettings.getString(L"level-name", L"server");
if (levelNameW.empty()) levelNameW = L"server";
char levelNameA[256] = {};
WideCharToMultiByte(CP_ACP, 0, levelNameW.c_str(), -1, levelNameA, sizeof(levelNameA), NULL, NULL);
// Tell StorageManager where to save — creates GameHDD/{name}/saveData.ms
StorageManager.ResetSaveData();
StorageManager.SetSaveTitle(levelNameW.c_str());
StorageManager.SetSaveUniqueFilename(levelNameA);
MinecraftServer::resetFlags();
g_NetworkManager.HostGame(0, false, true, MINECRAFT_NET_MAX_PLAYERS, 0);
@ -1445,8 +1463,66 @@ static int RunHeadlessServer()
g_NetworkManager.FakeLocalPlayerJoined();
NetworkGameInitData* param = new NetworkGameInitData();
param->seed = 0;
param->findSeed = true; // set this only and just set seed 0 (fallback to seed generation) only if there isn't an existing seed to load
wstring seedStr = serverSettings.getString(L"seed", L"");
if (!seedStr.empty())
{
__int64 configSeed = _wtoi64(seedStr.c_str());
if (configSeed != 0)
{
param->seed = configSeed;
param->findSeed = false;
printf("Using configured seed: %lld\n", (long long)configSeed);
}
}
if (param->findSeed)
{
param->seed = 0;
printf("No seed configured, generating random world.\n");
}
param->settings = app.GetGameHostOption(eGameHostOption_All);
param->levelName = levelNameW;
switch (worldSizeSetting)
{
case 0: param->xzSize = LEVEL_WIDTH_CLASSIC; param->hellScale = HELL_LEVEL_SCALE_CLASSIC; break;
case 1: param->xzSize = LEVEL_WIDTH_SMALL; param->hellScale = HELL_LEVEL_SCALE_SMALL; break;
case 2: param->xzSize = LEVEL_WIDTH_MEDIUM; param->hellScale = HELL_LEVEL_SCALE_MEDIUM; break;
case 3: param->xzSize = LEVEL_WIDTH_LARGE; param->hellScale = HELL_LEVEL_SCALE_LARGE; break;
}
// this will load an existing save for the server instead of creating a new one every launch
char savePath[MAX_PATH];
sprintf_s(savePath, "Windows64\\GameHDD\\%s\\saveData.ms", levelNameA);
HANDLE hFile = CreateFileA(savePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
if (hFile != INVALID_HANDLE_VALUE)
{
LARGE_INTEGER fileSize;
GetFileSizeEx(hFile, &fileSize);
if (fileSize.QuadPart > 0 && fileSize.QuadPart < 256 * 1024 * 1024)
{
LPVOID saveBuffer = new unsigned char[(size_t)fileSize.QuadPart];
DWORD bytesRead = 0;
if (ReadFile(hFile, saveBuffer, (DWORD)fileSize.QuadPart, &bytesRead, NULL) && bytesRead == fileSize.QuadPart)
{
param->saveData = new LoadSaveDataThreadParam(saveBuffer, fileSize.QuadPart, levelNameW);
printf("Loading save '%s' (%lld bytes)\n", levelNameA, fileSize.QuadPart);
}
else
{
delete[] (unsigned char*)saveBuffer;
printf("Failed to read save file, creating new world.\n");
}
}
CloseHandle(hFile);
}
else
{
printf("No existing save found at %s, creating new world.\n", savePath);
}
g_NetworkManager.ServerStoppedCreate(true);
g_NetworkManager.ServerReadyCreate(true);
@ -1499,6 +1575,20 @@ static int RunHeadlessServer()
printf("Stopping server...\n");
fflush(stdout);
// force everything to save before shutdown
MinecraftServer* shutdownServer = MinecraftServer::getInstance();
if (shutdownServer != NULL)
{
printf("Saving world...\n");
fflush(stdout);
PlayerList* pl = shutdownServer->getPlayers();
if (pl != NULL)
pl->saveAll(NULL, false);
shutdownServer->saveWorldToDisk();
printf("World saved.\n");
fflush(stdout);
}
app.m_bShutdown = true;
MinecraftServer::HaltServer();
g_NetworkManager.LeaveGame(false);