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

Disabled crash sending + arc

Browse Source
This commit is contained in:
Anuken
2021-07-30 16:26:25 -04:00
parent 2d35a024e2
commit 0c03c47eb9
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/net/CrashSender.java
View File

@@ -6,19 +6,14 @@ import arc.func.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import arc.util.io.*; import arc.util.io.*;
import arc.util.serialization.*;
import arc.util.serialization.JsonValue.*;
import arc.util.serialization.JsonWriter.*;
import mindustry.*; import mindustry.*;
import mindustry.core.*; import mindustry.core.*;
import mindustry.gen.*;
import java.io.*; import java.io.*;
import java.text.*; import java.text.*;
import java.util.*; import java.util.*;
import static arc.Core.*; import static arc.Core.*;
import static mindustry.Vars.net;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class CrashSender{ public class CrashSender{
@@ -126,6 +121,9 @@ public class CrashSender{
}catch(Throwable ignored){ }catch(Throwable ignored){
} }
//disabled until further notice.
/*
JsonValue value = new JsonValue(ValueType.object); JsonValue value = new JsonValue(ValueType.object);
boolean fn = netActive, fs = netServer; boolean fn = netActive, fs = netServer;
@@ -144,7 +142,7 @@ public class CrashSender{
ex(() -> value.addChild("trace", new JsonValue(parseException(exception)))); ex(() -> value.addChild("trace", new JsonValue(parseException(exception))));
ex(() -> value.addChild("javaVersion", new JsonValue(OS.javaVersion))); ex(() -> value.addChild("javaVersion", new JsonValue(OS.javaVersion)));
ex(() -> value.addChild("javaArch", new JsonValue(OS.osArchBits))); ex(() -> value.addChild("javaArch", new JsonValue(OS.osArchBits)));
Log.info("Sending crash report."); Log.info("Sending crash report.");
//post to crash report URL, exit code indicates send success //post to crash report URL, exit code indicates send success
@@ -154,7 +152,7 @@ public class CrashSender{
}).block(r -> { }).block(r -> {
Log.info("Crash sent successfully."); Log.info("Crash sent successfully.");
System.exit(1); System.exit(1);
}); });*/
ret(); ret();
}catch(Throwable death){ }catch(Throwable death){

1
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -392,6 +392,7 @@ public class SettingsMenuDialog extends Dialog{
}); });
Core.graphics.setVSync(Core.settings.getBool("vsync")); Core.graphics.setVSync(Core.settings.getBool("vsync"));
if(Core.settings.getBool("fullscreen")){ if(Core.settings.getBool("fullscreen")){
Core.app.post(() -> Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode())); Core.app.post(() -> Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode()));
} }

2
gradle.properties
View File

@@ -8,4 +8,4 @@ kapt.include.compile.classpath=false
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false
#needed for android compilation #needed for android compilation
android.useAndroidX=true android.useAndroidX=true
archash=6181955e8f540af889fe825140285aa26316a810 archash=1af9470cb128e1039ab18687bc7cebb767af2207