World for operations:
"..WORK_WORLD - if (OPERATION_CODE == 0) then - _small_content = _small_content .. "Operation:
Generation" - elseif (OPERATION_CODE == 1) then - _small_content = _small_content .. "Operation:
Regeneration" - end - _small_content = _small_content .. "Area:
["..AreaStartX..":"..AreaStartZ.."] ["..AreaEndX..":"..AreaEndZ.."]" - _small_content = _small_content .. "Progress:
"..CURRENT.."/"..TOTAL - _small_content = _small_content .. "" - _small_content = _small_content .. "" - return _small_content - end - if (GENERATION_STATE == 2 or GENERATION_STATE == 4) then - Content = ProcessingContent() - return Content - end - -- SELECTING - -------------------------------------------------------------------------------------------------- - if ( Request.PostParams["FormSetWorld"] ) then - WORK_WORLD = Request.PostParams["FormWorldName"] - WW_instance = cRoot:Get():GetWorld(WORK_WORLD) - end - - if( Request.PostParams["SelectWorld"] ~= nil - and Request.PostParams["WorldName"] ~= nil ) then -- World is selected! - WORK_WORLD = Request.PostParams["WorldName"] - WW_instance = cRoot:Get():GetWorld(WORK_WORLD) - end - - if(Request.PostParams["OperationGenerate"] ~= nil) then - OPERATION_CODE = 0 - end - if(Request.PostParams["OperationReGenerate"] ~= nil) then - OPERATION_CODE = 1 - end - - if (GENERATION_STATE == 0) then - if( Request.PostParams["FormAreaStartX"] ~= nil - and Request.PostParams["FormAreaStartZ"] ~= nil - and Request.PostParams["FormAreaEndX"] ~= nil - and Request.PostParams["FormAreaEndZ"] ~= nil ) then --(Re)Generation valid! - -- COMMON (Re)gen - if( Request.PostParams["StartArea"]) then - AreaStartX = tonumber(Request.PostParams["FormAreaStartX"]) - AreaStartZ = tonumber(Request.PostParams["FormAreaStartZ"]) - AreaEndX = tonumber(Request.PostParams["FormAreaEndX"]) - AreaEndZ = tonumber(Request.PostParams["FormAreaEndZ"]) - - PLUGIN.IniFile:DeleteValue("Area data", "StartX") - PLUGIN.IniFile:DeleteValue("Area data", "StartZ") - PLUGIN.IniFile:DeleteValue("Area data", "EndX") - PLUGIN.IniFile:DeleteValue("Area data", "EndZ") - PLUGIN.IniFile:SetValueI("Area data", "StartX", AreaStartX) - PLUGIN.IniFile:SetValueI("Area data", "StartZ", AreaStartZ) - PLUGIN.IniFile:SetValueI("Area data", "EndX", AreaEndX) - PLUGIN.IniFile:SetValueI("Area data", "EndZ", AreaEndZ) - if (OPERATION_CODE == 0) then - GENERATION_STATE = 1 - elseif (OPERATION_CODE == 1) then - GENERATION_STATE = 3 - end - PLUGIN.IniFile:WriteFile() - Content = ProcessingContent() - return Content - end - end - if( Request.PostParams["FormRadialX"] ~= nil - and Request.PostParams["FormRadialZ"] ~= nil - and Request.PostParams["FormRadius"] ~= nil ) then --(Re)Generation valid! - -- COMMON (Re)gen - if( Request.PostParams["StartRadial"]) then - RadialX = tonumber(Request.PostParams["FormRadialX"]) - RadialZ = tonumber(Request.PostParams["FormRadialZ"]) - Radius = tonumber(Request.PostParams["FormRadius"]) - AreaStartX = RadialX - Radius - AreaStartZ = RadialZ - Radius - AreaEndX = RadialX + Radius - AreaEndZ = RadialZ + Radius - - PLUGIN.IniFile:DeleteValue("Radial data", "RadialX") - PLUGIN.IniFile:DeleteValue("Radial data", "RadialZ") - PLUGIN.IniFile:DeleteValue("Radial data", "Radius") - PLUGIN.IniFile:SetValueI("Radial data", "RadialX", RadialX) - PLUGIN.IniFile:SetValueI("Radial data", "RadialZ", RadialZ) - PLUGIN.IniFile:SetValueI("Radial data", "Radius", Radius) - if (OPERATION_CODE == 0) then - GENERATION_STATE = 1 - elseif (OPERATION_CODE == 1) then - GENERATION_STATE = 3 - end - PLUGIN.IniFile:WriteFile() - Content = ProcessingContent() - return Content - end - end - -- POINT REGEN! - if( Request.PostParams["FormPointX"] ~= nil - and Request.PostParams["FormPointZ"] ~= nil ) then --ReGeneration valid! - -- EXACT - if ( Request.PostParams["PointExact"] ~= nil) then - AreaStartX = tonumber(Request.PostParams["FormPointX"]) - AreaStartZ = tonumber(Request.PostParams["FormPointZ"]) - AreaEndX = AreaStartX - AreaEndZ = AreaStartZ - GENERATION_STATE = 3 - Content = ProcessingContent() - return Content - end - -- 3x3 - if ( Request.PostParams["Point3x3"] ~= nil) then - AreaStartX = tonumber(Request.PostParams["FormPointX"]) - 1 - AreaStartZ = tonumber(Request.PostParams["FormPointZ"]) - 1 - AreaEndX = AreaStartX + 2 - AreaEndZ = AreaStartZ + 2 - GENERATION_STATE = 3 - Content = ProcessingContent() - return Content - end - end - - local GetAreaByPlayer = function(Player) - -- Player is valid only within this function, it cannot be stord and used later! - AreaStartX = Player:GetChunkX() - AreaStartZ = Player:GetChunkZ() - end - -- PLAYERS REGEN! - if( Request.PostParams["PlayerExact"] ~= nil - and Request.PostParams["PlayerName"] ~= nil ) then -- Making BOOM! I meant, regenereate... - cRoot:Get():GetWorld(WORK_WORLD):DoWithPlayer(Request.PostParams["PlayerName"],GetAreaByPlayer) - AreaEndX = AreaStartX - AreaEndZ = AreaStartZ - GENERATION_STATE = 3 - Content = ProcessingContent() - return Content - end - if( Request.PostParams["Player3x3"] ~= nil - and Request.PostParams["PlayerName"] ~= nil ) then -- Making BOOM! I meant, regenereate... - cRoot:Get():GetWorld(WORK_WORLD):DoWithPlayer(Request.PostParams["PlayerName"],GetAreaByPlayer) - AreaStartX = AreaStartX - 1 - AreaStartZ = AreaStartZ - 1 - AreaEndX = AreaStartX + 2 - AreaEndZ = AreaStartZ + 2 - GENERATION_STATE = 3 - Content = ProcessingContent() - return Content - end - end - - --Content = Content .. "
World for operations: " .. WORK_WORLD .. "
" - --Content = Content .. "" - - -- SELECTING WORK_WORLD - Content = Content .. "World for operations: " .. WORK_WORLD .. "
" - Content = Content .. "| " .. WorldNum .. ". | " - Content = Content .. "" .. World:GetName() .. " | " - Content = Content .. "" .. Button_World(World:GetName()) .. " | " - Content = Content .. "
| No worlds! O_O |
" - - -- SELECTING OPERATION - if (OPERATION_CODE == 0) then - Content = Content .. "
Operation: Generation
" - elseif (OPERATION_CODE == 1) then - Content = Content .. "Operation: Regeneration
" - end - Content = Content .. "" - - -- SELECTING AREA - Content = Content .. "Area:
Start X, Start Z; End X, End Z" - Content = Content .. "" - - -- SELECTING RADIAL - Content = Content .. "Radial:
Center X, Center Z, Raduis (0 to any)" - Content = Content .. "" - Content = Content .. "" - Content = Content .. "
" - Content = Content .. "
" - - -- SELECTING POINT - Content = Content .. "
Point regeneration:
X, Z" - Content = Content .. "" - - -- SELECTING PLAYERS - Content = Content .. "Player-based regeneration:
" - Content = Content .. "| " .. PlayerNum .. ". | " - Content = Content .. "" .. Player:GetName() .. " | " - Content = Content .. "" .. Buttons_Player(Player:GetName()) .. " | " - Content = Content .. "
| Incorrect world selection | ||
| No connected players |
" - return Content +local function Buttons_Player( Name ) + return "" +end + +local function Button_World( Name ) + return "" +end + +function HandleRequest_Generation( Request ) + local Content = "" + if (Request.PostParams["AGHRRRR"] ~= nil) then + GENERATION_STATE = 0 + WW_instance:SaveAllChunks() + WW_instance:UnloadUnusedChunks() + LOGERROR("" .. PLUGIN:GetName() .. " v" .. PLUGIN:GetVersion() .. ": works ABORTED by admin") + end + --Content = Content .. "" + -- PROCESSING + -------------------------------------------------------------------------------------------------- + local function ProcessingContent() + local _small_content = "" + _small_content = _small_content .. "" + _small_content = _small_content .. "
World for operations:
"..WORK_WORLD + if (OPERATION_CODE == 0) then + _small_content = _small_content .. "Operation:
Generation" + elseif (OPERATION_CODE == 1) then + _small_content = _small_content .. "Operation:
Regeneration" + end + _small_content = _small_content .. "Area:
["..AreaStartX..":"..AreaStartZ.."] ["..AreaEndX..":"..AreaEndZ.."]" + _small_content = _small_content .. "Progress:
"..CURRENT.."/"..TOTAL + _small_content = _small_content .. "" + _small_content = _small_content .. "" + return _small_content + end + if (GENERATION_STATE == 2 or GENERATION_STATE == 4) then + Content = ProcessingContent() + return Content + end + -- SELECTING + -------------------------------------------------------------------------------------------------- + if ( Request.PostParams["FormSetWorld"] ) then + WORK_WORLD = Request.PostParams["FormWorldName"] + WW_instance = cRoot:Get():GetWorld(WORK_WORLD) + end + + if( Request.PostParams["SelectWorld"] ~= nil + and Request.PostParams["WorldName"] ~= nil ) then -- World is selected! + WORK_WORLD = Request.PostParams["WorldName"] + WW_instance = cRoot:Get():GetWorld(WORK_WORLD) + end + + if(Request.PostParams["OperationGenerate"] ~= nil) then + OPERATION_CODE = 0 + end + if(Request.PostParams["OperationReGenerate"] ~= nil) then + OPERATION_CODE = 1 + end + + if (GENERATION_STATE == 0) then + if( Request.PostParams["FormAreaStartX"] ~= nil + and Request.PostParams["FormAreaStartZ"] ~= nil + and Request.PostParams["FormAreaEndX"] ~= nil + and Request.PostParams["FormAreaEndZ"] ~= nil ) then --(Re)Generation valid! + -- COMMON (Re)gen + if( Request.PostParams["StartArea"]) then + AreaStartX = tonumber(Request.PostParams["FormAreaStartX"]) + AreaStartZ = tonumber(Request.PostParams["FormAreaStartZ"]) + AreaEndX = tonumber(Request.PostParams["FormAreaEndX"]) + AreaEndZ = tonumber(Request.PostParams["FormAreaEndZ"]) + + PLUGIN.IniFile:DeleteValue("Area data", "StartX") + PLUGIN.IniFile:DeleteValue("Area data", "StartZ") + PLUGIN.IniFile:DeleteValue("Area data", "EndX") + PLUGIN.IniFile:DeleteValue("Area data", "EndZ") + PLUGIN.IniFile:SetValueI("Area data", "StartX", AreaStartX) + PLUGIN.IniFile:SetValueI("Area data", "StartZ", AreaStartZ) + PLUGIN.IniFile:SetValueI("Area data", "EndX", AreaEndX) + PLUGIN.IniFile:SetValueI("Area data", "EndZ", AreaEndZ) + if (OPERATION_CODE == 0) then + GENERATION_STATE = 1 + elseif (OPERATION_CODE == 1) then + GENERATION_STATE = 3 + end + PLUGIN.IniFile:WriteFile() + Content = ProcessingContent() + return Content + end + end + if( Request.PostParams["FormRadialX"] ~= nil + and Request.PostParams["FormRadialZ"] ~= nil + and Request.PostParams["FormRadius"] ~= nil ) then --(Re)Generation valid! + -- COMMON (Re)gen + if( Request.PostParams["StartRadial"]) then + RadialX = tonumber(Request.PostParams["FormRadialX"]) + RadialZ = tonumber(Request.PostParams["FormRadialZ"]) + Radius = tonumber(Request.PostParams["FormRadius"]) + AreaStartX = RadialX - Radius + AreaStartZ = RadialZ - Radius + AreaEndX = RadialX + Radius + AreaEndZ = RadialZ + Radius + + PLUGIN.IniFile:DeleteValue("Radial data", "RadialX") + PLUGIN.IniFile:DeleteValue("Radial data", "RadialZ") + PLUGIN.IniFile:DeleteValue("Radial data", "Radius") + PLUGIN.IniFile:SetValueI("Radial data", "RadialX", RadialX) + PLUGIN.IniFile:SetValueI("Radial data", "RadialZ", RadialZ) + PLUGIN.IniFile:SetValueI("Radial data", "Radius", Radius) + if (OPERATION_CODE == 0) then + GENERATION_STATE = 1 + elseif (OPERATION_CODE == 1) then + GENERATION_STATE = 3 + end + PLUGIN.IniFile:WriteFile() + Content = ProcessingContent() + return Content + end + end + -- POINT REGEN! + if( Request.PostParams["FormPointX"] ~= nil + and Request.PostParams["FormPointZ"] ~= nil ) then --ReGeneration valid! + -- EXACT + if ( Request.PostParams["PointExact"] ~= nil) then + AreaStartX = tonumber(Request.PostParams["FormPointX"]) + AreaStartZ = tonumber(Request.PostParams["FormPointZ"]) + AreaEndX = AreaStartX + AreaEndZ = AreaStartZ + GENERATION_STATE = 3 + Content = ProcessingContent() + return Content + end + -- 3x3 + if ( Request.PostParams["Point3x3"] ~= nil) then + AreaStartX = tonumber(Request.PostParams["FormPointX"]) - 1 + AreaStartZ = tonumber(Request.PostParams["FormPointZ"]) - 1 + AreaEndX = AreaStartX + 2 + AreaEndZ = AreaStartZ + 2 + GENERATION_STATE = 3 + Content = ProcessingContent() + return Content + end + end + + local GetAreaByPlayer = function(Player) + -- Player is valid only within this function, it cannot be stord and used later! + AreaStartX = Player:GetChunkX() + AreaStartZ = Player:GetChunkZ() + end + -- PLAYERS REGEN! + if( Request.PostParams["PlayerExact"] ~= nil + and Request.PostParams["PlayerName"] ~= nil ) then -- Making BOOM! I meant, regenereate... + cRoot:Get():GetWorld(WORK_WORLD):DoWithPlayer(Request.PostParams["PlayerName"],GetAreaByPlayer) + AreaEndX = AreaStartX + AreaEndZ = AreaStartZ + GENERATION_STATE = 3 + Content = ProcessingContent() + return Content + end + if( Request.PostParams["Player3x3"] ~= nil + and Request.PostParams["PlayerName"] ~= nil ) then -- Making BOOM! I meant, regenereate... + cRoot:Get():GetWorld(WORK_WORLD):DoWithPlayer(Request.PostParams["PlayerName"],GetAreaByPlayer) + AreaStartX = AreaStartX - 1 + AreaStartZ = AreaStartZ - 1 + AreaEndX = AreaStartX + 2 + AreaEndZ = AreaStartZ + 2 + GENERATION_STATE = 3 + Content = ProcessingContent() + return Content + end + end + + --Content = Content .. "
World for operations: " .. WORK_WORLD .. "
" + --Content = Content .. "" + + -- SELECTING WORK_WORLD + Content = Content .. "World for operations: " .. WORK_WORLD .. "
" + Content = Content .. "| " .. WorldNum .. ". | " + Content = Content .. "" .. World:GetName() .. " | " + Content = Content .. "" .. Button_World(World:GetName()) .. " | " + Content = Content .. "
| No worlds! O_O |
" + + -- SELECTING OPERATION + if (OPERATION_CODE == 0) then + Content = Content .. "
Operation: Generation
" + elseif (OPERATION_CODE == 1) then + Content = Content .. "Operation: Regeneration
" + end + Content = Content .. "" + + -- SELECTING AREA + Content = Content .. "Area:
Start X, Start Z; End X, End Z" + Content = Content .. "" + + -- SELECTING RADIAL + Content = Content .. "Radial:
Center X, Center Z, Raduis (0 to any)" + Content = Content .. "" + Content = Content .. "" + Content = Content .. "
" + Content = Content .. "
" + + -- SELECTING POINT + Content = Content .. "
Point regeneration:
X, Z" + Content = Content .. "" + + -- SELECTING PLAYERS + Content = Content .. "Player-based regeneration:
" + Content = Content .. "| " .. PlayerNum .. ". | " + Content = Content .. "" .. Player:GetName() .. " | " + Content = Content .. "" .. Buttons_Player(Player:GetName()) .. " | " + Content = Content .. "
| Incorrect world selection | ||
| No connected players |
" + return Content end \ No newline at end of file diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua index 1bc625c35..53b192656 100644 --- a/MCServer/Plugins/Debuggers/Debuggers.lua +++ b/MCServer/Plugins/Debuggers/Debuggers.lua @@ -1,744 +1,744 @@ - --- Global variables -PLUGIN = {}; -- Reference to own plugin object -ShouldDumpFunctions = true; -- If set to true, all available functions are written to the API.txt file upon plugin initialization - -g_DropSpensersToActivate = {}; -- A list of dispensers and droppers (as {World, X, Y Z} quadruplets) that are to be activated every tick - -g_HungerReportTick = 10; - - - - - -function Initialize(Plugin) - PLUGIN = Plugin - - Plugin:SetName("Debuggers") - Plugin:SetVersion(1) - - PluginManager = cRoot:Get():GetPluginManager() - PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_USING_BLOCK); - PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_USING_ITEM); - PluginManager:AddHook(Plugin, cPluginManager.HOOK_TAKE_DAMAGE); - PluginManager:AddHook(Plugin, cPluginManager.HOOK_TICK); - PluginManager:AddHook(Plugin, cPluginManager.HOOK_CHAT); - - PluginManager:BindCommand("/le", "debuggers", HandleListEntitiesCmd, "Shows a list of all the loaded entities"); - PluginManager:BindCommand("/ke", "debuggers", HandleKillEntitiesCmd, "Kills all the loaded entities"); - PluginManager:BindCommand("/wool", "debuggers", HandleWoolCmd, "Sets all your armor to blue wool"); - PluginManager:BindCommand("/testwnd", "debuggers", HandleTestWndCmd, "Opens up a window using plugin API"); - PluginManager:BindCommand("/gc", "debuggers", HandleGCCmd, "Activates the Lua garbage collector"); - PluginManager:BindCommand("/fast", "debuggers", HandleFastCmd, "Switches between fast and normal movement speed"); - PluginManager:BindCommand("/dash", "debuggers", HandleDashCmd, "Switches between fast and normal sprinting speed"); - PluginManager:BindCommand("/hunger", "debuggers", HandleHungerCmd, "Lists the current hunger-related variables"); - PluginManager:BindCommand("/poison", "debuggers", HandlePoisonCmd, "Sets food-poisoning for 15 seconds"); - PluginManager:BindCommand("/starve", "debuggers", HandleStarveCmd, "Sets the food level to zero"); - PluginManager:BindCommand("/fl", "debuggers", HandleFoodLevelCmd, "Sets the food level to the given value"); - - -- Enable the following line for BlockArea / Generator interface testing: - -- PluginManager:AddHook(Plugin, cPluginManager.HOOK_CHUNK_GENERATED); - - LOG("Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion()) - - -- dump all available API functions and objects: - if (ShouldDumpFunctions) then - DumpAPI(); - end - - - -- TestBlockAreas(); - -- TestSQLiteBindings(); - -- TestExpatBindings(); - - return true -end; - - - - - -function DumpAPI() - LOG("Dumping all available functions to API.txt..."); - function dump (prefix, a, Output) - for i, v in pairs (a) do - if (type(v) == "table") then - if (GetChar(i, 1) ~= ".") then - if (v == _G) then - LOG(prefix .. i .. " == _G, CYCLE, ignoring"); - elseif (v == _G.package) then - LOG(prefix .. i .. " == _G.package, ignoring"); - else - dump(prefix .. i .. ".", v, Output) - end - end - elseif (type(v) == "function") then - if (string.sub(i, 1, 2) ~= "__") then - table.insert(Output, prefix .. i .. "()"); - end - end - end - end - - local Output = {}; - dump("", _G, Output); - - table.sort(Output); - local f = io.open("API.txt", "w"); - for i, n in ipairs(Output) do - f:write(n, "\n"); - end - f:close(); - LOG("API.txt written."); -end - - - - - -function TestBlockAreas() - LOG("Testing block areas..."); - - -- Debug block area merging: - local BA1 = cBlockArea(); - local BA2 = cBlockArea(); - if (BA1:LoadFromSchematicFile("schematics/test.schematic")) then - if (BA2:LoadFromSchematicFile("schematics/fountain.schematic")) then - BA2:SetRelBlockType(0, 0, 0, E_BLOCK_LAPIS_BLOCK); - BA2:SetRelBlockType(1, 0, 0, E_BLOCK_LAPIS_BLOCK); - BA2:SetRelBlockType(2, 0, 0, E_BLOCK_LAPIS_BLOCK); - BA1:Merge(BA2, 1, 10, 1, cBlockArea.msImprint); - BA1:SaveToSchematicFile("schematics/merge.schematic"); - end - else - BA1:Create(16, 16, 16); - end - - -- Debug block area cuboid filling: - BA1:FillRelCuboid(2, 9, 2, 8, 2, 8, cBlockArea.baTypes, E_BLOCK_GOLD_BLOCK); - BA1:RelLine(2, 2, 2, 9, 8, 8, cBlockArea.baTypes or cBlockArea.baMetas, E_BLOCK_SAPLING, E_META_SAPLING_BIRCH); - BA1:SaveToSchematicFile("schematics/fillrel.schematic"); - - -- Debug block area mirroring: - if (BA1:LoadFromSchematicFile("schematics/lt.schematic")) then - BA1:MirrorXYNoMeta(); - BA1:SaveToSchematicFile("schematics/lt_XY.schematic"); - BA1:MirrorXYNoMeta(); - BA1:SaveToSchematicFile("schematics/lt_XY2.schematic"); - - BA1:MirrorXZNoMeta(); - BA1:SaveToSchematicFile("schematics/lt_XZ.schematic"); - BA1:MirrorXZNoMeta(); - BA1:SaveToSchematicFile("schematics/lt_XZ2.schematic"); - - BA1:MirrorYZNoMeta(); - BA1:SaveToSchematicFile("schematics/lt_YZ.schematic"); - BA1:MirrorYZNoMeta(); - BA1:SaveToSchematicFile("schematics/lt_YZ2.schematic"); - end - - -- Debug block area rotation: - if (BA1:LoadFromSchematicFile("schematics/rot.schematic")) then - BA1:RotateCWNoMeta(); - BA1:SaveToSchematicFile("schematics/rot1.schematic"); - BA1:RotateCWNoMeta(); - BA1:SaveToSchematicFile("schematics/rot2.schematic"); - BA1:RotateCWNoMeta(); - BA1:SaveToSchematicFile("schematics/rot3.schematic"); - BA1:RotateCWNoMeta(); - BA1:SaveToSchematicFile("schematics/rot4.schematic"); - end - - -- Debug block area rotation: - if (BA1:LoadFromSchematicFile("schematics/rotm.schematic")) then - BA1:RotateCCW(); - BA1:SaveToSchematicFile("schematics/rotm1.schematic"); - BA1:RotateCCW(); - BA1:SaveToSchematicFile("schematics/rotm2.schematic"); - BA1:RotateCCW(); - BA1:SaveToSchematicFile("schematics/rotm3.schematic"); - BA1:RotateCCW(); - BA1:SaveToSchematicFile("schematics/rotm4.schematic"); - end - - -- Debug block area mirroring: - if (BA1:LoadFromSchematicFile("schematics/ltm.schematic")) then - BA1:MirrorXY(); - BA1:SaveToSchematicFile("schematics/ltm_XY.schematic"); - BA1:MirrorXY(); - BA1:SaveToSchematicFile("schematics/ltm_XY2.schematic"); - - BA1:MirrorXZ(); - BA1:SaveToSchematicFile("schematics/ltm_XZ.schematic"); - BA1:MirrorXZ(); - BA1:SaveToSchematicFile("schematics/ltm_XZ2.schematic"); - - BA1:MirrorYZ(); - BA1:SaveToSchematicFile("schematics/ltm_YZ.schematic"); - BA1:MirrorYZ(); - BA1:SaveToSchematicFile("schematics/ltm_YZ2.schematic"); - end - - LOG("Block areas test ended"); -end - - - - - - -function TestSQLiteBindings() - LOG("Testing SQLite bindings..."); - - -- Debug SQLite binding - local TestDB, ErrCode, ErrMsg = sqlite3.open("test.sqlite"); - if (TestDB ~= nil) then - local function ShowRow(UserData, NumCols, Values, Names) - assert(UserData == 'UserData'); - LOG("New row"); - for i = 1, NumCols do - LOG(" " .. Names[i] .. " = " .. Values[i]); - end - return 0; - end - local sql = [=[ - CREATE TABLE numbers(num1,num2,str); - INSERT INTO numbers VALUES(1, 11, "ABC"); - INSERT INTO numbers VALUES(2, 22, "DEF"); - INSERT INTO numbers VALUES(3, 33, "UVW"); - INSERT INTO numbers VALUES(4, 44, "XYZ"); - SELECT * FROM numbers; - ]=] - local Res = TestDB:exec(sql, ShowRow, 'UserData'); - if (Res ~= sqlite3.OK) then - LOG("TestDB:exec() failed: " .. Res .. " (" .. TestDB:errmsg() .. ")"); - end; - TestDB:close(); - else - -- This happens if for example SQLite cannot open the file (eg. a folder with the same name exists) - LOG("SQLite3 failed to open DB! (" .. ErrCode .. ", " .. ErrMsg ..")"); - end - - LOG("SQLite bindings test ended"); -end - - - - - -function TestExpatBindings() - LOG("Testing Expat bindings..."); - - -- Debug LuaExpat bindings: - local count = 0 - callbacks = { - StartElement = function (parser, name) - LOG("+ " .. string.rep(" ", count) .. name); - count = count + 1; - end, - EndElement = function (parser, name) - count = count - 1; - LOG("- " .. string.rep(" ", count) .. name); - end - } - - local p = lxp.new(callbacks); - p:parse("
-
- 
-
-
-
-
-
+
+
+
+
- MCServer, the Minecraft Server coded in C++!
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Nightbuild2008.cmd b/Nightbuild2008.cmd
index 8d61ee598..b1d5ad3e7 100644
--- a/Nightbuild2008.cmd
+++ b/Nightbuild2008.cmd
@@ -1,146 +1,146 @@
-@echo off
-:: Nightbbuild2008.cmd
-:: This script is run every night to produce a new version of MCServer, backup its PDB files and upload the packages to web.
-:: These sub-scripts are used:
-:: - WCRev.cmd together with subwcrev templating to obtain the version number as an environment var
-:: - UploadVersion.ftp FTP command template for uploading the version to the web (not included in the SVN, because it contains confidential passwords! Use your own :)
-:: When run without parameters, this script pauses at the end and waits for a keypress.
-:: To run in an automated scheduler, add any parameter to disable waiting for a keystroke
-::
-:: This script expects a few tools on specific paths, you can pass the correct paths for your system as env vars "zip", "vc" and "tsvn"
-
-
-:: 7-zip executable (by default it should be on PATH):
-if %zip%a == a set zip=7z
-
-:: Visual C++ compiler executable name:
-if %vc%a == a set vc="vcbuild.exe"
-
-:: TortoiseProc executable (for updating to the latest version):
-if %tsvn%a== a set tsvn="c:\program files\tortoisesvn\bin\tortoiseproc.exe"
-
-:: Subwcrev (from TortoiseSVN, for querying revision number; by default in PATH):
-if %subwcrev%a == a set subwcrev=subwcrev
-
-
-
-
-echo Performing nightbuild of MC-Server
-
-
-
-
-
-set DONOTPAUSE=y
-
-:: Update the sources to the latest revision:
-del source\Bindings.cpp
-del source\Bindings.h
-start "tsvn src" /b /min /wait %tsvn% /command:update /path:. /closeonend:1
-if errorlevel 1 goto haderror
-
-
-:: 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
-)
-
-
-:: Get the revision number into WCREV env var
-call Install\WCVersion.cmd
-echo WCREV = %WCREV%
-
-
-:: Test if the version is already present
-if exist Install\MCServer_Win_%WCREV%.7z (
- echo Latest version already present, bailing out
- goto end
-)
-
-
-
-:: Update Bindings.cpp
-del source\Bindings.cpp
-del source\Bindings.h
-echo Updating Lua bindings
-set ALLTOLUA_WAIT=N
-cd source
-call AllToLua.bat
-cd ..
-
-
-
-
-:: Compile using VC2008 Express. Do a full rebuild.
-echo Setting up VS environment...
-call "%VS90COMNTOOLS%\vsvars32.bat"
-echo Compiling MCServer...
-title MCS Nightbuild
-start "vc" /b /wait /low /min %vc% /r vc2008\MCServer.sln "Release|Win32"
-if errorlevel 1 goto haderror
-
-
-
-
-
-:: Use 7-zip to compress the resulting files into a single file:
-:: Note: the output filename here must be the same as in the upload_win.ftp.template script
-copy MCServer\MCServer.exe Install\MCServer.exe
-cd Install
-%zip% a -mx9 -y MCServer_Win_%WCREV%.7z -scsWIN @Zip2008.list
-if errorlevel 1 goto haderror
-cd ..
-
-:: Also pack PDBs into a separate archive:
-:: Note: the output filename here must be the same as in the upload_win.ftp.template script
-%zip% a -mx9 -y Install\MCServer_Win_%WCREV%_PDBs.7z -scsWIN @Install\Zip2008_PDBs.list
-if errorlevel 1 goto haderror
-
-
-
-
-
-:: upload to the FTP:
-:upload
-if "a%ftppass%" == "a" (
- echo You need to set FTP password in the ftppass environment variable to upload the files
- goto end
-)
-if "a%ftpuser%" == "a" (
- echo You need to set FTP username in the ftpuser environment variable to upload the files
- goto end
-)
-if "a%ftpsite%" == "a" (
- echo You need to set FTP server in the ftpsite environment variable to upload the files
- goto end
-)
-ncftpput -p %ftppass% -u %ftpuser% -T temp_ %ftpsite% / Install\MCServer_Win_%WCREV%.7z
-if errorlevel 1 goto haderror
-ncftpput -p %ftppass% -u %ftpuser% -T temp_ %ftpsite% /PDBs Install\MCServer_Win_%WCREV%_PDBs.7z
-if errorlevel 1 goto haderror
-echo Upload finished.
-
-
-
-
-goto end
-
-
-
-
-:haderror
-echo an error was encountered, check command output above
-pause
-goto finished
-
-
-
-
-
-:end
-if "a%1" == "a" pause
-
-
-
+@echo off
+:: Nightbbuild2008.cmd
+:: This script is run every night to produce a new version of MCServer, backup its PDB files and upload the packages to web.
+:: These sub-scripts are used:
+:: - WCRev.cmd together with subwcrev templating to obtain the version number as an environment var
+:: - UploadVersion.ftp FTP command template for uploading the version to the web (not included in the SVN, because it contains confidential passwords! Use your own :)
+:: When run without parameters, this script pauses at the end and waits for a keypress.
+:: To run in an automated scheduler, add any parameter to disable waiting for a keystroke
+::
+:: This script expects a few tools on specific paths, you can pass the correct paths for your system as env vars "zip", "vc" and "tsvn"
+
+
+:: 7-zip executable (by default it should be on PATH):
+if %zip%a == a set zip=7z
+
+:: Visual C++ compiler executable name:
+if %vc%a == a set vc="vcbuild.exe"
+
+:: TortoiseProc executable (for updating to the latest version):
+if %tsvn%a== a set tsvn="c:\program files\tortoisesvn\bin\tortoiseproc.exe"
+
+:: Subwcrev (from TortoiseSVN, for querying revision number; by default in PATH):
+if %subwcrev%a == a set subwcrev=subwcrev
+
+
+
+
+echo Performing nightbuild of MC-Server
+
+
+
+
+
+set DONOTPAUSE=y
+
+:: Update the sources to the latest revision:
+del source\Bindings.cpp
+del source\Bindings.h
+start "tsvn src" /b /min /wait %tsvn% /command:update /path:. /closeonend:1
+if errorlevel 1 goto haderror
+
+
+:: 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
+)
+
+
+:: Get the revision number into WCREV env var
+call Install\WCVersion.cmd
+echo WCREV = %WCREV%
+
+
+:: Test if the version is already present
+if exist Install\MCServer_Win_%WCREV%.7z (
+ echo Latest version already present, bailing out
+ goto end
+)
+
+
+
+:: Update Bindings.cpp
+del source\Bindings.cpp
+del source\Bindings.h
+echo Updating Lua bindings
+set ALLTOLUA_WAIT=N
+cd source
+call AllToLua.bat
+cd ..
+
+
+
+
+:: Compile using VC2008 Express. Do a full rebuild.
+echo Setting up VS environment...
+call "%VS90COMNTOOLS%\vsvars32.bat"
+echo Compiling MCServer...
+title MCS Nightbuild
+start "vc" /b /wait /low /min %vc% /r vc2008\MCServer.sln "Release|Win32"
+if errorlevel 1 goto haderror
+
+
+
+
+
+:: Use 7-zip to compress the resulting files into a single file:
+:: Note: the output filename here must be the same as in the upload_win.ftp.template script
+copy MCServer\MCServer.exe Install\MCServer.exe
+cd Install
+%zip% a -mx9 -y MCServer_Win_%WCREV%.7z -scsWIN @Zip2008.list
+if errorlevel 1 goto haderror
+cd ..
+
+:: Also pack PDBs into a separate archive:
+:: Note: the output filename here must be the same as in the upload_win.ftp.template script
+%zip% a -mx9 -y Install\MCServer_Win_%WCREV%_PDBs.7z -scsWIN @Install\Zip2008_PDBs.list
+if errorlevel 1 goto haderror
+
+
+
+
+
+:: upload to the FTP:
+:upload
+if "a%ftppass%" == "a" (
+ echo You need to set FTP password in the ftppass environment variable to upload the files
+ goto end
+)
+if "a%ftpuser%" == "a" (
+ echo You need to set FTP username in the ftpuser environment variable to upload the files
+ goto end
+)
+if "a%ftpsite%" == "a" (
+ echo You need to set FTP server in the ftpsite environment variable to upload the files
+ goto end
+)
+ncftpput -p %ftppass% -u %ftpuser% -T temp_ %ftpsite% / Install\MCServer_Win_%WCREV%.7z
+if errorlevel 1 goto haderror
+ncftpput -p %ftppass% -u %ftpuser% -T temp_ %ftpsite% /PDBs Install\MCServer_Win_%WCREV%_PDBs.7z
+if errorlevel 1 goto haderror
+echo Upload finished.
+
+
+
+
+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
diff --git a/Tests/NoiseTest/NoiseTest.cpp b/Tests/NoiseTest/NoiseTest.cpp
index eae024f2f..5542f3ca6 100644
--- a/Tests/NoiseTest/NoiseTest.cpp
+++ b/Tests/NoiseTest/NoiseTest.cpp
@@ -1,101 +1,101 @@
-
-// NoiseTest.cpp
-
-// Implements the main app entrypoint
-
-#include "Globals.h"
-#include
+ MCServer, the Minecraft Server coded in C++!
+
+
+
+ Welcome {USERNAME}, to the Control Panel! :D
+ {CONTENT} +-
-#include