From ff91a3317d76eea77f5e8c1e80b459524c1a061a Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 3 Aug 2013 17:24:06 +0100 Subject: Updated inbuilt commands description Did this to meet help format standards. --- source/Server.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/Server.cpp b/source/Server.cpp index 67a02f626..55a42cd44 100644 --- a/source/Server.cpp +++ b/source/Server.cpp @@ -1,4 +1,3 @@ - // ReDucTor is an awesome guy who helped me a lot #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules @@ -481,11 +480,11 @@ void cServer::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallbac void cServer::BindBuiltInConsoleCommands(void) { cPluginManager * PlgMgr = cPluginManager::Get(); - PlgMgr->BindConsoleCommand("restart", NULL, "Restarts the server cleanly"); - PlgMgr->BindConsoleCommand("stop", NULL, "Stops the server cleanly"); - PlgMgr->BindConsoleCommand("chunkstats", NULL, "Displays detailed chunk memory statistics"); + PlgMgr->BindConsoleCommand("restart", NULL, " - Restarts the server cleanly"); + PlgMgr->BindConsoleCommand("stop", NULL, " - Stops the server cleanly"); + PlgMgr->BindConsoleCommand("chunkstats", NULL, " - Displays detailed chunk memory statistics"); #if defined(_MSC_VER) && defined(_DEBUG) && defined(ENABLE_LEAK_FINDER) - PlgMgr->BindConsoleCommand("dumpmem", NULL, "Dumps all used memory blocks together with their callstacks into memdump.xml"); + PlgMgr->BindConsoleCommand("dumpmem", NULL, " - Dumps all used memory blocks together with their callstacks into memdump.xml"); #endif } -- cgit v1.2.3 From 046f4be0066c3a0970d8b288597d250fffb690d4 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 3 Aug 2013 17:40:56 +0100 Subject: Added README Credits from startup sequence. --- MCServer/README.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 MCServer/README.txt diff --git a/MCServer/README.txt b/MCServer/README.txt new file mode 100644 index 000000000..cd0467ae1 --- /dev/null +++ b/MCServer/README.txt @@ -0,0 +1,18 @@ +/============================\ +| Custom Minecraft Server | +| Created by Kevin Bansberg | +| A.K.A. FakeTruth | +| Monsters by Alex Sonek | +| A.K.A. Duralex | +| Stuff by Mattes D | +| A.K.A. _Xoft(o) | +|============================| +| Info: WWW.MC-SERVER.ORG | +| WWW.AE-C.NET\n") | +| WWW.RBTHINKTANK.COM | +| Mail: faketruth@gmail.com | +\============================/ + + +Compatible clients: 1.2.4, 1.2.5, 1.3.1, 1.3.2, 1.4.2, 1.4.4, 1.4.5, 1.4.6, 1.4.7, 1.5, 1.5.1, 1.5.2, 1.6.1, 1.6.2 +Compatible protocol versions: 29, 39, 47, 49, 51, 60, 61, 73, 74 -- cgit v1.2.3 From 2383977fe76287f4a3cc93c802d83966726ee8a4 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 3 Aug 2013 17:45:24 +0100 Subject: Rm'd startup credits & mv'd to README Removed as I feel it serves no purpose other than spam console and bury real error messages from plugins, etc. This is especially the case with running under screen, which makes it very difficult to scroll up or down. --- source/Server.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/source/Server.cpp b/source/Server.cpp index 55a42cd44..b78df8d00 100644 --- a/source/Server.cpp +++ b/source/Server.cpp @@ -129,23 +129,6 @@ bool cServer::InitServer(cIniFile & a_SettingsIni) return false; } - printf("/============================\\\n"); - printf("| Custom Minecraft Server |\n"); - printf("| Created by Kevin Bansberg |\n"); - printf("| A.K.A. FakeTruth |\n"); - printf("| Monsters by Alex Sonek |\n"); - printf("| A.K.A. Duralex |\n"); - printf("| Stuff by Mattes D |\n"); - printf("| A.K.A. _Xoft(o) |\n"); - printf("\\============================/\n"); - printf("More info: WWW.MC-SERVER.ORG\n"); - printf(" WWW.AE-C.NET\n"); - printf(" WWW.RBTHINKTANK.COM\n"); - printf("email: faketruth@gmail.com\n\n"); - - LOG("Starting up server."); - LOGINFO("Compatible clients: %s", MCS_CLIENT_VERSIONS); - LOGINFO("Compatible protocol versions %s", MCS_PROTOCOL_VERSIONS); if (cSocket::WSAStartup() != 0) // Only does anything on Windows, but whatever { -- cgit v1.2.3 From e3ddfbc5667b33d6d3ddb753f7546eb29e320156 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 3 Aug 2013 17:49:38 +0100 Subject: Commented out groups spam Further reduces chance of error message burying. --- source/GroupManager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/GroupManager.cpp b/source/GroupManager.cpp index a474de9cb..396ad2e2f 100644 --- a/source/GroupManager.cpp +++ b/source/GroupManager.cpp @@ -1,4 +1,3 @@ - #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "GroupManager.h" @@ -88,7 +87,7 @@ cGroupManager::cGroupManager() for( unsigned int i = 0; i < Split.size(); i++) { Group->AddPermission( Split[i] ); - LOGINFO("Permission: %s", Split[i].c_str() ); + //LOGINFO("Permission: %s", Split[i].c_str() ); } } @@ -102,7 +101,7 @@ cGroupManager::cGroupManager() } } } - LOG("-- Done Loading Groups --"); + LOG("-- Groups Successfully Loaded --"); } -- cgit v1.2.3 From e585600e411a6b0bd9b6cf52d5a369d9983388d6 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sat, 3 Aug 2013 18:29:49 +0100 Subject: Revert "Rm'd startup credits & mv'd to README" This reverts commit 2383977fe76287f4a3cc93c802d83966726ee8a4. --- source/Server.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/source/Server.cpp b/source/Server.cpp index b78df8d00..55a42cd44 100644 --- a/source/Server.cpp +++ b/source/Server.cpp @@ -129,6 +129,23 @@ bool cServer::InitServer(cIniFile & a_SettingsIni) return false; } + printf("/============================\\\n"); + printf("| Custom Minecraft Server |\n"); + printf("| Created by Kevin Bansberg |\n"); + printf("| A.K.A. FakeTruth |\n"); + printf("| Monsters by Alex Sonek |\n"); + printf("| A.K.A. Duralex |\n"); + printf("| Stuff by Mattes D |\n"); + printf("| A.K.A. _Xoft(o) |\n"); + printf("\\============================/\n"); + printf("More info: WWW.MC-SERVER.ORG\n"); + printf(" WWW.AE-C.NET\n"); + printf(" WWW.RBTHINKTANK.COM\n"); + printf("email: faketruth@gmail.com\n\n"); + + LOG("Starting up server."); + LOGINFO("Compatible clients: %s", MCS_CLIENT_VERSIONS); + LOGINFO("Compatible protocol versions %s", MCS_PROTOCOL_VERSIONS); if (cSocket::WSAStartup() != 0) // Only does anything on Windows, but whatever { -- cgit v1.2.3 From 3255c29e7a4ebd1eb12a55d4e32ed8e87c9c72e4 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sat, 3 Aug 2013 18:36:04 +0100 Subject: Removed some stuff again. --- source/Server.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/source/Server.cpp b/source/Server.cpp index 55a42cd44..b07c65f04 100644 --- a/source/Server.cpp +++ b/source/Server.cpp @@ -129,20 +129,6 @@ bool cServer::InitServer(cIniFile & a_SettingsIni) return false; } - printf("/============================\\\n"); - printf("| Custom Minecraft Server |\n"); - printf("| Created by Kevin Bansberg |\n"); - printf("| A.K.A. FakeTruth |\n"); - printf("| Monsters by Alex Sonek |\n"); - printf("| A.K.A. Duralex |\n"); - printf("| Stuff by Mattes D |\n"); - printf("| A.K.A. _Xoft(o) |\n"); - printf("\\============================/\n"); - printf("More info: WWW.MC-SERVER.ORG\n"); - printf(" WWW.AE-C.NET\n"); - printf(" WWW.RBTHINKTANK.COM\n"); - printf("email: faketruth@gmail.com\n\n"); - LOG("Starting up server."); LOGINFO("Compatible clients: %s", MCS_CLIENT_VERSIONS); LOGINFO("Compatible protocol versions %s", MCS_PROTOCOL_VERSIONS); -- cgit v1.2.3 From b3906500c74375125708690c01382c730b84437a Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sat, 3 Aug 2013 20:41:26 +0200 Subject: Removed all example ini files from Install. They are copied from MCServer by the nightbuild script. --- Install/.gitignore | 3 ++- Install/Zip2008.list | 7 ++----- Install/banned.example.ini | 3 --- Install/groups.example.ini | 17 ----------------- Install/settings.example.ini | 31 ------------------------------- Install/users.example.ini | 8 -------- Install/webadmin.example.ini | 6 ------ Install/whitelist.example.ini | 6 ------ MCServer/banned.example.ini | 3 +++ MCServer/groups.example.ini | 17 +++++++++++++++++ MCServer/groups.ini | 17 ----------------- MCServer/users.example.ini | 23 +++++++++++++++++++++++ MCServer/users.ini | 23 ----------------------- MCServer/whitelist.example.ini | 6 ++++++ Nightbuild2008.cmd | 3 +++ UpdateVersions.cmd | 39 --------------------------------------- 16 files changed, 56 insertions(+), 156 deletions(-) delete mode 100644 Install/banned.example.ini delete mode 100644 Install/groups.example.ini delete mode 100644 Install/settings.example.ini delete mode 100644 Install/users.example.ini delete mode 100644 Install/webadmin.example.ini delete mode 100644 Install/whitelist.example.ini create mode 100644 MCServer/banned.example.ini create mode 100644 MCServer/groups.example.ini delete mode 100644 MCServer/groups.ini create mode 100644 MCServer/users.example.ini delete mode 100644 MCServer/users.ini create mode 100644 MCServer/whitelist.example.ini delete mode 100644 UpdateVersions.cmd diff --git a/Install/.gitignore b/Install/.gitignore index 4f8f2e7cb..3b0a53050 100644 --- a/Install/.gitignore +++ b/Install/.gitignore @@ -1,3 +1,4 @@ MCServer.exe *.7z -*.tag \ No newline at end of file +*.tag +*.example.ini \ No newline at end of file diff --git a/Install/Zip2008.list b/Install/Zip2008.list index b611bf832..0b45d81f3 100644 --- a/Install/Zip2008.list +++ b/Install/Zip2008.list @@ -6,13 +6,10 @@ ..\MCServer\items.ini ..\MCServer\monsters.ini MCServer*debug.cmd -banned.example.ini -groups.example.ini +*.example.ini Lua-LICENSE.txt LuaExpat-license.html LuaSQLite3-LICENSE.txt MersenneTwister-LICENSE.txt settings.example.ini -users.example.ini -webadmin.example.ini -whitelist.example.ini \ No newline at end of file +webadmin.example.ini \ No newline at end of file diff --git a/Install/banned.example.ini b/Install/banned.example.ini deleted file mode 100644 index ba53ec59f..000000000 --- a/Install/banned.example.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Banned] -;PlayerName=1 - diff --git a/Install/groups.example.ini b/Install/groups.example.ini deleted file mode 100644 index 87b28b70d..000000000 --- a/Install/groups.example.ini +++ /dev/null @@ -1,17 +0,0 @@ -[Admins] -Permissions=* -Color=c - -[Mods] -Color=5 -Inherits=Vips -Permissions=core.time,core.item - -[Vips] -Permissions=core.teleport -Color=2 -Inherits=Default - -[Default] -Permissions=core.build,core.help,core.playerlist,core.pluginlist,core.spawn -Color=7 \ No newline at end of file diff --git a/Install/settings.example.ini b/Install/settings.example.ini deleted file mode 100644 index 46f92ef74..000000000 --- a/Install/settings.example.ini +++ /dev/null @@ -1,31 +0,0 @@ -[Server] -Port=25565 -MaxPlayers=42 -Description=MCServer - Slightly more custom! - -[Worlds] -DefaultWorld=world -;World=world_sexy - -[Plugins] -NewPlugin=Core -NewPlugin=ChatLog - -[HelpPlugin] -ShowPluginNames=1 - -[Physics] -Water=0 - -[Redstone] -SimulateRedstone=0 - -[Monsters] -AnimalsOn=0 -AnimalSpawnInterval=10 -Types=Spider,Chicken,Cow,Pig,Sheep,Squid,Enderman,Zombiepigman,Cavespider,Creeper,Ghast,Silverfish,Skeleton,Slime,Spider,Zombie - -[Authentication] -Server=session.minecraft.net -Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID% -Authenticate=0 diff --git a/Install/users.example.ini b/Install/users.example.ini deleted file mode 100644 index 2065d3e37..000000000 --- a/Install/users.example.ini +++ /dev/null @@ -1,8 +0,0 @@ -[SomeAdmin] -Groups=Admins - -[FancyModerator] -Groups=Moderators - -[ImportantPerson] -Groups=Vips \ No newline at end of file diff --git a/Install/webadmin.example.ini b/Install/webadmin.example.ini deleted file mode 100644 index 5d6b24063..000000000 --- a/Install/webadmin.example.ini +++ /dev/null @@ -1,6 +0,0 @@ -[WebAdmin] -Enabled=1 -Port=8080 - -[User:admin] -Password=admin \ No newline at end of file diff --git a/Install/whitelist.example.ini b/Install/whitelist.example.ini deleted file mode 100644 index 7e06ba8d4..000000000 --- a/Install/whitelist.example.ini +++ /dev/null @@ -1,6 +0,0 @@ -[WhiteListSettings] -WhiteListOn=0 - -[WhiteList] -;PlayerName=1 - diff --git a/MCServer/banned.example.ini b/MCServer/banned.example.ini new file mode 100644 index 000000000..ceb71fe0b --- /dev/null +++ b/MCServer/banned.example.ini @@ -0,0 +1,3 @@ +[Banned] +;PlayerName=1 + diff --git a/MCServer/groups.example.ini b/MCServer/groups.example.ini new file mode 100644 index 000000000..87b28b70d --- /dev/null +++ b/MCServer/groups.example.ini @@ -0,0 +1,17 @@ +[Admins] +Permissions=* +Color=c + +[Mods] +Color=5 +Inherits=Vips +Permissions=core.time,core.item + +[Vips] +Permissions=core.teleport +Color=2 +Inherits=Default + +[Default] +Permissions=core.build,core.help,core.playerlist,core.pluginlist,core.spawn +Color=7 \ No newline at end of file diff --git a/MCServer/groups.ini b/MCServer/groups.ini deleted file mode 100644 index 87b28b70d..000000000 --- a/MCServer/groups.ini +++ /dev/null @@ -1,17 +0,0 @@ -[Admins] -Permissions=* -Color=c - -[Mods] -Color=5 -Inherits=Vips -Permissions=core.time,core.item - -[Vips] -Permissions=core.teleport -Color=2 -Inherits=Default - -[Default] -Permissions=core.build,core.help,core.playerlist,core.pluginlist,core.spawn -Color=7 \ No newline at end of file diff --git a/MCServer/users.example.ini b/MCServer/users.example.ini new file mode 100644 index 000000000..6726c0bf8 --- /dev/null +++ b/MCServer/users.example.ini @@ -0,0 +1,23 @@ +[FakeTruth] +Groups=Admins + +[Duralex] +Groups=Admins + +[Luthrandel] +Groups=Admins + +[cruisecho] +Groups=Admins + +[Kwen] +Groups=Admins + +[aloe_vera] +Groups=Admins + +[xoft] +Groups=Admins + +[Player] +Groups=Admins \ No newline at end of file diff --git a/MCServer/users.ini b/MCServer/users.ini deleted file mode 100644 index 6726c0bf8..000000000 --- a/MCServer/users.ini +++ /dev/null @@ -1,23 +0,0 @@ -[FakeTruth] -Groups=Admins - -[Duralex] -Groups=Admins - -[Luthrandel] -Groups=Admins - -[cruisecho] -Groups=Admins - -[Kwen] -Groups=Admins - -[aloe_vera] -Groups=Admins - -[xoft] -Groups=Admins - -[Player] -Groups=Admins \ No newline at end of file diff --git a/MCServer/whitelist.example.ini b/MCServer/whitelist.example.ini new file mode 100644 index 000000000..a89c148c9 --- /dev/null +++ b/MCServer/whitelist.example.ini @@ -0,0 +1,6 @@ +[WhiteListSettings] +WhiteListOn=0 + +[WhiteList] +;PlayerName=1 + diff --git a/Nightbuild2008.cmd b/Nightbuild2008.cmd index fdd5d3de1..11e2b3683 100644 --- a/Nightbuild2008.cmd +++ b/Nightbuild2008.cmd @@ -92,6 +92,9 @@ if errorlevel 1 goto haderror +:: Copy all the example ini files into the Install folder for zipping: +copy MCServer\*.example.ini Install\*.example.ini + :: Use 7-zip to compress the resulting files into a single file: set FILESUFFIX=%MYYEAR%_%MYMONTH%_%MYDAY%_%MYTIME%_%COMMITID% echo FILESUFFIX=%FILESUFFIX% diff --git a/UpdateVersions.cmd b/UpdateVersions.cmd deleted file mode 100644 index 1d4b00bca..000000000 --- a/UpdateVersions.cmd +++ /dev/null @@ -1,39 +0,0 @@ -@echo off -:: UpdateVersions.cmd -:: This script processes all *.template files into their non-templated variants using subwcrev, substituting WC-related keywords in the process -:: subwcrev is expected to be in path; you can pass the correct path for your system as env var "subwcrev" - - -:: Subwcrev (from TortoiseSVN, for querying revision number; by default in PATH): -if %subwcrev%a == a set subwcrev=subwcrev - - - - -:: Copy all *.template files into their non-template versions, substituting SVN keywords: -for /r %%X in (*.template) do ( - %subwcrev% . "%%X" "%%~dpX%%~nX" - if errorlevel 1 goto haderror -) - - -goto end - - - - -:haderror -echo an error was encountered, check command output above -pause -goto finished - - - - - -:end -if "a%1" == "a" pause - - - -:finished \ No newline at end of file -- cgit v1.2.3