CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Get fucked Java 8. Long live Java 11 (till we kill you for your big brother Java 13) (#3873)

Browse Source 
* 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>
This commit is contained in:
Draper 2020-05-28 22:02:23 +01:00 committed by GitHub
parent cf6966058e
commit cd14bccdc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
redbot/cogs/audio/manager.py
View File

@ -20,7 +20,7 @@ from .errors import LavalinkDownloadFailed
log = logging.getLogger("red.audio.manager") log = logging.getLogger("red.audio.manager")
JAR_VERSION: Final[str] = "3.3.1" JAR_VERSION: Final[str] = "3.3.1"
JAR_BUILD: Final[int] = 987 JAR_BUILD: Final[int] = 1050
LAVALINK_DOWNLOAD_URL: Final[str] = ( LAVALINK_DOWNLOAD_URL: Final[str] = (
"https://github.com/Cog-Creators/Lavalink-Jars/releases/download/" "https://github.com/Cog-Creators/Lavalink-Jars/releases/download/"
f"{JAR_VERSION}_{JAR_BUILD}/" f"{JAR_VERSION}_{JAR_BUILD}/"
@ -94,17 +94,11 @@ class ServerManager:
@classmethod @classmethod
async def _get_jar_args(cls) -> List[str]: async def _get_jar_args(cls) -> List[str]:
(java_available, java_version) = await cls._has_java() (java_available, java_version) = await cls._has_java()
if not java_available: 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): return ["java", "-Djdk.tls.client.protocols=TLSv1.2", "-jar", str(LAVALINK_JAR_FILE)]
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)]
@classmethod @classmethod
async def _has_java(cls) -> Tuple[bool, Optional[Tuple[int, int]]]: async def _has_java(cls) -> Tuple[bool, Optional[Tuple[int, int]]]:
@ -117,7 +111,7 @@ class ServerManager:
cls.java_version = None cls.java_version = None
else: else:
cls._java_version = version = await cls._get_java_version() 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 return cls._java_available, cls._java_version
@staticmethod @staticmethod