Skip to content

Commit

Permalink
*added* vanilla 1.13
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Schmitt committed Aug 22, 2018
1 parent bb49201 commit 025b39d
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 3 deletions.
6 changes: 5 additions & 1 deletion docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ Changelog

This log contains only the changes beginning with version *3.1.1-beta*.

* 6.0.1-beta

* Added Vanilla 1.13

* 6.0.0-beta

* Removed the ``{server_dir}`` placeholder introduced in version 4.0.5-beta
because there was no consistent or simple way of handling the quoting.
Specify the absolute path if you wish to use the *start_command* configuration
option.
option.

* 5.0.8-beta

Expand Down
2 changes: 1 addition & 1 deletion emsm/core/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ def __init__(self, path):
self["world"]["stop_delay"] = "5"
self["world"]["stop_message"] = "The server is going down.\n"\
"Hope to see you soon."
self["world"]["server"] = "vanilla 1.11"
self["world"]["server"] = "vanilla 1.13"
return None

def epilog(self):
Expand Down
20 changes: 20 additions & 0 deletions emsm/core/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,25 @@ def log_error_re(self):
return re.compile(".* \[SEVERE\] .*", re.MULTILINE)


class Vanilla_1_13(VanillaBase):

@classmethod
def name(self):
return "vanilla 1.13"

def default_url(self):
return "https://launcher.mojang.com/mc/game/1.13.1/server/fe123682e9cb30031eae351764f653500b7396c9/server.jar"

def log_path(self):
return "./logs/latest.log"

def log_start_re(self):
return re.compile("^.*Starting minecraft server version 1\.13.*")

def log_error_re(self):
return re.compile(".* \[SEVERE\] .*", re.MULTILINE)


# MinecraftForge
# ''''''''''''''

Expand Down Expand Up @@ -1142,6 +1161,7 @@ def __add_emsm_wrapper(self):
Vanilla_1_10,
Vanilla_1_11,
Vanilla_1_12,
Vanilla_1_13,
MinecraftForge_1_6,
MinecraftForge_1_7,
MinecraftForge_1_8,
Expand Down
2 changes: 1 addition & 1 deletion emsm/core/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
#: The version of the EMSM.
#:
#: Take a look at http://semver.org for more information.
VERSION = "6.0.0b0"
VERSION = "6.0.1b0"

0 comments on commit 025b39d

Please sign in to comment.