0
Commit Graph

1271 Commits

Author SHA1 Message Date
Nicolas F
54b93754c7 genPOI/docs: Handle new sign id values
Minecraft now uses minecraft:sign as its id for signs, but also uses
Sign for older versions or chunks that have not yet been updated.

Change the genPOI sign wrangling code and the documentation to reflect
this change.

Fixes #1340.
2016-12-06 15:17:39 +01:00
Nicolas F
c7d86eca76 Change shebang to python2 instead of python 2016-12-06 15:01:20 +01:00
Mark Vander Stel
d92f00d97d Update strings and items to 1.11
Update all strings and vars to 1.11.
Add new items and blocks to items.py.
2016-11-29 09:13:42 -05:00
Mark Vander Stel
23c00eaf1f Add new 1.11 blocks
Add observer, with 4 textures and 6 orientations.
Add shulker box, with 16 block IDs, an entity texture, and 6
orientations.
2016-11-29 09:13:35 -05:00
Nicolas F
4287fc5f0b Add -q alias for --quiet to genPOI
This brings it in line with the syntax of the main overviewer.py
script.
2016-06-30 09:04:49 +02:00
Aaron Griffith
1a41d8d195 bump overviewer.h version, textures.py version 2016-06-11 16:38:19 -04:00
Aaron Griffith
24e9f9e6e8 Merge remote-tracking branch 'dbergl/1.10-blocks' 2016-06-10 20:44:37 -04:00
Aaron Griffith
7bbc3bd4d4 Merge branch 'patch-3' of git://github.com/tazorax/Minecraft-Overviewer 2016-06-10 20:43:14 -04:00
Aaron Griffith
125c87b195 Merge remote-tracking branch 'Socolin/patch-3' 2016-06-10 20:37:30 -04:00
Aaron Griffith
11c10972e2 Merge remote-tracking branch 'kevinwchang/filter-id' 2016-06-10 20:31:28 -04:00
Aaron Griffith
5571f4eb54 Merge remote-tracking branch 'CounterPillow/corrupt-region-warning' 2016-06-10 20:22:40 -04:00
Aaron Griffith
5665beb43f Merge remote-tracking branch 'mc680x0/master' 2016-06-10 20:21:03 -04:00
Aaron Griffith
1c25b16ec6 fixed typo in biomes.h 2016-06-10 20:15:18 -04:00
Dan Berglund
67a77c7c05 Revert temp & humidity changes and add missing biomes 2016-06-10 14:33:00 -07:00
Dan Berglund
d20c4a37e7 Add new 1.7.2 biomes and update colors
temp/humnidity was calculated so it matched the pixel at the start of each biome
as shown in the color template (http://minecraft.gamepedia.com/File:Biomes1.7.2.png)
TODO: switch to using coordinates in the image instead of temp/humidity
2016-06-10 14:33:00 -07:00
Dan Berglund
7a98e6afa9 add new 1.10 blocks 2016-06-10 12:07:11 -07:00
tazo
218b0a5996 Fix chorus plants 2016-03-06 15:33:49 +01:00
tazo
7baade948d Add chorus plants and chorus flowers 2016-03-06 15:32:20 +01:00
tazo
a32582013f Fix beetroots duplication 2016-03-06 10:22:17 +01:00
Socolin
a639670639 Add missing pixels between slabs
Like stairs in issue #992 slabs have same problem
2016-03-06 00:23:24 -05:00
Andrew Chin
6682b9130a Merge PR #1285 2016-03-06 00:20:11 -05:00
tazo
9879bc9624 Implement beetroot crops
Conflicts:
	overviewer_core/textures.py
2016-03-06 00:03:45 -05:00
Andrew Chin
db3c79a46e Tweak crop rendering
Remote beetroot in preperation of bringing in patch
2016-03-06 00:03:44 -05:00
Socolin
210f2b4a4f Add some missing pixel between blocks (Issue #992)
Just copy/paste this piece of code from `build_block` to `build_full_block`
2016-03-05 18:09:40 -05:00
lother
2c5971b5d8 fix typo 2016-03-04 23:48:30 +08:00
lother
404ef9f0ad add frosted ice, structure_block 2016-03-04 23:32:07 +08:00
lother
1ba8342ca1 fix purpur pilar orientation 2016-03-04 23:31:45 +08:00
lother
0f33b65a85 add beetroot 2016-03-04 23:30:51 +08:00
lother
75a3ee5650 fix command block 2016-03-04 23:30:25 +08:00
lother
e4e2bae99e add end_gateway 2016-03-04 23:29:25 +08:00
Andrew Chin
5f9276a24a Implement path blocks
Farmland now shares a bit of code with pathblocks and are rendered at a
15/16th sized block
2016-03-03 21:22:09 -05:00
Andrew Chin
81be4bc6e8 Bump mc version in travis and textures.py error msg. also force rebuild 2016-03-01 21:29:51 -05:00
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