LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
2,236 Commits 3 Branches 0 Tags
b08e34b064728db251b1977c39291cab96d9efc2
Commit Graph

54 Commits

Author SHA1 Message Date
Jamie Bliss
b08e34b064 genPOI: add icon and createInfoWindow support for filters 
The defaults for "icon" and "createInfoWindow" are read from the POI,
but can be overridden by a filter function returning an appripriate
dict.
 2015-02-23 21:19:17 +01:00
MasterofJOKers
4b9d0a5c87 Merge branch 'master' into my_genpoi 
Conflicts:
	overviewer_core/aux_files/genPOI.py
 2015-02-08 14:19:21 +01:00
Gizmokid2005
77c4d24660 Skip missing dimensions in genPOI 
This fixes overviewer/Minecraft-Overviewer #1202 for genPOI renders.
 2015-02-05 13:54:01 -05:00
Koza
f1af25799e Fixed rendering regions. genPOI.py: add new line to baseMakers.js; views.js: add polygons, with all the features that Google provides, polylines work fine; regions.js: example of usage 2014-12-13 17:17:11 +01:00
MasterofJOKers
9cbeffc721 Merge branch 'master' into my_genpoi 2014-10-30 12:47:55 +01:00
MasterofJOKers
9d1eb35643 Merge branch 'master' into my_genpoi 
This just updates the code to the current master, so it can be merged
easily.

Conflicts:
	overviewer_core/aux_files/genPOI.py
 2014-10-28 22:15:58 +01:00
Nicolas F
dfe6f08ee9 genPOI: Resolve UUIDs for player spawns too 2014-10-24 13:57:06 +02:00
Andrew Chin
322922b8e6 Implement a UUID lookup cache, to avoid hitting the mojang server so much 
The cache is a gzip'd JSON file.  Soon we will have a small script to
help manage the cache

See #1090 and #1117
 2014-08-19 22:08:15 -04:00
Andrew Chin
59d277a131 Change ctime to localtime. 
See discussion in #1082
 2014-08-19 21:28:25 -04:00
Andrew Chin
8257220657 Merge PR# 1082 2014-08-19 21:17:57 -04:00
MasterofJOKers
2271f628ef genPOI: use filter functions on the fly 
Instead of reading all Players and especially Entities and TileEntities
into RAM and than applying the filter functions onto them, filter
functions are used after each parsed chunk to get only the markers of
this chunk and not all Entities.

This reduced the RAM usage dramatically:
On a 233 MB map over 200 MB of RAM was used before.
Using these changes (and only having two filter functions for signs) not
more than 36 MB of RAM was used.
 2014-08-03 23:26:23 +02:00
MasterofJOKers
eccad401ca genPOI: generate marker's internal name only once 
Why should it be duplicated anyway?
 2014-08-03 23:26:23 +02:00
MasterofJOKers
e2b6474b28 genPOI: use a defaultdict for markers 
This is a little faster and make the code a little shorter.
 2014-08-03 23:26:23 +02:00
MasterofJOKers
6c14d47650 genPOI: unite for-loops with itertools 
Since all the POIs are created from different lists, multiple for loops
were used. With itertools.chain these lists can be looped over with only
one for loop thus removing doubled code.
 2014-08-03 23:26:23 +02:00
MasterofJOKers
d7aa4fd4c2 genPOI: function for doubled code for marker creation 
The code creating the actual marker dict out of the entity and the
result of the filter function was almost the same for every set of
entities. Thus it is now a function.
 2014-08-03 23:26:23 +02:00
MasterofJOKers
61339b1c42 genPOI: add option --skip-players 
If one simply wants to add some manual POIs, no player files have to be
parsed.
 2014-08-03 23:26:23 +02:00
Nicolas F
792b049dd5 FIx genPOI dimension parsing 
Fixes Issue #1130
 2014-07-18 20:08:34 +02:00
Nicolas F.
a77f4aa5f4 Fix warning for unresolvable UUID 
Exception while catching an exception. Try to make an inception joke of that.
 2014-06-20 19:53:34 +02:00
Nicolas F
8053eaca72 Lazily get names from UUIDs 
Instead of doing the UUID->name resolution for all players in every
case, only do it when EntityId is accessed and the name hasn't been
retrieved this run already. This makes genPOI usable for people who
have many players on their servers but don't wish to use player POI
while still using other genPOI features.

To do this, a PlayerDict has been created, which contains a dirty
hack to see if the requested item is EntityId and whether it hasn't
been set already.
 2014-05-30 10:16:28 +02:00
Andrew Chin
8e5944d5c3 Catch some additional UUID lookup errors from urllib2 2014-04-10 19:52:50 -04:00
kiyote
a5b7c9617f Added ['time'] attribute to Players POI 
It's nice that we can see where a player was at logout, but now we can see when that logout was.
 2014-03-29 09:17:59 -05:00
Luc Ritchie
0e1bd4369a Use Mojang's session API to get usernames from UUIDs 2014-03-09 16:23:32 -04:00
Luc Ritchie
1cf131a8fc Handle UUID player files semi-nicely in POIgen (14w10a+, 1.7.6+) 2014-03-09 00:56:27 -05:00
Andrew Chin
d68c792c41 Allow --genpoi to use -c to specify a config file 
Closes #1033
 2013-12-26 23:45:07 -05:00
Aaron Griffith
1a1022fa2f multiprocessing-based POI generator no longer crashes on python 2.6 
fixes Issue #1041
 2013-12-24 12:10:05 -05:00
Andrew Chin
cc4261aea5 Ignore corrupt chunks from .get_chunks() in genpoi 
See #1038
 2013-12-13 20:34:54 -05:00
Aaron Griffith
df732bfa25 Revert "Merge remote-tracking branch 'exhuma/master', PR #963" 
This reverts commit e26727943f, reversing
changes made to 7bbb077704.
 2013-12-02 07:40:00 -05:00
Aaron Griffith
a8a2a191b8 Revert "used LOG instead of logging on a few stragglers" 
This reverts commit 144cff18e3.
 2013-12-02 07:35:10 -05:00
Aaron Griffith
144cff18e3 used LOG instead of logging on a few stragglers 2013-12-01 16:39:45 -05:00
Aaron Griffith
e26727943f Merge remote-tracking branch 'exhuma/master', PR #963 
Conflicts:
	overviewer.py
	overviewer_core/aux_files/genPOI.py
	overviewer_core/textures.py
 2013-12-01 16:35:28 -05:00
Aaron Griffith
af3554b18a Merge remote-tracking branch 'pibm/poi_changes', PR #999 
Conflicts:
	overviewer_core/aux_files/genPOI.py
 2013-12-01 16:26:51 -05:00
Steven Dwy
366e6db8e3 Fix #993 2013-10-29 12:47:05 -07:00
Patrick-Emmanuel Boulanger-Nadeau
55f7183c4d Cleanup even more 2013-10-01 13:13:14 -04:00
Patrick-Emmanuel Boulanger-Nadeau
f90b1ae6a4 Update the genPOI to uses multiple processes 2013-09-30 18:07:02 -04:00
Andrew Chin
fe42ed4165 Fix error reporting in genpoi when a bad dimension is specified 2013-09-26 14:13:54 -04:00
Michel Albert
4112b5a72e Using a dedicated logger inside overviewer_core. 2013-07-28 15:04:51 +02:00
Aaron Griffith
fecbfd0706 Merge branches 'config-include', 'hashchange', 'poi-polylines', 'showlocationmarker' and 'signed-timestamps' 2013-05-20 20:56:40 -04:00
Nicolas Frattaroli
cacf1498b8 Add option to skip scanning for POIs in regions 
Sometimes, people just use --genpoi for manual POIs. This option
allows them to save some time by not handling entities.
 2013-03-19 18:10:24 +01:00
Freakus Geekus
b75eb7e5b5 POI dict and polyline support 
Added support for filter functions to return dicts.
Added support for filter functions to return a list of coordinates to
draw lines between when shown.
 2013-02-16 21:05:36 +00:00
Andrew Chin
c5e4140bf5 Merge pull request #862 2013-01-25 19:30:43 -05:00
Andrew Chin
a5ee1b68ba Allow unicode to be returned from a genPOI filter function 2013-01-18 21:59:08 -05:00
Aaron Griffith
443aa84b07 updated tileset.py and genPOI.py and a few other stragglers 2013-01-06 01:00:06 -05:00
CounterPillow
3ad99d9461 Added possibility to return tuple from filterfunc 
If the returned type is a tuple, it will be interpreted as first the
title (i.e. hovertext), then the content of the infowindow. If the
returned type is a string, it will be used as both the title and
infowindow content (the old behaviour). This means that older configs
are still compatible and need no changes.
 2013-01-01 21:15:38 +01:00
CounterPillow
b13f0044e2 manualpois is now a per-render option 2012-12-31 18:54:31 +01:00
CounterPillow
2aa3a8cc02 Added manual POI option 
Here's how to use it:
have a list called "manualpois" in your config filled with objects that contain
the attributes id, x, y and z. Feel free to add more attributes as you need them.
Then, write filter functions to filter for your custom POIs (hint: use the id).
 2012-12-31 16:22:41 +01:00
Dafvid
e8cd99ce14 Added Entities support 2012-10-03 18:55:00 +02:00
Andrew Chin
14a3727bed Scrub parens from poi group names 
Fixes #814
 2012-09-21 08:28:15 -04:00
Thomas Lake
ca0ec868ac Update to use list comprehensions 2012-09-07 10:32:11 +01:00
Thomas Lake
a53843caa6 Filter out player files not ending in ".dat" 2012-09-05 10:58:41 +01:00
Andrew Chin
43d299ed92 Allow marker groups to be checked(displayed) by default 
Fixes #730
 2012-08-04 11:05:00 -04:00