Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed version not parsing on crash

Browse Source
This commit is contained in:
Anuken
2019-07-25 13:21:55 -04:00
parent 795e774119
commit 513243ba0f
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/io/anuke/mindustry/net/CrashSender.java
View File

@@ -1,21 +1,21 @@
package io.anuke.mindustry.net; package io.anuke.mindustry.net;
import io.anuke.arc.Core; import io.anuke.arc.*;
import io.anuke.arc.collection.ObjectMap; import io.anuke.arc.collection.*;
import io.anuke.arc.function.Consumer; import io.anuke.arc.function.*;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.arc.util.io.PropertiesUtils; import io.anuke.arc.util.io.*;
import io.anuke.arc.util.serialization.JsonValue; import io.anuke.arc.util.serialization.*;
import io.anuke.arc.util.serialization.JsonValue.ValueType; import io.anuke.arc.util.serialization.JsonValue.*;
import io.anuke.arc.util.serialization.JsonWriter.OutputType; import io.anuke.arc.util.serialization.JsonWriter.*;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.*;
import io.anuke.mindustry.game.Version; import io.anuke.mindustry.game.*;
import java.io.*; import java.io.*;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.*;
import java.time.LocalDateTime; import java.time.*;
import java.time.format.DateTimeFormatter; import java.time.format.*;
public class CrashSender{ public class CrashSender{
@@ -30,7 +30,7 @@ public class CrashSender{
if(Version.number == 0){ if(Version.number == 0){
try{ try{
ObjectMap<String, String> map = new ObjectMap<>(); ObjectMap<String, String> 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.type = map.get("type");
Version.number = Integer.parseInt(map.get("number")); 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; Version.build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1;
} }
}catch(Throwable ignored){ }catch(Throwable ignored){
ignored.printStackTrace();
Log.err("Failed to parse version."); Log.err("Failed to parse version.");
} }
} }

2
desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java
View File

@@ -48,7 +48,7 @@ public class DesktopPlatform extends Platform{
dialog.accept(() -> message( 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() : 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" + "Try to update your graphics drivers.\n\n" +
"(If that doesn't work, your computer just doesn't support Mindustry.)")); "(If that doesn't work, your computer just doesn't support Mindustry.)"));
badGPU = true; badGPU = true;