Merge branch 'master' of git://github.com/FrozenCow/dynmap

Conflicts: configuration.txt src/main/java/org/dynmap/DynmapPlugin.java
2011-02-17 08:54:23 -06:00 · 2011-02-17 08:54:23 -06:00 · 92b45b8d31
commit 92b45b8d31
parent 728a321fb6 a294e10413
45 changed files with 1095 additions and 517 deletions
--- a/configuration.txt
+++ b/configuration.txt
@ -1,58 +1,73 @@
-# All paths in this configuration file are relative to Dynmap's data-folder: minecraft_server/plugins/dynmap/
-
-# How often a tile gets rendered (in seconds).
-renderinterval: 1
-
-# The path where the tile-files are placed.
-tilepath: web/tiles
-
-# The path where the web-files are located.
-webpath: web
-
-# The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access).
-webserver-bindaddress: 0.0.0.0
-
-# The TCP-port the webserver will listen on.
-webserver-port: 8123
-
-# Disables Webserver portion of Dynmap (Advanced users only)
-disable-webserver: true
-
-# Writes JSON to file in the webpath
-jsonfile: true
-
-# How often the json file gets written to(in seconds)
-jsonfile-interval: 1000
-
-disabledcommands:
-  - fullrender
-
-# The maptypes Dynmap will use to render.
-maps:
-  - class: org.dynmap.kzedmap.KzedMap
-    renderers:
-      - class: org.dynmap.kzedmap.DefaultTileRenderer
-        prefix: t
-      - class: org.dynmap.kzedmap.CaveTileRenderer
-        prefix: ct
-
-web:
-    # Interval the browser should poll for updates.
-    updaterate: 2000
-    
-    showchatballoons: true
-    showplayerfacesonmap: true
-    showplayerfacesinmenu: true
-    focuschatballoons: false
-    
-    # The name of the map shown when opening Dynmap's page (must be in menu).
-    defaultmap: defaultmap
-    
-    # The maps shown in the menu.
-    shownmaps:
-      - type: KzedMapType
-        name: defaultmap
-        prefix: t
-      - type: KzedMapType
-        name: cavemap
-        prefix: ct
+# All paths in this configuration file are relative to Dynmap's data-folder: minecraft_server/plugins/dynmap/
+
+# How often a tile gets rendered (in seconds).
+renderinterval: 1
+
+# The path where the tile-files are placed.
+tilespath: web/tiles
+
+# The path where the web-files are located.
+webpath: web
+
+# The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access).
+webserver-bindaddress: 0.0.0.0
+
+# The TCP-port the webserver will listen on.
+webserver-port: 8123
+
+# Disables Webserver portion of Dynmap (Advanced users only)
+disable-webserver: true
+
+# Writes JSON to file in the webpath
+jsonfile: true
+
+# How often the json file gets written to(in seconds)
+jsonfile-interval: 1000
+
+disabledcommands:
+  - fullrender
+
+# The maptypes Dynmap will use to render.
+maps:
+  - class: org.dynmap.kzedmap.KzedMap
+    renderers:
+      - class: org.dynmap.kzedmap.DefaultTileRenderer
+        prefix: t
+        maximumheight: 127
+      - class: org.dynmap.kzedmap.CaveTileRenderer
+        prefix: ct
+        maximumheight: 127
+
+web:
+    # Interval the browser should poll for updates.
+    updaterate: 2000
+    
+    showchatballoons: true
+    showplayerfacesonmap: true
+    showplayerfacesinmenu: true
+    focuschatballoons: false
+    
+    # The clock that is shown alongside the map.
+    clock: timeofday
+    #clock: digital
+    
+    # The name of the map shown when opening Dynmap's page (must be in menu).
+    defaultmap: defaultmap
+    
+    # The maps shown in the menu.
+    shownmaps:
+      - type: KzedMapType
+        name: defaultmap
+        prefix: t
+      - type: KzedMapType
+        name: cavemap
+        prefix: ct
+    
+    # The name of the world shown when opening Dynmap's page.
+    defaultworld: world
+    
+    # The worlds shown in the menu.
+    shownworlds:
+      - world
+      - nether
+      - world_bad