Final working version of GDM 1.

Geometry-Dash-Multiplayer · Jan 31, 2022 · d1eedca · Starmania · Feb 1, 2022 · d1eedca
1 parent 81deb98
commit d1eedca
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 68 deletions.
diff --git a/Multiplayer/GDM/Globals/Global Data.cs b/Multiplayer/GDM/Globals/Global Data.cs
@@ -11,10 +11,10 @@ namespace Multiplayer.GDM.Globals
 {
     public static class Global_Data
     {
-        public static double Version = 4.03;
+        public static double Version = 5;
         public static int KeySize = 4; // for now, somehow secure
         public static int GIFDelay = 10;
-        public static int RefreshRate = 16;
+        public static int RefreshRate = 30;
         public static string LanguageFile = "Language.json";
         public static string InjectorName = "Injector.exe";
         public static bool IsGDThere = false;
@@ -35,7 +35,7 @@ public static class Global_Data
         public static string ClientName;
         public static int StandardPort = 7010;
         public static string ActiveServer = ""; // 194.233.71.142
-        public static string[] ServerIPs = new string[] { "206.189.50.40", "194.233.71.142" };
+        public static string[] ServerIPs = new string[] { "158.69.122.197", "194.233.71.142" };
         public static int VipKey = 0;
 
         public static bool PlayerIDLoaded = false;

diff --git a/Multiplayer/GDM/Release Files/Language-en.json b/Multiplayer/GDM/Release Files/Language-en.json
diff --git a/Multiplayer/GDM/Server.cs b/Multiplayer/GDM/Server.cs
@@ -248,10 +248,7 @@ public void StartRead()
                     }
                     catch (Exception ex)
                     {
-                        Utilities.Utils.HandleException(ex);
-                        Thread.Sleep(20);
-                        Main.Announce("Disconnected from server.");
-                        Reconnect();
+                        MessageBox.Show(ex.ToString());
                     }
 
                 }

diff --git a/Multiplayer/MainWindow.xaml b/Multiplayer/MainWindow.xaml
@@ -715,10 +715,10 @@
                                     <DropShadowEffect BlurRadius="25" Direction="0" ShadowDepth="0" Opacity="0.25"/>
                                 </Border.Effect>
                                 <DockPanel Margin="10,0">
-                                    <Image Source="UI/Images/Icons/icons8-europe-64.png" Margin="10,10,0,10" HorizontalAlignment="Left" DockPanel.Dock="Left" Width="35" VerticalAlignment="Center"/>
+                                    <Image Source="UI/Images/Icons/icons8-america-64.png" Margin="10,10,0,10" HorizontalAlignment="Left" DockPanel.Dock="Left" Width="35" VerticalAlignment="Center"/>
                                     <StackPanel Orientation="Vertical" Opacity="0.75" Margin="10,10,0,0">
 
-                                        <TextBlock x:Name="europe1" FontFamily="{DynamicResource Avenir}" Text="Europe" Foreground="White" Margin="2,0,0,2" FontSize="14"/>
+                                        <TextBlock x:Name="europe1" FontFamily="{DynamicResource Avenir}" Text="North America" Foreground="White" Margin="2,0,0,2" FontSize="14"/>
 
                                         <TextBlock x:Name="sg_ping" FontFamily="{DynamicResource Avenir}" Text="Online" Foreground="#FF4BBEFF" Margin="2,0,0,0"/>
                                     </StackPanel>

diff --git a/Multiplayer/MainWindow.xaml.cs b/Multiplayer/MainWindow.xaml.cs
@@ -111,7 +111,8 @@ private void Exit(object sender, MouseButtonEventArgs e)
             {
                 Utilities.Utils.HandleException(ex);
             }
-            Application.Current.Shutdown();
+
+            Environment.Exit(Environment.ExitCode);
         }
 
         private void Minimize(object sender, MouseButtonEventArgs e)

diff --git a/Multiplayer/Utilities/JSON Models/Language.cs b/Multiplayer/Utilities/JSON Models/Language.cs
@@ -12,7 +12,7 @@ public class Language
 
         public string SelectServer = "Select a Server";
         public string Preferably = "Preferably pick the nearest to your location.";
-        public string Europe = "Europe";
+        public string Europe = "North America"; // wtf
         public string Online = "Online";
 
         public string Welcome = "Welcome back, %username%!";