diff --git a/core/assets/fonts/fontello.ttf b/core/assets/fonts/fontello.ttf new file mode 100644 index 0000000000..7eaf076f22 Binary files /dev/null and b/core/assets/fonts/fontello.ttf differ diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 878b076dc4..6ecce095e9 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -1,30 +1,29 @@ package mindustry.core; import arc.*; -import mindustry.annotations.Annotations.*; -import arc.struct.*; import arc.graphics.*; import arc.math.*; -import arc.util.CommandHandler.*; +import arc.struct.*; import arc.util.*; +import arc.util.CommandHandler.*; import arc.util.io.*; import arc.util.serialization.*; import mindustry.*; +import mindustry.annotations.Annotations.*; import mindustry.core.GameState.*; -import mindustry.ctype.ContentType; +import mindustry.ctype.*; import mindustry.entities.*; -import mindustry.entities.Effects.*; import mindustry.entities.traits.BuilderTrait.*; import mindustry.entities.traits.*; import mindustry.entities.type.*; -import mindustry.game.*; import mindustry.game.EventType.*; +import mindustry.game.*; import mindustry.gen.*; import mindustry.net.Administration.*; import mindustry.net.Net.*; import mindustry.net.*; import mindustry.net.Packets.*; -import mindustry.type.TypeID; +import mindustry.type.*; import mindustry.world.*; import mindustry.world.modules.*; @@ -267,6 +266,9 @@ public class NetClient implements ApplicationListener{ ui.showText("", message); } + //TODO these are commented out to enforce compatibility with 103! uncomment before 104 release + /* + @Remote(variants = Variant.both) public static void onInfoPopup(String message, float duration, int align, int top, int left, int bottom, int right){ ui.showInfoPopup(message, duration, align, top, left, bottom, right); @@ -285,7 +287,7 @@ public class NetClient implements ApplicationListener{ @Remote(variants = Variant.both) public static void onEffectReliable(Effect effect, float x, float y, float rotation, Color color){ Effects.effect(effect, color, x, y, rotation); - } + }*/ @Remote(variants = Variant.both) public static void onInfoToast(String message, float duration){