0
Commit Graph

2261 Commits

Author SHA1 Message Date
Nicolas F
3a0f334970 optimizeimages: Add jpegoptim interface
Only options that appear to be interesting for us have been exposed,
namely -m and -S.
2014-10-10 20:54:47 +02:00
Nicolas F
16edd622a2 Add documentation for RConObserver 2014-10-06 21:52:21 +02:00
Nicolas F
c6830a35db Added RCon Observer
It does the rcons! And the observings!
2014-10-06 21:40:09 +02:00
Andrew Chin
00c2782bf5 Merge pull request #1151 from computertechie/fence_gates
Add support for the new fence gates
2014-09-03 20:26:03 -04:00
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
Ean McLaughlin
97350e81e3 Missing colon from else statement. 2014-09-03 02:10:50 -06:00
Ean McLaughlin
8f909f99de Added missing comma in function call for fence gate material definition. 2014-09-03 02:06:51 -06:00
Ean McLaughlin
f5b610e81c Update C extension version number. 2014-09-03 01:50:49 -06:00
Ean McLaughlin
893ca07419 Might as well slip a tiny bit of clean up in. 2014-09-03 01:45:29 -06:00
Ean McLaughlin
a3b7ac12b8 Added definitions for the new fence gates. Hopefully I got the C side right. Close #1148 2014-09-03 01:36:44 -06: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 McLaughlin
5f8d5ca7bc Forgot texture file extensions in a couple places. 2014-09-02 20:56:07 -04:00
Ean McLaughlin
ed09c5c965 Added definitions and support for all the various red sandstone blocks. 2014-09-02 20:55:57 -04:00
Andrew Chin
fd468f4cf3 Forgot to bump version for travis 2014-09-02 10:56:09 -04:00
Andrew Chin
5d13030834 Bump versions and docs for 1.8 support! 2014-09-02 10:54:13 -04:00
Andrew Chin
879699d3e6 Merge branch 'snapshot' 2014-09-02 10:44:53 -04:00
Andrew Chin
50b8da5820 Merge pull request #1146 from computertechie/patch-1
Fix a typo and silly crash case
2014-08-31 16:31:29 -04:00
Ean McLaughlin
52651c034c Fix a typo and silly crash case
Would crash instead of gracefully exiting if a tileset dir wasn't provided. Might also change how the memory limit option works - currently has to be provided, even though that's not mentioned.
2014-08-31 13:01:29 -06: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
Andrew Chin
8cc2346f6d Merge pull request #1141 from enaut/docfix
Fix error in the config.rst file
2014-08-19 21:15:06 -04:00
Franz Dietrich
55bbe26916 Fix error in the config.rst file 2014-08-14 10:35:44 +02:00
Andrew Chin
da3e6fdd41 Merge pull request #1133 from bmbeverst/patch-1
Latest version of minecraft jar
2014-08-05 21:58:47 -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
Brooks
6cca3ed004 Latest version of minecraft jar
Updated the version variable in the short script to install the latest minecraft jar for textures.
2014-07-30 22:24:23 -04:00
Andrew Chin
0b3f91e752 Merge pull request #1131 from CounterPillow/genpoi-dimfix
Fix genPOI dimension parsing
2014-07-28 12:19:12 -04:00
Nicolas F
792b049dd5 FIx genPOI dimension parsing
Fixes Issue #1130
2014-07-18 20:08:34 +02:00
Andrew Chin
6e29245a36 Merge pull request #1129 from Aaron1011/patch-2
Fix typo
2014-07-09 16:50:54 -04:00
Aaron1011
51e75a7d06 Fix typo 2014-07-09 10:52:12 -04:00
Aaron Griffith
35863578d7 Merge remote-tracking branch 'matrixhacker/master'
Conflicts:
	docs/config.rst
2014-06-26 05:14:49 -04:00
Aaron Griffith
360e579752 Merge pull request #1119 from dbergl/prismarine
add new 14w25a prismarine and sea lantern blocks
2014-06-26 04:59:50 -04:00
Aaron Griffith
97778e4a67 Merge pull request #1113 from CounterPillow/docs-cleanup
Docs cleanup
2014-06-26 04:58:51 -04:00
Aaron Griffith
c920c0ab7a Merge pull request #1118 from CounterPillow/patch-1
genPOI: Fix warning for unresolvable UUID
2014-06-23 05:08:59 -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
Andrew Chin
fdb3e4d599 Merge pull request #1112 from CounterPillow/worldnamefix
Remove broken special case for ancient worlds
2014-06-04 09:57:07 -04:00
Nicolas F
948d2fa741 Minor fixes to documentation
* Fix the copypasted section in the README

  * Update version and dates
2014-06-04 13:23:30 +02:00
Nicolas F
3c33080e3d Update front page of the docs
lol
2014-06-04 12:23:43 +02:00