From 5f0ec79b0f6e0d7c30b1496caf4f2c6b3fedb04f Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 18 Jun 2021 09:33:12 -0400 Subject: [PATCH 1/5] Fixed crash logs sometimes not saving --- core/src/mindustry/net/CrashSender.java | 7 ++++--- gradle.properties | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java index 4ca4f3714e..d045a83a5c 100644 --- a/core/src/mindustry/net/CrashSender.java +++ b/core/src/mindustry/net/CrashSender.java @@ -26,14 +26,15 @@ public class CrashSender{ public static String createReport(String error){ String report = "Mindustry has crashed. How unfortunate.\n"; - if(mods.list().size == 0 && Version.build != -1){ + if(mods != null && mods.list().size == 0 && Version.build != -1){ report += "Report this at " + Vars.reportIssueURL + "\n\n"; } - return report + "Version: " + Version.combined() + (Vars.headless ? " (Server)" : "") + "\n" + 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" - + mods.list().size + " Mods" + (mods.list().isEmpty() ? "" : ": " + mods.list().toString(", ", mod -> mod.name + ":" + mod.meta.version)) + + (mods == null ? "" : mods.list().size + " Mods" + (mods.list().isEmpty() ? "" : ": " + mods.list().toString(", ", mod -> mod.name + ":" + mod.meta.version))) + "\n\n" + error; } diff --git a/gradle.properties b/gradle.properties index a70ad43723..fb172e55f1 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=37fbff84ebd824be79586e1e13d05506446938b3 +archash=283f2b76f419fc157312b26b1f1eff0de83898e1 From 7ab0c86978d1d92070e8aad001d76ae980979bbe Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 18 Jun 2021 15:14:08 -0400 Subject: [PATCH 2/5] Stencil buffer fallback --- core/src/mindustry/graphics/LoadRenderer.java | 10 ++++++++-- gradle.properties | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java index c15e948285..69e660f79c 100644 --- a/core/src/mindustry/graphics/LoadRenderer.java +++ b/core/src/mindustry/graphics/LoadRenderer.java @@ -38,6 +38,7 @@ public class LoadRenderer implements Disposable{ private FxProcessor fx; private WindowedMean renderTimes = new WindowedMean(20); private BloomFilter bloom; + private boolean renderStencil = true; private long lastFrameTime; { @@ -45,7 +46,12 @@ public class LoadRenderer implements Disposable{ try{ fx = new FxProcessor(Format.rgba8888, 2, 2, false, true); }catch(Exception e){ - fx = new FxProcessor(Format.rgb565, 2, 2, false, true); + try{ + fx = new FxProcessor(Format.rgb565, 2, 2, false, true); + }catch(Exception awful){ + renderStencil = false; + fx = new FxProcessor(Format.rgba8888, 2, 2, false, false); + } } //vignetting is probably too much @@ -179,7 +185,7 @@ public class LoadRenderer implements Disposable{ Lines.poly(w/2, h/2, 4, rad); Lines.poly(w/2, h/2, 4, rad2); - if(assets.isLoaded("tech")){ + if(assets.isLoaded("tech") && renderStencil){ Font font = assets.get("tech"); font.getData().markupEnabled = true; diff --git a/gradle.properties b/gradle.properties index fb172e55f1..257b5544eb 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=283f2b76f419fc157312b26b1f1eff0de83898e1 +archash=fa51fd94b73e08998a1fa184d3b1782f6f08aa8c From 128174faa4ac54e94416f92d6aa504d66b01e651 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 18 Jun 2021 15:19:28 -0400 Subject: [PATCH 3/5] NOTHING --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 257b5544eb..38f0afac96 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=fa51fd94b73e08998a1fa184d3b1782f6f08aa8c +archash=cb31882829c7e0be1c33d799d17c3098c1465008 From 60b6e93f7cbec29b917cbc77e9f8c2243d915197 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 18 Jun 2021 15:25:40 -0400 Subject: [PATCH 4/5] arc --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 38f0afac96..98aca3389a 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=cb31882829c7e0be1c33d799d17c3098c1465008 +archash=3a84b1671d1d53c9f4513e0a4a701913acd87f62 From 12dfd71345477e9e3428974bbe7516b9a1b702f8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 18 Jun 2021 15:44:35 -0400 Subject: [PATCH 5/5] Minor load markup fix --- core/src/mindustry/graphics/LoadRenderer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/graphics/LoadRenderer.java b/core/src/mindustry/graphics/LoadRenderer.java index 69e660f79c..432798d683 100644 --- a/core/src/mindustry/graphics/LoadRenderer.java +++ b/core/src/mindustry/graphics/LoadRenderer.java @@ -476,6 +476,7 @@ public class LoadRenderer implements Disposable{ name.contains("maps") ? "map" : name.contains("ogg") || name.contains("mp3") ? "sound" : name.contains("png") ? "image" : "system"; Font font = assets.get("tech"); + font.getData().markupEnabled = true; font.setColor(Pal.accent); Draw.color(Color.black); font.draw(red + "[[[[ " + key + " ]]\n" + orange + "<" + Version.modifier + " " + (Version.build == 0 ? "[init]" : Version.buildString()) + ">", w/2f, h/2f + 110*s, Align.center);