From cd14bccdc8ae8162a1183ec6c5a9271ae5f9db2d Mon Sep 17 00:00:00 2001 From: Draper <27962761+Drapersniper@users.noreply.github.com> Date: Thu, 28 May 2020 22:02:23 +0100 Subject: [PATCH] Get fucked Java 8. Long live Java 11 (till we kill you for your big brother Java 13) (#3873) * Get fucked Java 8. Long live Java 11 (Till we kill you for your big brother Java 13) Signed-off-by: Drapersniper <27962761+drapersniper@users.noreply.github.com> * welp lets simplify this Signed-off-by: Drapersniper <27962761+drapersniper@users.noreply.github.com> --- redbot/cogs/audio/manager.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/redbot/cogs/audio/manager.py b/redbot/cogs/audio/manager.py index 4348720a8..9c0cc09ab 100644 --- a/redbot/cogs/audio/manager.py +++ b/redbot/cogs/audio/manager.py @@ -20,7 +20,7 @@ from .errors import LavalinkDownloadFailed log = logging.getLogger("red.audio.manager") JAR_VERSION: Final[str] = "3.3.1" -JAR_BUILD: Final[int] = 987 +JAR_BUILD: Final[int] = 1050 LAVALINK_DOWNLOAD_URL: Final[str] = ( "https://github.com/Cog-Creators/Lavalink-Jars/releases/download/" f"{JAR_VERSION}_{JAR_BUILD}/" @@ -94,17 +94,11 @@ class ServerManager: @classmethod async def _get_jar_args(cls) -> List[str]: (java_available, java_version) = await cls._has_java() + if not java_available: - raise RuntimeError("You must install Java 1.8+ for Lavalink to run.") + raise RuntimeError("You must install Java 11 for Lavalink to run.") - if java_version == (1, 8): - extra_flags = ["-Dsun.zip.disableMemoryMapping=true"] - elif java_version >= (11, 0): - extra_flags = ["-Djdk.tls.client.protocols=TLSv1.2"] - else: - extra_flags = [] - - return ["java", *extra_flags, "-jar", str(LAVALINK_JAR_FILE)] + return ["java", "-Djdk.tls.client.protocols=TLSv1.2", "-jar", str(LAVALINK_JAR_FILE)] @classmethod async def _has_java(cls) -> Tuple[bool, Optional[Tuple[int, int]]]: @@ -117,7 +111,7 @@ class ServerManager: cls.java_version = None else: cls._java_version = version = await cls._get_java_version() - cls._java_available = (2, 0) > version >= (1, 8) or version >= (8, 0) + cls._java_available = (11, 0) <= version < (12, 0) return cls._java_available, cls._java_version @staticmethod