diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java index 35bd82f240..64c9facba6 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Decal.java +++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java @@ -33,10 +33,5 @@ public abstract class Decal extends TimedEntity implements BelowLiquidTrait, Dra return groundEffectGroup; } - @Override - public float fin() { - return time / lifetime(); - } - abstract void drawDecal(); } diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java index 5351f5af64..b27b8abbd5 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java @@ -134,9 +134,4 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{ public EntityGroup targetGroup(){ return effectGroup; } - - @Override - public float fin(){ - return time() / lifetime(); - } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd5a..758de960ec 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/ios/robovm.properties b/ios/robovm.properties index d4df57dd7a..3e9997a364 100644 --- a/ios/robovm.properties +++ b/ios/robovm.properties @@ -2,5 +2,5 @@ app.version=4.0 app.id=io.anuke.mindustry app.mainclass=io.anuke.mindustry.IOSLauncher app.executable=IOSLauncher -app.build=14 +app.build=17 app.name=Mindustry diff --git a/ios/src/io/anuke/mindustry/TextFieldDialogListener.java b/ios/src/io/anuke/mindustry/TextFieldDialogListener.java index 527e45c6ef..f8557f72a8 100644 --- a/ios/src/io/anuke/mindustry/TextFieldDialogListener.java +++ b/ios/src/io/anuke/mindustry/TextFieldDialogListener.java @@ -26,6 +26,7 @@ public class TextFieldDialogListener { }); } + @SuppressWarnings("deprecation") private static void show(TextField field, int maxLength){ UIAlertViewDelegateAdapter delegate = new UIAlertViewDelegateAdapter() {