From d9418d5ce1f8495c6bf1b54e3a1150cb8e21403b Mon Sep 17 00:00:00 2001
From: black-sliver <59490463+black-sliver@users.noreply.github.com>
Date: Sat, 4 Jun 2022 18:10:34 +0200
Subject: [PATCH] Core: move is_linux, _macos, _windows to Utils.py

---
 Launcher.py        | 8 ++------
 MinecraftClient.py | 2 +-
 Utils.py           | 4 ++++
 setup.py           | 3 +--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Launcher.py b/Launcher.py
index acf235ff..3c1812bb 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -15,18 +15,14 @@ import sys
 from typing import Iterable, Sequence, Callable, Union, Optional
 import subprocess
 import itertools
-from Utils import is_frozen, user_path, local_path, init_logging
+from Utils import is_frozen, user_path, local_path, init_logging, open_filename, messagebox,\
+    is_windows, is_macos, is_linux
 from shutil import which
 import shlex
 from enum import Enum, auto
 import logging
 
 
-is_linux = sys.platform.startswith('linux')
-is_macos = sys.platform == 'darwin'
-is_windows = sys.platform in ("win32", "cygwin", "msys")
-
-
 def open_host_yaml():
     file = user_path('host.yaml')
     if is_linux:
diff --git a/MinecraftClient.py b/MinecraftClient.py
index d75f6d0f..ed3ba867 100644
--- a/MinecraftClient.py
+++ b/MinecraftClient.py
@@ -13,12 +13,12 @@ import logging
 import requests
 
 import Utils
+from Utils import is_windows
 
 atexit.register(input, "Press enter to exit.")
 
 # 1 or more digits followed by m or g, then optional b
 max_heap_re = re.compile(r"^\d+[mMgG][bB]?$")
-is_windows = sys.platform in ("win32", "cygwin", "msys")
 
 
 def prompt_yes_no(prompt):
diff --git a/Utils.py b/Utils.py
index 95a19a49..6b18dc89 100644
--- a/Utils.py
+++ b/Utils.py
@@ -32,6 +32,10 @@ class Version(typing.NamedTuple):
 __version__ = "0.3.2"
 version_tuple = tuplize_version(__version__)
 
+is_linux = sys.platform.startswith('linux')
+is_macos = sys.platform == 'darwin'
+is_windows = sys.platform in ("win32", "cygwin", "msys")
+
 import jellyfish
 from yaml import load, load_all, dump, SafeLoader
 
diff --git a/setup.py b/setup.py
index dd7acecf..05da702a 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from pathlib import Path
 from hashlib import sha3_512
 import base64
 import datetime
-from Utils import version_tuple
+from Utils import version_tuple, is_windows
 from collections.abc import Iterable
 import typing
 import setuptools
@@ -39,7 +39,6 @@ else:
 arch_folder = "exe.{platform}-{version}".format(platform=sysconfig.get_platform(),
                                                 version=sysconfig.get_python_version())
 buildfolder = Path("build", arch_folder)
-is_windows = sys.platform in ("win32", "cygwin", "msys")
 
 
 # see Launcher.py on how to add scripts to setup.py