0

Merge branch 'master' into python3-fun-times

This commit is contained in:
Aaron Griffith
2019-06-21 22:08:58 -04:00
25 changed files with 1188 additions and 218 deletions

View File

@@ -267,17 +267,17 @@ If you want or need to provide your own textures, you have several options:
Run the first line in a terminal, changing the version string to the latest as appropriate
(these docs may not always be updated to reflect the latest). Then paste the second line
into your terminal to download the latest version. ``${VERSION}`` will be replaced
by the acutal version string from the first line.
by the actual version string from the first line.
::
VERSION=1.12
wget https://s3.amazonaws.com/Minecraft.Download/versions/${VERSION}/${VERSION}.jar -P ~/.minecraft/versions/${VERSION}/
VERSION=1.14
wget https://overviewer.org/textures/${VERSION} -O ~/.minecraft/versions/${VERSION}/${VERSION}.jar
If that's too confusing for you, then just take this single line and paste it into
a terminal to get 1.12 textures::
a terminal to get 1.14 textures::
wget https://s3.amazonaws.com/Minecraft.Download/versions/1.12/1.12.jar -P ~/.minecraft/versions/1.12/
wget https://overviewer.org/textures/1.14 -O ~/.minecraft/versions/1.14/1.14.jar
* You can also just run the launcher to install the client.

View File

@@ -44,7 +44,7 @@ the Minecraft Wiki.
A more complicated filter function can construct a more customized display text::
def chestFilter(poi):
if poi['id'] == "Chest":
if poi['id'] == "Chest" or poi['id'] == 'minecraft:chest':
return "Chest with %d items" % len(poi.get('Items', []))
It is also possible to return a tuple from the filter function to specify a hovertext
@@ -52,7 +52,7 @@ different from the text displayed in the info window. The first entry of the tup
be used as the hover text, the second will be used as the info window content::
def chestFilter(poi):
if poi['id'] == "Chest":
if poi['id'] == "Chest" or poi['id'] == 'minecraft:chest':
return ("Chest", "Chest with %d items" % len(poi.get('Items', [])))
Because of the way the config file is loaded, if you need to import a function or module
@@ -61,7 +61,7 @@ for use in your filter function, you need to explicitly load it into the global
global escape
from cgi import escape
def signFilter(poi):
if poi['id'] == 'Sign':
if poi['id'] == 'Sign' or poi['id'] == 'minecraft:sign':
return "\n".join(map(escape, [poi['Text1'], poi['Text2'], poi['Text3'], poi['Text4']]))
Since writing these filters can be a little tedious, a set of predefined filters