diff --git a/build.gradle b/build.gradle index 0ccf28a2b0..e4ccc3dd26 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { appName = "Mindustry" gdxVersion = '1.9.8' aiVersion = '1.8.1' - uCoreVersion = '298c4a4'; + uCoreVersion = 'ee4b46a'; } repositories { diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 8b6fad6b62..0ae9e87f2a 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -48,7 +48,7 @@ import java.util.Arrays; import static io.anuke.mindustry.Vars.*; public class Control extends Module{ - io.anuke.mindustry.game.Tutorial tutorial = new io.anuke.mindustry.game.Tutorial(); + Tutorial tutorial = new Tutorial(); boolean hiscore = false; final Array weapons = new Array<>(); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index e82f899326..cd3988893d 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -21,7 +21,7 @@ import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Tmp; public class Block{ private static int lastid; - private static Array blocks = new Array(); + private static Array blocks = new Array<>(); private static ObjectMap map = new ObjectMap<>(); protected static TextureRegion temp = new TextureRegion(); diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java index 07758becd4..450e75e172 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java @@ -21,7 +21,7 @@ public class Junction extends Block{ @Override public void handleItem(Item item, Tile tile, Tile source){ int dir = source.relativeTo(tile.x, tile.y); - Tile to = tile.getNearby()[dir]; + Tile to = tile.getNearby(temptiles)[dir]; Timers.run(30, ()->{ if(to == null) return; @@ -34,7 +34,7 @@ public class Junction extends Block{ public boolean acceptItem(Item item, Tile tile, Tile source){ int dir = source.relativeTo(tile.x, tile.y); if(dir == -1) return false; - Tile to = tile.getNearby()[dir]; + Tile to = tile.getNearby(temptiles)[dir]; return to != null && to.block().acceptItem(item, to, tile); }