LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
3,027 Commits 3 Branches 0 Tags
deedd85eac1d8d2f08b790719da449f9fdfe4f37
Commit Graph
1552 Commits
Author SHA1 Message Date
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
Nicolas F c0d4fc9bc2 Add rollbacks to tile re-arrangements 
Previously, any kind of interruption during tile re-arrangements
would leave the tileset in a half re-arranged state.

This commit makes _increase_depth roll back possible changes it did
during the re-arrangement prior to it being interrupted.

Fixes issue #1166.
 2014-10-14 14:21:26 +02:00
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 c6830a35db Added RCon Observer 
It does the rcons! And the observings!
 2014-10-06 21:40:09 +02: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 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
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
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