Upstream/pyCraft
1
0
Fork 0
mirror of https://github.com/ammaraskar/pyCraft.git synced 2024-11-25 03:35:29 +01:00
Code Issues Projects Releases Wiki Activity

Add pre-release versions for 1.14.3 and 1.14.4

Browse Source
This commit is contained in:
joodicator 2019-08-16 00:16:41 +02:00
parent 6f54e852d4
commit bbbd3fb195
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
minecraft/__init__.py
View File

@ -6,8 +6,11 @@ with a MineCraft server.
# The version number of the most recent pyCraft release. # The version number of the most recent pyCraft release.
__version__ = "0.6.0" __version__ = "0.6.0"
# A dict mapping the name of each Minecraft version supported by pyCraft to # A dict mapping the ID string of each Minecraft version supported by pyCraft
# the corresponding protocol version number. # to the corresponding protocol version number. The ID string of a version is
# the key used to identify it in
# <https://launchermeta.mojang.com/mc/game/version_manifest.json>, or the 'id'
# key in "version.json" in the corresponding ".jar" file distributed by Mojang.
SUPPORTED_MINECRAFT_VERSIONS = { SUPPORTED_MINECRAFT_VERSIONS = {
'1.8': 47, '1.8': 47,
'1.8.1': 47, '1.8.1': 47,
@ -181,15 +184,26 @@ SUPPORTED_MINECRAFT_VERSIONS = {
'1.14.2 Pre-Release 3': 483, '1.14.2 Pre-Release 3': 483,
'1.14.2 Pre-Release 4': 484, '1.14.2 Pre-Release 4': 484,
'1.14.2': 485, '1.14.2': 485,
'1.14.3-pre1': 486,
'1.14.3-pre2': 487,
'1.14.3-pre3': 488,
'1.14.3-pre4': 489,
'1.14.3': 490, '1.14.3': 490,
'1.14.4-pre1': 491,
'1.14.4-pre2': 492,
'1.14.4-pre3': 493,
'1.14.4-pre4': 494,
'1.14.4-pre5': 495,
'1.14.4-pre6': 496,
'1.14.4-pre7': 497,
'1.14.4': 498, '1.14.4': 498,
} }
# Those Minecraft versions supported by pyCraft which are "release" versions, # Those Minecraft versions supported by pyCraft which are "release" versions,
# i.e. not development snapshots or pre-release versions. # i.e. not development snapshots or pre-release versions.
RELEASE_MINECRAFT_VERSIONS = { RELEASE_MINECRAFT_VERSIONS = {
name: protocol for (name, protocol) in SUPPORTED_MINECRAFT_VERSIONS.items() vid: protocol for (vid, protocol) in SUPPORTED_MINECRAFT_VERSIONS.items()
if __import__('re').match(r'\d+(\.\d+)+$', name)} if __import__('re').match(r'\d+(\.\d+)+$', vid)}
# The protocol versions of SUPPORTED_MINECRAFT_VERSIONS, without duplicates, # The protocol versions of SUPPORTED_MINECRAFT_VERSIONS, without duplicates,
# in ascending numerical (and hence chronological) order. # in ascending numerical (and hence chronological) order.

12
minecraft/networking/connection.py
View File

@ -73,13 +73,13 @@ class Connection(object):
object. If None, no authentication is attempted and object. If None, no authentication is attempted and
the server is assumed to be running in offline mode. the server is assumed to be running in offline mode.
:param username: Username string; only applicable in offline mode. :param username: Username string; only applicable in offline mode.
:param initial_version: A Minecraft version string or protocol version :param initial_version: A Minecraft version ID string or protocol
number to use if the server's protocol version version number to use if the server's protocol
cannot be determined. (Although it is now version cannot be determined. (Although it is
somewhat inaccurate, this name is retained for now somewhat inaccurate, this name is retained
backward compatibility.) for backward compatibility.)
:param allowed_versions: A set of versions, each being a Minecraft :param allowed_versions: A set of versions, each being a Minecraft
version string or protocol version number, version ID string or protocol version number,
restricting the versions that the client may restricting the versions that the client may
use in connecting to the server. use in connecting to the server.
:param handle_exception: The final exception handler. This is triggered :param handle_exception: The final exception handler. This is triggered

4
tests/fake_server.py
View File

@ -422,10 +422,10 @@ class _FakeServerTest(unittest.TestCase):
""" """
server_version = VERSIONS[-1] server_version = VERSIONS[-1]
# The Minecraft version name that the server will support. # The Minecraft version ID that the server will support.
client_versions = None client_versions = None
# The set of Minecraft version names or protocol version numbers that the # The set of Minecraft version IDs or protocol version numbers that the
# client will support. If None, the client supports all possible versions. # client will support. If None, the client supports all possible versions.
server_type = FakeServer server_type = FakeServer