Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #6089

Browse Source
This commit is contained in:
Anuken
2021-10-02 08:42:07 -04:00
parent 60fe1e5570
commit db6b8abce6
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/mindustry/ui/Menus.java
View File

@@ -68,20 +68,34 @@ public class Menus{
ui.showText("", message); 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){ public static void infoPopup(String message, float duration, int align, int top, int left, int bottom, int right){
if(message == null) return; if(message == null) return;
ui.showInfoPopup(message, duration, align, top, left, bottom, right); 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){ public static void label(String message, float duration, float worldx, float worldy){
if(message == null) return; if(message == null) return;
ui.showLabel(message, duration, worldx, worldy); 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) @Remote(variants = Variant.both)
public static void infoToast(String message, float duration){ public static void infoToast(String message, float duration){
if(message == null) return; if(message == null) return;

3
core/src/mindustry/world/blocks/production/SolidPump.java
View File

@@ -38,7 +38,7 @@ public class SolidPump extends Pump{
drawPotentialLinks(x, y); drawPotentialLinks(x, y);
if(attribute != null){ 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 validTiles;
public float lastPump; public float lastPump;
@Override @Override
public void drawCracks(){} public void drawCracks(){}

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=b2199ab9716ef9664f02f3d04549f65a7e2787d7 archash=159f05aff28e1f4edf6214f225aef2d63c4c37a6