Merge branch 'master' into ViewDistance

CMakeLists.txt

@@ -37,6 +37,21 @@ if(DEFINED ENV{MCSERVER_BUILD_ID})
 	endif()
 endif()
 
+# We need C++11 features, Visual Studio has those from VS2012, but it needs a new platform toolset for those; VS2013 supports them natively:
+# Adapted from http://binglongx.wordpress.com/2013/06/28/set-non-default-platform-toolset-in-cmake/
+if(MSVC OR MSVC_IDE)
+  if( MSVC_VERSION LESS 1700 )       # VC10- / VS2010-
+    message(FATAL_ERROR "The project requires C++11 features. "
+      "You need at least Visual Studio 11 (Microsoft Visual Studio 2012), "
+      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).")
+  elseif( MSVC_VERSION EQUAL 1700 )  # VC11 / VS2012
+    message( "VC11: using Microsoft Visual Studio 2012 "
+      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" )
+    set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE)
+  else() # VC12+, assuming C++11 supported.
+  endif()
+endif()
+
 # This has to be done before any flags have been set up.
 if(${BUILD_TOOLS})
 	add_subdirectory(Tools/MCADefrag/)

MCServer/Plugins/APIDump/APIDesc.lua

@@ -2137,6 +2137,7 @@ cPluginManager.AddHook(cPluginManager.HOOK_CHAT, OnChatMessage);
 				BroadcastChatWarning = { Params = "MessageText", Return = "", Notes = "Broadcasts the specified message to all players, with its message type set to mtWarning. Use for concerning events, such as plugin reload etc." },
 				CreateAndInitializeWorld = { Params = "WorldName", Return = "{{cWorld|cWorld}}", Notes = "Creates a new world and initializes it. If there is a world whith the same name it returns nil.<br/><br/><b>NOTE</b>This function is currently unsafe, do not use!" },
 				FindAndDoWithPlayer = { Params = "PlayerName, CallbackFunction", Return = "", Notes = "Calls the given callback function for all players with names partially (or fully) matching the name string provided." },
+				DoWithPlayerByUUID = { Params = "PlayerUUID, CallbackFunction, [CallbackData]", Return = "bool", Notes = "If there is the player with the uuid, calls the CallbackFunction with the {{cPlayer}} parameter representing the player. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cPlayer|Player}}, [CallbackData])</pre> The function returns false if the player was not found, or whatever bool value the callback returned if the player was found." },
 				ForEachPlayer = { Params = "CallbackFunction", Return = "", Notes = "Calls the given callback function for each player. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cPlayer|cPlayer}})</pre>" },
 				ForEachWorld = { Params = "CallbackFunction", Return = "", Notes = "Calls the given callback function for each world. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cWorld|cWorld}})</pre>" },
 				Get = { Params = "", Return = "Root object", Notes = "(STATIC)This function returns the cRoot object." },
@@ -2406,6 +2407,7 @@ end
 					{ Params = "{{Vector3i|BlockCoords}}, BlockType, BlockMeta", Return = "", Notes = "Sets the block at the specified coords, without waking up the simulators or replacing the block entities for the previous block type. Do not use if the block being replaced has a block entity tied to it!" },
 				},
 				FindAndDoWithPlayer = { Params = "PlayerNameHint, CallbackFunction, [CallbackData]", Return = "bool", Notes = "If there is a player of a name similar to the specified name (weighted-match), calls the CallbackFunction with the {{cPlayer}} parameter representing the player. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cPlayer|Player}}, [CallbackData])</pre> The function returns false if the player was not found, or whatever bool value the callback returned if the player was found. Note that the name matching is very loose, so it is a good idea to check the player name in the callback function." },
+				DoWithPlayerByUUID = { Params = "PlayerUUID, CallbackFunction, [CallbackData]", Return = "bool", Notes = "If there is the player with the uuid, calls the CallbackFunction with the {{cPlayer}} parameter representing the player. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cPlayer|Player}}, [CallbackData])</pre> The function returns false if the player was not found, or whatever bool value the callback returned if the player was found." },
 				ForEachBlockEntityInChunk = { Params = "ChunkX, ChunkZ, CallbackFunction, [CallbackData]", Return = "bool", Notes = "Calls the specified callback for each block entity in the chunk. Returns true if all block entities in the chunk have been processed (including when there are zero block entities), or false if the callback has aborted the enumeration by returning true. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cBlockEntity|BlockEntity}}, [CallbackData])</pre> The callback should return false or no value to continue with the next block entity, or true to abort the enumeration. Use {{tolua}}.cast() to cast the Callback's BlockEntity parameter to the correct {{cBlockEntity}} descendant." },
 				ForEachChestInChunk = { Params = "ChunkX, ChunkZ, CallbackFunction, [CallbackData]", Return = "bool", Notes = "Calls the specified callback for each chest in the chunk. Returns true if all chests in the chunk have been processed (including when there are zero chests), or false if the callback has aborted the enumeration by returning true. The CallbackFunction has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cChestEntity|ChestEntity}}, [CallbackData])</pre> The callback should return false or no value to continue with the next chest, or true to abort the enumeration." },
 				ForEachEntity = { Params = "CallbackFunction, [CallbackData]", Return = "bool", Notes = "Calls the specified callback for each entity in the loaded world. Returns true if all the entities have been processed (including when there are zero entities), or false if the callback function has aborted the enumeration by returning true. The callback function has the following signature: <pre class=\"prettyprint lang-lua\">function Callback({{cEntity|Entity}}, [CallbackData])</pre> The callback should return false or no value to continue with the next entity, or true to abort the enumeration." },

MCServer/webadmin/files/guest.html

@@ -0,0 +1,2 @@
+Hello! Welcome to the MCServer WebAdmin.<br>
+This is a default message, edit <b>files/guest.html</b> to add your own custom message.

MCServer/webadmin/files/login.css

@@ -0,0 +1,219 @@
+/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */
+* {
+    margin: 0;
+}
+
+body {
+    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+    -webkit-font-smoothing: antialiased;
+    background: #fff url(header.png) repeat-x top left;
+    width: 100%;
+    min-width: 100%;
+    overflow: hidden;
+}
+
+a:link {
+    color: #555;
+    text-decoration: none;
+}
+
+a:visited {
+    color: #444;
+    text-decoration: none;
+}
+
+a:hover, a:active {
+    color: #000;
+    text-decoration: underline;
+}
+
+img {
+    border: none;
+}
+
+h1 {
+    color: #069;
+}
+
+.row1 {
+    border-bottom: 1px solid #000;
+    height: 100px;
+    max-height: 100px;
+}
+
+.row2 {
+    margin: 0 auto;
+    text-align: center;
+    vertical-align: middle;
+}
+
+.contention {
+    color: #000;
+    text-align: left;
+    line-height: 1.4;
+    margin: 0;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
+    font-size: 13px;
+}
+
+button {
+    background: #fff;
+    color: #000;
+    border: 1px solid #ccc;
+    padding: 3px;
+    font-family: Tahoma,Verdana,Arial,Sans-Serif;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    margin: -3px 0;
+}
+
+button:hover {
+    border-top-color: #28597a;
+    background: #28597a;
+    color: #ccc;
+}
+
+button:active {
+    border-top-color: #1b435e;
+    background: #1b435e;
+}
+
+.push10 {
+    padding-bottom: 75px;
+}
+
+#panel .upper {
+    background: #dcdbdc url(tcat.png) repeat-x;
+    border-top: 1px solid #fff;
+    border-bottom: 1px solid #bbb;
+    padding: 7px;
+}
+
+#footer {
+    z-index: 99999;
+}
+
+#footer ul.menu {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+#footer ul.menu li {
+    margin: 0 5px;
+    display: inline;
+}
+
+#footer .upper {
+    background: #dcdbdc url(tcat.png) repeat-x;
+    border-top: 1px solid #bbb;
+    padding: 6px;
+    overflow: hidden;
+    font-size: 12px;
+}
+
+#footer .upper ul.bottom_links {
+    float: left;
+    margin: 3px 0 0 -5px;
+}
+
+#footer .lower {
+    background: #a1a2a2 url(thead.png) top left repeat-x;
+    color: #fff;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ddd;
+    overflow: hidden;
+    padding: 8px;
+    font-size: 11px;
+}
+
+#footer .lower a:link, #footer .lower a:visited {
+    color: #fff;
+    font-weight: 700;
+}
+
+#footer .lower a:hover, #footer .lower a:active {
+    color: #fff;
+    font-weight: 700;
+}
+
+#footer .lower #current_time {
+    float: right;
+    padding-right: 6px;
+}
+
+.wrapper {
+    width: 85%;
+    min-width: 970px;
+    max-width: 1500px;
+    margin: auto;
+}
+
+#footer {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 60px;
+    width: 100%;
+    background: #999;
+    border-top: 1px #000 solid;
+}
+
+* html #footer {
+    position: absolute;
+    top: expression((0-(footer.offsetHeight)+(document.documentElement.clientHeight ? document.documentElement.clientHeight : document.body.clientHeight)+(ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop))+'px');
+}
+
+tr td.trow2:first-child {
+    border-left: 0;
+}
+
+tr td.trow2:last-child {
+    border-right: 0;
+}
+
+.tborder {
+    -moz-border-radius: 7px;
+    -webkit-border-radius: 7px;
+    border-radius: 7px;
+}
+
+.thead, .rounded_top {
+    -moz-border-radius-topleft: 6px;
+    -moz-border-radius-topright: 6px;
+    -webkit-border-top-left-radius: 6px;
+    -webkit-border-top-right-radius: 6px;
+    border-top-left-radius: 6px;
+    border-top-right-radius: 6px;
+}
+
+table {
+    color: #000;
+    font-size: 13px;
+}
+
+.tborder {
+    background: #fff;
+    width: 100%;
+    margin: auto;
+    border: 1px solid #ccc;
+    padding: 1px;
+}
+
+.thead {
+    background: #a1a2a2 url(thead.png) top left repeat-x;
+    color: #fff;
+    border-bottom: 1px solid #8e8f8f;
+    padding: 8px;
+}
+
+.trow2 {
+    background: #efefef;
+    border: 1px solid;
+    border-color: #fff #ddd #ddd #fff;
+}
+
+.padtopp {
+    padding-top: 25px;
+}