From 0c2c803a168183c95d9b191cd8b35debed5d3f54 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 4 Nov 2013 22:06:23 +0000 Subject: Removed settings/webadmin.example.ini files Additionally, added some default plugins to autogeneration. Also moved nbt examples to docs/NBT Examples. --- Install/Zip2008.list | 2 - MCServer/settings.example.ini | 32 -------- MCServer/webadmin.example.ini | 6 -- docs/NBT Examples/single chunk NBT data.txt | 71 ++++++++++++++++++ docs/NBT Examples/tile entities.txt | 109 ++++++++++++++++++++++++++++ nbt examples/single chunk NBT data.txt | 71 ------------------ nbt examples/tile entities.txt | 109 ---------------------------- source/PluginManager.cpp | 7 +- 8 files changed, 186 insertions(+), 221 deletions(-) delete mode 100644 MCServer/settings.example.ini delete mode 100644 MCServer/webadmin.example.ini create mode 100644 docs/NBT Examples/single chunk NBT data.txt create mode 100644 docs/NBT Examples/tile entities.txt delete mode 100644 nbt examples/single chunk NBT data.txt delete mode 100644 nbt examples/tile entities.txt diff --git a/Install/Zip2008.list b/Install/Zip2008.list index 0b45d81f3..fbfc06e0c 100644 --- a/Install/Zip2008.list +++ b/Install/Zip2008.list @@ -11,5 +11,3 @@ Lua-LICENSE.txt LuaExpat-license.html LuaSQLite3-LICENSE.txt MersenneTwister-LICENSE.txt -settings.example.ini -webadmin.example.ini \ No newline at end of file diff --git a/MCServer/settings.example.ini b/MCServer/settings.example.ini deleted file mode 100644 index 3daeb00f1..000000000 --- a/MCServer/settings.example.ini +++ /dev/null @@ -1,32 +0,0 @@ -; This is the main server configuration -; For help, please visit the Wiki page: http://www.mc-server.org/wiki/doku.php?id=configure:settings.ini -; Most of these settings can also be set using the webadmin interface, if it is enabled. - -[Server] -Port=25565 -MaxPlayers=100 -Description=MCServer - in C++ -DefaultViewDistance=9 - -[Worlds] -DefaultWorld=world - -[Plugins] -; Plugin=Debuggers -; Plugin=DiamondMover -; Plugin=HookNotify -Plugin=Core -Plugin=ChunkWorx -Plugin=ChatLog -Plugin=TransAPI - -[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/MCServer/webadmin.example.ini b/MCServer/webadmin.example.ini deleted file mode 100644 index 8597225bb..000000000 --- a/MCServer/webadmin.example.ini +++ /dev/null @@ -1,6 +0,0 @@ -[WebAdmin] -Enabled=1 -Port=8081 - -[User:admin] -Password=admin \ No newline at end of file diff --git a/docs/NBT Examples/single chunk NBT data.txt b/docs/NBT Examples/single chunk NBT data.txt new file mode 100644 index 000000000..905d6465c --- /dev/null +++ b/docs/NBT Examples/single chunk NBT data.txt @@ -0,0 +1,71 @@ +TAG_Compound(""): 1 items +{ + TAG_Compound("Level"): 10 items + { + TAG_List("TileTicks"): 0 items of type 1 + { + } + TAG_List("Entities"): 0 items of type 1 + { + } + TAG_ByteArray("Biomes"): 256 bytes + TAG_Long("LastUpdate"): 1041959 + TAG_Int("xPos"): 0 + TAG_Int("zPos"): 0 + TAG_List("TileEntities"): 0 items of type 1 + { + } + TAG_Byte("TerrainPopulated"): 1 + TAG_List("Sections"): 6 items of type 10 + { + TAG_Compound(""): 5 items + { + TAG_ByteArray("Data"): 2048 bytes + TAG_ByteArray("SkyLight"): 2048 bytes + TAG_ByteArray("BlockLight"): 2048 bytes + TAG_Byte("Y"): 0 + TAG_ByteArray("Blocks"): 4096 bytes + } + TAG_Compound(""): 5 items + { + TAG_ByteArray("Data"): 2048 bytes + TAG_ByteArray("SkyLight"): 2048 bytes + TAG_ByteArray("BlockLight"): 2048 bytes + TAG_Byte("Y"): 1 + TAG_ByteArray("Blocks"): 4096 bytes + } + TAG_Compound(""): 5 items + { + TAG_ByteArray("Data"): 2048 bytes + TAG_ByteArray("SkyLight"): 2048 bytes + TAG_ByteArray("BlockLight"): 2048 bytes + TAG_Byte("Y"): 2 + TAG_ByteArray("Blocks"): 4096 bytes + } + TAG_Compound(""): 5 items + { + TAG_ByteArray("Data"): 2048 bytes + TAG_ByteArray("SkyLight"): 2048 bytes + TAG_ByteArray("BlockLight"): 2048 bytes + TAG_Byte("Y"): 3 + TAG_ByteArray("Blocks"): 4096 bytes + } + TAG_Compound(""): 5 items + { + TAG_ByteArray("Data"): 2048 bytes + TAG_ByteArray("SkyLight"): 2048 bytes + TAG_ByteArray("BlockLight"): 2048 bytes + TAG_Byte("Y"): 4 + TAG_ByteArray("Blocks"): 4096 bytes + } + TAG_Compound(""): 5 items + { + TAG_ByteArray("Data"): 2048 bytes + TAG_ByteArray("SkyLight"): 2048 bytes + TAG_ByteArray("BlockLight"): 2048 bytes + TAG_Byte("Y"): 5 + TAG_ByteArray("Blocks"): 4096 bytes + } + } + } +} diff --git a/docs/NBT Examples/tile entities.txt b/docs/NBT Examples/tile entities.txt new file mode 100644 index 000000000..e16ae45a7 --- /dev/null +++ b/docs/NBT Examples/tile entities.txt @@ -0,0 +1,109 @@ +TAG_List("TileEntities"): 3 items of type 10 +{ + TAG_Compound(""): 6 items + { + TAG_String("id"): 10 bytes: "MobSpawner" + TAG_Short("Delay"): 20 + TAG_Int("z"): 180 + TAG_String("EntityId"): 6 bytes: "Spider" + TAG_Int("y"): 11 + TAG_Int("x"): -6 + } + TAG_Compound(""): 5 items + { + TAG_List("Items"): 6 items of type 10 + { + TAG_Compound(""): 4 items + { + TAG_Short("id"): 325 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 1 + TAG_Byte("Slot"): 3 + } + TAG_Compound(""): 4 items + { + TAG_Short("id"): 296 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 4 + TAG_Byte("Slot"): 5 + } + TAG_Compound(""): 4 items + { + TAG_Short("id"): 325 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 1 + TAG_Byte("Slot"): 11 + } + TAG_Compound(""): 4 items + { + TAG_Short("id"): 351 + TAG_Short("Damage"): 3 + TAG_Byte("Count"): 1 + TAG_Byte("Slot"): 13 + } + TAG_Compound(""): 4 items + { + TAG_Short("id"): 296 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 1 + TAG_Byte("Slot"): 14 + } + TAG_Compound(""): 4 items + { + TAG_Short("id"): 287 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 2 + TAG_Byte("Slot"): 15 + } + } + TAG_String("id"): 5 bytes: "Chest" + TAG_Int("z"): 182 + TAG_Int("y"): 11 + TAG_Int("x"): -7 + } + TAG_Compound(""): 5 items + { + TAG_List("Items"): 5 items of type 10 + { + TAG_Compound(""): 4 items + { + TAG_Short("id"): 289 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 1 + TAG_Byte("Slot"): 5 + } + TAG_Compound(""): 4 items + { + TAG_Short("id"): 329 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 1 + TAG_Byte("Slot"): 12 + } + TAG_Compound(""): 4 items + { + TAG_Short("id"): 265 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 4 + TAG_Byte("Slot"): 17 + } + TAG_Compound(""): 4 items + { + TAG_Short("id"): 296 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 4 + TAG_Byte("Slot"): 21 + } + TAG_Compound(""): 4 items + { + TAG_Short("id"): 289 + TAG_Short("Damage"): 0 + TAG_Byte("Count"): 2 + TAG_Byte("Slot"): 22 + } + } + TAG_String("id"): 5 bytes: "Chest" + TAG_Int("z"): 181 + TAG_Int("y"): 11 + TAG_Int("x"): -8 + } +} \ No newline at end of file diff --git a/nbt examples/single chunk NBT data.txt b/nbt examples/single chunk NBT data.txt deleted file mode 100644 index 905d6465c..000000000 --- a/nbt examples/single chunk NBT data.txt +++ /dev/null @@ -1,71 +0,0 @@ -TAG_Compound(""): 1 items -{ - TAG_Compound("Level"): 10 items - { - TAG_List("TileTicks"): 0 items of type 1 - { - } - TAG_List("Entities"): 0 items of type 1 - { - } - TAG_ByteArray("Biomes"): 256 bytes - TAG_Long("LastUpdate"): 1041959 - TAG_Int("xPos"): 0 - TAG_Int("zPos"): 0 - TAG_List("TileEntities"): 0 items of type 1 - { - } - TAG_Byte("TerrainPopulated"): 1 - TAG_List("Sections"): 6 items of type 10 - { - TAG_Compound(""): 5 items - { - TAG_ByteArray("Data"): 2048 bytes - TAG_ByteArray("SkyLight"): 2048 bytes - TAG_ByteArray("BlockLight"): 2048 bytes - TAG_Byte("Y"): 0 - TAG_ByteArray("Blocks"): 4096 bytes - } - TAG_Compound(""): 5 items - { - TAG_ByteArray("Data"): 2048 bytes - TAG_ByteArray("SkyLight"): 2048 bytes - TAG_ByteArray("BlockLight"): 2048 bytes - TAG_Byte("Y"): 1 - TAG_ByteArray("Blocks"): 4096 bytes - } - TAG_Compound(""): 5 items - { - TAG_ByteArray("Data"): 2048 bytes - TAG_ByteArray("SkyLight"): 2048 bytes - TAG_ByteArray("BlockLight"): 2048 bytes - TAG_Byte("Y"): 2 - TAG_ByteArray("Blocks"): 4096 bytes - } - TAG_Compound(""): 5 items - { - TAG_ByteArray("Data"): 2048 bytes - TAG_ByteArray("SkyLight"): 2048 bytes - TAG_ByteArray("BlockLight"): 2048 bytes - TAG_Byte("Y"): 3 - TAG_ByteArray("Blocks"): 4096 bytes - } - TAG_Compound(""): 5 items - { - TAG_ByteArray("Data"): 2048 bytes - TAG_ByteArray("SkyLight"): 2048 bytes - TAG_ByteArray("BlockLight"): 2048 bytes - TAG_Byte("Y"): 4 - TAG_ByteArray("Blocks"): 4096 bytes - } - TAG_Compound(""): 5 items - { - TAG_ByteArray("Data"): 2048 bytes - TAG_ByteArray("SkyLight"): 2048 bytes - TAG_ByteArray("BlockLight"): 2048 bytes - TAG_Byte("Y"): 5 - TAG_ByteArray("Blocks"): 4096 bytes - } - } - } -} diff --git a/nbt examples/tile entities.txt b/nbt examples/tile entities.txt deleted file mode 100644 index e16ae45a7..000000000 --- a/nbt examples/tile entities.txt +++ /dev/null @@ -1,109 +0,0 @@ -TAG_List("TileEntities"): 3 items of type 10 -{ - TAG_Compound(""): 6 items - { - TAG_String("id"): 10 bytes: "MobSpawner" - TAG_Short("Delay"): 20 - TAG_Int("z"): 180 - TAG_String("EntityId"): 6 bytes: "Spider" - TAG_Int("y"): 11 - TAG_Int("x"): -6 - } - TAG_Compound(""): 5 items - { - TAG_List("Items"): 6 items of type 10 - { - TAG_Compound(""): 4 items - { - TAG_Short("id"): 325 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 1 - TAG_Byte("Slot"): 3 - } - TAG_Compound(""): 4 items - { - TAG_Short("id"): 296 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 4 - TAG_Byte("Slot"): 5 - } - TAG_Compound(""): 4 items - { - TAG_Short("id"): 325 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 1 - TAG_Byte("Slot"): 11 - } - TAG_Compound(""): 4 items - { - TAG_Short("id"): 351 - TAG_Short("Damage"): 3 - TAG_Byte("Count"): 1 - TAG_Byte("Slot"): 13 - } - TAG_Compound(""): 4 items - { - TAG_Short("id"): 296 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 1 - TAG_Byte("Slot"): 14 - } - TAG_Compound(""): 4 items - { - TAG_Short("id"): 287 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 2 - TAG_Byte("Slot"): 15 - } - } - TAG_String("id"): 5 bytes: "Chest" - TAG_Int("z"): 182 - TAG_Int("y"): 11 - TAG_Int("x"): -7 - } - TAG_Compound(""): 5 items - { - TAG_List("Items"): 5 items of type 10 - { - TAG_Compound(""): 4 items - { - TAG_Short("id"): 289 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 1 - TAG_Byte("Slot"): 5 - } - TAG_Compound(""): 4 items - { - TAG_Short("id"): 329 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 1 - TAG_Byte("Slot"): 12 - } - TAG_Compound(""): 4 items - { - TAG_Short("id"): 265 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 4 - TAG_Byte("Slot"): 17 - } - TAG_Compound(""): 4 items - { - TAG_Short("id"): 296 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 4 - TAG_Byte("Slot"): 21 - } - TAG_Compound(""): 4 items - { - TAG_Short("id"): 289 - TAG_Short("Damage"): 0 - TAG_Byte("Count"): 2 - TAG_Byte("Slot"): 22 - } - } - TAG_String("id"): 5 bytes: "Chest" - TAG_Int("z"): 181 - TAG_Int("y"): 11 - TAG_Int("x"): -8 - } -} \ No newline at end of file diff --git a/source/PluginManager.cpp b/source/PluginManager.cpp index ac79942b7..0ff7736ec 100644 --- a/source/PluginManager.cpp +++ b/source/PluginManager.cpp @@ -119,7 +119,12 @@ void cPluginManager::ReloadPluginsNow(cIniFile & a_SettingsIni) if (KeyNum == -1) { a_SettingsIni.AddKeyName("Plugins"); - a_SettingsIni.AddKeyComment("Plugins", " Plugin=Core"); + a_SettingsIni.AddKeyComment("Plugins", " Plugin=Debuggers"); + a_SettingsIni.AddKeyComment("Plugins", " Plugin=HookNotify"); + a_SettingsIni.AddKeyComment("Plugins", " Plugin=ChunkWorx"); + a_SettingsIni.SetValue("Plugins", "Plugin", "Core"); + a_SettingsIni.SetValue("Plugins", "Plugin", "TransAPI"); + a_SettingsIni.SetValue("Plugins", "Plugin", "ChatLog"); } else if (NumPlugins > 0) { -- cgit v1.2.3