0
Commit Graph

2786 Commits

Author SHA1 Message Date
Nicolas F
0b74d26c49 Completely change biome code again
Turns out my previous grasp of how Minecraft does this was wrong.

This seems to be the correct way. One side effect is that biome data
now has less resolution. One only really notices this when looking at
water, for which Minecraft does not even use the water colours for
in-game, otherwise I can't really tell a big difference.

Fixes #1698.
2019-12-23 23:50:20 +01:00
Nicolas F
2b699d0355 world: fix door block translation code
Fixes #1697.
2019-12-23 19:06:51 +01:00
Nicolas F
ed46082e16 biome: actually use the full range of biome data
Oopsie.
2019-12-23 18:36:24 +01:00
Nicolas F
e7c9a2c49e biome: fix biome reading code
Fixes #1696.
2019-12-23 18:31:30 +01:00
Nicolas F
64edf65aa5 biome: fix biomes for chunks at Y=16
Okay so you know how you have chunks and they map to 4 levels of biomes?
Logically you'd go hmmmm, let's just map 4 Y levels to one biome level.
Except there aren't 16 chunk heights, there are about 17 if you count
Y=16 (which can contain data), but there's also -1 technically but I've
never seen this have data in an NBT structure I don't think.

Anyway, let's just hope we're doing the right thing by giving Y=16 the
same biome as Y=15. If someone wants to check whether that is actually
correct please feel free to, but for now it's better than crashing at
the very least.

Would be nice if we had a spec for these kinds of things.

Fixes #1685.
2019-12-11 19:15:56 +01:00
Nicolas F
37ad13dba7 biome: for Y -1, return the first biome
Apparently rotated worlds would try to access the biome for Y-level
-1. I don't know why they do that (probably some dumb reason that may
be a bug in of itself) but returning the first level should be harmless.

Fixes #1683.
2019-12-11 18:43:16 +01:00
Nicolas F
76bbabb7de fix various logging.warn calls
Those are deprecated in favour of logging.warning now.
2019-12-11 18:42:35 +01:00
Nicolas F
268938a706 Fix biomes for Minecraft 1.15
Fixes #1650.

Mojang changed the biomes code so that it now can have different
biomes for different Y levels. We need to adjust our logic accordingly,
which is done through some small BiomeDispensary class where we shove
a numpy'd Mojang array in and can then read out the biomes for each level.

Biome data is now stored per-section, which needed some changes on the C
side of things. I didn't change anything in the biome overlay code so
I wouldn't be surprised if it's broken now, but for the time being I'd
rather have 1.15 fixed than some obscure overlay.

Tested to work with 1.14 and 1.15 data. No new biomes have been added
to the code yet.
2019-12-10 23:12:16 +01:00
Nicolas F
9607636d49 Merge pull request #1682 from Dravere/fixing-incorrect-blocks-rendering-1578
Fixed incorrect rendering of blocks (issue #1578)
2019-12-07 21:21:55 +01:00
Florian Graf
19086b3ea5 Fixed incorrect rendering of blocks (issue #1578)
The unpacking of the block states missed a single bit
when the bits per value was 7. Every 7 bytes it would
miss one bit and store it as 0 instead of the actual
value. This happened because 0xfc was used instead of
0xfe. 0xfc has six bits set to 1 and two to 0. 0xfe
has correctly set seven bits and one bit to 0. We need
those seven bits and not just the six.
2019-12-07 20:50:37 +01:00
Nicolas F
6dccdaa2a0 Merge pull request #1668 from IncredibleHolg/addblocks-nov19-01
Adds composter and bamboo
2019-12-05 15:32:25 +01:00
Aaron Griffith
7d9feb3cfc docs/building: don't need PIL_INCLUDE_DIR if you copy over files 2019-11-14 23:54:59 -05:00
Aaron Griffith
87e0e3b7c0 docs/building: easy_install not easy-install 2019-11-14 23:43:45 -05:00
Ian Salmons
9e27e6adc9 add composter 2019-11-01 11:45:00 +01:00
InrcedibleHolg
3c3e958eae add bamboo 2019-11-01 10:50:20 +01:00
Nicolas F
3d31347e9b observer: create outputdir if it doesn't exist
Observers get initialised at config parse time, before Overviewer
creates the outputdir. So we can just tell them to create the
outputdir if it doesn't already exist to avoid an awkward error
on the initial render.

Fixes #1657.
2019-10-27 20:19:07 +01:00
Nicolas F
a688c7b7c9 Merge pull request #1645 from dreamwraith/patch-1
Update Docs for Texture Install
2019-10-27 11:59:38 +01:00
Nicolas F
dce1c216ec Merge pull request #1664 from IncredibleHolg/addblocks-dec19
Addblocks dec19
2019-10-27 11:55:59 +01:00
InrcedibleHolg
17bb942b94 add missing smooth_red_sandstone_stairs 2019-10-27 11:46:20 +01:00
InrcedibleHolg
fa954714ae adapt id for bamboo sapling 2019-10-27 09:36:43 +01:00
Florian Graf
935bdb847d feat: added 1.14 scaffolding block 2019-10-27 09:10:55 +01:00
InrcedibleHolg
20fde52236 add new stone walls 2019-10-27 09:07:00 +01:00
Nicolas F
240a02a2dc Merge pull request #1663 from Esvandiary/fix/go-to-hash-layers
Web: Fix multiple layers being added on page load if a non-default layer is in the hash
2019-10-26 21:56:40 +02:00
Nicolas F
d07c2e708b Merge pull request #1634 from Gyzie/saplings_rework
Created seperate sapling blocks and added bamboo_sapling
2019-10-26 21:52:59 +02:00
Andy Martin
17e3e48928 goToHash: set current layer before firing worldCtrl's onChange event so the correct layer is added 2019-10-26 13:36:46 +01:00
Nicolas F
79a5668bd2 genPOI: handle more uuidcache.dat corruption
Apparently the gzip stream can be malformed in a way where it
does read it, but then throws an EOFError when it abruptly ends.

Catch this so we don't error out.
2019-10-26 02:41:56 +02:00
dreamwraith
ee080247c2 Update Docs for Texture Install
Documentation Not Accounting for wget oddness with non-existing directories. When using wget options to create directories, results in errors. This change works reliably for utilizing with wget where directories do not already exist, and also adds note indicating ability to integrate with shell scripts.
2019-09-22 15:02:18 -07:00
Nicolas F
71d59be4b9 tileset: fix changelist option for Python 3
Turns out os.write only accepts bytes!
2019-09-11 21:00:34 +02:00
Nicolas F
4f619cbaef world: also allow chunks of status "spawn"
Apparently this is a status sometimes seen with worlds converted from
1.12 to 1.14. From the sample I have, it looks like they're properly
populated with light and terrain data, so hopefully this doesn't break
anything.

Possibly fixes #1630.
2019-08-26 19:37:12 +02:00
Gijs Oortgiese
7342085140 Created seperate sapling blocks and added bamboo_sapling 2019-08-21 09:44:37 +02:00
Nicolas F
3498641d4e Merge rebased sign changes from Gyzie's 1-14-signs (#1627) 2019-08-19 12:36:57 +02:00
Gijs Oortgiese
f73e5d92ff Added sign variants added in 1.14 2019-08-19 12:35:56 +02:00
Nicolas F
577c86afab Merge branch 'implement-new-stairs' of IncredibleHolg (#1624) 2019-08-19 12:07:28 +02:00
Nicolas F
040085a2a8 Merge pull request #1629 from Horcrux/patch-1
Documentation typo fix
2019-08-17 13:08:15 +02:00
InrcedibleHolg
cdcb88b0f2 Implement new stairs fix stone stairs and slabs
added code change requests by @CounterPillow
2019-08-17 11:09:03 +02:00
Dawid Botha
45abe40a16 Typo fix 2019-08-17 10:25:12 +02:00
Nicolas F
56a0d5bef2 contrib: add empty __init__.py
Maybe Debian needs this? Who knows!
2019-08-08 21:34:52 +02:00
Nicolas F
bdd3b7bc16 test: import relative to __init__.py
Might fix tests for Debian builders somehow maybe?
2019-08-08 21:31:41 +02:00
Nicolas F
3b96158fb4 Implement smooth sandstone stairs 2019-08-06 14:26:03 +02:00
Gijs "Gyzie" Oortgiese
9193b66cdd Clarified overlay transparency instructions (#1619) 2019-08-02 21:06:01 +02:00
Nicolas F
b28073c3a7 Increase overviewer C extension version to 71 2019-08-02 17:12:04 +02:00
Nicolas F
467dc728b8 Merge branch 'add-lantern' of IncredibleHolg/Minecraft-Overviewer (#1617) 2019-08-02 17:03:40 +02:00
InrcedibleHolg
a5d9787071 Lantern implemented
enforcing coding style
2019-07-30 14:43:04 +02:00
Nicolas F
d2bef52a76 travis: use xenial after all because python 3.5
The bionic image offers no Python 3.5. Since we still want to test
for that, we should stick with Xenial, I guess.
2019-07-29 16:55:28 +02:00
Nicolas F
15f18812d5 observer: use == 0, not is 0
Who thought that was a good idea?
2019-07-29 16:51:52 +02:00
Nicolas F
32e34af381 travis: use bionic and test for 3.8-dev 2019-07-29 16:35:00 +02:00
Nicolas F
cf5dad5539 docs/building: clarify Linux build instructions
python3-imaging doesn't exist but python3-pil does, which
python3-pillow is aliased to. It also includes the necessary headers.

Add a note about pip missing the headers and warn of ABI mismatches if
people do weird things.
2019-07-29 16:27:15 +02:00
Nicolas F
e2ee37393b world: fix rail orientations
Fixes #1616.
2019-07-29 11:36:23 +02:00
Nicolas F
1b85e478f5 test_world: disable broken test case
Blegh pre-anvil
2019-07-24 17:17:02 +02:00
Nicolas F
0d3d630104 Get rid of config global state, improve tests
While dicking around with the tests I noticed that you could make
them fail if you ran them twice. Many hours were spent investigating,
and it turns out that Overviewer's config stuff has global state that
gets modified by having parsed configurations actually modify the
default config values. Not good!

We can fix this by having settingsDefinition return a dict of the
defaults, instead of assigning it to module-level names.

We can also get rid of test_all.py, because what it would do with
pytest is run all tests *twice*. Instead, do the module path stuff
in __init__.py. Also, instead of throwing a non-specific Exception
if exmaple isn't checked out, just skip the test thank you very much.

This is the weirdest rabbit hole I've ever gone down and I haven't
slept in about 30 hours. I'm going to push this commit, and if it
breaks anything, I'll be blissfully asleep as the unwashed masses
begin to riot over exception this traceback that.
2019-07-24 17:02:39 +02:00