From 677526cb16140413665ff638002e8efbc578c3c9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 3 Jul 2018 19:03:53 -0400 Subject: [PATCH 1/4] Fixed iOS NullPtr --- core/src/io/anuke/mindustry/Vars.java | 3 +++ .../src/io/anuke/mindustry/entities/effect/ItemTransfer.java | 5 +++++ .../src/io/anuke/mindustry/entities/traits/BuilderTrait.java | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index dab3a6a2b0..acad9eeafa 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.trait.DrawTrait; import io.anuke.ucore.entities.impl.EffectEntity; import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.util.OS; +import io.anuke.ucore.util.Translator; import java.util.Locale; @@ -96,6 +97,8 @@ public class Vars{ public static final int tilesize = 8; + public static final Translator[] tmptr = new Translator[]{new Translator(), new Translator(), new Translator(), new Translator()}; + public static final Locale[] locales = {new Locale("en"), new Locale("fr"), new Locale("ru"), new Locale("uk", "UA"), new Locale("pl"), new Locale("de"), new Locale("pt", "BR"), new Locale("ko"), new Locale("in", "ID"), new Locale("ita"), new Locale("es")}; diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java index 340073caa4..2eba1b7511 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java @@ -130,4 +130,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 8b8d2cd19b..5026eefe52 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -30,12 +30,12 @@ import io.anuke.ucore.util.*; 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; /**Interface for units that build, break or mine things.*/ public interface BuilderTrait { //these are not instance variables! - Translator[] tmptr = {new Translator(), new Translator(), new Translator(), new Translator()}; float placeDistance = 140f; float mineDistance = 70f; From 5f82d575ee3bea88b4005a1af4a12064eb1aa8cd Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 13 Jul 2018 19:50:18 -0400 Subject: [PATCH 2/4] iOS fixes --- core/src/io/anuke/mindustry/entities/effect/Decal.java | 5 +++++ ios/robovm.properties | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java index 762cc480e6..7f936235d6 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Decal.java +++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java @@ -31,5 +31,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/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 From 6cbb645b108ac4c78f8ca6d05cceb99b4629156d Mon Sep 17 00:00:00 2001 From: Gureumi Date: Sat, 14 Jul 2018 08:54:55 +0900 Subject: [PATCH 3/4] Update bundle_ko.properties --- core/assets/bundles/bundle_ko.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 정식때 이전 게임버전에서 만든 저장파일과 호환됩니다. From a2f7d3e2411e75bb7739c6dc91c4240fd731131b Mon Sep 17 00:00:00 2001 From: player20033 <41218039+player20033@users.noreply.github.com> Date: Sat, 14 Jul 2018 10:02:13 +0800 Subject: [PATCH 4/4] #142 Solution --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) 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")