LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
2,196 Commits 3 Branches 0 Tags
086820ac7226880c38eb8cdbb632fee0ea023fc1
Commit Graph
975 Commits
Author SHA1 Message Date
Franz Dietrich 086820ac72 Adding StructureOverlay an overlay to color the map according to structures. 
A usecase to demonstrate a possible application of the extended functionality:

**"Rails Overlay that draws only the rails that are on Cobblestone for a subway map."**

With this patch it is very easy to achive that:

```python
MineralOverlay(minerals=[(((0, 0, 0, 66), (0, -1, 0, 4)), (255, 0, 0, 255)),
                         (((0, 0, 0, 27), (0, -1, 0, 4)), (0, 255, 0, 255))])
```

In this case the overlay will be red for rails on cobblestone and green for powerrails on cobblestone.
The syntax is `(<tuple of conditions>, <target color>)`
 * where `<target color>` is a 4 tuple with a `(r, g, b, a)` color
 * and `<tuple of conditions>` is a tuple with an arbitrary number of conditions with the following syntax:
`((relx, rely, relz, blkid), ...)` where the `rel<>` parameters specify the relative coordinates to the block that is checked if it matches bklid.

In the example the fist tuple `(0,0,0,66)` checks if at the current position is a
rail while `(0,-1,0,4)` checks if at one below the current position is a cobblestone.
If both are true then the color `(255, 0, 0, 255)` is used.

A Sample Config file exploiting the capabilities:

``` python
worlds['My World'] = "~/.minecraft/saves/test/"
outputdir = "/tmp/test_render"
rendermode = "lighting"

renders["render1"] = {
    'world': 'My World',
    'title': 'A regular render',
}
renders["render_overlay_dafault_rails"] = {
    'world': 'My World',
    'title': 'Default Rails',
    'rendermode': [ClearBase(), StructureOverlay()],
    'overlay': ['render1'],
}
renders["render_overlay_cust_rails"] = {
    'world': 'My World',
    'title': 'Custom Rails',
    #relative coordinates [[(relx, rely, relz, mineral)], (red, green, blue, alpha)]
    'rendermode': [ClearBase(), StructureOverlay(structures=[(((0, 0, 0, 66), (0, -1, 0, 4)), (255, 0, 0, 255)),
                                                            (((0, 0, 0, 27), (0, -1, 0, 4)), (0, 255, 0, 255))])],
    'overlay': ['render1'],
}
```

The "Default Rails" overlay uses default coloring of the structures overlay. "Custom Rails" uses some custom coloring.

fixes overviewer/Minecraft-Overviewer#556 and fixes overviewer/Minecraft-Overviewer#787
 2014-09-03 12:05:11 +02:00
Andrew Chin af47000079 Lighting fixes for red sandstone stairs and slabs 
Closes #1150
Closes #1149
 2014-09-02 22:23:33 -04:00
Ean McLaughlinandAndrew Chin 5f8d5ca7bc Forgot texture file extensions in a couple places. 2014-09-02 20:56:07 -04:00
Ean McLaughlinandAndrew Chin ed09c5c965 Added definitions and support for all the various red sandstone blocks. 2014-09-02 20:55:57 -04:00
Andrew Chin 5d13030834 Bump versions and docs for 1.8 support! 2014-09-02 10:54:13 -04:00
Andrew Chin e82e7bf0b2 added support for different door types 2014-08-26 15:48:05 -04:00
Andrew Chin df920e60de Added support for the difference fence colors 2014-08-26 14:17:40 -04:00
Andrew Chin 0974b37fa7 Merge remote-tracking branch 'origin/snapshot' into snapshot 2014-08-26 14:17:03 -04:00
Andrew Chin da295d928a Merge branch 'master' into snapshot 2014-08-26 11:55:00 -04:00
Andrew Chin 924d396758 Show an ETA when using the plain text logger 
Closes #1088
 2014-08-19 22:49:33 -04: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
Nicolas F 792b049dd5 FIx genPOI dimension parsing 
Fixes Issue #1130
 2014-07-18 20:08:34 +02:00
Aaron Griffith 35863578d7 Merge remote-tracking branch 'matrixhacker/master' 
Conflicts:
	docs/config.rst
 2014-06-26 05:14:49 -04:00
Dan Berglund 37711f6b79 add new 14w25a prismarine and sea lantern blocks 2014-06-20 11:35:21 -07: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
Andrew Chin 9d7e1d2e02 Merge pull request #1110 from CounterPillow/genpoi-triage 
genPOI triage
 2014-06-18 22:51:25 -04:00
CounterPillow c15b9383c8 Remove broken special case for ancient worlds 
And to whoever wrote that thing: "World10" is not 6 characters
long, so the workaround was broken anyway.
 2014-06-03 18:08:27 +02:00
Andrew Chin 381d66f36d Try to prevent findGitHash from ever returning None 
See #1093
 2014-06-01 21:13:55 -04:00
Andrew Chin a7aab9d1b2 Try to prevent findGitHash from ever returning None 2014-06-01 21:13:14 -04: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 5427b28ca2 Use is not None instead of != None 2014-05-26 14:02:40 -04:00
Shadark b3f41c7928 Fixed pngnq rename error in Windows 
Fixed error 183 (File already exists) in Windows when trying to use
pngnq and trying to rename "file.png.tmp" to "file.png".
 2014-05-14 01:49:45 +02:00
matrixhacker bb1c4a7b85 Updated documentation and added an additional validation check for 
improperly formatted crop zones.
 2014-05-12 14:47:45 -04:00
Andrew Chin 6eacb3ecc7 Merge branch 'master' into snapshot 2014-05-10 19:44:33 -04:00
Aaron Griffith 95de300276 fix jar caching forcing default textures (caused by 183da128) 2014-05-10 18:45:58 -04:00
matrixhacker b6ac54a2b6 Added the ability to specify multiple crop zones. 2014-05-09 23:44:46 -04:00
CounterPillow 6812cad596 Fix validator for empty lists (the default value) 
Whoops.
 2014-05-09 16:58:47 +02:00
CounterPillow 6d28942626 Clarify optimizeimg docs; add warnings 
The validator will now warn if it detects that a crushed output
is fed into something that is not a crusher.

The is_crusher method of an optimizer shall return True if the
optimisation process is lossless, and does try to find optimal
encoding parameters as opposed to only removing unneeded channels
or reducing palettes.
 2014-05-08 20:56:46 +02:00
Andrew Chin ab29a9155f Merge branch 'master' into snapshot 2014-05-07 18:34:45 -04:00
Aaron Griffith 4b2cbfb5ee Merge pull request #1074 from CounterPillow/optimizerewrite 
Rewrote image optimisation stuff.
 2014-05-06 18:25:09 -04:00
CounterPillow 03561dccfa Use check_call(), add workaround for broken pngnq 
Also -f pngnq to write files, in case something didn't work
last render.
 2014-05-06 22:31:23 +02:00
CounterPillow 8817972b36 Move the check for program availability into class 
We also actually execute it now. Go us!
 2014-05-06 20:10:42 +02:00
CounterPillow 866c2fe064 Work around and warn if old optimizeimg definition 
Before someone says this is incorrect because it only ever uses
pngcrush: The old code always used pngcrush and nothing else
anyway. This is absolutely correct and the old behaviour.

I also added a check to make sure it's a list, as some people might
forget the whole list thing.
 2014-05-06 19:54:43 +02:00
Aaron Griffith 7c23d6e86a added rendercheck mode 3, the identity function of rendercheck modes! 2014-05-01 16:48:28 -04:00
Andrew Chin 7d87d25658 Fix ServerAnnounceObserver typo 2014-04-15 11:22:41 -04:00
Andrew Chin 8e5944d5c3 Catch some additional UUID lookup errors from urllib2 2014-04-10 19:52:50 -04:00
Andrew Chin ae586a7d27 Merge PR #1079 -- Handle UUID player files semi-nicely in POIgen 2014-04-10 19:44:24 -04:00
Aaron Griffith a8fc3300b4 general fixes for min/maxzoom, documentation cleared up 
hopeful fix for #1086
 2014-04-05 20:29:58 -04:00
Andrew Chin 90071e999f Merge #1055 -- Prevent opening and parsing files which haven't been modified since the last time that the render was done. 2014-03-30 18:21:08 -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 a6922e4ab7 New snapshot block: slime blocks 
See #1062
 2014-03-08 13:09:15 -05:00
Andrew Chin 5be1d62e15 New blocks for snapshot 
Granite, Diorite, Andesite (new data values for blockid:1)
Iron trapdoor

See #1062
 2014-03-08 13:02:01 -05:00
CounterPillow 09477ed8a0 Rewrote image optimisation stuff. 
The old one was broken anyway.
 2014-03-04 00:39:59 +01:00
Andrew Chin eda7671450 Merge pull request #1068 from overviewer/locale_fix 
Fixes for locale issues
 2014-02-19 21:16:24 -05:00
Andrew Chin 2c35ab8cc7 Merge pull request #1064 from overviewer/fscaps 
Try to track the capabilities of our outputdir filesystem.
 2014-02-16 22:38:41 -05:00
Andrew Chin c7ee8560d3 Fixes for locale issues 
There were some problems when a level.dat contained a non-ascii name, or
when a level.dat lived in a directory with a non-ascii name.

Paths returned by os.listdir are encoded, so we need to decode them
before printing them.  When calculating the max length of the enumerated
world names, were we for some reason calling str() before taking the
len().  The had the effect of converting unicode strings into
non-unicode strings, which is not the correct thing to do.
 2014-02-16 13:35:16 -05:00