From 513243ba0f6c3f8f7dbb657f10e42818824c4b97 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 25 Jul 2019 13:21:55 -0400 Subject: [PATCH] Fixed version not parsing on crash --- .../io/anuke/mindustry/net/CrashSender.java | 27 ++++++++++--------- .../mindustry/desktopsdl/DesktopPlatform.java | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/core/src/io/anuke/mindustry/net/CrashSender.java b/core/src/io/anuke/mindustry/net/CrashSender.java index c0ab9812e5..6fa290098b 100644 --- a/core/src/io/anuke/mindustry/net/CrashSender.java +++ b/core/src/io/anuke/mindustry/net/CrashSender.java @@ -1,21 +1,21 @@ package io.anuke.mindustry.net; -import io.anuke.arc.Core; -import io.anuke.arc.collection.ObjectMap; -import io.anuke.arc.function.Consumer; +import io.anuke.arc.*; +import io.anuke.arc.collection.*; +import io.anuke.arc.function.*; import io.anuke.arc.util.*; -import io.anuke.arc.util.io.PropertiesUtils; -import io.anuke.arc.util.serialization.JsonValue; -import io.anuke.arc.util.serialization.JsonValue.ValueType; -import io.anuke.arc.util.serialization.JsonWriter.OutputType; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.game.Version; +import io.anuke.arc.util.io.*; +import io.anuke.arc.util.serialization.*; +import io.anuke.arc.util.serialization.JsonValue.*; +import io.anuke.arc.util.serialization.JsonWriter.*; +import io.anuke.mindustry.*; +import io.anuke.mindustry.game.*; import java.io.*; import java.nio.file.Files; -import java.nio.file.Paths; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; +import java.nio.file.*; +import java.time.*; +import java.time.format.*; public class CrashSender{ @@ -30,7 +30,7 @@ public class CrashSender{ if(Version.number == 0){ try{ ObjectMap map = new ObjectMap<>(); - PropertiesUtils.load(map, new InputStreamReader(CrashSender.class.getResourceAsStream("version.properties"))); + PropertiesUtils.load(map, new InputStreamReader(new FileInputStream("version.properties"))); Version.type = map.get("type"); Version.number = Integer.parseInt(map.get("number")); @@ -43,6 +43,7 @@ public class CrashSender{ Version.build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1; } }catch(Throwable ignored){ + ignored.printStackTrace(); Log.err("Failed to parse version."); } } diff --git a/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java b/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java index 5bf16aab0c..b609ab0dd7 100644 --- a/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java +++ b/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java @@ -48,7 +48,7 @@ public class DesktopPlatform extends Platform{ dialog.accept(() -> message( e.getMessage().contains("Couldn't create window") ? "A graphics initialization error has occured! Try to update your graphics drivers:\n" + e.getMessage() : - "Your graphics card does not support OpenGL 2.0!\n" + + "Your graphics card does not support OpenGL 2.1!\n" + "Try to update your graphics drivers.\n\n" + "(If that doesn't work, your computer just doesn't support Mindustry.)")); badGPU = true;