From a0ee2f139815a5ca2f01fd77cdbcc4c2efc5c6e2 Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Tue, 7 May 2024 14:46:47 +0530
Subject: [PATCH] improve server list readability a bit

---
 data/ui/xbox/platform_android_white.png | Bin 0 -> 314 bytes
 data/ui/xbox/platform_desktop_white.png | Bin 0 -> 289 bytes
 data/ui/xbox/platform_mac_white.png     | Bin 0 -> 268 bytes
 data/ui/xbox/platform_unknown_white.png | Bin 0 -> 363 bytes
 data/ui/xbox/platform_web_white.png     | Bin 0 -> 388 bytes
 src/Console.hx                          |   4 ++++
 src/Marble.hx                           |   2 ++
 src/gui/MPServerListGui.hx              |  30 +++++++++++++++++-------
 8 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 data/ui/xbox/platform_android_white.png
 create mode 100644 data/ui/xbox/platform_desktop_white.png
 create mode 100644 data/ui/xbox/platform_mac_white.png
 create mode 100644 data/ui/xbox/platform_unknown_white.png
 create mode 100644 data/ui/xbox/platform_web_white.png

diff --git a/data/ui/xbox/platform_android_white.png b/data/ui/xbox/platform_android_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..342dd87b69c7ec6acf7c2743d470ecbd26883779
GIT binary patch
literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}c0*}aI1_r)^Ak4U9V)k30;CW9M#}Etuw^I^%4;cuwa&tK_K46e}z`z-C
zfKe!c&w<f{fmMMqh}ojyd){^V#e2&VTjFa@PJcJ;S!rz1_0RWq=TG9AbIAAajHis+
z6_dO?S>+x`#4X+Q@L<Za)f2e(94M&jQ%!l{qIHyuXZiFU2i+3lua|Eth$vuJUgK~m
zdwS0a*19A18?5cQV-BV}zU$mz)hb&s?Nl1$&ChGCS{vVpoys%{vNSmK`^krl&-^z9
z%cruZZd_;6;Jz~F*)Fl;;^ylVor^!5{=UIbC8$xh;2mrIH@C!ori5gm*BCrq{an^L
HB{Ts5hBtO=

literal 0
HcmV?d00001

diff --git a/data/ui/xbox/platform_desktop_white.png b/data/ui/xbox/platform_desktop_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..319801d0e645ddfe4ffc096a1cb9b6a2cfa9e5b4
GIT binary patch
literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}c0*}aI1_r)^Ak4U9V)k30;5JVe#}Etu<eEP}44F+Cg{Lf&TCl6}M4TDJ
zqn`q5o(~uW{8=6`EAVY<eBBtq*l|!ug@IjxO;U>Ek%IIN`3^^+&IGxS3xJF^sV0kN
z`ye;oB{B=tr5P3CIGzde|7nz1!apZx0x!!_)qq({s(C34K|IXz3rwsuSRSz|ux)DG
z;lLztc$139V-^l!YXy-uMhBixLOcyO6u1kRoY-D58)|UqIT)V!{mr3ASm1H$qyq{5
c?L0gTnOYiOWzT#m0Q!Kz)78&qol`;+06TeAVE_OC

literal 0
HcmV?d00001

diff --git a/data/ui/xbox/platform_mac_white.png b/data/ui/xbox/platform_mac_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..90907af54aad66d3df10409105b7e57d523ffc92
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}c0*}aI1_r)^Ak4U9V)k30;6hIq#}Etu<eEP}44F+Cg{Lf&TCl6}M4TDJ
zqn`q5o(~uW{8=6`EAVY<eBBtq*rDH0d4zd_vqKwOlf?<PckD?MT$E<G+q_^;VplL@
zDP*f((j(<zDG|liBvi^Iu>W||`((l9#0hd0@0gxWVNl5Bf7qnTs^B9Mz;Q&rK_WVi
zy)(bzlDH#V(<dd3-wDPXk_{#gf|)1fyPP{6!q{v(O;UoP;JVS*iN#ZzfR1JGboFyt
I=akR{08hwM{{R30

literal 0
HcmV?d00001

diff --git a/data/ui/xbox/platform_unknown_white.png b/data/ui/xbox/platform_unknown_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..07f54b8fb3843332fc5f3d306b6d89daab8f7223
GIT binary patch
literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~mUKs7M+SzC
z{oH>NS%G}c0*}aI1_r)^Ak4U9V)k301_n<T#}EtuwNtut4;hHKG7BGInZldEbfY1!
z;YI_mfG~q_fEt6^0-p<g4O3WeFuW_2=`^X^wzO!;;vcRTznZ_Bk{Y>Za=-(Ryj5va
zcHcRfA71Iy=>Ai&J~q|)xWPAnca0D3*Y+Nt;qBDE?o&i#>3hw*O@cSRp5LF7YX5M0
zP9iJQWw&d^@8|w1->RF`cww@5<yRpoRnZd~GvvGvh`ekNoV|o8n<J@&WwW5#&c^wZ
zCa#SYRWzUA>=#j>9CwoUNsQ53m7R^umMdo!7BSC!w<zn_MyBbXCQitYiuiBj{`ig7
z?3riw$=qm|ygKIxuVQ8G$A@0a%BCupOz8Di68XX3^@vlh)m`w-t1e(zFfe$!`njxg
HN@xNAcm<Ek

literal 0
HcmV?d00001

diff --git a/data/ui/xbox/platform_web_white.png b/data/ui/xbox/platform_web_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1e087d1b218731824ce8efe567fafbf5131dfbb
GIT binary patch
literal 388
zcmV-~0ek+5P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T<mc!T}X1N`L?W0U1d|K~y+T&6NKU
z0WlDTj|!AP1$00Obf5$(Py!t&0TrMEI-mnO;C;F5O=LDV{O6l_lOLD7Z1(o9`g=OD
z_2@~Xs4)}bDxIZM82tby7wJ_H&sg&n3+W+wMrbSTVt+2R!l`X$H>ocH#>^EXC1*z|
zH$j;29HkH`hqz26&x}naIEXdVFcRI^0--<aZo@#D)m@i+)G&-hYDj79rDYh^<Og_A
zLQNi1LpGD6jbx_Y3-VHs=QgmCFfb^e+{~210qeT^35jK~l?9Yc4b~Dw^HOs70w|r7
zQeAQ*BBN~FD}$8*iw*j@St`n{6}u*p+V#CCnR9dJK^brrGtSLOjhnZ&-xsinqP1)B
i`#Qw-n;QK)s_G4;6m<jc5To?~0000<MNUMnLSTZ$R+nV}

literal 0
HcmV?d00001

diff --git a/src/Console.hx b/src/Console.hx
index bba551de..0dad0f96 100644
--- a/src/Console.hx
+++ b/src/Console.hx
@@ -197,6 +197,10 @@ class Console {
 				MarbleGame.instance.fpsLimit = scale;
 				MarbleGame.instance.limitingFps = true;
 				log("Set FPS to " + scale);
+			} else if (cmdType == 'reload') {
+				#if sys
+				hl.Api.checkReload();
+				#end
 			} else {
 				error("Unknown command");
 			}
diff --git a/src/Marble.hx b/src/Marble.hx
index f8c1f7e8..67325e47 100644
--- a/src/Marble.hx
+++ b/src/Marble.hx
@@ -1784,6 +1784,8 @@ class Marble extends GameObject {
 		this.megaMarbleUseTick = p.megaTick;
 		// this.currentUp = p.gravityDirection;
 		this.level.setUp(cast this, p.gravityDirection, this.level.timeState);
+		if (this.outOfBounds && !p.oob && this.controllable)
+			@:privateAccess this.level.playGui.setCenterText('');
 		this.outOfBounds = p.oob;
 		this.camera.oob = p.oob;
 		if (p.powerUpId == 0x1FF) {
diff --git a/src/gui/MPServerListGui.hx b/src/gui/MPServerListGui.hx
index 0365aef0..1f436a05 100644
--- a/src/gui/MPServerListGui.hx
+++ b/src/gui/MPServerListGui.hx
@@ -64,15 +64,15 @@ class MPServerListGui extends GuiImage {
 				case "notready":
 					return ResourceLoader.getResource("data/ui/xbox/NotReady.png", ResourceLoader.getImage, this.imageResources).toTile();
 				case "pc":
-					return ResourceLoader.getResource("data/ui/xbox/platform_desktop.png", ResourceLoader.getImage, this.imageResources).toTile();
+					return ResourceLoader.getResource("data/ui/xbox/platform_desktop_white.png", ResourceLoader.getImage, this.imageResources).toTile();
 				case "mac":
-					return ResourceLoader.getResource("data/ui/xbox/platform_mac.png", ResourceLoader.getImage, this.imageResources).toTile();
+					return ResourceLoader.getResource("data/ui/xbox/platform_mac_white.png", ResourceLoader.getImage, this.imageResources).toTile();
 				case "web":
-					return ResourceLoader.getResource("data/ui/xbox/platform_web.png", ResourceLoader.getImage, this.imageResources).toTile();
+					return ResourceLoader.getResource("data/ui/xbox/platform_web_white.png", ResourceLoader.getImage, this.imageResources).toTile();
 				case "android":
-					return ResourceLoader.getResource("data/ui/xbox/platform_android.png", ResourceLoader.getImage, this.imageResources).toTile();
+					return ResourceLoader.getResource("data/ui/xbox/platform_android_white.png", ResourceLoader.getImage, this.imageResources).toTile();
 				case "unknown":
-					return ResourceLoader.getResource("data/ui/xbox/platform_unknown.png", ResourceLoader.getImage, this.imageResources).toTile();
+					return ResourceLoader.getResource("data/ui/xbox/platform_unknown_white.png", ResourceLoader.getImage, this.imageResources).toTile();
 			}
 			return null;
 		}
@@ -84,9 +84,9 @@ class MPServerListGui extends GuiImage {
 		var serverList = new GuiMLTextListCtrl(arial14, serverDisplays, imgLoader);
 
 		serverList.selectedColor = 0xF29515;
-		serverList.selectedFillColor = 0xEBEBEB;
+		serverList.selectedFillColor = 0x858585;
 		serverList.position = new Vector(25, 22);
-		serverList.extent = new Vector(550, 480);
+		serverList.extent = new Vector(680, 480);
 		serverList.scrollable = true;
 		serverList.onSelectedFunc = (sel) -> {
 			curSelection = sel;
@@ -97,7 +97,7 @@ class MPServerListGui extends GuiImage {
 		var platformToString = ["unknown", "pc", "mac", "web", "android"];
 
 		function updateServerListDisplay() {
-			serverDisplays = ourServerList.map(x -> return '<img src="${platformToString[x.platform]}"></img><font color="#101010">${x.name}</font>');
+			serverDisplays = ourServerList.map(x -> return '<img src="${platformToString[x.platform]}"></img><font color="#FFFFFF">${x.name}</font>');
 			serverList.setTexts(serverDisplays);
 		}
 
@@ -124,6 +124,20 @@ class MPServerListGui extends GuiImage {
 		backButton.pressedAction = (e) -> MarbleGame.canvas.setContent(new MainMenuGui());
 		bottomBar.addChild(backButton);
 
+		var refreshButton = new GuiXboxButton("Refresh", 220);
+		refreshButton.position = new Vector(750, 0);
+		refreshButton.vertSizing = Bottom;
+		refreshButton.horizSizing = Right;
+		refreshButton.pressedAction = (e) -> {
+			MasterServerClient.connectToMasterServer(() -> {
+				MasterServerClient.instance.getServerList((servers) -> {
+					ourServerList = servers;
+					updateServerListDisplay();
+				});
+			});
+		}
+		bottomBar.addChild(refreshButton);
+
 		var nextButton = new GuiXboxButton("Join", 160);
 		nextButton.position = new Vector(960, 0);
 		nextButton.vertSizing = Bottom;