From 82d9ac1e1c95eb3421e062be2334308ee3837560 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 25 Sep 2015 10:14:17 +0200 Subject: Namechange to Cuberite --- src/Bindings/PluginLua.h | 4 ++-- src/Bindings/PluginManager.cpp | 2 +- src/BiomeDef.h | 2 +- src/ChunkDef.h | 4 ++-- src/Globals.h | 2 +- src/HTTPServer/HTTPServer.cpp | 2 +- src/LoggerListeners.cpp | 2 +- src/Mobs/Monster.cpp | 2 +- src/Mobs/Path.h | 2 +- src/PolarSSL++/SslContext.cpp | 2 +- src/Protocol/Authenticator.cpp | 4 ++-- src/Protocol/Authenticator.h | 4 ++-- src/Protocol/MojangAPI.cpp | 4 ++-- src/Protocol/Protocol17x.cpp | 6 +++--- src/Protocol/Protocol18x.cpp | 4 ++-- src/Root.cpp | 2 +- src/Server.cpp | 2 +- src/WebAdmin.cpp | 10 +++++----- src/WorldStorage/NBTChunkSerializer.cpp | 2 +- src/WorldStorage/WSSAnvil.cpp | 2 +- src/main.cpp | 12 ++++++------ 21 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/Bindings/PluginLua.h b/src/Bindings/PluginLua.h index 4344b36ac..1312103b8 100644 --- a/src/Bindings/PluginLua.h +++ b/src/Bindings/PluginLua.h @@ -14,8 +14,8 @@ #include "LuaState.h" // Names for the global variables through which the plugin is identified in its LuaState -#define LUA_PLUGIN_NAME_VAR_NAME "_MCServerInternal_PluginName" -#define LUA_PLUGIN_INSTANCE_VAR_NAME "_MCServerInternal_PluginInstance" +#define LUA_PLUGIN_NAME_VAR_NAME "_CuberiteInternal_PluginName" +#define LUA_PLUGIN_INSTANCE_VAR_NAME "_CuberiteInternal_PluginInstance" diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp index 026865f5b..72e031b33 100644 --- a/src/Bindings/PluginManager.cpp +++ b/src/Bindings/PluginManager.cpp @@ -1761,7 +1761,7 @@ bool cPluginManager::BindConsoleCommand(const AString & a_Command, cPlugin * a_P { if (cmd->second.m_Plugin == nullptr) { - LOGWARNING("Console command \"%s\" is already bound internally by MCServer, cannot bind in plugin \"%s\".", a_Command.c_str(), a_Plugin->GetName().c_str()); + LOGWARNING("Console command \"%s\" is already bound internally by Cuberite, cannot bind in plugin \"%s\".", a_Command.c_str(), a_Plugin->GetName().c_str()); } else { diff --git a/src/BiomeDef.h b/src/BiomeDef.h index 48726123c..0fad23100 100644 --- a/src/BiomeDef.h +++ b/src/BiomeDef.h @@ -16,7 +16,7 @@ // tolua_begin /** Biome IDs The first batch corresponds to the clientside biomes, used by MineCraft. -BiomeIDs over 255 are used by MCServer internally and are translated to MC biomes before sending them to client +BiomeIDs over 255 are used by Cuberite internally and are translated to MC biomes before sending them to client */ enum EMCSBiome { diff --git a/src/ChunkDef.h b/src/ChunkDef.h index 7af0ef630..f6c0381db 100644 --- a/src/ChunkDef.h +++ b/src/ChunkDef.h @@ -68,8 +68,8 @@ public: /** The type used for any heightmap operations and storage; idx = x + Width * z; Height points to the highest non-air block in the column */ typedef HEIGHTTYPE HeightMap[Width * Width]; - /** The type used for any biomemap operations and storage inside MCServer, - using MCServer biomes (need not correspond to client representation!) + /** The type used for any biomemap operations and storage inside Cuberite, + using Cuberite biomes (need not correspond to client representation!) idx = x + Width * z */ typedef EMCSBiome BiomeMap[Width * Width]; diff --git a/src/Globals.h b/src/Globals.h index a69a64452..2ee8574ba 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -225,7 +225,7 @@ template class SizeChecker; #endif #if defined(ANDROID_NDK) - #define FILE_IO_PREFIX "/sdcard/mcserver/" + #define FILE_IO_PREFIX "/sdcard/Cuberite/" #else #define FILE_IO_PREFIX "" #endif diff --git a/src/HTTPServer/HTTPServer.cpp b/src/HTTPServer/HTTPServer.cpp index 7a6303b1f..bbff5d57a 100644 --- a/src/HTTPServer/HTTPServer.cpp +++ b/src/HTTPServer/HTTPServer.cpp @@ -83,7 +83,7 @@ class cDebugCallbacks : { if (!a_Request.HasAuth() || (a_Request.GetAuthUsername() != "a") || (a_Request.GetAuthPassword() != "b")) { - a_Connection.SendNeedAuth("MCServer WebAdmin"); + a_Connection.SendNeedAuth("Cuberite WebAdmin"); return; } } diff --git a/src/LoggerListeners.cpp b/src/LoggerListeners.cpp index 3b6ed2147..ed10e648c 100644 --- a/src/LoggerListeners.cpp +++ b/src/LoggerListeners.cpp @@ -190,7 +190,7 @@ break; } } - __android_log_print(AndroidLogLevel, "MCServer", "%s", a_Message.c_str()); + __android_log_print(AndroidLogLevel, "Cuberite", "%s", a_Message.c_str()); } }; diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index fa86f28ae..b28e94ec1 100644 --- a/src/Mobs/Monster.cpp +++ b/src/Mobs/Monster.cpp @@ -912,7 +912,7 @@ eMonsterType cMonster::StringToMobType(const AString & a_Name) { AString lcName = StrToLower(a_Name); - // Search MCServer name: + // Search Cuberite name: for (size_t i = 0; i < ARRAYCOUNT(g_MobTypeNames); i++) { if (strcmp(g_MobTypeNames[i].m_lcName, lcName.c_str()) == 0) diff --git a/src/Mobs/Path.h b/src/Mobs/Path.h index d42bb77bc..69a05f651 100644 --- a/src/Mobs/Path.h +++ b/src/Mobs/Path.h @@ -10,7 +10,7 @@ class cPath; #include "../FastRandom.h" #ifdef COMPILING_PATHFIND_DEBUGGER /* Note: the COMPILING_PATHFIND_DEBUGGER flag is used by Native / WiseOldMan95 to debug - this class outside of MCServer. This preprocessor flag is never set when compiling MCServer. */ + this class outside of Cuberite. This preprocessor flag is never set when compiling Cuberite. */ #include "PathFinderIrrlicht_Head.h" #endif diff --git a/src/PolarSSL++/SslContext.cpp b/src/PolarSSL++/SslContext.cpp index 1409405bc..90e0ae0e2 100644 --- a/src/PolarSSL++/SslContext.cpp +++ b/src/PolarSSL++/SslContext.cpp @@ -50,7 +50,7 @@ int cSslContext::Initialize(bool a_IsClient, const SharedPtr & if (m_CtrDrbg.get() == nullptr) { m_CtrDrbg.reset(new cCtrDrbgContext); - m_CtrDrbg->Initialize("MCServer", 8); + m_CtrDrbg->Initialize("Cuberite", 8); } // Initialize PolarSSL's structures: diff --git a/src/Protocol/Authenticator.cpp b/src/Protocol/Authenticator.cpp index bfbe5028d..304486935 100644 --- a/src/Protocol/Authenticator.cpp +++ b/src/Protocol/Authenticator.cpp @@ -149,7 +149,7 @@ bool cAuthenticator::AuthWithYggdrasil(AString & a_UserName, const AString & a_S AString Request; Request += "GET " + ActualAddress + " HTTP/1.0\r\n"; Request += "Host: " + m_Server + "\r\n"; - Request += "User-Agent: MCServer\r\n"; + Request += "User-Agent: Cuberite\r\n"; Request += "Connection: close\r\n"; Request += "\r\n"; @@ -223,7 +223,7 @@ bool cAuthenticator::GetPlayerProperties(const AString & a_UUID, Json::Value & a AString Request; Request += "GET " + ActualAddress + " HTTP/1.0\r\n"; Request += "Host: " + m_Server + "\r\n"; - Request += "User-Agent: MCServer\r\n"; + Request += "User-Agent: Cuberite\r\n"; Request += "Connection: close\r\n"; Request += "\r\n"; diff --git a/src/Protocol/Authenticator.h b/src/Protocol/Authenticator.h index 02b349256..845277569 100644 --- a/src/Protocol/Authenticator.h +++ b/src/Protocol/Authenticator.h @@ -1,10 +1,10 @@ // cAuthenticator.h -// Interfaces to the cAuthenticator class representing the thread that authenticates users against the official MC server +// Interfaces to the cAuthenticator class representing the thread that authenticates users against the official Mojang servers // Authentication prevents "hackers" from joining with an arbitrary username (possibly impersonating the server admins) // For more info, see http://wiki.vg/Session#Server_operation -// In MCS, authentication is implemented as a single thread that receives queued auth requests and dispatches them one by one. +// In Cuberite, authentication is implemented as a single thread that receives queued auth requests and dispatches them one by one. diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp index f3f9baf25..73b3bd8c0 100644 --- a/src/Protocol/MojangAPI.cpp +++ b/src/Protocol/MojangAPI.cpp @@ -688,7 +688,7 @@ void cMojangAPI::QueryNamesToUUIDs(AStringVector & a_NamesToQuery) AString Request; Request += "POST " + m_NameToUUIDAddress + " HTTP/1.0\r\n"; // We need to use HTTP 1.0 because we don't handle Chunked transfer encoding Request += "Host: " + m_NameToUUIDServer + "\r\n"; - Request += "User-Agent: MCServer\r\n"; + Request += "User-Agent: Cuberite\r\n"; Request += "Connection: close\r\n"; Request += "Content-Type: application/json\r\n"; Request += Printf("Content-Length: %u\r\n", static_cast(RequestBody.length())); @@ -802,7 +802,7 @@ void cMojangAPI::QueryUUIDToProfile(const AString & a_UUID) AString Request; Request += "GET " + Address + " HTTP/1.0\r\n"; // We need to use HTTP 1.0 because we don't handle Chunked transfer encoding Request += "Host: " + m_UUIDToProfileServer + "\r\n"; - Request += "User-Agent: MCServer\r\n"; + Request += "User-Agent: Cuberite\r\n"; Request += "Connection: close\r\n"; Request += "Content-Length: 0\r\n"; Request += "\r\n"; diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index ad76480b3..d17537ff7 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -1800,7 +1800,7 @@ void cProtocol172::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) // Version: Json::Value Version; - Version["name"] = "MCServer 1.7.2"; + Version["name"] = "Cuberite 1.7.2"; Version["protocol"] = 4; // Players: @@ -2394,7 +2394,7 @@ void cProtocol172::HandleVanillaPluginMessage(cByteBuffer & a_ByteBuffer, const } // Send back our brand: - SendPluginMessage("MC|Brand", "MCServer"); + SendPluginMessage("MC|Brand", "Cuberite"); return; } else if (a_Channel == "MC|Beacon") @@ -3256,7 +3256,7 @@ void cProtocol176::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) // Version: Json::Value Version; - Version["name"] = "MCServer 1.7.6"; + Version["name"] = "Cuberite 1.7.6"; Version["protocol"] = 5; // Players: diff --git a/src/Protocol/Protocol18x.cpp b/src/Protocol/Protocol18x.cpp index ed1d3bfc1..d5ecb8023 100644 --- a/src/Protocol/Protocol18x.cpp +++ b/src/Protocol/Protocol18x.cpp @@ -2066,7 +2066,7 @@ void cProtocol180::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) // Version: Json::Value Version; - Version["name"] = "MCServer 1.8"; + Version["name"] = "Cuberite 1.8"; Version["protocol"] = 47; // Players: @@ -2671,7 +2671,7 @@ void cProtocol180::HandleVanillaPluginMessage(cByteBuffer & a_ByteBuffer, const HANDLE_READ(a_ByteBuffer, ReadVarUTF8String, AString, Brand); m_Client->SetClientBrand(Brand); // Send back our brand, including the length: - SendPluginMessage("MC|Brand", "\x08MCServer"); + SendPluginMessage("MC|Brand", "\x08Cuberite"); return; } else if (a_Channel == "MC|Beacon") diff --git a/src/Root.cpp b/src/Root.cpp index 13166d883..57056cc1b 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -121,7 +121,7 @@ void cRoot::Start(std::unique_ptr a_OverridesRepo) LOG("--- Started Log ---"); #ifdef BUILD_ID - LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID); + LOG("Cuberite " BUILD_SERIES_NAME " build id: " BUILD_ID); LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME); #endif diff --git a/src/Server.cpp b/src/Server.cpp index 313db90e6..a21248695 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -187,7 +187,7 @@ void cServer::PlayerDestroying(const cPlayer * a_Player) bool cServer::InitServer(cSettingsRepositoryInterface & a_Settings, bool a_ShouldAuth) { - m_Description = a_Settings.GetValueSet("Server", "Description", "MCServer - in C++!"); + m_Description = a_Settings.GetValueSet("Server", "Description", "Cuberite - in C++!"); m_MaxPlayers = a_Settings.GetValueSetI("Server", "MaxPlayers", 100); m_bIsHardcore = a_Settings.GetValueSetB("Server", "HardcoreEnabled", false); m_bAllowMultiLogin = a_Settings.GetValueSetB("Server", "AllowMultiLogin", false); diff --git a/src/WebAdmin.cpp b/src/WebAdmin.cpp index 91fad96c6..27294f19b 100644 --- a/src/WebAdmin.cpp +++ b/src/WebAdmin.cpp @@ -96,7 +96,7 @@ bool cWebAdmin::Init(void) if (!m_IniFile.ReadFile("webadmin.ini")) { LOGWARN("Regenerating webadmin.ini, all settings will be reset"); - m_IniFile.AddHeaderComment(" This file controls the webadmin feature of MCServer"); + m_IniFile.AddHeaderComment(" This file controls the webadmin feature of Cuberite"); m_IniFile.AddHeaderComment(" Username format: [User:*username*]"); m_IniFile.AddHeaderComment(" Password format: Password=*password*; for example:"); m_IniFile.AddHeaderComment(" [User:admin]"); @@ -131,7 +131,7 @@ bool cWebAdmin::Init(void) // Sets the fallback template: m_LoginTemplate = \ - "

MCServer WebAdmin

" \ + "

Cuberite WebAdmin

" \ "
" \ "
" \ "" \ @@ -216,7 +216,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque { if (!a_Request.HasAuth()) { - a_Connection.SendNeedAuth("MCServer WebAdmin"); + a_Connection.SendNeedAuth("Cuberite WebAdmin"); return; } @@ -224,7 +224,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque AString UserPassword = m_IniFile.GetValue("User:" + a_Request.GetAuthUsername(), "Password", ""); if ((UserPassword == "") || (a_Request.GetAuthPassword() != UserPassword)) { - a_Connection.SendNeedAuth("MCServer WebAdmin - bad username or password"); + a_Connection.SendNeedAuth("Cuberite WebAdmin - bad username or password"); return; } @@ -333,7 +333,7 @@ void cWebAdmin::HandleWebadminRequest(cHTTPConnection & a_Connection, cHTTPReque ReplaceString(Template, "{MENU}", Menu); ReplaceString(Template, "{PLUGIN_NAME}", FoundPlugin); ReplaceString(Template, "{CONTENT}", Content); - ReplaceString(Template, "{TITLE}", "MCServer"); + ReplaceString(Template, "{TITLE}", "Cuberite"); AString NumChunks; Printf(NumChunks, "%d", cRoot::Get()->GetTotalChunkCount()); diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp index f204ec52b..e2ba416c6 100644 --- a/src/WorldStorage/NBTChunkSerializer.cpp +++ b/src/WorldStorage/NBTChunkSerializer.cpp @@ -415,7 +415,7 @@ void cNBTChunkSerializer::AddFallingBlockEntity(cFallingBlock * a_FallingBlock) AddBasicEntity(a_FallingBlock, "FallingSand"); m_Writer.AddInt("TileID", a_FallingBlock->GetBlockType()); m_Writer.AddByte("Data", a_FallingBlock->GetBlockMeta()); - m_Writer.AddByte("Time", 1); // Unused in MCServer, Vanilla said to need nonzero + m_Writer.AddByte("Time", 1); // Unused in Cuberite, Vanilla said to need nonzero m_Writer.AddByte("DropItem", 1); m_Writer.AddByte("HurtEntities", a_FallingBlock->GetBlockType() == E_BLOCK_ANVIL); m_Writer.EndCompound(); diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index dc1b7faff..f0c990037 100755 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -1139,7 +1139,7 @@ cBlockEntity * cWSSAnvil::LoadMobSpawnerFromNBT(const cParsedNBT & a_NBT, int a_ std::unique_ptr MobSpawner = cpp14::make_unique(a_BlockX, a_BlockY, a_BlockZ, m_World); - // Load entity (MCServer worlds): + // Load entity (Cuberite worlds): int Type = a_NBT.FindChildByName(a_TagIdx, "Entity"); if ((Type >= 0) && (a_NBT.GetType(Type) == TAG_Short)) { diff --git a/src/main.cpp b/src/main.cpp index b9c3ae0bc..6e7dc0aff 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ bool cRoot::m_RunAsService = false; #if defined(_WIN32) SERVICE_STATUS_HANDLE g_StatusHandle = nullptr; HANDLE g_ServiceThread = INVALID_HANDLE_VALUE; - #define SERVICE_NAME "MCServerService" + #define SERVICE_NAME "CuberiteService" #endif @@ -77,10 +77,10 @@ void NonCtrlHandler(int a_Signal) case SIGSEGV: { std::signal(SIGSEGV, SIG_DFL); - LOGERROR(" D: | MCServer has encountered an error and needs to close"); + LOGERROR(" D: | Cuberite has encountered an error and needs to close"); LOGERROR("Details | SIGSEGV: Segmentation fault"); #ifdef BUILD_ID - LOGERROR("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID); + LOGERROR("Cuberite " BUILD_SERIES_NAME " build id: " BUILD_ID); LOGERROR("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME); #endif PrintStackTrace(); @@ -92,10 +92,10 @@ void NonCtrlHandler(int a_Signal) #endif { std::signal(a_Signal, SIG_DFL); - LOGERROR(" D: | MCServer has encountered an error and needs to close"); + LOGERROR(" D: | Cuberite has encountered an error and needs to close"); LOGERROR("Details | SIGABRT: Server self-terminated due to an internal fault"); #ifdef BUILD_ID - LOGERROR("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID); + LOGERROR("Cuberite " BUILD_SERIES_NAME " build id: " BUILD_ID); LOGERROR("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME); #endif PrintStackTrace(); @@ -358,7 +358,7 @@ std::unique_ptr ParseArguments(int argc, char **argv) try { // Parse the comand line args: - TCLAP::CmdLine cmd("MCServer"); + TCLAP::CmdLine cmd("Cuberite"); TCLAP::ValueArg slotsArg ("s", "max-players", "Maximum number of slots for the server to use, overrides setting in setting.ini", false, -1, "number", cmd); TCLAP::MultiArg portsArg ("p", "port", "The port number the server should listen to", false, "port", cmd); TCLAP::SwitchArg commLogArg ("", "log-comm", "Log server client communications to file", cmd); -- cgit v1.2.3