diff --git a/core/src/mindustry/ui/Menus.java b/core/src/mindustry/ui/Menus.java index 1d79b59831..511bd7b55b 100644 --- a/core/src/mindustry/ui/Menus.java +++ b/core/src/mindustry/ui/Menus.java @@ -68,20 +68,34 @@ public class Menus{ ui.showText("", message); } - @Remote(variants = Variant.both) + @Remote(variants = Variant.both, unreliable = true) public static void infoPopup(String message, float duration, int align, int top, int left, int bottom, int right){ if(message == null) return; ui.showInfoPopup(message, duration, align, top, left, bottom, right); } - @Remote(variants = Variant.both) + @Remote(variants = Variant.both, unreliable = true) public static void label(String message, float duration, float worldx, float worldy){ if(message == null) return; ui.showLabel(message, duration, worldx, worldy); } + @Remote(variants = Variant.both) + public static void infoPopupReliable(String message, float duration, int align, int top, int left, int bottom, int right){ + if(message == null) return; + + ui.showInfoPopup(message, duration, align, top, left, bottom, right); + } + + @Remote(variants = Variant.both) + public static void labelReliable(String message, float duration, float worldx, float worldy){ + if(message == null) return; + + ui.showLabel(message, duration, worldx, worldy); + } + @Remote(variants = Variant.both) public static void infoToast(String message, float duration){ if(message == null) return; diff --git a/core/src/mindustry/world/blocks/production/SolidPump.java b/core/src/mindustry/world/blocks/production/SolidPump.java index f430ef7679..d65e3ecf26 100644 --- a/core/src/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/mindustry/world/blocks/production/SolidPump.java @@ -38,7 +38,7 @@ public class SolidPump extends Pump{ drawPotentialLinks(x, y); if(attribute != null){ - drawPlaceText(Core.bundle.format("bar.efficiency", Math.round(Math.max(sumAttribute(attribute, x, y) / size / size + baseEfficiency, 0f) * 100 * percentSolid(x, y))), x, y, valid); + drawPlaceText(Core.bundle.format("bar.efficiency", Math.round(Math.max((sumAttribute(attribute, x, y)) / size / size + percentSolid(x, y) * baseEfficiency, 0f) * 100)), x, y, valid); } } @@ -90,7 +90,6 @@ public class SolidPump extends Pump{ public float validTiles; public float lastPump; - @Override public void drawCracks(){} diff --git a/gradle.properties b/gradle.properties index 5d87cf4f6d..23a9144e91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=b2199ab9716ef9664f02f3d04549f65a7e2787d7 +archash=159f05aff28e1f4edf6214f225aef2d63c4c37a6