diff --git a/build.gradle b/build.gradle index 8939f41ed4..ec66d5463b 100644 --- a/build.gradle +++ b/build.gradle @@ -168,6 +168,10 @@ project(":core") { project(":server") { apply plugin: "java" + configurations { + compile.exclude module: android + } + dependencies { compileOnly project(":annotations") diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 20cc051619..46636e977d 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -276,7 +276,6 @@ text.blocks.inputfuel=연료 text.blocks.fuelburntime=연료 연소 시간 text.blocks.inputcapacity=입력 용량 text.blocks.outputcapacity=출력 용량 -text.blocks.requird=요구사항: text.unit.blocks=블록들 text.unit.powersecond=초당 전력 단위 @@ -499,4 +498,4 @@ block.liquid-junction.name=액체 교차기 block.bridge-conduit.name=브릿지 도관 block.rotary-pump.name=로타리 펌프 block.nuclear-reactor.name=핵발전소 -text.save.old=This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release. \ No newline at end of file +text.save.old=이 저장파일은 이전 버전의 게임용이며, 지금은 사용할 수 없습니다. \n\n[LIGHT_GRAY]4.0 정식때 이전 게임버전에서 만든 저장파일과 호환됩니다. diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index ba03f4c21f..193e97a9ba 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -23,6 +23,7 @@ import io.anuke.ucore.entities.impl.EffectEntity; import io.anuke.ucore.entities.trait.DrawTrait; import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.util.OS; +import io.anuke.ucore.util.Translator; import java.util.Locale; @@ -130,6 +131,8 @@ public class Vars{ public static EntityGroup fireGroup; public static EntityGroup[] unitGroups; + public static final Translator[] tmptr = new Translator[]{new Translator(), new Translator(), new Translator(), new Translator()}; + public static void init(){ Version.init(); diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java index 64c9facba6..35bd82f240 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Decal.java +++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java @@ -33,5 +33,10 @@ 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 b27b8abbd5..5351f5af64 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java @@ -134,4 +134,9 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{ public EntityGroup targetGroup(){ return effectGroup; } + + @Override + public float fin(){ + return time() / lifetime(); + } } diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index 5b67677802..bbf7df9f9d 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -34,6 +34,7 @@ import java.io.IOException; import java.util.Arrays; import static io.anuke.mindustry.Vars.tilesize; +import static io.anuke.mindustry.Vars.tmptr; import static io.anuke.mindustry.Vars.world; /** @@ -41,7 +42,6 @@ import static io.anuke.mindustry.Vars.world; */ public interface BuilderTrait extends Entity{ //these are not instance variables! - Translator[] tmptr = {new Translator(), new Translator(), new Translator(), new Translator()}; float placeDistance = 140f; float mineDistance = 70f; diff --git a/ios/robovm.properties b/ios/robovm.properties index a53bf9ac88..d4df57dd7a 100644 --- a/ios/robovm.properties +++ b/ios/robovm.properties @@ -1,6 +1,6 @@ -app.version=3.5 +app.version=4.0 app.id=io.anuke.mindustry app.mainclass=io.anuke.mindustry.IOSLauncher app.executable=IOSLauncher -app.build=11 +app.build=14 app.name=Mindustry