Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.github/workflows/gradle.yml
This commit is contained in:
Anuken
2020-11-19 18:53:15 -05:00
+8
View File
@@ -21,6 +21,7 @@ import mindustry.net.Administration.*;
import mindustry.net.Net.*; import mindustry.net.Net.*;
import mindustry.net.*; import mindustry.net.*;
import mindustry.net.Packets.*; import mindustry.net.Packets.*;
import mindustry.ui.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.modules.*; import mindustry.world.modules.*;
@@ -339,6 +340,13 @@ public class NetClient implements ApplicationListener{
ui.showInfoToast(message, duration); ui.showInfoToast(message, duration);
} }
@Remote(variants = Variant.both)
public static void warningToast(int unicode, String text){
if(text == null || Fonts.icon.getData().getGlyph((char)unicode) == null) return;
ui.hudfrag.showToast(Fonts.getGlyph(Fonts.icon, (char)unicode), text);
}
@Remote(variants = Variant.both) @Remote(variants = Variant.both)
public static void setRules(Rules rules){ public static void setRules(Rules rules){