From 5d25f908a472d3010510953af948c3b8cc6ae863 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Sun, 30 Apr 2023 18:10:58 +0200
Subject: [PATCH] Launcher: fix loading of mcicon (#1779)

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
---
 Launcher.py                  |   5 +++--
 data/mcicon.png              | Bin 0 -> 594 bytes
 setup.py                     |  13 ++++++++++++-
 worlds/LauncherComponents.py |   4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 data/mcicon.png

diff --git a/Launcher.py b/Launcher.py
index a9c9a3181a5c..7acaeb78739c 100644
--- a/Launcher.py
+++ b/Launcher.py
@@ -146,7 +146,7 @@ def launch(exe, in_terminal=False):
 
 def run_gui():
     from kvui import App, ContainerLayout, GridLayout, Button, Label
-    from kivy.uix.image import Image
+    from kivy.uix.image import AsyncImage
     from kivy.uix.relativelayout import RelativeLayout
 
     class Launcher(App):
@@ -188,7 +188,8 @@ def build_button(component: Component):
                 button.component = component
                 button.bind(on_release=self.component_action)
                 if component.icon != "icon":
-                    image = Image(source=icon_paths[component.icon], size=(38, 38), size_hint=(None, 1), pos=(5, 0))
+                    image = AsyncImage(source=icon_paths[component.icon],
+                                       size=(38, 38), size_hint=(None, 1), pos=(5, 0))
                     box_layout = RelativeLayout()
                     box_layout.add_widget(button)
                     box_layout.add_widget(image)
diff --git a/data/mcicon.png b/data/mcicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b8fc5489711f3faef5f367a3bdbade932e02f3b
GIT binary patch
literal 594
zcmV-Y0<HatP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkQ1W80eRCodHSSwG&Kp0#I0)rrsATB}hLr72vEE0=DBS0W75K@CV
zha{&!kswecC<G3J00iL#1cCv9f@^YVGDF*C>6S<5JJs25Zy(c{>9)?<&lr$qVCWC*
z{ylIFQP(^iIC<l`8v%{GrGXoY>ZgLaOFh24Fjerk{N~-GdoEPkgIR#-RKxNLsN|o4
zTB3S<E13iluB|=-W>7T~<P~59u%y)RS2EyNJzjSvm<7}%&-;~EK$-#n%Hy#!L0$ny
z0EdDa{*(cWvlGC<_}B>GP!Q_b(Eh&lTwK3Gm$S<kz-9rULlDR-z?%Uqil5E|o}V#$
zoa-Aq`_R<w?g5rpfDr(C5Cq<b{AT9_XjxyG100$OzHfXmcprp%e5TdnAxg1Xpp+hg
zqPzmU8F16<feuEe=K(+89s>@|gxDT$C)==|tMfy^_AUT)I45rbc>>Z5NZ$vt-@)k<
zeIs1TYUu@^3)%^k9cRMb!y9%W#AkKibKK`~8s4$zxh}5&BY-8LhQa>@n}<x`Z-$%+
zd~Wc0n&*t|@&5Rwdo&C19Z<va3MlnQff|A`fj!M*@>!khzUO$q|9AF~O(U-WBOud)
z=tU*}3^*&z1mC+r-5&SdSF?bRp{Cd66%Zo>SR{}MT+G3BtRZKb{3dw?7y<dhuvTNh
g7%&Em0SN{^0RP~LtH!cqzW@LL07*qoM6N<$f*k+=_W%F@

literal 0
HcmV?d00001

diff --git a/setup.py b/setup.py
index 94a242f0f07f..13b12251e276 100644
--- a/setup.py
+++ b/setup.py
@@ -157,11 +157,22 @@ def download_SNI():
 
 
 # see Launcher.py on how to add scripts to setup.py
+def resolve_icon(icon_name: str):
+    base_path = icon_paths[icon_name]
+    if is_windows:
+        path, extension = os.path.splitext(base_path)
+        ico_file = path + ".ico"
+        assert os.path.exists(ico_file), f"ico counterpart of {base_path} should exist."
+        return ico_file
+    else:
+        return base_path
+
+
 exes = [
     cx_Freeze.Executable(
         script=f'{c.script_name}.py',
         target_name=c.frozen_name + (".exe" if is_windows else ""),
-        icon=icon_paths[c.icon],
+        icon=resolve_icon(c.icon),
         base="Win32GUI" if is_windows and not c.cli else None
     ) for c in components if c.script_name and c.frozen_name
 ]
diff --git a/worlds/LauncherComponents.py b/worlds/LauncherComponents.py
index d9f04e601d11..2e1152a8313d 100644
--- a/worlds/LauncherComponents.py
+++ b/worlds/LauncherComponents.py
@@ -101,7 +101,7 @@ def __call__(self, path: str):
 
 
 icon_paths = {
-    'icon': local_path('data', 'icon.ico' if is_windows else 'icon.png'),
-    'mcicon': local_path('data', 'mcicon.ico'),
+    'icon': local_path('data', 'icon.png'),
+    'mcicon': local_path('data', 'mcicon.png'),
     'discord': local_path('data', 'discord-mark-blue.png'),
 }