From 121f3fab899a1a81ea525ba4bf2287b1fa7415de Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sun, 26 Jan 2020 13:36:08 -0800 Subject: [PATCH 1/8] Add support for forge 1.13.2 Note that this uses the current latest forge for 1.13.2, because there apparently has not been a recommended stable version. The changelog indicates it has been many months since the last change, so presumably this version of forge should be reasonably stable and usable. --- emsm/core/server.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/emsm/core/server.py b/emsm/core/server.py index 2bb8243..abc4749 100644 --- a/emsm/core/server.py +++ b/emsm/core/server.py @@ -943,6 +943,24 @@ def exe_path(self): return os.path.join(self.directory(), filename) +class MinecraftForge_1_13(MinecraftForgeBase, Vanilla_1_13): + + @classmethod + def name(self): + return "minecraft forge 1.13" + + def default_url(self): + # 1.13.2 + return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.13.2-25.0.219/forge-1.13.2-25.0.219-installer.jar" + + def exe_path(self): + filenames = [filename \ + for filename in os.listdir(self.directory()) \ + if re.match("^forge-1\.13.*.jar$", filename)] + filename = filenames[0] + return os.path.join(self.directory(), filename) + + # Bungeecord # '''''''''' @@ -1286,6 +1304,7 @@ def __add_emsm_wrapper(self): MinecraftForge_1_10, MinecraftForge_1_11, MinecraftForge_1_12, + MinecraftForge_1_13, BungeeCordServerWrapper, Spigot, Spigot_1_8, From 2b5fb7a1d80588fce530077a5f86e94f8e94338b Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sun, 26 Jan 2020 13:40:22 -0800 Subject: [PATCH 2/8] Add support for forge 1.14.4 Note this pulls the latest forge currently available, 28.1.116, rather than the recommended stable version 28.1.0. While this is an unstable version bringing in some new features over version 28.1.0 from last September, the changelog for the past few months is almost entirely stability fixes. --- emsm/core/server.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/emsm/core/server.py b/emsm/core/server.py index abc4749..965e760 100644 --- a/emsm/core/server.py +++ b/emsm/core/server.py @@ -961,6 +961,24 @@ def exe_path(self): return os.path.join(self.directory(), filename) +class MinecraftForge_1_14(MinecraftForgeBase, Vanilla_1_14): + + @classmethod + def name(self): + return "minecraft forge 1.14" + + def default_url(self): + # 1.14.4 + return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.14.4-28.1.116/forge-1.14.4-28.1.116-installer.jar" + + def exe_path(self): + filenames = [filename \ + for filename in os.listdir(self.directory()) \ + if re.match("^forge-1\.14.*.jar$", filename)] + filename = filenames[0] + return os.path.join(self.directory(), filename) + + # Bungeecord # '''''''''' @@ -1305,6 +1323,7 @@ def __add_emsm_wrapper(self): MinecraftForge_1_11, MinecraftForge_1_12, MinecraftForge_1_13, + MinecraftForge_1_14, BungeeCordServerWrapper, Spigot, Spigot_1_8, From dd1910a367d8092ff4cb0280cbdab24b6cf70802 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sun, 26 Jan 2020 14:00:47 -0800 Subject: [PATCH 3/8] Add support for forge 1.15.2 This is a relatively new server release, and there are only two forge releases so far, so this is still pretty new and likely will need further updates as development progresses. --- emsm/core/server.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/emsm/core/server.py b/emsm/core/server.py index 965e760..946544f 100644 --- a/emsm/core/server.py +++ b/emsm/core/server.py @@ -979,6 +979,24 @@ def exe_path(self): return os.path.join(self.directory(), filename) +class MinecraftForge_1_15(MinecraftForgeBase, Vanilla_1_15): + + @classmethod + def name(self): + return "minecraft forge 1.15" + + def default_url(self): + # 1.15.2 + return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.15.2-31.0.1/forge-1.15.2-31.0.1-installer.jar" + + def exe_path(self): + filenames = [filename \ + for filename in os.listdir(self.directory()) \ + if re.match("^forge-1\.15.*.jar$", filename)] + filename = filenames[0] + return os.path.join(self.directory(), filename) + + # Bungeecord # '''''''''' @@ -1324,6 +1342,7 @@ def __add_emsm_wrapper(self): MinecraftForge_1_12, MinecraftForge_1_13, MinecraftForge_1_14, + MinecraftForge_1_15, BungeeCordServerWrapper, Spigot, Spigot_1_8, From e34b6e1691beaf0e6afc16ae0eda4ceaccd7c848 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 1 May 2021 17:56:27 -0700 Subject: [PATCH 4/8] update jar links for forge These match the current "Download Recommended" links from files.minecraftforge.net as of May 1, 2021. --- emsm/core/server.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/emsm/core/server.py b/emsm/core/server.py index 946544f..ad1ae22 100644 --- a/emsm/core/server.py +++ b/emsm/core/server.py @@ -882,7 +882,7 @@ def name(self): return "minecraft forge 1.8" def default_url(self): - return "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.8.9-11.15.1.1722/forge-1.8.9-11.15.1.1722-installer.jar" + return "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.8.9-11.15.1.2318-1.8.9/forge-1.8.9-11.15.1.2318-1.8.9-installer.jar" def exe_path(self): filenames = [filename \ @@ -899,7 +899,7 @@ def name(self): return "minecraft forge 1.10" def default_url(self): - return "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.10.2-12.18.0.2008/forge-1.10.2-12.18.0.2008-installer.jar" + return "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.10.2-12.18.3.2511/forge-1.10.2-12.18.3.2511-installer.jar" def exe_path(self): filenames = [filename \ @@ -916,7 +916,7 @@ def name(self): return "minecraft forge 1.11" def default_url(self): - return "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.0.2228/forge-1.11.2-13.20.0.2228-installer.jar" + return "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.1.2588/forge-1.11.2-13.20.1.2588-installer.jar" def exe_path(self): filenames = [filename \ @@ -933,7 +933,7 @@ def name(self): return "minecraft forge 1.12" def default_url(self): - return "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.12.2-14.23.5.2854/forge-1.12.2-14.23.5.2854-installer.jar" + return "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.12.2-14.23.5.2855/forge-1.12.2-14.23.5.2855-installer.jar" def exe_path(self): filenames = [filename \ @@ -969,7 +969,7 @@ def name(self): def default_url(self): # 1.14.4 - return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.14.4-28.1.116/forge-1.14.4-28.1.116-installer.jar" + return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.14.4-28.2.0/forge-1.14.4-28.2.0-installer.jar" def exe_path(self): filenames = [filename \ @@ -987,7 +987,7 @@ def name(self): def default_url(self): # 1.15.2 - return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.15.2-31.0.1/forge-1.15.2-31.0.1-installer.jar" + return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.15.2-31.2.0/forge-1.15.2-31.2.0-installer.jar" def exe_path(self): filenames = [filename \ From b8087b882747ec01de8cf7788b3bea14fae970b9 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 1 May 2021 18:05:04 -0700 Subject: [PATCH 5/8] Add support for forge 1.16.5 --- emsm/core/server.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/emsm/core/server.py b/emsm/core/server.py index ad1ae22..9f288dc 100644 --- a/emsm/core/server.py +++ b/emsm/core/server.py @@ -997,6 +997,24 @@ def exe_path(self): return os.path.join(self.directory(), filename) +class MinecraftForge_1_16(MinecraftForgeBase, Vanilla_1_16): + + @classmethod + def name(self): + return "minecraft forge 1.16" + + def default_url(self): + # 1.16.5 + return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.16.5-36.1.0/forge-1.16.5-36.1.0-installer.jar" + + def exe_path(self): + filenames = [filename \ + for filename in os.listdir(self.directory()) \ + if re.match("^forge-1\.16.*.jar$", filename)] + filename = filenames[0] + return os.path.join(self.directory(), filename) + + # Bungeecord # '''''''''' From 6fd5bfd91bff3ccf82b6eac675c021340fc579cb Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Tue, 19 May 2020 16:23:10 -0700 Subject: [PATCH 6/8] *updated* to minecraft server 1.12.2 (and forge) --- emsm/core/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emsm/core/server.py b/emsm/core/server.py index 9f288dc..0155675 100644 --- a/emsm/core/server.py +++ b/emsm/core/server.py @@ -675,7 +675,7 @@ def name(self): return "vanilla 1.12" def default_url(self): - return "https://launcher.mojang.com/v1/objects/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar" + return "https://s3.amazonaws.com/Minecraft.Download/versions/1.12.2/minecraft_server.1.12.2.jar" def log_path(self): return "./logs/latest.log" @@ -933,7 +933,7 @@ def name(self): return "minecraft forge 1.12" def default_url(self): - return "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.12.2-14.23.5.2855/forge-1.12.2-14.23.5.2855-installer.jar" + return "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.12.2-14.23.5.2854/forge-1.12.2-14.23.5.2854-installer.jar" def exe_path(self): filenames = [filename \ From da28d3828e50627a47f79f6c9a6aeeb7c5449ba5 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 4 Jun 2022 12:14:05 -0700 Subject: [PATCH 7/8] Add support for 1.18.2 --- emsm/core/server.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/emsm/core/server.py b/emsm/core/server.py index 0155675..aa79d32 100644 --- a/emsm/core/server.py +++ b/emsm/core/server.py @@ -763,6 +763,25 @@ def log_error_re(self): return re.compile(".* \[SEVERE\] .*", re.MULTILINE) +class Vanilla_1_18(VanillaBase): + + @classmethod + def name(self): + return "vanilla 1.18" + + def default_url(self): + return "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar"; + + def log_path(self): + return "./logs/latest.log" + + def log_start_re(self): + return re.compile("^.*Starting minecraft server version 1\.18\.2.*") + + def log_error_re(self): + return re.compile(".* \[SEVERE\] .*", re.MULTILINE) + + # MinecraftForge # '''''''''''''' From 2d2f5638a5f47d5a614692926458f898e6a27603 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 4 Jun 2022 12:14:05 -0700 Subject: [PATCH 8/8] Add support for 1.18.2 --- emsm/core/server.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/emsm/core/server.py b/emsm/core/server.py index aa79d32..143f9e0 100644 --- a/emsm/core/server.py +++ b/emsm/core/server.py @@ -751,7 +751,7 @@ def name(self): return "vanilla 1.16" def default_url(self): - return "https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar"; + return "https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar" def log_path(self): return "./logs/latest.log" @@ -770,7 +770,7 @@ def name(self): return "vanilla 1.18" def default_url(self): - return "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar"; + return "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar" def log_path(self): return "./logs/latest.log" @@ -1371,6 +1371,7 @@ def __add_emsm_wrapper(self): Vanilla_1_14, Vanilla_1_15, Vanilla_1_16, + Vanilla_1_18, MinecraftForge_1_6, MinecraftForge_1_7, MinecraftForge_1_8,