0
Commit Graph

2609 Commits

Author SHA1 Message Date
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
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
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
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
Nicolas F
99eebd5b69 world: fix potatoes and carrots growth stages
Concerns #1486

Also get rid of an obviously broken leftover wheat elif.
2019-03-16 17:47:49 +01:00
Nicolas F
f7ab92917f world: fix seed growth stages
Concerns #1486
2019-03-16 17:40:05 +01:00
Nicolas F
061406ca55 world: fix mossy cobblestone block/wall rendering
Concerns #1486

I need some high-proof alcohol.
2019-03-16 17:07:35 +01:00
Nicolas F
dd6e69189f world: fix petrified_oak_slab rendering
Concerns #1486
2019-03-16 16:50:15 +01:00
Nicolas F
6aaf680c8c settingsValidators: fix code style, adjust strings
Some absolute thonkers in here like two-spaces indent code. Yikes
my man.
2019-03-15 16:48:08 +01:00
Nicolas F
d6ed0bd416 overviewer: use print_function
PYTHON 3 SOON POGGERS
2019-03-14 16:03:35 +01:00
Nicolas F
4082c8ed05 contrib/playerInspect: add usage output 2019-03-14 13:57:29 +01:00
Nicolas F
05f031fbb9 contrib/playerInspect: fix code style
Also use the print function.
2019-03-14 13:48:53 +01:00
Nicolas F
75f2bc1dfc contribManager: fix imports, use print_function
We don't need to import nbt from overviewer_core at all so we
can remove the silly fix to do that. Why was that ever there? It's
a mystery!
2019-03-14 13:40:27 +01:00
Nicolas F
4be0f07156 contribManager: fix code style 2019-03-14 13:30:22 +01:00
Nicolas F
daa25d80fd Merge pull request #1533 from CounterPillow/png-it-modernisation
Modernise png-it.py and make it less weird
2019-03-13 17:09:27 +01:00
Nicolas F
d742c15a1c Merge pull request #1534 from NPCtom/patch-2
Replace OSX with macOS
2019-03-12 05:58:15 +01:00
Tom Tamaira
579b0aacf8 Replaced OSX with macOS 2019-03-12 16:25:05 +13:00
Nicolas F
2c1ce0d522 contrib/png-it: allow saving to stdout with -
Following the same convention as some other tools, - as output
filename means stdout now.
2019-03-12 00:41:57 +01:00
Nicolas F
e6d4ed8068 contrib/png-it: use the print function
This also allows us to print to stderr, which is handy and means
all program text output (i.e. argument parser and script messages)
will be on stderr.
2019-03-12 00:33:02 +01:00
Nicolas F
eee196623f contrib/png-it: switch from optparse to argparse
In the process, we can clean up some of the command line argument
handling. Sadly, argparse's mutually exclusive groups are too
primitive to get rid of the autocrop/manual crop conflict checking,
but we'll have to live with those two lines I guess.

This script apparently also works with Python 3 now, which is neat.
2019-03-12 00:26:51 +01:00
Nicolas F
88c056b6b7 contrib/png-it: clean up code, grammar
This took several years off my life expectancy, and there's still
ways to go.
2019-03-12 00:26:45 +01:00
Tom Tamaira
a2a2e6c71f Updated macOS Build Instructions (#1530)
* Updated macOS Build Instructions

Updated macOS instructions with file downloads, more detailed information, updated phrases etc.
2019-03-12 00:00:40 +01:00
Nicolas F
4e08859f0e Merge pull request #1532 from jsmienk/patch-2
Simplify finding spawn Y
2019-03-11 19:16:03 +01:00
Nicolas F
57a55b68e1 contribManager: get rid of removed scripts 2019-03-11 18:05:20 +01:00
Jeroen Smienk
84938213dd Simplified finding spawn Y
Simplified finding the first air block above saved spawn Y by removing the function and looping through the sections once.
2019-03-11 14:52:29 +01:00
Nicolas F
9f50e0fb2f contrib: delete scripts that are no longer useful
dtt-c has been a thing for 8 years now, I think it's safe to say
people have deleted their old caches in the meantime.

findSigns has also been superseded by genPOI ever since genPOI
has been a thing, which has probably been since anvil.
2019-03-10 18:09:09 +01:00
Nicolas F
c9b506a58c genPOI: fix code style
One code style error can't really be fixed because despite
has_key being deprecated, "in" doesn't work on "super" for objects
that derive from dict, at least not in Python 2.7. Thanks Guido.

Also, I don't know which one of you it is that keeps putting semicolons
at the end of your statements but you seriously need to stop.
2019-03-10 18:05:32 +01:00
Nicolas F
6f5730d40a Merge pull request #1529 from CounterPillow/arrrgparse
overviewer: replace optparse with argparse
2019-03-10 17:39:54 +01:00
Nicolas F
3a923c2932 overviewer: warn about shell quoting issues
This reimplements the warning about missing quotes on the command
line that was removed with the previous commit.
2019-03-09 18:47:49 +01:00
Nicolas F
25f0907d05 overviewer: replace optparse with argparse
optparse is deprecated, and switching to argparse is mostly but not
entirely trivial. Nicely telling the user about shell quoting had
to be removed because I didn't see an easy way to do that with
argparse.
2019-03-08 16:48:31 +01:00
Nicolas F
849e5d690e overviewer: fix git hash being after line break
Apparently that comma had its reasons for being there because
Python2's print works in weird ways. We can do this better though
by using string concatenation.
2019-03-07 16:04:56 +01:00
Nicolas F
e4924c3d73 overviewer: misc style fixes
except as instead of comma, get rid of strange superfluous comma
after print.
2019-03-07 16:02:14 +01:00
Nicolas F
a551795969 optimizeimages: fix code style 2019-03-07 15:50:59 +01:00
Nicolas F
ec63aa55b6 util: fix code style 2019-03-07 15:49:37 +01:00
Nicolas F
fc88572aa3 cache: fix code style 2019-03-07 15:43:01 +01:00
Nicolas F
94aa49019c logger: code style fixes 2019-03-07 15:33:28 +01:00
Nicolas F
ef66efd140 overviewer: code style and consistency fixes
A good sprinkling of PEP8 fixes. We're also getting rid of some
odd manual linebreaks in the output messages, and making sure to
end sentences with a period where appropriate. Help messages have
also been made more consistent, e.g. "Tries" -> "Try" and so forth.
2019-03-06 14:27:04 +01:00
Nicolas F
4ffa0be456 Merge pull request #1526 from CounterPillow/webp-support
Add WebP image format support
2019-03-06 13:54:21 +01:00
Nicolas F
61ebd35240 Add WebP image format support
Since Firefox 65 added support for WebP, users may be interested
in having maps that use WebP images. Support for this is added in
this commit, along with documentation for it.

A new option, "imglossless", controls whether we write out lossless
or lossy WebP images. The generic name "imglossless" as opposed to
a more specific "webplossless" was chosen in case future image
formats we also implement also support lossless/lossy modes in the
same format (JPEG-XL? AV1 image format?).

It's an okay meme but lossy mode really falls apart on our sorts
of images on the more zoomed out composite tiles, resulting in
pretty blurry messes. Might be due to a PSNR bias in the encoder,
which is to be expected from Google.
2019-03-04 17:04:09 +01:00
Nicolas F
7f63dfe315 tileset: drastic code style fixes
We've also added a setup.cfg to specify what rules we want for
pycodestyle. We'll be ignoring some dumb ones that make no sense
and probably shouldn't exist, like both W503 and W504 being an
issue somehow???????

We're using a line length limit of 100. If you're on an 80 character
terminal and incredibly upset about this, then that's the nursing
home staff's problem, not ours.
2019-03-03 16:47:35 +01:00
Nicolas F
0499f8d168 docs: update copyright year, version, release
Bump version and release to 0.13, update the copyright date from
2017 (!!!) to 2019.
2019-03-02 16:35:23 +01:00