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

Better organization

Browse Source
This commit is contained in:
Anuken
2019-10-21 21:22:35 -04:00
parent bb593af463
commit d7ebbbf2b6
102 changed files with 206 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ 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 io.anuke.mindustry.core.Version;
import java.io.*;
import java.text.*;
@@ -26,23 +26,23 @@ public class CrashSender{
exception.printStackTrace();
//don't create crash logs for custom builds, as it's expected
if(Version.build == -1 || (System.getProperty("user.name").equals("anuke") && "release".equals(Version.modifier))) return;
if(io.anuke.mindustry.core.Version.build == -1 || (System.getProperty("user.name").equals("anuke") && "release".equals(io.anuke.mindustry.core.Version.modifier))) return;
//attempt to load version regardless
if(Version.number == 0){
if(io.anuke.mindustry.core.Version.number == 0){
try{
ObjectMap<String, String> map = new ObjectMap<>();
PropertiesUtils.load(map, new InputStreamReader(CrashSender.class.getResourceAsStream("/version.properties")));
Version.type = map.get("type");
Version.number = Integer.parseInt(map.get("number"));
Version.modifier = map.get("modifier");
io.anuke.mindustry.core.Version.type = map.get("type");
io.anuke.mindustry.core.Version.number = Integer.parseInt(map.get("number"));
io.anuke.mindustry.core.Version.modifier = map.get("modifier");
if(map.get("build").contains(".")){
String[] split = map.get("build").split("\\.");
Version.build = Integer.parseInt(split[0]);
Version.revision = Integer.parseInt(split[1]);
io.anuke.mindustry.core.Version.build = Integer.parseInt(split[0]);
io.anuke.mindustry.core.Version.revision = Integer.parseInt(split[1]);
}else{
Version.build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1;
io.anuke.mindustry.core.Version.build = Strings.canParseInt(map.get("build")) ? Integer.parseInt(map.get("build")) : -1;
}
}catch(Throwable ignored){
ignored.printStackTrace();
@@ -70,7 +70,7 @@ public class CrashSender{
}
//do not send exceptions that occur for versions that can't be parsed
if(Version.number == 0){
if(io.anuke.mindustry.core.Version.number == 0){
return;
}
@@ -89,10 +89,10 @@ public class CrashSender{
boolean fn = netActive, fs = netServer;
//add all relevant info, ignoring exceptions
ex(() -> value.addChild("versionType", new JsonValue(Version.type)));
ex(() -> value.addChild("versionNumber", new JsonValue(Version.number)));
ex(() -> value.addChild("versionModifier", new JsonValue(Version.modifier)));
ex(() -> value.addChild("build", new JsonValue(Version.build)));
ex(() -> value.addChild("versionType", new JsonValue(io.anuke.mindustry.core.Version.type)));
ex(() -> value.addChild("versionNumber", new JsonValue(io.anuke.mindustry.core.Version.number)));
ex(() -> value.addChild("versionModifier", new JsonValue(io.anuke.mindustry.core.Version.modifier)));
ex(() -> value.addChild("build", new JsonValue(io.anuke.mindustry.core.Version.build)));
ex(() -> value.addChild("revision", new JsonValue(Version.revision)));
ex(() -> value.addChild("net", new JsonValue(fn)));
ex(() -> value.addChild("server", new JsonValue(fs)));

3
core/src/io/anuke/mindustry/net/NetworkIO.java
View File

@@ -2,6 +2,7 @@ package io.anuke.mindustry.net;
import io.anuke.arc.*;
import io.anuke.arc.util.*;
import io.anuke.mindustry.core.Version;
import io.anuke.mindustry.entities.type.*;
import io.anuke.mindustry.game.*;
import io.anuke.mindustry.io.*;
@@ -67,7 +68,7 @@ public class NetworkIO{
buffer.putInt(playerGroup.size());
buffer.putInt(state.wave);
buffer.putInt(Version.build);
buffer.putInt(io.anuke.mindustry.core.Version.build);
writeString(buffer, Version.type);
buffer.put((byte)Gamemode.bestFit(state.rules).ordinal());

2
core/src/io/anuke/mindustry/net/Packets.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.net;
import io.anuke.arc.Core;
import io.anuke.arc.collection.*;
import io.anuke.arc.util.serialization.Base64Coder;
import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.core.Version;
import io.anuke.mindustry.io.TypeIO;
import java.nio.ByteBuffer;