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

1439 Commits

Author SHA1 Message Date
Andrew Chin
bc9a097957 Add some new blocks for Minecraft 1.9 
* Purpur blocks, pillars, stairs, and slabs
* End brick
 2016-03-01 21:25:15 -05:00
Andrew Chin
8d3d8dc0ee Fix command block for Minecraft 1.9 
See #1280
 2016-03-01 20:47:22 -05:00
Andrew Chin
68955c7b93 Fix redstone dust for Minecraft 1.9 
This breaks compatibily with Minecraft 1.8

See #1280
 2016-03-01 20:46:02 -05:00
Stefan Floeren
3d3ef0c82e Remove inline for estimate_blocklevel 
Inlining the function allows the compiler to optimize away the
function completely. Clang 3.7.1 does exactly that.

This leads to an error, if the library is used with python:

    % ./overviewer.py
    Traceback (most recent call last):
      File "/tmp/minecraft/Minecraft-Overviewer/overviewer_core/__init__.py", line 20, in check_c_overviewer
        import c_overviewer
    ImportError: /tmp/minecraft/Minecraft-Overviewer/overviewer_core/c_overviewer.so: undefined symbol: estimate_blocklevel

    Something has gone wrong importing the c_overviewer extension.  Please
    make sure it is up-to-date (clean and rebuild)
 2016-02-13 15:46:04 +01:00
Nicolas F
4e77ba8d13 genpoi: Fix GzipFile closing on python 2.6 
Fixes #1275
 2016-02-13 14:41:09 +01:00
Nicolas F
8f08b3b69f rcon: Throw more helpful exception if proto error 
Addresses #1273.
 2016-01-30 15:25:45 +01:00
Nicolas F
9fc050cf67 genPOI: Use "with" statement to close gzip files 
Previously, the files were not closed after reading or writing;
by using a "with" statement, the file handles will be closed as
soon as they go out of scope.

Possible fix for #1271.
 2016-01-30 14:17:16 +01:00
Nicolas F
c7f8cfee8c rcon: Wait for buffer to fill 
We should wait for the buffer to fill up to 12 bytes instead of
simply assuming it will.

Possible fix for #1273.
 2016-01-30 13:58:36 +01:00
Andrew Chin
d849f25930 Merge pull request #1267 from overviewer/uuidcache 
genpoi UUID improvements
 2016-01-14 16:12:51 -05:00
Andrew Chin
2e34507568 Use FileReplacer to manage the uuid cache file 2016-02-01 09:32:35 -05:00
Andrew Chin
68430335c8 JSObserver: Add missing string formatting param 2015-12-27 15:04:32 -05:00
Andrew Chin
270741eb8f genpoi UUID improvements 
* When reading the cache, catch some errors on load, instead of crashing
* When writing to cache, write to tmp file, then move it into place.
  This should be more robust if a ctrl+c is recieved while writing the
  cache

Addresses #1266
 2015-12-27 14:59:03 -05:00
Kevin Chang
eabda0750c create filter identifiers from render name instead of region set 
This allows for separate sets of markers when multiple renders share the same region set (dimension).
 2015-12-04 01:48:04 -08:00
Nicolas F
7dcf40fc20 Add region directory to corruption warnings 
Fixes issue #1251
 2015-10-18 21:33:08 +02:00
Andrew Chin
0ba0c60ed2 Catch TypeErrors as well when loading player dat files 2015-10-06 17:38:49 -04:00
Horst Burkhardt
06e500415a fix typo from last commit, should work now 
Signed-off-by: Horst Burkhardt <mc@680x0.com>
 2015-08-17 12:04:51 +10:00
Horst Burkhardt
5dabcb3408 add support for advpng to optimizeimages.py 
Signed-off-by: Horst Burkhardt <mc@680x0.com>
 2015-08-17 11:57:16 +10:00
Nicolas F
a8c71d089d Fix mingw-w64 build 
On Windows with mingw-w64, Pillow includes windows.h, and thus
including Imaging.h would result in a name conflict of "TRANSPARENT",
which windows.h #defines but overviewer.h wants to use as enum.

For the record, this used to not be broken back when I initially
fixed Pillow for mingw-w64, so the change got somewhere introduced
between then and now.
 2015-08-15 23:50:40 +02:00
Andrew Chin
afc1c4f924 Don't call save_cache if running with --skip-players 2015-08-14 08:47:52 -04:00
Nicolas F
0aef9b436c [webassets] Updated jQuery version 2015-05-04 14:59:18 +02:00
Mark Fickett
f839068f27 Convert filter generator to list before passing to handleEntities to fix repeated iteration. Fixes #1220 . 2015-03-18 23:33:54 -04:00
Aaron Griffith
4a9d808bb2 Merge pull request #1219 from MasterofJOKers/player_poi_fix 
[genPOI] Fix generation of multiple players
 2015-03-12 13:00:24 -04:00
Aaron Griffith
0c7441f93d equality != assignment... 2015-03-12 12:25:41 -04:00
Aaron Griffith
88de7b1567 get genpoi multiprocessing working on windows 2015-03-12 12:21:39 -04:00
MasterofJOKers
803d8d7933 [genPOI] sort list of imports 
Easier to see if an import is already there.
 2015-03-12 15:56:48 +01:00
MasterofJOKers
adcf105778 [genPOI] fix generation of multiple players 
The same problem as in bd8f3577 is also present for players. The filters
were given as iterator, but iterated through once per player.
 2015-03-12 15:54:48 +01:00
MasterofJOKers
5764183e00 [genPOI] remove unnecessary second import of json 2015-03-09 09:37:10 +01:00
MasterofJOKers
bd8f357787 [genPOI] pass filters as list to handleManualPOI 
It was accidently passed as an iterator, so it was only iterable once,
which lead to only the first manual poi being displayed.
 2015-03-09 09:34:44 +01:00
Nicolas F
b35f848855 [genPOI] Work around utter plebbery 2015-03-08 17:03:43 +01:00
Nicolas F
b5ecf8a7f4 [genPOI] Work around JSON signs 
lol Mojang
 2015-03-07 18:16:32 +01:00
Andrew Chin
e6f44aed26 Merge pull request #1135 from MasterofJOKers/my_genpoi 
addressing genPOI RAM usage
 2015-03-06 17:09:40 -05:00
Jamie Bliss
3cd2afb0c4 genPOI: don't ignore invalid polyline point 
There is no point in ignoring an invalid point, because without an error
message the user might wonder, why it's poyline doesn't look the way it
should.
 2015-02-23 21:39:03 +01:00
Jamie Bliss
7229fcc3df genPOI: use more pythonic ways ... 
One should use isinstance instead of `type(A) ==` because of
inheritance.
There should be an exception if a list of `elif`s don't match.
Make Polyline not only accept tuples, but any iterable.
 2015-02-23 21:39:03 +01:00
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
Aaron Griffith
9ec0a75eaa fix lighting for flowing water and ice 
fix for issue #1205
 2015-02-23 10:27:08 -05: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
Aaron Griffith
32fbc1dea2 nbt array lengths are unsigned (see issue #1190) 2015-02-02 04:59:43 -05:00
Aaron Griffith
9a119a2dce Merge remote-tracking branch 'kiskoza/master' 2015-02-01 12:46:22 -05:00
Aaron Griffith
7e771abfee Merge remote-tracking branch 'CounterPillow/expand-dong' 2015-02-01 12:39:42 -05:00
Aaron Griffith
4eacfa467f Merge remote-tracking branch 'CounterPillow/rcon-observer' 2015-02-01 12:22:34 -05:00
Aaron Griffith
bad4261cb5 Merge remote-tracking branch 'enaut/structure_overlay' 2015-02-01 12:15:56 -05:00
Andrew Chin
97e5985933 Allow worlds with a version of zero (temp fix for #1194) 2015-01-03 11:56:51 -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
Andrew Chin
f3af9555f0 Merge pull request #1163 from CounterPillow/optimizeimg-fixes 
Add jpegoptim interface to optimizeimages
 2014-11-25 02:17:14 -05:00
Andrew Chin
d34378bc29 Merge pull request #1172 from tswsl1989/upstream 
Fix east side large mushroom rendering
 2014-11-25 02:14:13 -05: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
Thomas Lake
904e5abd8e Fix east side large mushroom rendering 2014-10-20 11:19:31 +01:00