From 12906c026d414c752d3c0ba9481f425b24b29c67 Mon Sep 17 00:00:00 2001 From: faketruth Date: Mon, 20 Aug 2012 12:20:20 +0000 Subject: [PATCH] Moved files used by MCServer to a special MCServer folder git-svn-id: http://mc-server.googlecode.com/svn/trunk@763 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- {Plugins => MCServer/Plugins}/ChatLog/plugin.lua | 0 {Plugins => MCServer/Plugins}/Core/ban.lua | 0 {Plugins => MCServer/Plugins}/Core/coords.lua | 0 {Plugins => MCServer/Plugins}/Core/gamemode.lua | 0 {Plugins => MCServer/Plugins}/Core/gotoworld.lua | 0 {Plugins => MCServer/Plugins}/Core/help.lua | 0 {Plugins => MCServer/Plugins}/Core/item.lua | 0 {Plugins => MCServer/Plugins}/Core/kick.lua | 0 {Plugins => MCServer/Plugins}/Core/main.lua | 1 + {Plugins => MCServer/Plugins}/Core/motd.lua | 0 {Plugins => MCServer/Plugins}/Core/onblockdig.lua | 0 {Plugins => MCServer/Plugins}/Core/onblockplace.lua | 0 {Plugins => MCServer/Plugins}/Core/oncraftingnorecipe.lua | 0 {Plugins => MCServer/Plugins}/Core/onkilled.lua | 0 {Plugins => MCServer/Plugins}/Core/onlogin.lua | 0 {Plugins => MCServer/Plugins}/Core/onplayerjoin.lua | 0 {Plugins => MCServer/Plugins}/Core/playerlist.lua | 0 {Plugins => MCServer/Plugins}/Core/pluginlist.lua | 0 {Plugins => MCServer/Plugins}/Core/regeneratechunk.lua | 0 {Plugins => MCServer/Plugins}/Core/reload.lua | 0 {Plugins => MCServer/Plugins}/Core/spawn.lua | 0 {Plugins => MCServer/Plugins}/Core/stop.lua | 0 {Plugins => MCServer/Plugins}/Core/teleport.lua | 0 {Plugins => MCServer/Plugins}/Core/time.lua | 0 {Plugins => MCServer/Plugins}/Core/top.lua | 0 {Plugins => MCServer/Plugins}/Core/unban.lua | 0 {Plugins => MCServer/Plugins}/Core/viewdistance.lua | 0 {Plugins => MCServer/Plugins}/Core/web_manageplugins.lua | 0 {Plugins => MCServer/Plugins}/Core/web_permissions.lua | 0 {Plugins => MCServer/Plugins}/Core/web_playerlist.lua | 0 {Plugins => MCServer/Plugins}/Core/web_whitelist.lua | 0 {Plugins => MCServer/Plugins}/MagicCarpet/objects.lua | 0 {Plugins => MCServer/Plugins}/MagicCarpet/plugin.lua | 0 {Plugins => MCServer/Plugins}/SquirrelChatLog.nut | 0 {Plugins => MCServer/Plugins}/sTick/main.lua | 0 {Plugins => MCServer/Plugins}/sTick/onblockplace.lua | 0 banned.example.ini => MCServer/banned.example.ini | 0 crafting.txt => MCServer/crafting.txt | 0 furnace.txt => MCServer/furnace.txt | 0 groups.example.ini => MCServer/groups.example.ini | 0 groups.ini => MCServer/groups.ini | 0 items.ini => MCServer/items.ini | 0 monsters.ini => MCServer/monsters.ini | 0 settings.example.ini => MCServer/settings.example.ini | 0 settings.ini => MCServer/settings.ini | 8 ++++++-- terrain.ini => MCServer/terrain.ini | 0 users.example.ini => MCServer/users.example.ini | 0 users.ini => MCServer/users.ini | 0 webadmin.example.ini => MCServer/webadmin.example.ini | 0 webadmin.ini => MCServer/webadmin.ini | 2 +- {webadmin => MCServer/webadmin}/template.html | 0 whitelist.example.ini => MCServer/whitelist.example.ini | 0 VC2008/MCServer.vcproj | 3 +++ 53 files changed, 11 insertions(+), 3 deletions(-) rename {Plugins => MCServer/Plugins}/ChatLog/plugin.lua (100%) rename {Plugins => MCServer/Plugins}/Core/ban.lua (100%) rename {Plugins => MCServer/Plugins}/Core/coords.lua (100%) rename {Plugins => MCServer/Plugins}/Core/gamemode.lua (100%) rename {Plugins => MCServer/Plugins}/Core/gotoworld.lua (100%) rename {Plugins => MCServer/Plugins}/Core/help.lua (100%) rename {Plugins => MCServer/Plugins}/Core/item.lua (100%) rename {Plugins => MCServer/Plugins}/Core/kick.lua (100%) rename {Plugins => MCServer/Plugins}/Core/main.lua (97%) rename {Plugins => MCServer/Plugins}/Core/motd.lua (100%) rename {Plugins => MCServer/Plugins}/Core/onblockdig.lua (100%) rename {Plugins => MCServer/Plugins}/Core/onblockplace.lua (100%) rename {Plugins => MCServer/Plugins}/Core/oncraftingnorecipe.lua (100%) rename {Plugins => MCServer/Plugins}/Core/onkilled.lua (100%) rename {Plugins => MCServer/Plugins}/Core/onlogin.lua (100%) rename {Plugins => MCServer/Plugins}/Core/onplayerjoin.lua (100%) rename {Plugins => MCServer/Plugins}/Core/playerlist.lua (100%) rename {Plugins => MCServer/Plugins}/Core/pluginlist.lua (100%) rename {Plugins => MCServer/Plugins}/Core/regeneratechunk.lua (100%) rename {Plugins => MCServer/Plugins}/Core/reload.lua (100%) rename {Plugins => MCServer/Plugins}/Core/spawn.lua (100%) rename {Plugins => MCServer/Plugins}/Core/stop.lua (100%) rename {Plugins => MCServer/Plugins}/Core/teleport.lua (100%) rename {Plugins => MCServer/Plugins}/Core/time.lua (100%) rename {Plugins => MCServer/Plugins}/Core/top.lua (100%) rename {Plugins => MCServer/Plugins}/Core/unban.lua (100%) rename {Plugins => MCServer/Plugins}/Core/viewdistance.lua (100%) rename {Plugins => MCServer/Plugins}/Core/web_manageplugins.lua (100%) rename {Plugins => MCServer/Plugins}/Core/web_permissions.lua (100%) rename {Plugins => MCServer/Plugins}/Core/web_playerlist.lua (100%) rename {Plugins => MCServer/Plugins}/Core/web_whitelist.lua (100%) rename {Plugins => MCServer/Plugins}/MagicCarpet/objects.lua (100%) rename {Plugins => MCServer/Plugins}/MagicCarpet/plugin.lua (100%) rename {Plugins => MCServer/Plugins}/SquirrelChatLog.nut (100%) rename {Plugins => MCServer/Plugins}/sTick/main.lua (100%) rename {Plugins => MCServer/Plugins}/sTick/onblockplace.lua (100%) rename banned.example.ini => MCServer/banned.example.ini (100%) rename crafting.txt => MCServer/crafting.txt (100%) rename furnace.txt => MCServer/furnace.txt (100%) rename groups.example.ini => MCServer/groups.example.ini (100%) rename groups.ini => MCServer/groups.ini (100%) rename items.ini => MCServer/items.ini (100%) rename monsters.ini => MCServer/monsters.ini (100%) rename settings.example.ini => MCServer/settings.example.ini (100%) rename settings.ini => MCServer/settings.ini (83%) rename terrain.ini => MCServer/terrain.ini (100%) rename users.example.ini => MCServer/users.example.ini (100%) rename users.ini => MCServer/users.ini (100%) rename webadmin.example.ini => MCServer/webadmin.example.ini (100%) rename webadmin.ini => MCServer/webadmin.ini (54%) rename {webadmin => MCServer/webadmin}/template.html (100%) rename whitelist.example.ini => MCServer/whitelist.example.ini (100%) diff --git a/Plugins/ChatLog/plugin.lua b/MCServer/Plugins/ChatLog/plugin.lua similarity index 100% rename from Plugins/ChatLog/plugin.lua rename to MCServer/Plugins/ChatLog/plugin.lua diff --git a/Plugins/Core/ban.lua b/MCServer/Plugins/Core/ban.lua similarity index 100% rename from Plugins/Core/ban.lua rename to MCServer/Plugins/Core/ban.lua diff --git a/Plugins/Core/coords.lua b/MCServer/Plugins/Core/coords.lua similarity index 100% rename from Plugins/Core/coords.lua rename to MCServer/Plugins/Core/coords.lua diff --git a/Plugins/Core/gamemode.lua b/MCServer/Plugins/Core/gamemode.lua similarity index 100% rename from Plugins/Core/gamemode.lua rename to MCServer/Plugins/Core/gamemode.lua diff --git a/Plugins/Core/gotoworld.lua b/MCServer/Plugins/Core/gotoworld.lua similarity index 100% rename from Plugins/Core/gotoworld.lua rename to MCServer/Plugins/Core/gotoworld.lua diff --git a/Plugins/Core/help.lua b/MCServer/Plugins/Core/help.lua similarity index 100% rename from Plugins/Core/help.lua rename to MCServer/Plugins/Core/help.lua diff --git a/Plugins/Core/item.lua b/MCServer/Plugins/Core/item.lua similarity index 100% rename from Plugins/Core/item.lua rename to MCServer/Plugins/Core/item.lua diff --git a/Plugins/Core/kick.lua b/MCServer/Plugins/Core/kick.lua similarity index 100% rename from Plugins/Core/kick.lua rename to MCServer/Plugins/Core/kick.lua diff --git a/Plugins/Core/main.lua b/MCServer/Plugins/Core/main.lua similarity index 97% rename from Plugins/Core/main.lua rename to MCServer/Plugins/Core/main.lua index 220dd940e..fead7638b 100644 --- a/Plugins/Core/main.lua +++ b/MCServer/Plugins/Core/main.lua @@ -140,6 +140,7 @@ function Initialize( Plugin ) WebPlugin:AddTab( "Whitelist", HandleRequest_WhiteList ) WebPlugin:AddTab( "Permissions", HandleRequest_Permissions ) WebPlugin:AddTab( "Manage Plugins", HandleRequest_ManagePlugins ) + WebPlugin:AddTab( "Ini Editor", HandleRequest_IniEditor ) LOG( "Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion() ) return true diff --git a/Plugins/Core/motd.lua b/MCServer/Plugins/Core/motd.lua similarity index 100% rename from Plugins/Core/motd.lua rename to MCServer/Plugins/Core/motd.lua diff --git a/Plugins/Core/onblockdig.lua b/MCServer/Plugins/Core/onblockdig.lua similarity index 100% rename from Plugins/Core/onblockdig.lua rename to MCServer/Plugins/Core/onblockdig.lua diff --git a/Plugins/Core/onblockplace.lua b/MCServer/Plugins/Core/onblockplace.lua similarity index 100% rename from Plugins/Core/onblockplace.lua rename to MCServer/Plugins/Core/onblockplace.lua diff --git a/Plugins/Core/oncraftingnorecipe.lua b/MCServer/Plugins/Core/oncraftingnorecipe.lua similarity index 100% rename from Plugins/Core/oncraftingnorecipe.lua rename to MCServer/Plugins/Core/oncraftingnorecipe.lua diff --git a/Plugins/Core/onkilled.lua b/MCServer/Plugins/Core/onkilled.lua similarity index 100% rename from Plugins/Core/onkilled.lua rename to MCServer/Plugins/Core/onkilled.lua diff --git a/Plugins/Core/onlogin.lua b/MCServer/Plugins/Core/onlogin.lua similarity index 100% rename from Plugins/Core/onlogin.lua rename to MCServer/Plugins/Core/onlogin.lua diff --git a/Plugins/Core/onplayerjoin.lua b/MCServer/Plugins/Core/onplayerjoin.lua similarity index 100% rename from Plugins/Core/onplayerjoin.lua rename to MCServer/Plugins/Core/onplayerjoin.lua diff --git a/Plugins/Core/playerlist.lua b/MCServer/Plugins/Core/playerlist.lua similarity index 100% rename from Plugins/Core/playerlist.lua rename to MCServer/Plugins/Core/playerlist.lua diff --git a/Plugins/Core/pluginlist.lua b/MCServer/Plugins/Core/pluginlist.lua similarity index 100% rename from Plugins/Core/pluginlist.lua rename to MCServer/Plugins/Core/pluginlist.lua diff --git a/Plugins/Core/regeneratechunk.lua b/MCServer/Plugins/Core/regeneratechunk.lua similarity index 100% rename from Plugins/Core/regeneratechunk.lua rename to MCServer/Plugins/Core/regeneratechunk.lua diff --git a/Plugins/Core/reload.lua b/MCServer/Plugins/Core/reload.lua similarity index 100% rename from Plugins/Core/reload.lua rename to MCServer/Plugins/Core/reload.lua diff --git a/Plugins/Core/spawn.lua b/MCServer/Plugins/Core/spawn.lua similarity index 100% rename from Plugins/Core/spawn.lua rename to MCServer/Plugins/Core/spawn.lua diff --git a/Plugins/Core/stop.lua b/MCServer/Plugins/Core/stop.lua similarity index 100% rename from Plugins/Core/stop.lua rename to MCServer/Plugins/Core/stop.lua diff --git a/Plugins/Core/teleport.lua b/MCServer/Plugins/Core/teleport.lua similarity index 100% rename from Plugins/Core/teleport.lua rename to MCServer/Plugins/Core/teleport.lua diff --git a/Plugins/Core/time.lua b/MCServer/Plugins/Core/time.lua similarity index 100% rename from Plugins/Core/time.lua rename to MCServer/Plugins/Core/time.lua diff --git a/Plugins/Core/top.lua b/MCServer/Plugins/Core/top.lua similarity index 100% rename from Plugins/Core/top.lua rename to MCServer/Plugins/Core/top.lua diff --git a/Plugins/Core/unban.lua b/MCServer/Plugins/Core/unban.lua similarity index 100% rename from Plugins/Core/unban.lua rename to MCServer/Plugins/Core/unban.lua diff --git a/Plugins/Core/viewdistance.lua b/MCServer/Plugins/Core/viewdistance.lua similarity index 100% rename from Plugins/Core/viewdistance.lua rename to MCServer/Plugins/Core/viewdistance.lua diff --git a/Plugins/Core/web_manageplugins.lua b/MCServer/Plugins/Core/web_manageplugins.lua similarity index 100% rename from Plugins/Core/web_manageplugins.lua rename to MCServer/Plugins/Core/web_manageplugins.lua diff --git a/Plugins/Core/web_permissions.lua b/MCServer/Plugins/Core/web_permissions.lua similarity index 100% rename from Plugins/Core/web_permissions.lua rename to MCServer/Plugins/Core/web_permissions.lua diff --git a/Plugins/Core/web_playerlist.lua b/MCServer/Plugins/Core/web_playerlist.lua similarity index 100% rename from Plugins/Core/web_playerlist.lua rename to MCServer/Plugins/Core/web_playerlist.lua diff --git a/Plugins/Core/web_whitelist.lua b/MCServer/Plugins/Core/web_whitelist.lua similarity index 100% rename from Plugins/Core/web_whitelist.lua rename to MCServer/Plugins/Core/web_whitelist.lua diff --git a/Plugins/MagicCarpet/objects.lua b/MCServer/Plugins/MagicCarpet/objects.lua similarity index 100% rename from Plugins/MagicCarpet/objects.lua rename to MCServer/Plugins/MagicCarpet/objects.lua diff --git a/Plugins/MagicCarpet/plugin.lua b/MCServer/Plugins/MagicCarpet/plugin.lua similarity index 100% rename from Plugins/MagicCarpet/plugin.lua rename to MCServer/Plugins/MagicCarpet/plugin.lua diff --git a/Plugins/SquirrelChatLog.nut b/MCServer/Plugins/SquirrelChatLog.nut similarity index 100% rename from Plugins/SquirrelChatLog.nut rename to MCServer/Plugins/SquirrelChatLog.nut diff --git a/Plugins/sTick/main.lua b/MCServer/Plugins/sTick/main.lua similarity index 100% rename from Plugins/sTick/main.lua rename to MCServer/Plugins/sTick/main.lua diff --git a/Plugins/sTick/onblockplace.lua b/MCServer/Plugins/sTick/onblockplace.lua similarity index 100% rename from Plugins/sTick/onblockplace.lua rename to MCServer/Plugins/sTick/onblockplace.lua diff --git a/banned.example.ini b/MCServer/banned.example.ini similarity index 100% rename from banned.example.ini rename to MCServer/banned.example.ini diff --git a/crafting.txt b/MCServer/crafting.txt similarity index 100% rename from crafting.txt rename to MCServer/crafting.txt diff --git a/furnace.txt b/MCServer/furnace.txt similarity index 100% rename from furnace.txt rename to MCServer/furnace.txt diff --git a/groups.example.ini b/MCServer/groups.example.ini similarity index 100% rename from groups.example.ini rename to MCServer/groups.example.ini diff --git a/groups.ini b/MCServer/groups.ini similarity index 100% rename from groups.ini rename to MCServer/groups.ini diff --git a/items.ini b/MCServer/items.ini similarity index 100% rename from items.ini rename to MCServer/items.ini diff --git a/monsters.ini b/MCServer/monsters.ini similarity index 100% rename from monsters.ini rename to MCServer/monsters.ini diff --git a/settings.example.ini b/MCServer/settings.example.ini similarity index 100% rename from settings.example.ini rename to MCServer/settings.example.ini diff --git a/settings.ini b/MCServer/settings.ini similarity index 83% rename from settings.ini rename to MCServer/settings.ini index b21997f32..ab1519021 100644 --- a/settings.ini +++ b/MCServer/settings.ini @@ -8,10 +8,13 @@ Description=MCServer - Slightly more custom! DefaultWorld=world [Plugins] -NewPlugin=Core ;NewPlugin=Protect ;NewPlugin=MagicCarpet ;NewPlugin=ChatLog +;NewPlugin=BlockInfo +NewPlugin=CuboidPlus +NewPlugin=Core +NewPlugin=ChunkWorx [HelpPlugin] ShowPluginNames=1 @@ -30,4 +33,5 @@ Types=Spider,Chicken,Cow,Pig,Sheep,Squid,Enderman,Zombiepigman,Cavespider,Creepe [Authentication] Server=session.minecraft.net Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID% -Authenticate=0 \ No newline at end of file +Authenticate=0 + diff --git a/terrain.ini b/MCServer/terrain.ini similarity index 100% rename from terrain.ini rename to MCServer/terrain.ini diff --git a/users.example.ini b/MCServer/users.example.ini similarity index 100% rename from users.example.ini rename to MCServer/users.example.ini diff --git a/users.ini b/MCServer/users.ini similarity index 100% rename from users.ini rename to MCServer/users.ini diff --git a/webadmin.example.ini b/MCServer/webadmin.example.ini similarity index 100% rename from webadmin.example.ini rename to MCServer/webadmin.example.ini diff --git a/webadmin.ini b/MCServer/webadmin.ini similarity index 54% rename from webadmin.ini rename to MCServer/webadmin.ini index 6ecbf7513..7384f0bde 100644 --- a/webadmin.ini +++ b/MCServer/webadmin.ini @@ -1,6 +1,6 @@ [WebAdmin] Enabled=1 -Port=8080 +Port=8081 [User:admin] Password=admin \ No newline at end of file diff --git a/webadmin/template.html b/MCServer/webadmin/template.html similarity index 100% rename from webadmin/template.html rename to MCServer/webadmin/template.html diff --git a/whitelist.example.ini b/MCServer/whitelist.example.ini similarity index 100% rename from whitelist.example.ini rename to MCServer/whitelist.example.ini diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index a2137e87f..9082c8de2 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -64,6 +64,7 @@