0
Commit Graph

2799 Commits

Author SHA1 Message Date
Ben Steadman
ae32f5f019 logger.warn->logger.warning 2019-04-06 19:08:23 +01:00
Nicolas F
1ab66dddea fix prismarine stairs
Sorry for the noise in mc_id.h, but somebody decided they want DOS
line endings and I couldn't allow that to happen. When not doing that
put the whole thing into diff, I decided to just fix the indentation
too while I was at it.

Needed bugfixing of some overlooked unsigned char usages for block IDs,
as otherwise the lighting would be scuffed.

Concerns issue #1486.
2019-03-31 19:20:10 +02:00
Ben Steadman
b7e9e868ce use adjacency dictionary for graph equality 2019-03-30 16:49:17 +00:00
Ben Steadman
6b533dad04 python3.5 minimum 2019-03-30 14:44:28 +00:00
Ben Steadman
3423b8f6a4 pip install networkx in travis 2019-03-30 11:57:23 +00:00
Ben Steadman
9db2ececb8 testRender.py tests 2019-03-30 11:51:45 +00:00
Ben Steadman
d11bf1306d testRender.py Python3 refactor 2019-03-30 11:49:39 +00:00
Ben Steadman
dd11cdd03b # This is a combination of 7 commits.
# This is the 1st commit message:

testRender.py Python3 refactor

# The commit message #2 will be skipped:

# Popen -> subprocess.run

# The commit message #3 will be skipped:

# split subprocess args

# The commit message #4 will be skipped:

# map -> list comprehension

# The commit message #5 will be skipped:

# optparse->argparse

# The commit message #6 will be skipped:

# factor out CLI parsing from main logic

# The commit message #7 will be skipped:

# fix backwards verbose/quiet behaviour
2019-03-30 11:46:37 +00:00
Ben Steadman
36f55ea7b4 python3 shebang lines 2019-03-30 11:46:37 +00:00
Ben Steadman
cf695ed9de regionTrimmer.py tests 2019-03-30 11:48:38 +00:00
Ben Steadman
9121a4b080 regionTrimmer.py Python3 refactor 2019-03-30 11:46:37 +00:00
Ben Steadman
ced67cf317 deltete deprecated/unused scripts 2019-03-30 11:48:07 +00:00
Ben Steadman
5807c2565b playerInspect.py Python3 refactor 2019-03-30 11:46:37 +00:00
Ben Steadman
7516cd0c25 gallery.py Python3 refactor 2019-03-30 11:46:37 +00:00
Ben Steadman
4e3a861c9c cyrillic_convert.py Python3 refactor 2019-03-30 11:47:00 +00:00
Ben Steadman
7a2b0e6061 contributors.py Python3 refactor 2019-03-30 11:46:37 +00:00
Ben Steadman
bd596c56c2 contributors.py Python3 refactor 2019-03-30 11:46:37 +00:00
Nicolas F
be69712ca0 docs/signs.rst: fix filter function ids for 1.13 2019-03-29 17:05:31 +01:00
aheadley
2186d08c32 web: fix goToHash on layer change
Fixes #1548.
2019-03-28 16:07:30 +01:00
Nicolas F
f93bc28230 world: fix stair orientations
Concerns issue #1486.

Inner/outer corners apparently have their data from ancil data instead
of Minecraft's stuff, so we might need to fix that in the future.
2019-03-28 16:02:53 +01:00
Nicolas F
58f73d8f81 docs/building.rst: clean up macOS instructions
I've had to fight rst a lot to get this right, somehow the code
block after the last bullet point breaks if you explicitly number
the enumerated list instead of using auto-enumeration. Like legit,
change `#.` to `12.` and it'll break. No clue why.
2019-03-27 15:15:07 +01:00
Nicolas F
3c4d8e34e6 docs: move last mentions of Python 2 to Python 3
I've adjusted the macOS instructions slightly to be more general,
e.g. do not advise symlinking a specific Python executable of a
specific version, just tell people they should make sure it's in
their environment.

And yes, on Windows, python.exe is whatever version you have installed,
so if you install Python 3, python.exe is going to be Python 3.

I've removed the FreeBSD instructions because they only talk about
working around ports potentially using Python 2.6, which is no longer
relevant. If somebody here uses FreeBSD and has anything to add to the
instructions not already covered by the Linux instructions, let me know.
2019-03-27 15:14:01 +01:00
Nicolas F
79754b367c world: bandaid fix for double stone brick slabs
This code badly needs a rewrite, we're just altering code path and
data all over the place and this isn't okay.
2019-03-25 21:42:08 +01:00
Nicolas F
ed9a9930db Merge pull request #1547 from InrcedibleHolg/master
added missing cut_red_sandstone and chiseled_red_sandstone
2019-03-24 22:20:19 +01:00
InrcedibleHolg
37dd1bc56c added cut_red_sandstone and chiseled_red_sandstone 2019-03-24 20:12:24 +01:00
Nicolas F
fb63788dc7 mailmap: more adding of myself, sheesh 2019-03-22 19:22:46 +01:00
Nicolas F
477bd701a3 mailmap: add myself 2019-03-22 19:16:34 +01:00
Nicolas F
4c3e0bfb6e docs: update mingw build instructions (untested) 2019-03-22 17:19:47 +01:00
Nicolas F
316b8099e9 docs: update Linux build instructions for Python 3 2019-03-22 17:18:12 +01:00
Nicolas F
dc7d1cd208 genPOI: replace optparse with argparse
Maybe one day we'll use actual subparsers but today is not that day.
2019-03-22 17:10:52 +01:00
Nicolas F
4c78a05e91 travis: switch to xenial and test for python 3.7
Python 3.7 requires using the xenial images in Travis-CI. It appears
that they do not yet have newer distro version images available, so
that's the best we can get for now.
2019-03-21 15:29:41 +01:00
Nicolas F
a23682fec8 docs: update optimizeimages instructions for py3 2019-03-21 15:21:43 +01:00
Nicolas F
2c4b0d40b5 Merge pull request #1541 from Wunkolo/block_class
Add block_class to accelerate block-conditionals
2019-03-19 00:52:36 +01:00
Wunkolo
4b0b50f215 Implement style fixes 2019-03-18 14:04:36 -07:00
Nicolas F
11aa232141 genPOI: port to Python 3
There's some stuff left to do, like properly do the functools.partial
stuff, and check that the uuidcache is actually working. But hey,
player markers work at least, and so does --skip-scan.

Still needs a port to argparse though.
2019-03-18 19:45:22 +01:00
Nicolas F
7085b048de overviewer: fix shell quoting check in edge case
If you supply an option that can't possibly be a world or an output
but isn't recognised, Overviewer would barf.
2019-03-18 19:36:24 +01:00
Nicolas F
a533f3a396 contribManager: Python 3 compatibility 2019-03-18 18:52:32 +01:00
Nicolas F
a709dbccf5 Merge branch 'contribManager-management' into python3-fun-times 2019-03-18 18:50:23 +01:00
Wunkolo
62dcfab7a0 Fix block_class_is_subset linkage 2019-03-17 20:21:03 -07:00
Wunkolo
121b0d96ab Increment extension version 2019-03-17 18:48:06 -07:00
Wunkolo
26bd4d120a Fix implicit declaration 2019-03-17 18:46:45 -07:00
Wunkolo
1271772aa1 Collapse special case logic to block_class_is_subset
Thanks demorgan's law
2019-03-17 18:02:44 -07:00
Wunkolo
5ff6a6400e Convert case switch to block_class_is_subset 2019-03-17 17:57:18 -07:00
Wunkolo
ee9a3411ba block_class_is_subset implementation pass 2019-03-17 17:33:30 -07:00
Wunkolo
2c3d54ea5d Implement block_class header 2019-03-17 15:09:33 -07:00
Nicolas F
00b4e83822 Merge pull request #1539 from Wunkolo/mc_id
Convert block ids into mc_block_id enum
2019-03-17 21:10:38 +01:00
Wunkolo
eb9d6a98e5 Increment overviewer extension version 2019-03-17 12:05:32 -07:00
Nicolas F
0072eae3f0 world: fix reading old biomes
Some older maps store biomes differently, and we should use this as
a bytes object, not a str object.
2019-03-17 18:13:26 +01:00
Nicolas F
137797cd51 travis: move to Python 3 2019-03-17 18:08:03 +01:00
Nicolas F
e348a548b6 Initial Python 3 port
Many things work, some don't. Notably, genPOI doesn't work, and
there's some signedness comparison stuff going on in the C extension.

This also completely drops support for Python 2, as maintaining a C
extension for both Python 2 and 3 is a pain and not worth it for the
9 months that Python 2 is still going to be supported upstream.

The documentation needs to be adjusted as well.

All of the few tests we have pass, and rendering a map works, both
with a configuration file and without. We can also use optimizeimages.

Concerns #1528.
2019-03-17 17:57:07 +01:00