diff --git a/core/src/mindustry/ai/formations/Formation.java b/core/src/mindustry/ai/formations/Formation.java index db2ce02e14..cbbb02a541 100644 --- a/core/src/mindustry/ai/formations/Formation.java +++ b/core/src/mindustry/ai/formations/Formation.java @@ -175,16 +175,6 @@ public class Formation{ return -1; } - // debug - public SlotAssignment getSlotAssignmentAt(int index){ - return slotAssignments.get(index); - } - - // debug - public int getSlotAssignmentCount(){ - return slotAssignments.size; - } - /** Writes new slot locations to each member */ public void updateSlots(){ positionOffset.set(anchor); diff --git a/core/src/mindustry/async/AsyncCore.java b/core/src/mindustry/async/AsyncCore.java index 88272feb95..5de761d0ca 100644 --- a/core/src/mindustry/async/AsyncCore.java +++ b/core/src/mindustry/async/AsyncCore.java @@ -2,6 +2,7 @@ package mindustry.async; import arc.*; import arc.struct.*; +import arc.util.async.*; import mindustry.game.EventType.*; import java.util.concurrent.*; @@ -49,7 +50,7 @@ public class AsyncCore{ executor = Executors.newFixedThreadPool(processes.size, r -> { Thread thread = new Thread(r, "AsyncLogic-Thread"); thread.setDaemon(true); - thread.setUncaughtExceptionHandler((t, e) -> Core.app.post(() -> { throw new RuntimeException(e); })); + thread.setUncaughtExceptionHandler((t, e) -> Threads.throwAppException(e)); return thread; }); } diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java index 75eaac5ab0..4b4bd3e46d 100644 --- a/core/src/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/mindustry/ui/fragments/ChatFragment.java @@ -32,7 +32,7 @@ public class ChatFragment extends Table{ private Font font; private GlyphLayout layout = new GlyphLayout(); private float offsetx = Scl.scl(4), offsety = Scl.scl(4), fontoffsetx = Scl.scl(2), chatspace = Scl.scl(50); - private Color shadowColor = new Color(0, 0, 0, 0.4f); + private Color shadowColor = new Color(0, 0, 0, 0.5f); private float textspacing = Scl.scl(10); private Seq history = new Seq<>(); private int historyPos = 0; diff --git a/gradle.properties b/gradle.properties index 3506311dc0..b4b9d4eeb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ kapt.include.compile.classpath=false kotlin.stdlib.default.dependency=false #needed for android compilation android.useAndroidX=true -archash=a9dedf9345fe888e54ab2be3c56bf8d4d2aeb2b8 +archash=1412891bd14e01db3f3cb3576cf4f7dd502dd14b