Compare commits

...

318 Commits

Author SHA1 Message Date
FrozenCow 445f37475a Added php proxy. 2011-04-03 17:15:19 +02:00
FrozenCow 0dca8d9cfe Fixed a incompatiblity with FF3 (and others). 2011-04-02 00:52:24 +02:00
FrozenCow 060f4641d4 Added option for digital clock to timeofday. 2011-03-31 16:00:47 +02:00
FrozenCow f93eb8dcbc Changed clocks to be components. 2011-03-31 15:53:42 +02:00
FrozenCow 1cda538eef Dynamically load javascript files of components. 2011-03-31 13:06:34 +02:00
FrozenCow 6622db1b2c Simplified component-creation, dropping IE8 compatibility. 2011-03-31 12:54:32 +02:00
FrozenCow 6eface57ae Separated playermarkers to a component. 2011-03-31 12:44:42 +02:00
FrozenCow 7464e5b809 Separated chatbox to a separate component (into different files). 2011-03-31 12:32:27 +02:00
FrozenCow 9a09cace54 Separated chat-balloon-code to a component. 2011-03-29 23:42:56 +02:00
alron fb825daa04 Force maven to treat everything as UTF-8. Removed a warning at compile time. 2011-03-29 12:22:54 -07:00
FrozenCow 0b421209a2 Small fix for invalid http response of updates. 2011-03-29 01:16:52 +02:00
FrozenCow 43bc625c08 Another fix for IndexOutOfBounds (by ignoring it...) 2011-03-29 00:59:10 +02:00
FrozenCow 43a652f15a Fixed IndexOutOfBoundsException (sortof?) 2011-03-28 18:32:29 +02:00
FrozenCow 649edfdc2d Changed events for the latest Bukkit changes. 2011-03-28 18:27:11 +02:00
FrozenCow 2a9b768e3f Removed onLoad again. 2011-03-27 13:14:35 +02:00
John Du Hart 064f911f5a Mised the maps API URL 2011-03-26 00:15:54 +01:00
John Du Hart 3c094ec87d Implemented protocol-relative URLs (this is tested) 2011-03-24 18:32:43 +01:00
FrozenCow 2be0cd3671 Added initial work for 'componentizing' client-side. 2011-03-21 20:46:53 +01:00
FrozenCow 15a8e03e9e Added client-side events to map. 2011-03-21 19:07:30 +01:00
FrozenCow 777b55f27b Changed version to 0.15. 2011-03-20 18:12:02 +01:00
FrozenCow 09568294f3 Removed getWorld. 2011-03-20 18:09:54 +01:00
FrozenCow 394dfff8f4 Removed chunkgenerated and chunkloaded from configuration. 2011-03-17 22:30:14 +01:00
FrozenCow 9206fce435 Set version to 0.14. 2011-03-17 22:26:37 +01:00
FrozenCow 64733202c0 Merged from flames/master 2011-03-17 22:10:59 +01:00
FrozenCow 082b3577fb Removed jQuery.js (using jQuery from Google now.) 2011-03-17 21:54:32 +01:00
FrozenCow e4fa4fe015 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 21:43:02 +01:00
Arthur Mayer 2bfbaa241b added forgotten jquery.mousewheel.js 2011-03-17 21:41:24 +01:00
FrozenCow c13517949b Hides scrollbuttons when they are not needed. 2011-03-17 21:10:35 +01:00
FrozenCow 79c2989b37 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 15:55:24 +01:00
Arthur Mayer 89b66613f0 scrollbutton images 2011-03-17 15:53:14 +01:00
FrozenCow cc7b33ef47 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 15:46:14 +01:00
Arthur Mayer 954ab689e9 scrollbuttons added and small change for css (because i want it so!) 2011-03-17 15:43:28 +01:00
FrozenCow 5e325d00ea Corrected image references from css. 2011-03-17 15:30:30 +01:00
FrozenCow 37ad28dbcc Removed empty line. 2011-03-17 03:29:25 +01:00
FrozenCow 3bed604190 Another import removal. 2011-03-17 02:36:26 +01:00
FrozenCow 550a607ec9 Organized imports. 2011-03-17 02:21:04 +01:00
FrozenCow 2c0717f3d9 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-17 00:03:05 +01:00
Arthur Mayer 105e2d1829 css for playerlist scrolling. thanks lechd for help. js part comming
soon :P
2011-03-16 23:56:04 +01:00
FrozenCow e281b55c3f Added flatmap-icon. 2011-03-16 14:12:54 +01:00
FrozenCow 05aaa1c39d Fixed website and other not very interesting stuff in pom.xml. 2011-03-16 02:28:49 +01:00
FrozenCow 4d5d8d63bf Made pom.xml refer to TheYeti's permissions' groupId and it use the latest version. 2011-03-16 01:31:05 +01:00
FrozenCow e5520934f6 Merge branch 'master' of https://github.com/Kilandor/dynmap 2011-03-16 01:21:53 +01:00
Jason Booth 2cef9731ed WebChat enhancement and fixes
Added Spam Message config
Internal server now replies a spam message
Fixed getting webchat-interval to get int rather than double then cast
Fixed holding down "enter" on the empty chat line would spam chat attempts
Fixed so jsonip.appspot query is only done once
2011-03-15 19:17:58 -05:00
FrozenCow 831fb04bae Revert "Revert "Bleh, Old Permissions. Bleh, hardcoded artifact location.""
This reverts commit 8105a1d2a5.
2011-03-16 01:02:33 +01:00
Arthur Mayer 07cb3ad1b3 readded modified sk89q colorssheme, its contains now beta 1.3 blocks
and snow is not that bright.
2011-03-15 23:59:16 +01:00
Arthur Mayer 4a2f82a7d6 messagettl for chat also in seconds :) 2011-03-15 23:56:22 +01:00
FrozenCow 58060137b4 Made webchat-interval in seconds. 2011-03-15 22:47:12 +01:00
FrozenCow 38e997cf37 Added webchat-interval for anti-spam webmessaging. 2011-03-15 22:43:48 +01:00
FrozenCow 6c6d29a402 Removed some warnings, redisabled BufferedOutputStream closing. 2011-03-15 21:04:53 +01:00
FrozenCow 8105a1d2a5 Revert "Bleh, Old Permissions. Bleh, hardcoded artifact location."
This reverts commit 5fa0bb1fa6.
2011-03-15 19:38:53 +01:00
FrozenCow 437e82387b Merge remote-tracking branch 'alron/master' 2011-03-15 16:53:12 +01:00
FrozenCow 5eb070cd94 Made dynmap compatible with chat-plugins who cancel chat-events. 2011-03-15 14:03:04 +01:00
FrozenCow 5a878cbd0d Added empty onLoad method 2011-03-15 13:22:05 +01:00
FrozenCow d5ab98deaf New coloring system for flatmap. 2011-03-15 00:01:08 +01:00
alron 19a7dba613 Doesn't change anywhere? Probably should be final. 2011-03-12 01:38:34 -08:00
alron 57c952a1cd oops, didn't need that ^^ 2011-03-12 01:36:43 -08:00
alron 77cc1a70c4 Close potential filedescriptor leak. 2011-03-12 01:35:07 -08:00
alron 0007acd05b Close potential filedescriptor leak. 2011-03-12 01:33:30 -08:00
alron 5fa0bb1fa6 Bleh, Old Permissions. Bleh, hardcoded artifact location. 2011-03-12 01:23:19 -08:00
FrozenCow 10e03c4219 Abstracted permissions. Cleaned up DynmapPlugin. 2011-03-11 16:05:54 +01:00
FrozenCow 47e1f20a15 Fixed shutting down http server(?) 2011-03-11 15:22:14 +01:00
FrozenCow 612966734a Fixed very long shutdown(?) 2011-03-11 15:18:48 +01:00
FrozenCow 70429dc5a4 Merge branch 'master' of https://github.com/flames/dynmap 2011-03-11 15:18:41 +01:00
FrozenCow cbe562d33d Render command now responds with a nice message. 2011-03-10 22:59:03 +01:00
Arthur Mayer f071e12524 added sk89q's custom colors txt 2011-03-10 20:46:56 +01:00
FrozenCow 0657d9c559 Code cleanup. 2011-03-10 15:59:19 +01:00
FrozenCow 29a3391ed8 Merge remote-tracking branch 'kilandor/master' 2011-03-10 12:03:56 +01:00
Jason Booth d296724755 Fix client side timestamp problem
Added Support for standalone webchat by reading a json file
Fix for jsonfile-interval in code
Added working php script with spam prevention, for webchat
2011-03-10 00:11:43 -06:00
Jason Booth 965686d44c Cleanup Moved CSS and JS to matching folders 2011-03-09 17:43:24 -06:00
Jason Booth d4bc0863b8 Merge branch 'master' of git://github.com/FrozenCow/dynmap 2011-03-09 16:42:49 -06:00
Arthur Mayer 363339c632 important fix for css, forgotten in my last commit, FrozenCow, please
pull
2011-03-09 17:36:15 +01:00
FrozenCow ead24cc304 Added heightmap like combination for flatmap. 2011-03-08 16:42:21 +01:00
FrozenCow 02e0f0aa24 Fixed being able to render other worlds from command. 2011-03-08 02:39:16 +01:00
FrozenCow d98fe89c42 Fixed not being able to follow players. 2011-03-08 01:22:03 +01:00
FrozenCow b985a55b92 Changed chat-mechanism a bit. 2011-03-07 22:07:34 +01:00
FrozenCow 072924a2a5 Renamed embedded.css to embedded_example.css. 2011-03-07 21:04:37 +01:00
Jason Booth fe0c6556ed Merge branch 'master' of git://github.com/FrozenCow/dynmap
Conflicts:
	colorschemes/ovocean.txt
	src/main/java/org/dynmap/MapManager.java
2011-03-07 13:39:58 -06:00
Arthur Mayer 07010f36ac another fix 2011-03-07 08:14:41 +01:00
Arthur Mayer fe93d372ab css fixes, allow to use dynmap embedded into a website or standalone. 2011-03-07 08:10:30 +01:00
Arthur Mayer f4ba02cd23 fix, json has boolean, so checking for boolean and not string.
thanks dashkal for testing that
2011-03-07 07:48:46 +01:00
Arthur Mayer bc7ddaf9d2 some fix to allowchat 2011-03-07 07:13:32 +01:00
Arthur Mayer 32fdf9da86 added option to disable webchat input 2011-03-07 07:07:48 +01:00
Arthur Mayer 689df03b78 merged latest changes, added ability to embed dynmap into a website. 2011-03-07 03:45:42 +01:00
FrozenCow 3fd0ed89b0 Removed (seemingly broken) event BLOCK_DAMAGED. 2011-03-06 14:50:15 +01:00
FrozenCow 1001028c2a Updated configuration to reflect flatmap changes. 2011-03-06 14:49:29 +01:00
FrozenCow f3c90f0aae Added prefix to flatmap. 2011-03-06 14:45:26 +01:00
FrozenCow 090f417f32 Added ability to specify colorschemes per map/renderer. 2011-03-05 18:38:17 +01:00
FrozenCow 803867fbc9 Fixed unfollowing when panning to another player. 2011-03-05 17:43:41 +01:00
FrozenCow a4564889df Fixed map-icons. 2011-03-05 17:42:07 +01:00
FrozenCow 8d70839d3b Some changes after running Findbugs. 2011-03-05 16:09:26 +01:00
FrozenCow b0c84234cc Added configurable render-triggers. 2011-03-05 15:39:21 +01:00
FrozenCow 41bf56fccb Optimized stringifyJson a bit. 2011-03-04 22:17:50 +01:00
FrozenCow d1f280eb0f Cleaned Http handling a bit. 2011-03-04 21:31:16 +01:00
FrozenCow 9ce160f1b9 Enabled '-' and '.' to be valid world-characters. 2011-03-04 20:15:52 +01:00
FrozenCow e771d94f24 Added configuration caching. 2011-03-01 18:52:15 +01:00
FrozenCow c1603f1060 Changed skin url from minecraft.net to s3.amazonaws.com. 2011-03-01 18:21:15 +01:00
FrozenCow d54532d899 Merge remote-tracking branch 'flames/master' 2011-03-01 02:01:51 +01:00
FrozenCow f4f4a33b8b Implemented FlatMap fullrender + required clientlib. 2011-03-01 01:59:33 +01:00
FrozenCow 1755411545 Added default equals method to MapTile. 2011-03-01 01:58:33 +01:00
Arthur Mayer d200b0b8c5 moved all images to separate folder 2011-03-01 00:01:35 +01:00
FrozenCow 9fea1eafdb Added shitty-looking top-down flat map. 2011-02-28 19:26:05 +01:00
FrozenCow ff36e4f87a Fixed incorrect offset when using maximumheight. 2011-02-28 19:24:32 +01:00
FrozenCow 686331d1a5 Better error status message. 2011-02-28 19:23:25 +01:00
FrozenCow 0372329d06 Fixed incorrect offset with maximumHeight. 2011-02-26 23:02:11 +01:00
FrozenCow a04215be8f Alertbox does not open when opening page anymore. 2011-02-26 21:33:02 +01:00
FrozenCow 84b86f25a3 Removed BukkitPlayerDebugger: incompatible with Bukkit. 2011-02-26 20:31:26 +01:00
FrozenCow 1e04d10b35 Nicer invalid update-url handling (for invalid world-names or non-existing worlds). 2011-02-26 20:27:54 +01:00
FrozenCow 5778611227 Fixed JsonTimerTask. 2011-02-26 18:23:35 +01:00
FrozenCow 119abb33eb Merge remote-tracking branch 'alron/master' 2011-02-24 16:10:29 +01:00
alron 001a865c2a Renamed assembly.xml to more accurately reflect what it is doing. As assembly can me many many things with maven. 2011-02-23 19:18:09 -08:00
alron 550d6e401f Moved assembly file into more maven consistent location. 2011-02-23 19:14:46 -08:00
alron 256436f68d Someone forgot to rev-bump when they released. :)
also, you are not org.bukkit.dynmap. you are org.dynmap.dynmap
2011-02-23 19:07:43 -08:00
FrozenCow 39db895b9d Fixed disable-webserver not being used (thanks for checking that Kilandor). 2011-02-24 00:58:40 +01:00
FrozenCow e6d2c4932a Reverted back to "== '13'" like flames suggested before. This seemed to raise incompatiblities for Firefox and Safari on Mac, not on Linux. 2011-02-24 00:38:46 +01:00
FrozenCow 00f55758c1 Changed version to 0.13. :D 2011-02-24 00:29:57 +01:00
FrozenCow ea64a55c04 Some dumb description changes in configuration. 2011-02-24 00:21:35 +01:00
FrozenCow fcbd76c591 Removed clock configuration. 2011-02-24 00:16:30 +01:00
FrozenCow 9a32485ca9 Small cleanup. 2011-02-24 00:16:10 +01:00
Jason Booth a1d7805116 Fix for NPE JsonTimerTask.java using wrong playerList
Removed unused PlayerList variable in MapManager.java
2011-02-23 17:07:04 -06:00
FrozenCow 20e954b905 Change for the inner nerd in me. 2011-02-24 00:06:36 +01:00
FrozenCow da4c456254 Merge remote-tracking branch 'flames/master' 2011-02-24 00:03:52 +01:00
Jason Booth bd51387c10 Merge branch 'master' of git://github.com/FrozenCow/dynmap 2011-02-23 17:03:10 -06:00
FrozenCow 95bf263f11 Merge remote-tracking branch 'kilandor/master' 2011-02-24 00:02:15 +01:00
Jason Booth 774e013558 Fix jsonfile-interval should be 1 not 1000 2011-02-23 16:31:57 -06:00
Arthur Mayer b6ec0a2955 lechd updated override example 2011-02-23 23:28:28 +01:00
Arthur Mayer cdd30d95c5 lechd's new override style to let the sidebar always open and hides
also the icon
2011-02-23 23:03:26 +01:00
Arthur Mayer cc0bb3b509 fixed chat sending messages from web.
event.keyCode === '13', where the strict equal operator seem to break
safari, firefox and chrome (different value types? keydown event seem
not to provide either a string nor an integer)
2011-02-23 21:26:51 +01:00
FrozenCow 1d2cce6caa Simplified tile-mechanism again (a bit like hMod's version). 2011-02-23 14:06:13 +01:00
FrozenCow b7f6a5a39d Applied style-change of lechd. 2011-02-23 12:40:05 +01:00
FrozenCow 1cc43637ee Merge remote-tracking branch 'kilandor/master' into nowebserver
Conflicts:
	configuration.txt
	src/main/java/org/dynmap/DynmapPlayerListener.java
	src/main/java/org/dynmap/DynmapPlugin.java
	web/map.js
2011-02-22 17:58:39 +01:00
FrozenCow da7da17235 Applied some suggestions by JSLint. 2011-02-22 15:38:49 +01:00
FrozenCow b99f487567 Replaced onPlayerCommand by onCommand (server-consoles can now also be used to execute commands). 2011-02-22 14:51:40 +01:00
FrozenCow ccf6f2ac49 Player per world support @ client. 2011-02-22 14:49:03 +01:00
FrozenCow ca76b29fb9 Made Dynmap package not include subdirectory. 2011-02-22 14:09:14 +01:00
FrozenCow 40c7c9fa66 It's official, ima retard. 2011-02-22 09:17:38 +01:00
FrozenCow fae5014b4e Added commands to plugin.yml, removed disabledcommands and added fullrender <worldname>. 2011-02-22 00:42:37 +01:00
FrozenCow 0fbd0c0a44 Added commands to plugin.yml. 2011-02-21 22:39:21 +01:00
FrozenCow 8d0f509bfe Made MapTypes per World (instead of having MapTypes for all worlds). 2011-02-21 22:17:38 +01:00
FrozenCow 65f3ea4fe3 Used new Bukkit constructor format. 2011-02-21 16:22:16 +01:00
FrozenCow b097fb8321 Added entry for css overrides and cleaned up styles by lechd. 2011-02-20 23:55:16 +01:00
FrozenCow feb6d65d82 Merge remote-tracking branch 'flames/master' 2011-02-20 22:13:41 +01:00
FrozenCow cd4027495c New buttons and example override css by lechd. 2011-02-20 22:11:28 +01:00
Arthur Mayer 298c0f3391 corrected (hopefully) the chat response for show/hide commands 2011-02-20 20:06:07 +01:00
Arthur Mayer e15514291b only OPs can use fullrender. added response to chat for
hide/show/fillrender commands.
2011-02-20 19:49:05 +01:00
FrozenCow f80385e1af Added lechd's new images. 2011-02-20 18:47:18 +01:00
FrozenCow 618d1b05c9 Merge branch 'master' of https://github.com/flames/dynmap 2011-02-20 17:46:27 +01:00
alron aaa06bfc38 Automagic packages built. Love me for this. :) 2011-02-19 21:49:24 -08:00
Arthur Mayer ad07d68d7e added configuration option messagettl, TimeToLive for chatmessages, in
Milliseconds! 15seconds: messagettl: 15000
2011-02-20 02:11:44 +01:00
Arthur Mayer 02fb226350 removed forgotten comma 2011-02-20 02:02:45 +01:00
Arthur Mayer d7fe6072a5 a lot of changes. chat and ui related. thanks FrozenCow & lechd 2011-02-20 01:58:53 +01:00
Jason Booth 6ab82174a5 Added timestamp support to Update Tiles and Chat.
New web config to handle for jsonfile method
Modified webclient to handle timestamps to prevent duplication.
Removed duplicate code in JsonTimerTask.java
2011-02-19 18:55:01 -06:00
FrozenCow 83f334445b Made chatinput reset after send. 2011-02-19 21:16:14 +01:00
FrozenCow d5bd6ff038 Made sendmessage url relative. 2011-02-19 21:08:14 +01:00
Arthur Mayer 22cc46f4b8 many ui iprovements by lechd 2011-02-19 20:51:21 +01:00
FrozenCow 77539522f0 Merge branch 'master' of https://github.com/flames/dynmap 2011-02-19 16:31:36 +01:00
FrozenCow 2bd0052aa9 Added WebChat back to web. 2011-02-19 16:31:13 +01:00
FrozenCow c53e6058be Added debugging to configuration. Disabled by default. 2011-02-19 15:25:31 +01:00
Arthur Mayer 9b604d4e75 Merge remote branch 'choose_remote_name/master' into HEAD 2011-02-19 08:28:03 +01:00
Arthur Mayer 9d490cbcc8 removed my custom url, made it relative 2011-02-19 08:26:40 +01:00
FrozenCow 791341f210 Fixed httpserver thereby also more optimized. 2011-02-19 00:01:42 +01:00
FrozenCow 42d07d6ca2 Added quotes to login/out messages for yaml. 2011-02-19 00:01:21 +01:00
Arthur Mayer 61c6f4a086 corrected the json string in sendChat() 2011-02-18 20:15:18 +01:00
FrozenCow 723e7da8d3 Added stacktrace for errors. 2011-02-18 19:43:45 +01:00
FrozenCow d3cf795ebb Fixed stupid mistake with body of http requests. 2011-02-18 19:42:32 +01:00
Arthur Mayer 67baf5100c forgotten config change for chat 2011-02-18 18:46:48 +01:00
Arthur Mayer 56f126d5f2 uups. removed debug alert, added function call 2011-02-18 11:15:05 +01:00
Arthur Mayer 10f93c02c1 added chatSend() function 2011-02-18 10:21:55 +01:00
Arthur Mayer 5ddaf940ed chat interface added, config option changed from showchatballoons:
ture/false to showchat: balloons/modal
2011-02-18 07:08:29 +01:00
Arthur Mayer 7c917b729e added join and quit messages to chat 2011-02-18 05:30:49 +01:00
Arthur Mayer 00485ddcc2 fixed small bug/typo where players were not removed from player list
at quit game.
2011-02-18 01:28:58 +01:00
Arthur Mayer 55aeb3c583 added custom configuration to nether rendering, changed pom.xml, so
maven compiles dynmap.jar instead of dynamic-map.jar
2011-02-18 01:23:14 +01:00
FrozenCow 1388fa11e5 Some desperate attempts to make IE8 work. 2011-02-18 00:07:59 +01:00
FrozenCow b860c7dd0e Added pinning. 2011-02-18 00:07:51 +01:00
FrozenCow c67b2e5cc2 Added example to configuration. 2011-02-17 21:17:54 +01:00
FrozenCow 44748d7f07 Changed gui by lechd + map per world client-configuration. 2011-02-17 20:08:50 +01:00
Jason Booth 13099587e0 Fixed mistake with map updates only pulling interval+10 instead of interval+10000 2011-02-17 11:14:37 -06:00
Jason Booth 3916c363ae Fixed jsontimer-interval config not being used.
Change JsonTimerTask.java to use jsontimer-interval+10 to allow a buffer for late/delayed client requests(to prevent updated tiles info to be missing)
2011-02-17 10:05:07 -06:00
Jason Booth 77d9a88868 Fixed timer to be stopped onDisabled if it was started 2011-02-17 09:45:32 -06:00
Jason Booth e1f2ca26d6 Changed disable-webserver and jsonfile to default false 2011-02-17 09:38:08 -06:00
Jason Booth 3c1bde1092 Updated JsonTimerTask.java to be Multi-World Compatible 2011-02-17 09:33:27 -06:00
Jason Booth f7dbc89ab4 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
FrozenCow 909207ac26 Organized imports. 2011-02-15 21:44:08 +01:00
FrozenCow 99605ba433 Make sure request-body is skipped if not read. 2011-02-15 21:06:14 +01:00
FrozenCow ada9637d72 Added sendmessage handler (for chatting back). 2011-02-15 21:00:36 +01:00
FrozenCow 2d693b1ebf Improved HTTP performance and POST/PUT compatbility. 2011-02-15 21:00:04 +01:00
FrozenCow e900aca2e0 Added helper classes for HTTP. 2011-02-15 14:19:43 +01:00
FrozenCow 060d1092f9 Made clock configurable and split clocks from map. 2011-02-15 13:50:04 +01:00
FrozenCow 38df91bafe Report world for players in updates. 2011-02-15 13:38:46 +01:00
FrozenCow 18ad2e1d79 Removed copyrights through flames' css. 2011-02-15 13:33:40 +01:00
FrozenCow 5fb098259a focuschatballoons now defaults to false. 2011-02-15 13:08:33 +01:00
Daniel Chesters 24c9dfed41 if focuschatballoons is at false, disableAutoPan should be at true 2011-02-14 21:53:07 +01:00
FrozenCow a1c86bfabb Removed depricated time-images. 2011-02-14 00:02:52 +01:00
FrozenCow 49d45c653d Made clock and timeofday interchangable. 2011-02-14 00:01:20 +01:00
FrozenCow 42391cc4d5 Readded getMinecraftTime. 2011-02-13 23:30:19 +01:00
FrozenCow 3980ebefa1 Revert "Removed Clock"
This reverts commit 9ca8f8dc64e9a28da81a538a3578c2b2a8b34c88.
2011-02-13 23:27:37 +01:00
lishid 058ab0eea7 Transparent compass now 2011-02-13 23:27:37 +01:00
lishid 6e8160e576 Removed Clock 2011-02-13 23:27:37 +01:00
lishid 51e7420bdb Dynamic Time of the day Added 2011-02-13 23:27:37 +01:00
lishid 60ea503053 Added/Modified images 2011-02-13 23:27:37 +01:00
lishid f894c4945b Added/Modified images 2011-02-13 23:27:37 +01:00
lishid 7241b2be81 Added compass and TimeOfDay 2011-02-13 23:27:37 +01:00
unknown b729f28df4 initial commit 2011-02-13 23:27:37 +01:00
FrozenCow 1fc2cdb636 Force making directories on tile-rendering (needs cleaner fix). 2011-02-13 23:23:15 +01:00
FrozenCow b63369675d Re-added flushing again (oops). 2011-02-13 23:22:57 +01:00
FrozenCow a81665d38d Fixed time being reported of the correct world. 2011-02-13 22:46:45 +01:00
FrozenCow db9ced3394 Fixed tiles not updating. 2011-02-13 22:42:08 +01:00
FrozenCow d5d737d385 Fixed 'unknown command' being shown after fullrender. 2011-02-13 22:34:38 +01:00
FrozenCow f3a1d53277 Added maximumheight to configuration for somewhat better nether rendering. 2011-02-13 22:33:33 +01:00
FrozenCow 9a2b9ccac0 Fixed HttpServer some more. 2011-02-13 22:30:24 +01:00
FrozenCow 835e566151 Some improvements to HttpServer. 2011-02-13 02:56:00 +01:00
FrozenCow 2380325975 Added automatically creating tiles directory. 2011-02-13 01:33:05 +01:00
FrozenCow 100f3e0590 Added multiworld update support along with client-side support. 2011-02-13 01:19:47 +01:00
FrozenCow 5b0171c459 Server-side multiworld support with several improvements overal. 2011-02-12 23:47:00 +01:00
FrozenCow 2fd91ef94b Changed tilepath to tilespath in configuration. 2011-02-11 06:28:17 -08:00
FrozenCow 403a2acc53 Added default player-faces. 2011-02-10 01:20:50 +01:00
Jason Booth 959040e5f4 Merge branch 'master' of git://github.com/FrozenCow/dynmap 2011-02-09 14:24:13 -06:00
Jason Booth 2f6930bc17 Removed System debug messages.
Added missing JsonTimerTask.java
2011-02-09 11:57:46 -06:00
Jason Booth fb01f6ecf7 New config to Disable Webserver
New feature and config to output JSON to file
2011-02-09 11:35:09 -06:00
FrozenCow 29517e9a24 Fixed handling invalid http requests. 2011-02-09 17:22:16 +01:00
FrozenCow d566fccb1e Fixed rendering zoomedout tiles. 2011-02-09 13:25:06 +01:00
FrozenCow b2f6ae5132 Disabled fullrender by default. 2011-02-09 01:03:31 +01:00
FrozenCow 5c209c2a5e Renamed y to z in DynmapChunk. 2011-02-09 00:42:16 +01:00
FrozenCow fb1b5df3d0 Made zoomed-rendering make use of existing tile-files instead of keeping those tiles in memory. 2011-02-08 23:38:57 +01:00
FrozenCow 38ee8657e8 Better exception handling. 2011-02-08 20:59:51 +01:00
FrozenCow 89c8d564a4 Made use of newly introduced unloadChunk in BukkitAPI + removal of unstable features. 2011-02-08 20:27:37 +01:00
FrozenCow b31bb14452 disabledcommands can now be empty. 2011-02-07 22:26:55 +01:00
FrozenCow 553eb7952d Added ability to disable commands in configuration. 2011-02-07 17:25:16 +01:00
FrozenCow 421b91058a Merge https://github.com/kosiini/dynmap 2011-02-07 17:01:39 +01:00
Janne Sinisalo 100a03274c Compile fix for multiworld
Updated getWorlds()[0] to getWorlds().get(0)
2011-02-07 17:42:11 +02:00
FrozenCow d2b7169884 Workaround for IE's retardness (not yet tested). 2011-02-06 15:09:15 +01:00
FrozenCow 3e398e9124 Made updates in JSON format. Combined chat and tile queues into one UpdateQueue. Fixed UpdateQueue. 2011-02-06 03:00:51 +01:00
FrozenCow 7c257af454 Fixed Json stringify. 2011-02-06 02:00:27 +01:00
FrozenCow a937d13086 Added reflection-support for stringifyJson. 2011-02-05 21:09:49 +01:00
FrozenCow d651d58d63 Moved stringifyJson to Json class. 2011-02-05 21:02:39 +01:00
FrozenCow 9a655676ab Moved FileHandler to handlers package. 2011-02-05 20:54:28 +01:00
FrozenCow debf5bcc57 Renamed WebServer to HttpServer and WebServerRequest to HttpServerConnection. 2011-02-05 20:53:42 +01:00
FrozenCow 2a79aea7bb Moved handlers to their own (independent) classes. 2011-02-05 20:51:20 +01:00
FrozenCow 883eba6890 Removed debugging + small fix. 2011-02-05 19:57:32 +01:00
FrozenCow 226cc5f86c More work on HttpServer. 2011-02-05 19:51:48 +01:00
FrozenCow bf0edea7e2 Initial http-server work. 2011-02-05 19:51:48 +01:00
FrozenCow 711341ec47 Oops, forgot comma. 2011-02-05 19:51:06 +01:00
FrozenCow 14a3d32205 Used colors.txt from lechd. 2011-02-05 17:49:11 +01:00
FrozenCow 9f555bd4bb Added 'loadChunks' to configuration. 2011-02-05 03:03:52 +01:00
FrozenCow 902cc87458 Added 'focuschatballoons' to config influenced by Incendia's suggestion. 2011-02-05 02:59:03 +01:00
FrozenCow 9951baf8b5 Made tiles use nearest-neighbor filtering in Firefox and IE as suggested by lechd. 2011-02-05 02:54:06 +01:00
FrozenCow 335109d8c7 Added pumpkin colors as suggested by lechd. 2011-02-05 02:53:22 +01:00
FrozenCow 3940b91d0e Applied Eclipse formatting. 2011-02-05 02:25:18 +01:00
FrozenCow 4f138a56da Removed comments. 2011-02-05 02:11:49 +01:00
FrozenCow c8cf39a440 Added unstable fullmap rendering. Also... messed up formatting by pressing ctrl+shift+f in eclipse, sigh 2011-02-05 02:01:04 +01:00
FrozenCow 138aed8c33 Added chunk loading to rendering. 2011-02-04 23:12:55 +01:00
FrozenCow fde56275fe Changed day/night time as suggested by lologarithm. 2011-02-02 11:58:14 +01:00
FrozenCow 13e829cda0 Updated Server.getTime to World.getTime (to reflect Bukkit's changes) 2011-02-02 11:40:49 +01:00
FrozenCow 455b5d3b3e Added showchatballoons, showplayerfacesonmap and showplayerfacesinmenu to configuration. 2011-02-01 15:16:54 +01:00
FrozenCow 8abf596ba6 Organized imports. 2011-02-01 14:23:13 +01:00
FrozenCow 1beb4fa466 Added server-to-client configuration and maptype-configuration: enables serverside configuration of maps and updaterate. 2011-02-01 14:17:08 +01:00
FrozenCow e47b4dc49f Small fixes to chat-balloons. 2011-01-26 01:05:00 +01:00
FrozenCow 3ff0b85ef7 Merge branch 'master' of https://github.com/NathanWolf/dynmap 2011-01-26 00:39:48 +01:00
FrozenCow 99ae8a8f3b Moved Web* to webpackage and added server-to-client configuration (server-side). 2011-01-26 00:38:36 +01:00
Nathan Wolf 18b36f96fe Finish the client-side chat bubble interface:
- Bubbles disappear automatically after some time
 - Each bubble shows the last 5 messages for each player
 - Some formatting to the bubble done, could be better (add high-res
player pic?)
2011-01-25 15:10:42 -08:00
FrozenCow 36d1a7676e Merge branch 'master' of https://github.com/NathanWolf/dynmap 2011-01-25 23:06:48 +01:00
Nathan Wolf f14e097c54 Adding chat message pop-ups! 2011-01-25 14:03:27 -08:00
FrozenCow 4de18ac700 Changed startup message (shows webserver-info, hides debug) 2011-01-25 22:59:22 +01:00
FrozenCow 98f03c588e Added ignores. 2011-01-25 22:56:35 +01:00
FrozenCow 5ee5fee232 Added getters/setters. 2011-01-25 18:43:11 +01:00
FrozenCow c2047fe7c4 Fixed webpath and tilepath accepting absolute paths. 2011-01-23 19:56:59 +01:00
FrozenCow 34093874bc Changed /map to /dynmap. 2011-01-23 12:07:23 +01:00
FrozenCow 676f6c5a3e Made it possible to change background color in style.css 2011-01-23 12:00:15 +01:00
FrozenCow 9ea9e347ea Changed proxy-url to /up/ as ktr suggested. 2011-01-22 14:55:50 -08:00
FrozenCow 75efba1425 Fixed comment in config.js. 2011-01-20 23:29:38 +01:00
FrozenCow 6419469be3 Added ability to hide players (/map hide, /map hide playername(s) and /map show). 2011-01-20 22:56:39 +01:00
FrozenCow 68412ae27d Changed '/map_render' to '/map render'. 2011-01-20 20:50:18 +01:00
FrozenCow bcb25468db Added aspx for proxying on IIS. 2011-01-20 20:48:00 +01:00
FrozenCow 78b243371d Fixed red and yellow colors for flowers. 2011-01-19 19:29:37 +01:00
FrozenCow 867f069822 Added new minecraft-blocks to colors. 2011-01-18 20:54:47 +01:00
FrozenCow 7dec76aadc Removed web from jar. 2011-01-18 20:54:32 +01:00
FrozenCow b27fcdbd4b Changed configuration to key/value instead of full YAML. 2011-01-18 20:08:05 +01:00
FrozenCow 9b8a90bf9f Added some of the configuration options. (not all yet) 2011-01-16 21:44:03 +01:00
FrozenCow 3aa48f2215 Added configuration and renamed Map to MapType. 2011-01-16 18:09:58 +01:00
FrozenCow ce60452a35 Fix to be compatible with latest Bukkit. 2011-01-16 11:51:56 +01:00
Arthur Mayer 08ba9de51c changed dependencie from java version 1.5 to 1.6 in maven project file 2011-01-16 00:35:38 +01:00
flames 9f1c8f548a reverted pom.xml back to its old version 2011-01-16 00:35:19 +01:00
FrozenCow 18a1f484d8 Fixed to be compatible with latest Dynmap. 2011-01-15 23:18:16 +01:00
FrozenCow 53e7ab73a0 Fix to reflect Bukkit's changes. Also fixes the threading-problems. 2011-01-15 21:44:27 +01:00
FrozenCow 6205aee3b6 Updated maven buildfile, removed depricated readmes. 2011-01-15 12:13:54 +01:00
FrozenCow 32567b8569 Removed hardcoded path, sigh. 2011-01-15 03:33:30 +01:00
FrozenCow b501f1d8cb More exception handling and messages. 2011-01-15 02:57:11 +01:00
FrozenCow b22a48d5cb Fixed small browser incompatibilities 2011-01-15 02:11:31 +01:00
FrozenCow b5deec79be Enabled hack for faster rendering when zoomed in, which also fixed a bug that was annoying to fix. 2011-01-15 00:02:03 +01:00
FrozenCow d594df93ee Fixed little bug. 2011-01-15 00:01:44 +01:00
FrozenCow 686b09bc9d Tiles will now also generate when destroying blocks. 2011-01-14 23:41:13 +01:00
FrozenCow dfc051743d Better way of handling inheriting in javascript. 2011-01-14 23:38:50 +01:00
FrozenCow dfe33efdc3 Made dynmap's javascript self-contained, which allows for multiple maps on a single page. 2011-01-14 20:08:23 +01:00
FrozenCow 77b0bc1664 More debug messages. 2011-01-14 20:05:12 +01:00
FrozenCow 2e1a9d0a0e Changed Color to ChatColor to reflect Bukkits changes. 2011-01-14 14:51:29 +01:00
FrozenCow ff5f96aa78 Small fix for loadColorSet. 2011-01-13 15:33:30 +01:00
FrozenCow 342a72f39f Made colors load from jar when not found in filesystem. 2011-01-13 11:18:54 +01:00
FrozenCow 4f0e89b1d8 Set tilePath to 'tiles/'. 2011-01-13 01:57:19 +01:00
FrozenCow c4cce7182a More cleanup. 2011-01-12 02:03:31 +01:00
FrozenCow d634aede92 Minor cleaups. 2011-01-12 01:45:56 +01:00
FrozenCow 27fb8a20f1 Abstracted clock and tile-updating a bit. 2011-01-12 01:28:45 +01:00
FrozenCow 8263918b8d Abstracted from cave+normal to kzedmaps. Can now have any configurable type of map. 2011-01-10 23:58:39 +01:00
FrozenCow 4b5e6e6f80 Cleaned up client-side tile logic. 2011-01-10 01:28:50 +01:00
FrozenCow c8a08b5af7 Commented debug-tile-grid. 2011-01-10 00:43:23 +01:00
FrozenCow ce7bfdb46e Small cleanup. 2011-01-10 00:38:18 +01:00
FrozenCow a08edc3fa9 Fixed zoomed tile/player not fitting unzoomed. 2011-01-10 00:31:44 +01:00
FrozenCow 2b2891bd0a Readded zoom-tiles. Still needs some work. 2011-01-09 01:12:35 +01:00
FrozenCow e1a3ac60e2 Cleanup/Refactoring. 2011-01-08 18:56:08 +01:00
FrozenCow 8860eb8c04 Splitted up MapManager. 2011-01-08 03:20:51 +01:00
FrozenCow 90afd9ef82 Restructured MapManager. 2011-01-07 15:36:50 +01:00
FrozenCow 6a7559f3ad Expanded internal webserver to also handle web and tiles, where web-files can be retrieved from filesystem or jar. Also some debugging changes. 2011-01-07 04:50:43 +01:00
flames b4fca31cd5 added configvariable bindaddress (thanks FrozenCow) 2011-01-07 02:52:59 +01:00
FrozenCow 8162817041 Reenabled time again by using Bukkit's getTime. 2011-01-06 16:37:54 +01:00
FrozenCow c5d5a85a17 Separated rendering from MapTile, removed separate cave logic (integrated in rendering) and temporarily removed/disabled zoom-rendering. 2011-01-06 03:30:50 +01:00
flames 225d28e177 Added maven build file 2011-01-06 01:50:45 +01:00
FrozenCow 4261f30dcd Made code better fit for Bukkit. 2011-01-05 21:19:11 +01:00
FrozenCow eafc8a858c Added seperate file for ant build parameters. 2011-01-05 21:17:27 +01:00
FrozenCow f0ec375834 Put classes in package to be more compatible with Bukkit. 2011-01-05 19:41:21 +01:00
FrozenCow 80f9435a1a Initial bukket work, now compileable 2011-01-03 23:15:58 +01:00
150 changed files with 6368 additions and 2952 deletions
+25
View File
@@ -0,0 +1,25 @@
# Eclipse stuff
/.classpath
/.project
/.settings
# netbeans
/nbproject
# we use maven!
/build.xml
# maven
/target
# vim
.*.sw[a-p]
# various other potential build files
/build
/bin
/dist
/manifest.mf
# Mac filesystem dust
/.DS_Store
+15 -20
View File
@@ -1,46 +1,41 @@
<project name="dynmap" default="dist" basedir=".">
<!-- Change the following two properties to the correct jar files -->
<property name="minecraftserver.jar" location="../../minecraft_server.jar"/>
<property name="hmod.jar" location="../../Minecraft_Mod.jar"/>
<property name="bukkit.jar" location="C:\Users\Bob\Desktop\minecraft_server\bukkit-0.0.1-SNAPSHOT.jar"/>
<property name="minecraft" location="C:\Users\Bob\Desktop\minecraft_server"/>
<property name="plugins" location="${minecraft}/plugins/"/>
<property name="http_root" location="/srv/http/dynmap/"/>
<property name="pluginname" value="dynmap"/>
<property name="minecraft" location="../../"/>
<property name="plugins" location="${minecraft}/plugins/"/>
<property name="http_root" location="/srv/http/dynmap/"/>
<property name="src" location="src"/>
<property name="bin" location="bin"/>
<property name="dist" location="dist"/>
<property name="web" location="web"/>
<target name="init">
<mkdir dir="${bin}"/>
</target>
<target name="compile" depends="init">
<javac srcdir="${src}" destdir="${bin}" includeantruntime="false">
<classpath>
<pathelement location="${hmod.jar}"/>
<pathelement location="${minecraftserver.jar}"/>
</classpath>
</javac>
<javac srcdir="${src}/main/java" destdir="${bin}" classpath="${bukkit.jar}" debug="on" includeantruntime="false" />
</target>
<target name="dist" depends="compile">
<mkdir dir="${dist}"/>
<jar jarfile="${dist}/map.jar" basedir="${bin}"/>
<jar jarfile="${dist}/${pluginname}.jar">
<fileset dir="${bin}"/>
<fileset file="${src}/main/resources/plugin.yml"/>
<zipfileset file="${src}/main/resources/colors.txt"/>
</jar>
</target>
<target name="deploy" depends="dist">
<copy file="${dist}/map.jar" todir="${plugins}"/>
<copy file="colors.txt" todir="${minecraft}"/>
<copy file="${dist}/${pluginname}.jar" todir="${plugins}"/>
<copy todir="${http_root}">
<fileset dir="web"/>
</copy>
</target>
<target name="release" depends="dist">
<delete file="dynmap.zip"/>
<zip destfile="dynmap.zip">
<delete file="${pluginname}.zip"/>
<zip destfile="${pluginname}.zip">
<zipfileset dir="." includes="README.md" fullpath="readme.txt"/>
<zipfileset dir="." includes="build.xml"/>
<zipfileset dir="${dist}" includes="*.jar"/>
@@ -53,4 +48,4 @@
<delete dir="${bin}"/>
<delete dir="${dist}"/>
</target>
</project>
</project>
+6
View File
@@ -0,0 +1,6 @@
<project name="dynmap_parameters" basedir=".">
<property name="bukkit.jar" location="../../bukkit.jar"/>
<property name="minecraft" location="../../"/>
<property name="plugins" location="${minecraft}/plugins/"/>
<property name="http_root" location="/srv/http/dynmap/"/>
</project>
+125 -22
View File
@@ -1,72 +1,175 @@
Stone
1 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
Grass
2 117 176 73 255 93 140 58 255 58 88 36 255 46 70 29 255
Dirt
3 134 96 67 255 107 76 53 255 67 48 33 255 53 38 26 255
Cobblestone
4 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
48 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Wooden Plank
5 157 128 79 255 125 102 63 255 78 64 39 255 62 51 31 255
Sappling
6 120 120 120 0 96 96 96 0 60 60 60 0 48 48 48 0
Bedrock
7 84 84 84 255 67 67 67 255 42 42 42 255 33 33 33 255
Water
8 38 92 255 51 30 73 204 51 19 46 127 51 15 36 102 51
Stationary Water
9 38 92 255 51 30 73 204 51 19 46 127 51 15 36 102 51
Lava
10 255 90 0 255 204 72 0 255 127 45 0 255 102 36 0 255
Stationary Lava
11 255 90 0 255 204 72 0 255 127 45 0 255 102 36 0 255
Sand
12 218 210 158 255 174 168 126 255 109 105 79 255 87 84 63 255
Gravel
13 136 126 126 255 108 100 100 255 68 63 63 255 54 50 50 255
Gold Ore
14 143 140 125 255 114 112 100 255 71 70 62 255 57 56 50 255
Iron Ore
15 136 130 127 255 108 104 101 255 68 65 63 255 54 52 50 255
Coal Ore
16 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Wood
17 102 81 51 255 81 64 40 255 51 40 25 255 40 32 20 255
Leaves
18 60 192 41 100 48 153 32 100 30 96 20 100 24 76 16 100
Sponge
19 193 193 65 255 174 174 47 255 97 97 5 255 76 76 20 255
Glass
20 255 255 255 64 204 204 204 64 127 127 127 64 102 102 102 64
Lapis Lazuli Ore
21 23 68 196 255 18 56 158 255 14 43 122 255 14 43 78 255
Lapis Lazuli Block
22 23 68 196 255 18 56 158 255 14 43 122 255 14 43 78 255
Dispenser
23 96 96 96 255 76 76 76 255 48 48 48 255 38 38 38 255
Sandstone
24 218 210 158 255 174 168 126 255 109 105 79 255 87 84 63 255
Note Block
25 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255
Aqua Green Cloth
26 43 192 117 255 38 168 101 255 34 150 90 255 29 130 78 255
Cyan Cloth
27 43 192 192 255 36 185 185 255 29 130 130 255 22 99 99 255
Blue Cloth
28 0 0 255 255 0 0 204 255 0 0 127 255 0 0 102 255
Purple Cloth
29 101 101 188 255 95 95 175 255 86 86 160 255 78 78 145 255
Indigo Cloth
30 113 41 186 255 99 38 165 255 85 32 142 255 72 27 119 255
Violet Cloth
31 156 65 198 255 132 55 168 255 112 47 142 255 84 35 107 255
Magenta Cloth
32 187 42 187 255 160 36 160 255 135 31 135 255 112 25 112 255
Pink Cloth
33 192 43 117 255 168 38 103 255 142 32 87 255 127 29 78 255
Black Cloth
34 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255
Wool
35 222 222 222 255 177 177 177 255 111 111 111 255 88 88 88 255
37 255 0 0 255 204 0 0 255 127 0 0 255 102 0 0 255
38 255 255 0 0 204 204 0 0 127 127 0 0 102 102 0 0
Gray Cloth
36 125 125 125 255 114 114 114 255 104 104 104 255 86 86 86 255
Yellow Flower
37 255 255 0 255 204 204 0 255 127 127 0 255 102 102 0 255
Red Rose
38 255 0 0 255 204 0 0 255 127 0 0 255 102 0 0 255
Brown Mushroom
39 204 153 120 32 145 109 85 32 114 86 67 32 73 64 58 32
Red Mushroom
40 255 43 43 32 196 29 38 32 186 105 109 32 124 64 64 32
Gold Block
41 232 245 46 255 185 196 36 255 116 122 23 255 92 98 18 255
Iron Block
42 191 191 191 255 152 152 152 255 95 95 95 255 76 76 76 255
Double Stone Slab
43 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255
Stone Slab
44 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255
Brick
45 170 86 62 255 136 68 49 255 85 43 31 255 68 34 24 255
TNT
46 160 83 65 255 128 66 52 255 80 41 32 255 64 33 26 255
Bookshelf
54 125 91 38 192 100 72 30 192 62 45 19 192 50 36 15 192
Moss Stone
48 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Obsidian
49 26 11 43 255 20 8 34 255 13 5 21 255 10 4 17 255
Torch
50 159 127 80 255 98 88 20 0 245 220 50 255 196 176 40 0
Fire
51 255 170 30 200 204 136 24 200 127 85 15 200 102 68 12 200
Monster Spawner
52 0 150 110 196 0 150 130 196 0 150 110 196 0 150 130 196
Wooden Stair
53 157 128 79 255 125 102 63 255 78 64 39 255 62 51 31 255
Chest
54 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255
Diamond Ore
56 129 140 143 255 103 112 114 255 64 70 71 255 51 56 57 255
Diamond Block
57 45 166 152 255 36 132 121 255 22 83 76 255 18 66 60 255
Workbench
58 114 88 56 255 91 70 44 255 57 44 28 255 45 35 22 255
Crops
59 146 192 0 255 116 153 0 255 73 96 0 255 58 76 0 255
Farmland
60 95 58 30 255 76 46 24 255 47 29 15 255 38 23 12 255
Furnace
61 96 96 96 255 76 76 76 255 48 48 48 255 38 38 38 255
Burning Furnace
62 96 96 96 255 76 76 76 255 48 48 48 255 38 38 38 255
Sign Post
63 111 91 54 255 88 72 43 255 55 45 27 255 44 36 21 255
Wooden Door
64 136 109 67 255 108 87 53 255 68 54 33 255 54 43 26 255
Ladder
65 181 140 64 32 144 112 51 32 90 70 32 32 72 56 25 32
Minecart Tracks
66 150 134 102 180 120 107 81 180 75 67 51 180 60 53 40 180
Cobblestone Stairs
67 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Iron Door
71 191 191 191 255 152 152 152 255 95 95 95 255 76 76 76 255
Redstone Ore
73 131 107 107 255 104 85 85 255 65 53 53 255 52 42 42 255
Glowing Redstone Ore
74 131 107 107 255 104 85 85 255 65 53 53 255 52 42 42 255
78 255 255 255 255 204 204 204 255 127 127 127 255 102 102 102 255
79 83 113 163 51 66 90 130 51 41 56 81 51 33 45 65 51
80 250 250 250 255 200 200 200 255 125 125 125 255 100 100 100 255
81 25 120 25 255 20 96 20 255 12 60 12 255 10 48 10 255
82 151 157 169 255 120 125 135 255 75 78 84 255 60 62 67 255
83 193 234 150 255 154 187 120 255 96 117 75 255 77 93 60 255
redstone torch off
Redstone Torch off
75 159 127 80 255 72 56 25 0 181 140 64 255 144 112 51 0
redstone torch on
Redstone Torch on
76 159 127 80 255 102 0 0 0 255 0 0 255 204 0 0 0
torch
50 159 127 80 255 98 88 20 0 245 220 50 255 196 176 40 0
fence
85 172 136 82 255 172 136 82 0 91 70 37 255 91 70 37 0
netherstone
Snow
78 255 255 255 255 204 204 204 255 127 127 127 255 102 102 102 255
Ice
79 83 113 163 51 66 90 130 51 41 56 81 51 33 45 65 51
Snow Block
80 250 250 250 255 200 200 200 255 125 125 125 255 100 100 100 255
Cactus
81 25 120 25 255 20 96 20 255 12 60 12 255 10 48 10 255
Clay
82 151 157 169 255 120 125 135 255 75 78 84 255 60 62 67 255
Sugar Cane
83 193 234 150 255 154 187 120 255 96 117 75 255 77 93 60 255
Jukebox
84 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255
Fence
85 127 98 49 96 95 72 33 96 48 34 9 96 32 21 21 96
Pumpkin
86 255 115 0 200 204 92 0 200 126 57 0 200 102 46 0 200
Netherrack
87 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
slowsand
Soulsand
88 133 109 94 255 121 97 82 255 90 70 57 255 79 59 46 255
lightstone
Glowstone
89 249 212 156 255 255 188 94 255 192 143 70 255 122 91 44 255
portal
90 99 66 222 128 99 66 222 128 99 66 222 128 99 66 222 128
Portal
90 140 0 196 128 120 0 196 128 140 0 196 128 120 0 196 128
Jack-o-lantern
91 255 115 0 255 204 92 0 255 126 57 0 255 102 46 0 255
Cake Block
92 234 234 234 255 210 210 210 255 203 203 203 255 190 190 190 255
+175
View File
@@ -0,0 +1,175 @@
Stone
1 120 120 120 255 96 96 96 255 60 60 60 255 48 48 48 255
Grass
2 60 113 17 255 50 94 14 255 42 79 12 255 50 94 14 255
Dirt
3 134 96 67 255 107 76 53 255 67 48 33 255 53 38 26 255
Cobblestone
4 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Wooden Plank
5 157 128 79 255 125 102 63 255 78 64 39 255 62 51 31 255
Sappling
6 120 120 120 0 96 96 96 0 60 60 60 0 48 48 48 0
Bedrock
7 84 84 84 255 67 67 67 255 42 42 42 255 33 33 33 255
Water
8 38 92 255 51 30 73 204 51 19 46 127 51 15 36 102 51
Stationary Water
9 38 92 255 51 30 73 204 51 19 46 127 51 15 36 102 51
Lava
10 255 90 0 255 204 72 0 255 127 45 0 255 102 36 0 255
Stationary Lava
11 255 90 0 255 204 72 0 255 127 45 0 255 102 36 0 255
Sand
12 218 210 158 255 174 168 126 255 109 105 79 255 87 84 63 255
Gravel
13 136 126 126 255 108 100 100 255 68 63 63 255 54 50 50 255
Gold Ore
14 143 140 125 255 114 112 100 255 71 70 62 255 57 56 50 255
Iron Ore
15 136 130 127 255 108 104 101 255 68 65 63 255 54 52 50 255
Coal Ore
16 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Wood
17 102 81 51 255 81 64 40 255 51 40 25 255 40 32 20 255
Leaves
18 27 69 37 180 22 57 31 180 19 48 25 180 22 57 31 180
Sponge
19 193 193 65 255 174 174 47 255 97 97 5 255 76 76 20 255
Glass
20 255 255 255 64 204 204 204 64 127 127 127 64 102 102 102 64
Lapis Lazuli Ore
21 23 68 196 255 18 56 158 255 14 43 122 255 14 43 78 255
Lapis Lazuli Block
22 23 68 196 255 18 56 158 255 14 43 122 255 14 43 78 255
Dispenser
23 96 96 96 255 76 76 76 255 48 48 48 255 38 38 38 255
Sandstone
24 192 178 110 255 160 148 92 255 134 124 77 255 160 148 92 255
Note Block
25 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255
Aqua Green Cloth
26 43 192 117 255 38 168 101 255 34 150 90 255 29 130 78 255
Cyan Cloth
27 43 192 192 255 36 185 185 255 29 130 130 255 22 99 99 255
Blue Cloth
28 0 0 255 255 0 0 204 255 0 0 127 255 0 0 102 255
Purple Cloth
29 101 101 188 255 95 95 175 255 86 86 160 255 78 78 145 255
Indigo Cloth
30 113 41 186 255 99 38 165 255 85 32 142 255 72 27 119 255
Violet Cloth
31 156 65 198 255 132 55 168 255 112 47 142 255 84 35 107 255
Magenta Cloth
32 187 42 187 255 160 36 160 255 135 31 135 255 112 25 112 255
Pink Cloth
33 192 43 117 255 168 38 103 255 142 32 87 255 127 29 78 255
Black Cloth
34 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255
Wool
35 247 255 239 255 244 251 236 255 204 210 197 255 244 251 236 255
Gray Cloth
36 125 125 125 255 114 114 114 255 104 104 104 255 86 86 86 255
Yellow Flower
37 255 255 0 255 204 204 0 255 127 127 0 255 102 102 0 255
Red Rose
38 255 0 0 255 204 0 0 255 127 0 0 255 102 0 0 255
Brown Mushroom
39 204 153 120 32 145 109 85 32 114 86 67 32 73 64 58 32
Red Mushroom
40 255 43 43 32 196 29 38 32 186 105 109 32 124 64 64 32
Gold Block
41 232 245 46 255 185 196 36 255 116 122 23 255 92 98 18 255
Iron Block
42 191 191 191 255 152 152 152 255 95 95 95 255 76 76 76 255
Double Stone Slab
43 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255
Stone Slab
44 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255
Brick
45 170 86 62 255 136 68 49 255 85 43 31 255 68 34 24 255
TNT
46 160 83 65 255 128 66 52 255 80 41 32 255 64 33 26 255
Bookshelf
54 125 91 38 192 100 72 30 192 62 45 19 192 50 36 15 192
Moss Stone
48 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Obsidian
49 26 11 43 255 20 8 34 255 13 5 21 255 10 4 17 255
Torch
50 159 127 80 255 98 88 20 0 245 220 50 255 196 176 40 0
Fire
51 255 170 30 200 204 136 24 200 127 85 15 200 102 68 12 200
Monster Spawner
52 0 150 110 196 0 150 130 196 0 150 110 196 0 150 130 196
Wooden Stair
53 157 128 79 255 125 102 63 255 78 64 39 255 62 51 31 255
Chest
54 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255
Diamond Ore
56 129 140 143 255 103 112 114 255 64 70 71 255 51 56 57 255
Diamond Block
57 45 166 152 255 36 132 121 255 22 83 76 255 18 66 60 255
Workbench
58 114 88 56 255 91 70 44 255 57 44 28 255 45 35 22 255
Crops
59 146 192 0 255 116 153 0 255 73 96 0 255 58 76 0 255
Farmland
60 95 58 30 255 76 46 24 255 47 29 15 255 38 23 12 255
Furnace
61 96 96 96 255 76 76 76 255 48 48 48 255 38 38 38 255
Burning Furnace
62 96 96 96 255 76 76 76 255 48 48 48 255 38 38 38 255
Sign Post
63 111 91 54 255 88 72 43 255 55 45 27 255 44 36 21 255
Wooden Door
64 136 109 67 255 108 87 53 255 68 54 33 255 54 43 26 255
Ladder
65 181 140 64 32 144 112 51 32 90 70 32 32 72 56 25 32
Minecart Tracks
66 150 134 102 180 120 107 81 180 75 67 51 180 60 53 40 180
Cobblestone Stairs
67 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Iron Door
71 191 191 191 255 152 152 152 255 95 95 95 255 76 76 76 255
Redstone Ore
73 131 107 107 255 104 85 85 255 65 53 53 255 52 42 42 255
Glowing Redstone Ore
74 131 107 107 255 104 85 85 255 65 53 53 255 52 42 42 255
Redstone Torch off
75 159 127 80 255 72 56 25 0 181 140 64 255 144 112 51 0
Redstone Torch on
76 159 127 80 255 102 0 0 0 255 0 0 255 204 0 0 0
Snow
78 255 255 255 255 204 204 204 255 127 127 127 255 102 102 102 255
Ice
79 83 113 163 51 66 90 130 51 41 56 81 51 33 45 65 51
Snow Block
80 250 250 250 255 200 200 200 255 125 125 125 255 100 100 100 255
Cactus
81 25 120 25 255 20 96 20 255 12 60 12 255 10 48 10 255
Clay
82 151 157 169 255 120 125 135 255 75 78 84 255 60 62 67 255
Sugar Cane
83 193 234 150 255 154 187 120 255 96 117 75 255 77 93 60 255
Jukebox
84 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255
Fence
85 127 98 49 96 95 72 33 96 48 34 9 96 32 21 21 96
Pumpkin
86 255 115 0 200 204 92 0 200 126 57 0 200 102 46 0 200
Netherrack
87 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
Soulsand
88 133 109 94 255 121 97 82 255 90 70 57 255 79 59 46 255
Glowstone
89 249 212 156 255 255 188 94 255 192 143 70 255 122 91 44 255
Portal
90 140 0 196 128 120 0 196 128 140 0 196 128 120 0 196 128
Jack-o-lantern
91 255 115 0 255 204 92 0 255 126 57 0 255 102 46 0 255
Cake Block
92 234 234 234 255 210 210 210 255 203 203 203 255 190 190 190 255
+175
View File
@@ -0,0 +1,175 @@
Stone
1 119 104 84 255 104 95 80 255 96 87 72 255 77 68 53 255
Grass
2 75 156 43 255 56 117 32 255 35 104 10 255 32 82 0 255
Dirt
3 134 96 67 255 107 76 53 255 67 48 33 255 68 49 33 255
Cobblestone
4 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Wooden Plank
5 157 128 79 255 125 102 63 255 78 64 39 255 62 51 31 255
Sappling
6 120 120 120 0 96 96 96 0 60 60 60 0 48 48 48 0
Bedrock
7 84 84 84 255 67 67 67 255 42 42 42 255 33 33 33 255
Water
8 21 88 125 80 7 70 117 80 6 68 115 80 5 53 90 80
Stationary Water
9 21 88 125 80 7 70 117 80 6 68 115 80 5 53 90 80
Lava
10 255 90 0 255 204 72 0 255 127 45 0 255 102 36 0 255
Stationary Lava
11 255 90 0 255 204 72 0 255 127 45 0 255 102 36 0 255
Sand
12 214 182 111 255 203 171 100 255 186 154 83 255 173 141 70 255
Gravel
13 136 126 126 255 108 100 100 255 68 63 63 255 54 50 50 255
Gold Ore
14 143 140 125 255 114 112 100 255 71 70 62 255 57 56 50 255
Iron Ore
15 136 130 127 255 108 104 101 255 68 65 63 255 54 52 50 255
Coal Ore
16 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Wood
17 102 81 51 255 81 64 40 255 51 40 25 255 40 32 20 255
Leaves
18 23 68 6 100 12 56 0 100 6 52 0 100 0 42 0 100
Sponge
19 193 193 65 255 174 174 47 255 97 97 5 255 76 76 20 255
Glass
20 255 255 255 64 204 204 204 64 127 127 127 64 102 102 102 64
Lapis Lazuli Ore
21 23 68 196 255 18 56 158 255 14 43 122 255 14 43 78 255
Lapis Lazuli Block
22 23 68 196 255 18 56 158 255 14 43 122 255 14 43 78 255
Dispenser
23 96 96 96 255 76 76 76 255 48 48 48 255 38 38 38 255
Sandstone
24 214 182 111 255 203 171 100 255 186 154 83 255 173 141 70 255
Note Block
25 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255
Aqua Green Cloth
26 43 192 117 255 38 168 101 255 34 150 90 255 29 130 78 255
Cyan Cloth
27 43 192 192 255 36 185 185 255 29 130 130 255 22 99 99 255
Blue Cloth
28 0 0 255 255 0 0 204 255 0 0 127 255 0 0 102 255
Purple Cloth
29 101 101 188 255 95 95 175 255 86 86 160 255 78 78 145 255
Indigo Cloth
30 113 41 186 255 99 38 165 255 85 32 142 255 72 27 119 255
Violet Cloth
31 156 65 198 255 132 55 168 255 112 47 142 255 84 35 107 255
Magenta Cloth
32 187 42 187 255 160 36 160 255 135 31 135 255 112 25 112 255
Pink Cloth
33 192 43 117 255 168 38 103 255 142 32 87 255 127 29 78 255
Black Cloth
34 0 0 0 255 0 0 0 255 0 0 0 255 0 0 0 255
Wool
35 222 222 222 255 177 177 177 255 111 111 111 255 88 88 88 255
Gray Cloth
36 125 125 125 255 114 114 114 255 104 104 104 255 86 86 86 255
Yellow Flower
37 255 255 0 255 204 204 0 255 127 127 0 255 102 102 0 255
Red Rose
38 255 0 0 255 204 0 0 255 127 0 0 255 102 0 0 255
Brown Mushroom
39 204 153 120 32 145 109 85 32 114 86 67 32 73 64 58 32
Red Mushroom
40 255 43 43 32 196 29 38 32 186 105 109 32 124 64 64 32
Gold Block
41 232 245 46 255 185 196 36 255 116 122 23 255 92 98 18 255
Iron Block
42 191 191 191 255 152 152 152 255 95 95 95 255 76 76 76 255
Double Stone Slab
43 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255
Stone Slab
44 200 200 200 255 160 160 160 255 100 100 100 255 80 80 80 255
Brick
45 170 86 62 255 136 68 49 255 85 43 31 255 68 34 24 255
TNT
46 160 83 65 255 128 66 52 255 80 41 32 255 64 33 26 255
Bookshelf
54 125 91 38 192 100 72 30 192 62 45 19 192 50 36 15 192
Moss Stone
48 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Obsidian
49 26 11 43 255 20 8 34 255 13 5 21 255 10 4 17 255
Torch
50 159 127 80 255 98 88 20 0 245 220 50 255 196 176 40 0
Fire
51 255 170 30 200 204 136 24 200 127 85 15 200 102 68 12 200
Monster Spawner
52 0 150 110 196 0 150 130 196 0 150 110 196 0 150 130 196
Wooden Stair
53 157 128 79 255 125 102 63 255 78 64 39 255 62 51 31 255
Chest
54 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255
Diamond Ore
56 129 140 143 255 103 112 114 255 64 70 71 255 51 56 57 255
Diamond Block
57 45 166 152 255 36 132 121 255 22 83 76 255 18 66 60 255
Workbench
58 114 88 56 255 91 70 44 255 57 44 28 255 45 35 22 255
Crops
59 146 192 0 255 116 153 0 255 73 96 0 255 58 76 0 255
Farmland
60 95 58 30 255 76 46 24 255 47 29 15 255 38 23 12 255
Furnace
61 96 96 96 255 76 76 76 255 48 48 48 255 38 38 38 255
Burning Furnace
62 96 96 96 255 76 76 76 255 48 48 48 255 38 38 38 255
Sign Post
63 111 91 54 255 88 72 43 255 55 45 27 255 44 36 21 255
Wooden Door
64 136 109 67 255 108 87 53 255 68 54 33 255 54 43 26 255
Ladder
65 181 140 64 32 144 112 51 32 90 70 32 32 72 56 25 32
Minecart Tracks
66 150 134 102 180 120 107 81 180 75 67 51 180 60 53 40 180
Cobblestone Stairs
67 115 115 115 255 92 92 92 255 57 57 57 255 46 46 46 255
Iron Door
71 191 191 191 255 152 152 152 255 95 95 95 255 76 76 76 255
Redstone Ore
73 131 107 107 255 104 85 85 255 65 53 53 255 52 42 42 255
Glowing Redstone Ore
74 131 107 107 255 104 85 85 255 65 53 53 255 52 42 42 255
Redstone Torch off
75 159 127 80 255 72 56 25 0 181 140 64 255 144 112 51 0
Redstone Torch on
76 159 127 80 255 102 0 0 0 255 0 0 255 204 0 0 0
Snow
78 255 255 255 255 204 204 204 255 127 127 127 255 102 102 102 255
Ice
79 83 113 163 51 66 90 130 51 41 56 81 51 33 45 65 51
Snow Block
80 250 250 250 255 200 200 200 255 125 125 125 255 100 100 100 255
Cactus
81 25 120 25 255 20 96 20 255 12 60 12 255 10 48 10 255
Clay
82 151 157 169 255 120 125 135 255 75 78 84 255 60 62 67 255
Sugar Cane
83 193 234 150 255 154 187 120 255 96 117 75 255 77 93 60 255
Jukebox
84 125 91 38 255 100 72 30 255 62 45 19 255 50 36 15 255
Fence
85 127 98 49 96 95 72 33 96 48 34 9 96 32 21 21 96
Pumpkin
86 255 115 0 200 204 92 0 200 126 57 0 200 102 46 0 200
Netherrack
87 166 89 89 255 141 80 62 255 135 15 15 255 96 6 6 255
Soulsand
88 133 109 94 255 121 97 82 255 90 70 57 255 79 59 46 255
Glowstone
89 249 212 156 255 255 188 94 255 192 143 70 255 122 91 44 255
Portal
90 140 0 196 128 120 0 196 128 140 0 196 128 120 0 196 128
Jack-o-lantern
91 255 115 0 255 204 92 0 255 126 57 0 255 102 46 0 255
Cake Block
92 234 234 234 255 210 210 210 255 203 203 203 255 190 190 190 255
+63
View File
@@ -0,0 +1,63 @@
1 133 129 118 255 111 108 98 255 93 90 82 255 111 108 98 255
2 60 113 17 255 50 94 14 255 42 79 12 255 50 94 14 255
3 103 83 51 255 86 69 43 255 72 58 36 255 86 69 43 255
4 118 112 96 255 98 93 80 255 82 78 67 255 98 93 80 255
5 109 80 60 255 91 67 50 255 76 56 41 255 91 67 50 255
7 79 79 82 255 66 66 68 255 55 55 57 255 66 66 68 255
8 94 170 255 51 82 148 223 51 69 124 186 51 82 148 223 51
9 94 170 255 51 82 148 223 51 69 124 186 51 82 148 223 51
10 255 164 41 255 255 164 41 255 212 137 34 255 255 164 41 255
11 255 164 41 255 255 164 41 255 212 137 34 255 255 164 41 255
12 192 178 110 255 160 148 92 255 134 124 77 255 160 148 92 255
13 120 105 79 255 100 87 66 255 84 73 55 255 100 87 66 255
14 255 181 38 255 255 181 38 255 212 151 31 255 255 181 38 255
15 231 174 113 255 193 145 94 255 161 121 79 255 193 145 94 255
16 56 60 70 255 46 50 58 255 39 42 49 255 46 50 58 255
17 119 97 74 255 99 81 62 255 83 68 52 255 99 81 62 255
18 27 69 37 180 22 57 31 180 19 48 25 180 22 57 31 180
20 178 217 223 90 148 181 186 90 124 151 155 90 148 181 186 90
35 247 255 239 255 244 251 236 255 204 210 197 255 244 251 236 255
36 0 0 0 254 0 0 0 254 0 0 0 254 0 0 0 254
37 73 108 60 254 61 90 50 254 51 75 42 254 61 90 50 254
38 84 139 187 254 70 116 155 254 59 97 130 254 70 116 155 254
39 184 144 0 254 153 119 0 254 128 100 0 254 153 119 0 254
40 201 17 17 254 168 14 14 254 140 12 12 254 168 14 14 254
41 247 255 239 255 244 251 236 255 204 210 197 255 244 251 236 255
42 249 249 249 255 207 207 207 255 173 173 173 255 207 207 207 255
43 122 112 99 255 101 93 82 255 85 78 69 255 101 93 82 255
44 122 112 99 254 101 93 82 254 85 78 69 254 101 93 82 254
45 230 103 73 255 192 86 61 255 160 71 50 255 192 86 61 255
46 255 79 30 255 231 72 27 255 193 60 22 255 231 72 27 255
48 96 108 70 255 80 90 58 255 67 75 49 255 80 90 58 255
49 83 67 83 255 69 56 69 255 58 47 58 255 69 56 69 255
50 255 203 58 200 255 203 58 200 212 169 48 200 255 203 58 200
51 255 170 30 200 255 170 30 200 212 141 25 200 255 170 30 200
52 255 228 52 255 255 228 52 255 212 190 43 255 255 228 52 255
53 145 109 80 255 121 91 67 255 101 76 56 255 121 91 67 255
54 165 132 100 255 138 110 84 255 115 92 70 255 138 110 84 255
55 116 21 21 255 97 18 18 255 81 15 15 255 97 18 18 255
56 115 230 255 255 105 210 232 255 88 175 194 255 105 210 232 255
57 164 217 237 255 136 181 198 255 114 151 165 255 136 181 198 255
58 171 138 99 255 142 115 82 255 118 96 68 255 142 115 82 255
59 136 152 21 255 114 127 17 255 95 106 14 255 114 127 17 255
60 123 82 51 255 103 68 43 255 86 57 36 255 103 68 43 255
61 158 128 73 255 132 106 61 255 110 89 51 255 132 106 61 255
62 158 128 73 255 132 106 61 255 110 89 51 255 132 106 61 255
63 60 112 17 255 50 93 14 255 42 78 12 255 50 93 14 255
64 129 97 69 255 108 81 57 255 90 68 47 255 108 81 57 255
65 144 128 99 32 120 106 82 32 100 89 69 32 120 106 82 32
66 113 109 102 180 94 91 85 180 79 76 71 180 94 91 85 180
67 115 107 93 255 96 89 78 255 80 75 65 255 96 89 78 255
71 255 255 255 255 229 229 229 255 191 191 191 255 229 229 229 255
73 174 107 107 255 145 89 89 255 121 75 75 255 145 89 89 255
74 174 107 107 255 145 89 89 255 121 75 75 255 145 89 89 255
75 255 140 61 254 217 119 52 254 181 99 43 254 217 119 52 254
76 255 0 0 254 255 0 0 254 212 0 0 254 255 0 0 254
78 237 248 255 254 237 248 255 254 198 207 212 254 237 248 255 254
79 166 222 255 55 166 222 255 55 139 185 212 55 166 222 255 55
80 237 248 255 255 237 248 255 255 198 207 212 255 237 248 255 255
81 116 167 80 255 97 139 67 255 81 116 56 255 97 139 67 255
82 234 240 255 255 216 221 235 255 180 185 196 255 216 221 235 255
83 136 167 74 255 114 139 62 255 95 116 52 255 114 139 62 255
84 116 97 80 255 97 81 67 255 81 68 55 255 97 81 67 255
85 115 99 63 255 96 82 52 255 80 69 44 255 96 82 52 255
+139
View File
@@ -0,0 +1,139 @@
# 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
render-triggers:
# - playermove
# - playerjoin
- blockplaced
- blockbreak
# 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: false
# Writes JSON to file in the webpath
jsonfile: false
# How often the json file gets written to(in seconds)
jsonfile-interval: 1
# The maptypes Dynmap will use to render.
worlds:
- name: world
maps:
- class: org.dynmap.flat.FlatMap
prefix: flat
colorscheme: default
- class: org.dynmap.kzedmap.KzedMap
renderers:
- class: org.dynmap.kzedmap.DefaultTileRenderer
prefix: t
maximumheight: 127
colorscheme: default
- class: org.dynmap.kzedmap.CaveTileRenderer
prefix: ct
maximumheight: 127
- name: nether
maps:
- class: org.dynmap.flat.FlatMap
prefix: flat
colorscheme: default
- class: org.dynmap.kzedmap.KzedMap
renderers:
- class: org.dynmap.kzedmap.DefaultTileRenderer
prefix: nt
maximumheight: 64
colorscheme: default
web:
# Handles the clientside updates differently only enable if using jsonfile
jsonfile: false
# Interval the browser should poll for updates.
updaterate: 2000
showchatballoons: false
focuschatballoons: false
showchatwindow: true
allowwebchat: true
webchat-interval: 5
messagettl: 15
showplayerfacesonmap: true
showplayerfacesinmenu: true
joinmessage: "%playername% joined"
quitmessage: "%playername% quit"
spammessage: "You may only chat once every %interval% seconds."
components:
- type: chat
- type: chatballoon
focuschatballoons: false
- type: chatbox
showplayerfaces: true
messagettl: 5
- type: playermarkers
showplayerfaces: true
#- type: digitalclock
- type: timeofdayclock
showdigitalclock: true
defaultworld: world
worlds:
- title: World
name: world
maps:
- type: FlatMapType
title: Flat
name: flat
prefix: flat
- type: KzedMapType
title: Surface
name: surface
prefix: t
- type: KzedMapType
title: Cave
name: cave
prefix: ct
- title: Nether
name: nether
maps:
- type: FlatMapType
title: Flat
name: flat
prefix: flat
- type: KzedMapType
title: Surface
name: nether
prefix: nt
# Example:
#- title: Other World # With what name the world is displayed.
# name: world_other # The actual name of the world (equal to your directory-name).
# maps:
# - type: KzedMapType # The type (or perspective) of the map. At the moment, there are no others than KzedMapType.
# title: Surface # The name of the map that will be displayed.
# name: surface # The actual name of the map (should be unique for this world).
# prefix: t # The prefix of the tile-files that are generated.
# icon: images/block_other.png # Sets a custom icon for the map. (optional)
# - type: KzedMapType
# title: Cave
# name: cave
# prefix: ct
# Enables debugging.
#debuggers:
# - class: org.dynmap.debug.LogDebugger
+59
View File
@@ -0,0 +1,59 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.dynmap</groupId>
<artifactId>dynmap</artifactId>
<version>0.15</version>
<name>dynmap</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<url>http://github.com/FrozenCow/dynmap/</url>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/FrozenCow/dynmap/issues</url>
</issueManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>build</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>com.nijikokun.bukkit</groupId>
<artifactId>Permissions</artifactId>
<version>[2.5.4,)</version>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>0.0.1-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
-22
View File
@@ -1,22 +0,0 @@
Commands
--------------------------------------------------
/map_wait [wait] - set wait between tile renders (ms)
/map_stat - query number of tiles in render queue
/map_regen - regenerate entire map (currently buggy)
/map_debug - send map debugging messages
/map_nodebug - disable map debugging messages
/map_regenzoom - regenerates zoom-out tiles
/addsign [name] - adds a named sign to the map
/removesign [name] - removes a named sign to the map
/listsigns - list all named signs
/tpsign [name] - teleport to a named sign
server.properties
--------------------------------------------------
map-colorsetpath - point to colors.txt
map-tilepath - point to web/tiles folder
map-signspath - point to signs.txt file (do not need to create the file, one will be created when you create a sign)
map-serverport - the port the web server runs on (default is 8123)
map-showmarkers - a list of which markers to show on the map, comma separated if multiple (spawn, homes, warps, signs, players, all, none)
map-generateportraits - whether player-portraits are generated by the server (0, 1, default: 0)
-114
View File
@@ -1,114 +0,0 @@
import java.util.HashMap;
public class Cache<K, V>
{
private final int size;
private int len;
private CacheNode head;
private CacheNode tail;
private class CacheNode
{
public CacheNode prev;
public CacheNode next;
public K key;
public V value;
public CacheNode(K key, V value)
{
this.key = key;
this.value = value;
prev = null;
next = null;
}
public void unlink()
{
if(prev == null) {
head = next;
} else {
prev.next = next;
}
if(next == null) {
tail = prev;
} else {
next.prev = prev;
}
prev = null;
next = null;
len --;
}
public void append()
{
if(tail == null) {
head = this;
tail = this;
} else {
tail.next = this;
prev = tail;
tail = this;
}
len ++;
}
}
private HashMap<K, CacheNode> map;
public Cache(int size)
{
this.size = size;
len = 0;
head = null;
tail = null;
map = new HashMap<K, CacheNode>();
}
/* returns value for key, if key exists in the cache
* otherwise null */
public V get(K key)
{
CacheNode n = map.get(key);
if(n == null)
return null;
return n.value;
}
/* puts a new key-value pair in the cache
* if the key existed already, the value is updated, and the old value is returned
* if the key didn't exist, it is added; the oldest value (now pushed out of the
* cache) may be returned, or null if the cache isn't yet full */
public V put(K key, V value)
{
CacheNode n = map.get(key);
if(n == null) {
V ret = null;
if(len >= size) {
CacheNode first = head;
first.unlink();
map.remove(first.key);
ret = first.value;
}
CacheNode add = new CacheNode(key, value);
add.append();
map.put(key, add);
return ret;
} else {
n.unlink();
V old = n.value;
n.value = value;
n.append();
return old;
}
}
}
-13
View File
@@ -1,13 +0,0 @@
/* FlatFileSource class wrapper to expose protected properties */
import java.util.List;
public class DMFlatFileSource extends FlatFileSource {
public List<Warp> getAllWarps() {
return this.warps;
}
public List<Warp> getAllHomes() {
return this.homes;
}
}
-13
View File
@@ -1,13 +0,0 @@
/* MySQLSource class wrapper to expose protected properties */
import java.util.List;
public class DMMySQLSource extends MySQLSource {
public List<Warp> getAllWarps() {
return this.warps;
}
public List<Warp> getAllHomes() {
return this.homes;
}
}
-151
View File
@@ -1,151 +0,0 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.logging.Logger;
public class MapListener extends PluginListener {
private static final Logger log = Logger.getLogger("Minecraft");
private MapManager mgr;
public MapListener(MapManager mgr)
{
this.mgr = mgr;
}
@Override
public boolean onBlockCreate(Player player, Block blockPlaced, Block blockClicked, int itemInHand)
{
if(mgr.touch(blockPlaced.getX(), blockPlaced.getY(), blockPlaced.getZ()))
mgr.debug(player.getName() + " touch " + blockPlaced.getX() + "," + blockPlaced.getY() + "," + blockPlaced.getZ() + " from onBlockCreate");
return false;
}
@Override
public boolean onBlockDestroy(Player player, Block block)
{
int x = block.getX();
int y = block.getY();
int z = block.getZ();
if(x == 0 && y == 0 && z == 0)
return false;
if(mgr.touch(x, y, z))
mgr.debug(player.getName() + " touch " + x + "," + y + "," + z + " from onBlockBreak");
return false;
}
@Override
public void onLogin(Player player)
{
mgr.getPlayerImage(player);
}
@Override
public boolean onCommand(Player player, String[] split)
{
if(!player.canUseCommand(split[0]))
return false;
if(split[0].equals("/map_wait")) {
if(split.length < 2) {
mgr.renderWait = 1000;
} else {
try {
mgr.renderWait = Integer.parseInt(split[1]);
} catch(NumberFormatException e) {
player.sendMessage(Colors.Rose + "Invalid number");
}
}
return true;
}
if(split[0].equals("/map_regen")) {
mgr.regenerate((int) player.getX(), (int) player.getY(), (int) player.getZ());
player.sendMessage(Colors.Rose + "Map regeneration in progress");
return true;
}
if(split[0].equals("/map_stat")) {
player.sendMessage(Colors.Rose + "Stale tiles: " + mgr.getStaleCount() + " Recent updates: " + mgr.getRecentUpdateCount());
return true;
}
if(split[0].equals("/map_debug")) {
mgr.debugPlayer = player.getName();
return true;
}
if(split[0].equals("/map_nodebug")) {
mgr.debugPlayer = null;
return true;
}
if(split[0].equals("/addsign")) {
if(split.length < 2)
{
player.sendMessage("Map> " + Colors.Red + "Usage: /addsign [name]");
}
else
{
if (mgr.addSign(player, split[1], player.getX(), player.getY(), player.getZ()))
{
player.sendMessage("Map> " + Colors.White + "Sign \"" + split[1] + "\" added successfully");
}
}
return true;
}
if(split[0].equals("/removesign")) {
if(split.length < 2)
{
player.sendMessage("Map> " + Colors.Red + "Usage: /removesign [name]");
}
else
{
if (mgr.removeSign(player, split[1]))
{
player.sendMessage("Map> " + Colors.White + "Sign \"" + split[1] + "\" removed successfully");
}
}
return true;
}
if(split[0].equals("/listsigns")) {
String msg = "";
Collection<Warp> values = mgr.signs.values();
Iterator<Warp> it = values.iterator();
while(it.hasNext())
{
Warp sign = it.next();
String line = " - " + sign.Name + "\t";
msg += line;
}
player.sendMessage("" + Colors.White + msg);
return true;
}
if(split[0].equals("/tpsign")) {
if(split.length < 2)
{
player.sendMessage("Map> " + Colors.Red + "Usage: /tpsign [name]");
}
else
{
if (mgr.teleportToSign(player, split[1]))
{
//player.sendMessage("Map> " + Colors.White + "");
}
}
return true;
}
if(split[0].equals("/map_regenzoom")) {
mgr.regenerateZoom((int) player.getX(), (int) player.getY(), (int) player.getZ());
player.sendMessage(Colors.Rose + "regenerateZoom done");
return true;
}
return false;
}
}
-944
View File
File diff suppressed because it is too large Load Diff
-519
View File
File diff suppressed because it is too large Load Diff
-12
View File
@@ -1,12 +0,0 @@
/* this class stores a tile update */
public class TileUpdate {
public long at;
public MapTile tile;
public TileUpdate(long at, MapTile tile)
{
this.at = at;
this.tile = tile;
}
}
-53
View File
@@ -1,53 +0,0 @@
import java.io.*;
import java.net.*;
import java.util.*;
import java.util.logging.Logger;
public class WebServer extends Thread {
public static final String VERSION = "Huncraft";
protected static final Logger log = Logger.getLogger("Minecraft");
private ServerSocket sock = null;
private boolean running = false;
private MapManager mgr;
public WebServer(int port, MapManager mgr) throws IOException
{
this.mgr = mgr;
sock = new ServerSocket(port, 5, InetAddress.getByName("127.0.0.1"));
running = true;
start();
log.info("map WebServer started on port " + port);
}
public void run()
{
while (running) {
try {
Socket socket = sock.accept();
WebServerRequest requestThread = new WebServerRequest(socket, mgr);
requestThread.start();
}
catch (IOException e) {
log.info("map WebServer.run() stops with IOException");
break;
}
}
log.info("map WebServer run() exiting");
}
public void shutdown()
{
try {
if(sock != null) {
sock.close();
}
} catch(IOException e) {
log.info("map stop() got IOException while closing socket");
}
running = false;
}
}
-145
View File
@@ -1,145 +0,0 @@
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.Socket;
import java.util.Date;
import java.util.List;
import java.util.logging.Logger;
public class WebServerRequest extends Thread {
protected static final Logger log = Logger.getLogger("Minecraft");
private Socket sock;
private MapManager mgr;
public WebServerRequest(Socket socket, MapManager mgr)
{
sock = socket;
this.mgr = mgr;
}
private static void sendHeader(BufferedOutputStream out, int code, String contentType, long contentLength, long lastModified) throws IOException
{
out.write(("HTTP/1.0 " + code + " OK\r\n" +
"Date: " + new Date().toString() + "\r\n" +
"Server: JibbleWebServer/1.0\r\n" +
"Content-Type: " + contentType + "\r\n" +
"Expires: Thu, 01 Dec 1994 16:00:00 GMT\r\n" +
((contentLength != -1) ? "Content-Length: " + contentLength + "\r\n" : "") +
"Last-modified: " + new Date(lastModified).toString() + "\r\n" +
"\r\n").getBytes());
}
private static void sendError(BufferedOutputStream out, int code, String message) throws IOException
{
message = message + "<hr>" + WebServer.VERSION;
sendHeader(out, code, "text/html", message.length(), System.currentTimeMillis());
out.write(message.getBytes());
out.flush();
out.close();
}
public void run()
{
InputStream reader = null;
try {
sock.setSoTimeout(30000);
BufferedReader in = new BufferedReader(new InputStreamReader(sock.getInputStream()));
BufferedOutputStream out = new BufferedOutputStream(sock.getOutputStream());
String request = in.readLine();
if (request == null || !request.startsWith("GET ") || !(request.endsWith(" HTTP/1.0") || request.endsWith("HTTP/1.1"))) {
// Invalid request type (no "GET")
sendError(out, 500, "Invalid Method.");
return;
}
String path = request.substring(4, request.length() - 9);
int current = (int) (System.currentTimeMillis() / 1000);
long cutoff = 0;
if(path.charAt(0) == '/') {
try {
cutoff = ((long) Integer.parseInt(path.substring(1))) * 1000;
} catch(NumberFormatException e) {
}
}
sendHeader(out, 200, "text/plain", -1, System.currentTimeMillis());
StringBuilder sb = new StringBuilder();
sb.append(current + " " + etc.getServer().getRelativeTime() + "\n");
if (mgr.showPlayers) {
for(Player player : etc.getServer().getPlayerList()) {
sb.append(player.getName() + " player " + player.getX() + " " + player.getY() + " " + player.getZ() + "\n");
}
}
if (mgr.showSigns) {
for(Warp sign : mgr.signs.values())
{
sb.append(sign.Name + " sign " + sign.Location.x + " " + sign.Location.y + " " + sign.Location.z + "\n");
}
}
if (mgr.showWarps) {
List<Warp> warps = mgr.loadWarps();
if (warps != null) {
for(Warp warp : warps) {
sb.append(warp.Name + " warp " + warp.Location.x + " " + warp.Location.y + " " + warp.Location.z + "\n");
}
}
}
if (mgr.showHomes) {
List<Warp> homes = mgr.loadHomes();
if (homes != null) {
for(Warp warp : homes) {
sb.append(warp.Name + " home " + warp.Location.x + " " + warp.Location.y + " " + warp.Location.z + "\n");
}
}
}
if (mgr.showSpawn) {
Location spawnLocation = etc.getServer().getSpawnLocation();
sb.append("Spawn spawn " + spawnLocation.x + " " + spawnLocation.y + " " + spawnLocation.z + "\n");
}
synchronized(mgr.lock) {
for(TileUpdate tu : mgr.tileUpdates) {
if(tu.at >= cutoff) {
sb.append(tu.tile.px + "_" + tu.tile.py + " " + tu.tile.zpx + "_" + tu.tile.zpy + " t\n");
}
}
for(TileUpdate tu : mgr.caveTileUpdates) {
if(tu.at >= cutoff) {
sb.append(tu.tile.px + "_" + tu.tile.py + " " + tu.tile.zpx + "_" + tu.tile.zpy + " c\n");
}
}
}
out.write(sb.toString().getBytes());
out.flush();
out.close();
}
catch (IOException e) {
if (reader != null) {
try {
reader.close();
}
catch (Exception anye) {
// Do nothing.
}
}
}
}
}
+38
View File
@@ -0,0 +1,38 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>tar.bz2</format>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
<include>CHANGELOG*</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/web</directory>
<outputDirectory>/dynmap/web</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/colorschemes</directory>
<outputDirectory>/dynmap/colorschemes</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}</directory>
<outputDirectory>/dynmap/</outputDirectory>
<includes>
<include>configuration.txt</include></includes></fileSet>
</fileSets>
<files>
<file>
<source>${project.build.directory}/${artifactId}-${version}.jar</source>
<outputDirectory>/</outputDirectory>
<destName>dynmap.jar</destName></file></files>
</assembly>

Some files were not shown because too many files have changed in this diff Show More