From caf9ea38df33b7b48c9cc181c954a9d2ac9f68e2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 15 Jul 2021 11:25:35 -0400
Subject: [PATCH] aaa

---
 core/src/mindustry/net/CrashSender.java | 13 ++++++-------
 core/src/mindustry/ui/Links.java        |  2 +-
 gradle.properties                       |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/core/src/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java
index b6def302c6..e82977f16a 100644
--- a/core/src/mindustry/net/CrashSender.java
+++ b/core/src/mindustry/net/CrashSender.java
@@ -30,9 +30,8 @@ public class CrashSender{
         }
         return report
             + "Version: " + Version.combined() + (Vars.headless ? " (Server)" : "") + "\n"
-            + "OS: " + System.getProperty("os.name") + " x" + (OS.is64Bit ? "64" : "32") + "\n"
-            + "Java Version: " + System.getProperty("java.version") + "\n"
-            + "Java Architecture: " + System.getProperty("sun.arch.data.model") + "\n"
+            + "OS: " + OS.osName + " x" + (OS.osArchBits) + " (" + OS.osArch + ")\n"
+            + "Java Version: " + OS.javaVersion + "\n"
             + (mods == null ? "<no mod init>" : mods.list().size + " Mods" + (mods.list().isEmpty() ? "" : ": " + mods.list().toString(", ", mod -> mod.name + ":" + mod.meta.version)))
             + "\n\n" + error;
     }
@@ -60,7 +59,7 @@ public class CrashSender{
             }catch(Throwable ignored){}
 
             //don't create crash logs for custom builds, as it's expected
-            if(Version.build == -1 || (System.getProperty("user.name").equals("anuke") && !"steam".equals(Version.modifier))){
+            if(Version.build == -1 || (OS.username.equals("anuke") && !"steam".equals(Version.modifier))){
                 ret();
             }
 
@@ -141,10 +140,10 @@ public class CrashSender{
             ex(() -> value.addChild("server", new JsonValue(fs)));
             ex(() -> value.addChild("players", new JsonValue(Groups.player.size())));
             ex(() -> value.addChild("state", new JsonValue(Vars.state.getState().name())));
-            ex(() -> value.addChild("os", new JsonValue(System.getProperty("os.name") + "x" + (OS.is64Bit ? "64" : "32"))));
+            ex(() -> value.addChild("os", new JsonValue(OS.osName + " x" + OS.osArchBits + " " + OS.osVersion)));
             ex(() -> value.addChild("trace", new JsonValue(parseException(exception))));
-            ex(() -> value.addChild("javaVersion", new JsonValue(System.getProperty("java.version"))));
-            ex(() -> value.addChild("javaArch", new JsonValue(System.getProperty("sun.arch.data.model"))));
+            ex(() -> value.addChild("javaVersion", new JsonValue(OS.javaVersion)));
+            ex(() -> value.addChild("javaArch", new JsonValue(OS.osArchBits)));
 
             Log.info("Sending crash report.");
 
diff --git a/core/src/mindustry/ui/Links.java b/core/src/mindustry/ui/Links.java
index f9c4c734d9..54a577df11 100644
--- a/core/src/mindustry/ui/Links.java
+++ b/core/src/mindustry/ui/Links.java
@@ -77,7 +77,7 @@ public class Links{
             - [ ] **I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.**
             - [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.**
             """,
-            OS.isAndroid ? "Android " + Core.app.getVersion() : (System.getProperty("os.name") + (OS.is64Bit ? " x64" : " x32")),
+            OS.isAndroid ? "Android " + Core.app.getVersion() : (OS.osName + " x" + OS.osArchBits),
             Version.combined(),
             Vars.mods.list().any() ? Vars.mods.list().select(LoadedMod::enabled).map(l -> l.meta.author + "/" + l.name + ":" + l.meta.version) : "none"));
     }
diff --git a/gradle.properties b/gradle.properties
index 642357fb9e..3489eea88c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=fbdfa0307101b881e208f53666c1f4b7ebf0fe90
+archash=f223b2a9d421d751209efedc615352257fb3773b