LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
3,003 Commits 3 Branches 0 Tags
09e796b5cd0dda178aaf29126838cd6a32c31fdd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas FandGitHub 7171af5873 Merge PR #2007 from tomasdev 
Add missing dependency on Mac OS X
 2021-12-14 10:09:11 +01:00
Nicolas FandGitHub 5807fdafca Merge PR #2004 from stwalkerster 
POIs: Add additional tag to search for entities
 2021-12-09 21:27:25 +01:00
Nicolas FandGitHub 9f9cd1ea71 Merge PR #1963 from buscher 
Added more 1.17 blocks
 2021-12-05 23:35:16 +01:00
Nicolas FandGitHub a5b36f568f Merge PR #1990 from 26/master 
Add compatibility for 21w39a and 21w43a snapshots
 2021-12-02 18:58:19 +01:00
Nicolas F 2402e410cf overviewer.h: bump extension version 2021-07-28 10:29:37 +02:00
Nicolas F 08e628c39a Merge PR #1959 from buscher 2021-07-28 10:28:30 +02:00
Nicolas F 68c9ccee07 Merge PR #1958 from buscher 2021-07-28 10:16:22 +02:00
Nicolas F 86b241a5f7 Fix rendering onto mounted CIFS shares 
You still shouldn't do it for performance reasons but I guess
now you can do it in theory. Yay.
 2021-07-10 19:58:11 +02:00
Nicolas F dab3268b3b overviewer.h: bump C extension version 2021-07-10 11:23:59 +02:00
Nicolas F 352102552a Merge PR #1957 of buscher 
Fix fence connection
 2021-07-10 11:18:56 +02:00
Nicolas F e254e6a192 world: fix the unknown regions warning in 1.17 
Fixes #1948.
 2021-07-10 11:05:40 +02:00
Nicolas F f16aa05ed0 docs: document JSObserver CORS nonsense 
Concerns issue #1933.
 2021-06-30 15:08:36 +02:00
Nicolas F 49497b602c docs: remove obsolete section about HTTPS 
Closes #1953.
 2021-06-30 15:01:40 +02:00
Nicolas F ca01386cef docs: try to fix backslash once more 
My previous fix worked with the version of sphinx I have locally,
but apparently not the one readTheDocs uses. Imagine my surprise!

Let's just use ``backticks`` for our backslash.
 2021-06-21 14:22:50 +02:00
Nicolas FandGitHub 0eb0700e52 Merge PR #1949 from buscher 
Added more 1.17 blocks
 2021-06-21 10:42:47 +02:00
Nicolas F 1a5aee0fee docs: fix backslash issue in ironic twist 2021-06-21 01:26:12 +02:00
Nicolas F 4b2035e1f9 textures: add cut copper slabs 
Also fix copper stairs stuff not being in alt_height.
 2021-06-14 21:58:47 +02:00
Nicolas F c1f1c31119 textures: add cut copper stairs 2021-06-13 11:43:10 +02:00
Nicolas F eddb0f2375 textures: add copper ore and raw copper block 2021-06-12 11:37:18 +02:00
Nicolas F cb375e6788 textures: add cut copper 2021-06-11 21:33:49 +02:00
Nicolas F d8e469b313 nbt: eagerly load the entire MCR on chunk load 
During the first call to get_chunk, we can simply read the whole
region file into a BytesIO object. By then re-reading location
and timestamp data, we might make scrambled maps a lot less
likely.

Hopefully mitigates #1888.
 2021-06-11 20:59:40 +02:00
Nicolas F 70e739916c biome: don't use new Python syntax because Debian 
lol
 2021-06-11 20:04:39 +02:00
Nicolas F 9081f78ba6 biome: fix crash on depth increased worlds 
Unsurprisingly, my code was at fault.

Does not yet render any of the new data. Just fixes parsing it.

Closes #1902.
 2021-06-11 20:00:01 +02:00
Nicolas F f2afeda287 world: fix rendering grass paths on maps < 1.17 2021-06-11 09:47:59 +02:00
Nicolas F 9df56fc30a overviewer.h: bump C extension version 2021-06-10 19:35:46 +02:00
Nicolas F ea4b543e74 Merge PR #1943 from buscher 2021-06-10 19:34:11 +02:00
Nicolas F 6097461494 Merge PR #1941 from buscher 2021-06-10 19:26:11 +02:00
Nicolas F e729addd23 textures: add some of the new copper blocks 2021-06-10 19:24:01 +02:00
Nicolas F 6ece5c0735 textures: update error message for 1.17 2021-06-10 17:56:14 +02:00
Nicolas F 257975383d textures: add budding amethyst 2021-06-10 17:53:14 +02:00
Nicolas F 66195f6fc7 textures: add amethyst block, raw iron, raw gold 2021-06-10 17:42:30 +02:00
Nicolas F c717b7170f world: fix dirt path rendering for 1.17 2021-06-10 17:34:46 +02:00
Nicolas F b150cf0daa docs: update texture installation instructions 2021-06-10 17:26:58 +02:00
Nicolas F f228d5f07a travis: test python 3.9 and minecraft 1.17 2021-06-10 17:24:49 +02:00
Nicolas F 81bfbc0a15 world: fix warnings regarding unknown region types 2021-06-10 17:23:23 +02:00
Nicolas F 1beb5799b5 textures: use new name for path block on 1.17 
Fixes rendering with 1.17 textures and no 1.16 fallback,
breaks rendering for anything using 1.16 textures.
 2021-06-10 17:22:23 +02:00
Nicolas F 3488450531 overviewer.h: bump C extension version 2021-06-06 18:53:53 +02:00
Nicolas F 111579ed89 Merge PR #1811 of DragonDev1906 2021-06-06 18:52:31 +02:00
Nicolas F 999e613b28 setup.py: enable c99 mode with gnu extensions 
Apparently this is needed on certain old gcc versions, but does
fine on newer ones. No clue why.
 2021-06-06 08:10:32 +02:00
Nicolas F 3084d57bb3 genPOI: don't panic on empty player dat files 
Closes #1876.
 2021-06-04 14:03:33 +02:00
Nicolas FandGitHub 498c844136 Merge PR #1845 from Esvandiary 
GenPOI: adds explicit pool close/join in handleEntities to fix possible hang (issue #1817)
 2021-06-04 13:59:41 +02:00
Nicolas F 9fbcd54037 Merge PR #1863 of vilhelmprytz 2021-06-04 13:45:00 +02:00
Nicolas FandGitHub 218dc14e04 Merge PR #1878 from Phoenix616 
Add name of world to some errors
 2021-06-04 13:43:07 +02:00
Nicolas F 2dbfafe857 Merge PR #1939 of buscher 
Add chains
 2021-06-03 15:59:04 +02:00
Nicolas FandGitHub 3d644c3511 Merge PR #1938 from buscher 
Fixed black full height snow layers
 2021-06-01 20:42:45 +02:00
Nicolas FandGitHub 7a4ef31faa Merge PR #1937 from buscher 
Added chiseled and cracked nether bricks
 2021-06-01 20:40:07 +02:00
Nicolas FandGitHub bd06e9eeb3 Merge PR #1935 from buscher 
Fix dead Chorus Flower
 2021-05-31 19:10:58 +02:00
Nicolas FandGitHub 98392a35d9 Merge PR #1934 from buscher 
Add End Rod
 2021-05-31 19:10:13 +02:00
Nicolas F 1926aa6c6f docs: move to libera.chat 2021-05-22 13:21:26 +02:00
Nicolas F efa0f9e850 web_assets: update leaflet to 1.7.1 2021-05-21 02:34:45 +02:00
Nicolas F c43284a2cf Merge PR #1856 from IncredibleHolg 
I finally got around to doing this.
 2021-05-21 01:32:49 +02:00
Nicolas F 649a20e902 Revert "Merge PR #1708 from AstraLuma" 
This reverts commit b2a7bc99ba, reversing
changes made to a5fbe03133.

Breaks buildbot in various ways
 2021-05-16 19:48:39 +02:00
Nicolas F ff94206a05 setup.py: don't error out when PIL can't be found 
It may still be in the include directories provided by the
operating system, such as it is on the vast majority of Linux
distributions.
 2021-05-16 18:26:36 +02:00
Nicolas F b2a7bc99ba Merge PR #1708 from AstraLuma 2021-05-16 18:13:55 +02:00
Nicolas F a5fbe03133 setup.py: make sure to enable -O3 on unix 
Apparently my -O3 came from somewhere other than this script.
It's possible that there is some generic "use optimisations"
mechanism in setuptools/distutils/whateverthisis, but I don't feel
like opening up that can of worms so let's just add an -O3 extra
argument to the compiler invocation to make sure it always gets it.
 2021-05-16 18:00:51 +02:00
Nicolas F a5e2f182af overviewer.h: bump C extension version 2021-05-16 14:50:23 +02:00
Nicolas F a7e5be4322 Merge PR #1926 of Buscher 2021-05-16 14:49:44 +02:00
Nicolas F cfbfd4c026 Merge PR #1925 of Buscher 2021-05-16 14:48:23 +02:00
Nicolas F 1b5e0f5802 Merge PR #1920 of buscher 2021-05-16 14:46:52 +02:00
Nicolas F 2fc64c6f26 block_class: optimise aarch64 SIMD some more 
15% faster than the previous SIMD.
 2021-05-11 12:24:54 +02:00
Nicolas F 772d73ce04 block_class: add aarch64 SIMD 
Speedup of 2.3x for this particular function. Can probably be
improved somewhat still.
 2021-05-11 11:57:52 +02:00
Nicolas FandGitHub 86963c5de9 Merge PR #1890 from lenzls 
Minor spelling fixes
 2021-01-16 15:53:32 +01:00
Nicolas FandGitHub 074a7d23a1 Merge PR #1877 from clonetwin26 
"Catch KeyErrors since nether maps don't necessarily have well formed player.dat"
 2020-11-27 14:17:41 +01:00
Nicolas FandGitHub 731af71d27 Merge pull request #1857 from jakubskorupa/fix-typos 
Fix typos and punctuation in documentation
 2020-10-07 09:56:56 +02:00
Nicolas F 47a0604b5a textures: be more resilient against corrupted jars 2020-10-04 19:45:39 +02:00
Nicolas F 01ed588278 textures: work around old pillow 
Older versions apparently didn't have LANCZOS filtering for
resizing. In this case, just fall back to whatever the default is.

Will look marginally worse for those people but at least it works.
 2020-09-20 16:16:10 +02:00
Nicolas F 91ea87447a docs: add a note about Bedrock Edition support 
Namely, that it does not exist.

Fixes #1841.
 2020-08-25 16:47:05 +02:00
Nicolas FandGitHub 4c0a69dd28 Merge PR #1826 from Auron956 
Resolve stair & stem rendering issues
 2020-08-07 23:05:48 +02:00
Nicolas FandGitHub 50b84e95b5 Merge pull request #1791 from overviewer/116-blocks 2020-08-05 19:05:57 +02:00
Nicolas F 1d40ea77d4 nether: move nether roof blocks into new class 2020-08-05 19:01:52 +02:00
Nicolas F 0776bf0a93 textures: fix various small nitpicks 
- don't redundantly declare a side image when it's the same as top
- change wood blocks to get textures from a dict
 2020-08-05 18:52:21 +02:00
Nicolas F ba173698f3 Merge PR #1812 from IncredibleHolg 2020-08-05 18:14:27 +02:00
Nicolas F 08e8c21d0c web: don't clutter up web console by default 
If one wishes to add debug output, they should use overviewer.utils.debug.
To see the output produced by that, set overviewerConfig.map.debug to true.

Fixes #1816.
 2020-07-28 13:22:07 +02:00
Nicolas F 11aabbfd9f world: fix 1.16 block unpacking 
Fixes #1797.
 2020-07-28 13:08:43 +02:00
Nicolas F fcb3f2644d Shuffle around wall IDs, change wall check 
Previously, walls were all numbered at 21000+. This is bad because
our blockmap is an array, so this caused our blockmap to take up
80 MiB of RAM in each worker process.

This commit changes the wall numbering, and exploits some bitmasking
to have the wall check run in constant time no matter how many walls
there are. This is done with a simple mask and xor to check the prefix.

RAM usage for the blockmap thus drops to like 44 MiB.

This is in preparation for adding more walls for 1.16.
 2020-07-13 19:15:47 +02:00
Nicolas FandGitHub 3282791bc4 Merge PR #1796 from DragonDev1906 
Make icons in legend OptIn
 2020-07-11 14:19:00 +02:00
Nicolas F 8c0028495d world: work around minecraft palette bugs 
Instead of trusting that Minecraft will only request up to index
num_palette_entries - 1, we'll assume Mojang occasionally produces
a weird file where it tries to request past that, up to the maximum
palette index it can based on the bits per value. To facilitate this,
this commit extends the translation palette array to this maximum size.

Such invalid palette picks will simply be replaced by ID 0 (aka air),
so it should cause minimal weirdness in the output.

Works around #1797.
 2020-07-09 18:33:39 +02:00
Nicolas F 8ec2a998e2 build-tools: remove unused garbage 2020-07-07 23:36:56 +02:00
Nicolas F a3e4812ca9 world: skip zero-size region files 
Minecraft 1.16.1 loves writing these in singleplayer, and they
cause a whole bunch of corruption warnings if we don't handle them
in a special way like this.
 2020-07-03 13:10:23 +02:00
Nicolas F fd2c0a057a Add blackstone and netherite blocks 2020-07-03 13:10:23 +02:00
Nicolas F bc56346bad Initial 1.16 block work 
- Add ancient debris
- Add basalt
- Add polished basalt
- Add soul campfire
 2020-07-03 13:10:23 +02:00
Nicolas F d362e1512d overlay-mineral: fix tuple parse data type 
Was a byte, should've been an unsigned short.

Fixes #1801.
 2020-07-03 13:06:46 +02:00
Nicolas F 27eabb08a5 web_assets: make poi control icons look less bad 
using rem here is probably wrong because we want to be the height
of the line in the span we're inside of, not of some global thing.

Also, add a margin to the left.
 2020-07-01 18:59:34 +02:00
Nicolas F f54e398a2a docs/signs: fix escape example and add note 
Concerns #1795.
 2020-07-01 18:46:56 +02:00
Nicolas F a424744762 Merge PR #1734 by DragonDev1906 2020-06-29 18:49:34 +02:00
Nicolas FandGitHub f6b7e67b85 Merge PR #1793 from eminence 
Show the Overviewer version in the "welcome" message
 2020-06-28 00:30:42 +02:00
Nicolas F 9605bd8098 Add a FUNDING.yml for a sponsor button 
After discussing this with the other folks on IRC, everyone seemed
to be cool with me adding myself to this. It makes it so people see
a little sponsor button that tells them how they can monetarily
support the project if they choose to do so.
 2020-06-25 21:42:25 +02:00
Nicolas F a04ca9ca81 genPOI: fix dumb dimension handling mistake 
lol
 2020-06-25 19:10:29 +02:00
Nicolas F d3a5786642 world: work around Minecraft lighting nonsense 
Minecraft occasionally generates chunks which are not yet lit.
In the past, I'd have said to just make them not render, but these
can sometimes be large areas of the world.

Instead, render them with full bright SkyLight. This looks less bad
than whatever is stored in the SkyLight property in these cases.

Closes #1787, probably. Only one person bothered providing a sample file.
 2020-06-25 18:55:48 +02:00
Nicolas F 0143ad63a6 genPOI: code style fixes 
E129 can suck me off. Get a better syntax, Python.
 2020-06-25 18:36:00 +02:00
Nicolas F 2b550fdf66 genPOI: fix handling of new dimension format 
Fixes #1778.
 2020-06-25 18:17:21 +02:00
Nicolas F 1355f8c49e world: retry chunk read on OSError too 
Closes #1790.

If a chunk fails reading due to an underlying operating system
IO error, we can invoke the retry logic too. No clue what could
cause this to happen beyond hardware faults.

Also lower the sleep time to 0.25s down from 0.5s because half a
second of sleeping for each chunk this happens on seems incredibly
overkill.

Making the nbt code raise a CorruptChunkError in this case also means
that failing to read a chunk due to an IOError is not a fatal error
anymore, it'll simply skip it and move on.
 2020-06-25 15:37:17 +02:00
Nicolas F c53268e8fe assetmanager: don't choke on existing icons dir 
Fixes #1789.
 2020-06-25 00:17:12 +02:00
Nicolas FandGitHub 780597d7b2 Merge pull request #1780 from dreamwraith 2020-06-24 18:10:18 +02:00
Nicolas F cadb24a015 assetmanager: rename icons dir to markers, symlink 
This fixes a name collision with Apache's default config.

Closes #1773. Install nginx already.
 2020-06-24 17:57:12 +02:00
Nicolas F 07e6be4b43 Merge pull request #1788 from Auron956 2020-06-24 17:16:45 +02:00
Nicolas FandGitHub 98fe552790 Merge pull request #1786 from IncredibleHolg/flowers-berry 
add flowers and berries
 2020-06-14 18:58:48 +02:00
Nicolas FandGitHub 678048177d Merge pull request #1755 from cliffmeyers 
fix a bug where multiple renders of the same world led to repeat genPOI scans
 2020-05-23 16:27:05 +02:00
Nicolas F 98f83af4df Merge PR #1759 from iRath96 2020-05-22 16:21:02 +02:00
Nicolas FandGitHub dc6f8cfcbd Merge pull request #1747 from cliffmeyers 
Apply consisting sorting to markers JS files in genPOI
 2020-04-12 21:06:24 +02:00