From cbbd5ffc62505b6ca28a669b2adc944681b3f931 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Apr 2018 11:22:35 -0400 Subject: [PATCH] Renamed 'android' usage to 'mobile' --- core/assets/bundles/bundle.properties | 3 ++- core/src/io/anuke/mindustry/Vars.java | 10 ++++++---- core/src/io/anuke/mindustry/core/Control.java | 6 +++--- core/src/io/anuke/mindustry/core/NetClient.java | 2 +- core/src/io/anuke/mindustry/core/Renderer.java | 10 +++++----- core/src/io/anuke/mindustry/game/Tutorial.java | 5 ++--- .../src/io/anuke/mindustry/graphics/BlockRenderer.java | 2 +- core/src/io/anuke/mindustry/input/InputHandler.java | 4 ++-- core/src/io/anuke/mindustry/input/PlaceMode.java | 8 ++++---- core/src/io/anuke/mindustry/io/versions/Save12.java | 2 +- core/src/io/anuke/mindustry/io/versions/Save13.java | 2 +- core/src/io/anuke/mindustry/io/versions/Save14.java | 2 +- core/src/io/anuke/mindustry/io/versions/Save15.java | 2 +- .../io/anuke/mindustry/mapeditor/MapEditorDialog.java | 2 +- core/src/io/anuke/mindustry/resource/Recipes.java | 2 +- .../io/anuke/mindustry/ui/dialogs/ChangelogDialog.java | 5 +++++ .../io/anuke/mindustry/ui/dialogs/PausedDialog.java | 2 +- .../anuke/mindustry/ui/dialogs/SettingsMenuDialog.java | 4 ++-- .../anuke/mindustry/ui/fragments/BlocksFragment.java | 4 ++-- .../io/anuke/mindustry/ui/fragments/ChatFragment.java | 4 ++-- .../io/anuke/mindustry/ui/fragments/HudFragment.java | 10 +++++----- .../io/anuke/mindustry/ui/fragments/MenuFragment.java | 2 +- .../mindustry/ui/fragments/PlacementFragment.java | 2 +- .../mindustry/ui/fragments/PlayerListFragment.java | 2 +- .../io/anuke/mindustry/ui/fragments/ToolFragment.java | 4 +--- core/src/io/anuke/mindustry/world/WorldGenerator.java | 2 +- .../world/blocks/types/production/WeaponFactory.java | 2 +- 27 files changed, 55 insertions(+), 50 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 2709ee58da..fefce1d37b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -133,7 +133,8 @@ text.back=Back text.quit.confirm=Are you sure you want to quit? text.changelog.title=Changelog text.changelog.loading=Getting changelog... -text.changelog.error.android=[orange]Note that the changelog does not work on Android 4.4 and below!\nThis is due to an internal Android bug. +text.changelog.error.android=[orange]Note that the changelog sometimes does not work on Android 4.4 and below!\nThis is due to an internal Android bug. +text.changelog.error.ios=[orange]The changelog is currently not supported in iOS. text.changelog.error=[scarlet]Error getting changelog!\nCheck your internet connection. text.changelog.current=[yellow][[Current version] text.changelog.latest=[orange][[Latest version] diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index e1983e3522..8b9165ad08 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -23,10 +23,12 @@ import java.util.Locale; public class Vars{ - public static final boolean testAndroid = false; + public static final boolean testMobile = false; //shorthand for whether or not this is running on android - public static final boolean android = (Gdx.app.getType() == ApplicationType.Android) || - Gdx.app.getType() == ApplicationType.iOS|| testAndroid; + public static final boolean mobile = (Gdx.app.getType() == ApplicationType.Android) || + Gdx.app.getType() == ApplicationType.iOS || testMobile; + public static final boolean ios = Gdx.app.getType() == ApplicationType.iOS; + public static final boolean android = Gdx.app.getType() == ApplicationType.Android; //shorthand for whether or not this is running on GWT public static final boolean gwt = (Gdx.app.getType() == ApplicationType.WebGL); //whether to send block state change events to players @@ -36,7 +38,7 @@ public class Vars{ //respawn time in frames public static final float respawnduration = 60*4; //time between waves in frames (on normal mode) - public static final float wavespace = 60*60*(android ? 1 : 1); + public static final float wavespace = 60*60*(mobile ? 1 : 1); //waves can last no longer than 3 minutes, otherwise the next one spawns public static final float maxwavespace = 60*60*4f; //advance time the pathfinding starts at diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 4fb9e19c0e..2a3915dde0 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -57,7 +57,7 @@ public class Control extends Module{ Gdx.input.setCatchBackKey(true); - if(android){ + if(mobile){ input = new AndroidInput(); }else{ input = new DesktopInput(); @@ -115,7 +115,7 @@ public class Control extends Module{ Settings.defaultList( "ip", "localhost", "port", port+"", - "name", android || gwt ? "player" : UCore.getProperty("user.name"), + "name", mobile || gwt ? "player" : UCore.getProperty("user.name"), "servers", "", "color", Color.rgba8888(playerColors[8]), "lastVersion", "3.2", @@ -130,7 +130,7 @@ public class Control extends Module{ player = new Player(); player.name = Settings.getString("name"); - player.isAndroid = android; + player.isAndroid = mobile; player.color.set(Settings.getInt("color")); player.isLocal = true; diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index a8cebfdbb3..60e1fe6986 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -69,7 +69,7 @@ public class NetClient extends Module { ConnectPacket c = new ConnectPacket(); c.name = player.name; - c.android = android; + c.android = mobile; c.color = Color.rgba8888(player.color); c.uuid = Platform.instance.getUUID(); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 5912ba6129..2e49c7db94 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -121,7 +121,7 @@ public class Renderer extends RendererModule{ if(!smoothcam){ setCamera(player.x, player.y); }else{ - smoothCamera(player.x, player.y, android ? 0.3f : 0.14f); + smoothCamera(player.x, player.y, mobile ? 0.3f : 0.14f); } }else{ smoothCamera(world.getCore().worldx(), world.getCore().worldy(), 0.4f); @@ -137,7 +137,7 @@ public class Renderer extends RendererModule{ float deltax = camera.position.x - prex, deltay = camera.position.y - prey; - if(android){ + if(mobile){ player.x += camera.position.x - prevx; player.y += camera.position.y - prevy; } @@ -403,7 +403,7 @@ public class Renderer extends RendererModule{ int tilex = control.input().getBlockX(); int tiley = control.input().getBlockY(); - if(android){ + if(mobile){ Vector2 vec = Graphics.world(Gdx.input.getX(0), Gdx.input.getY(0)); tilex = Mathf.scl2(vec.x, tilesize); tiley = Mathf.scl2(vec.y, tilesize); @@ -412,7 +412,7 @@ public class Renderer extends RendererModule{ InputHandler input = control.input(); //draw placement box - if((input.recipe != null && state.inventory.hasItems(input.recipe.requirements) && (!ui.hasMouse() || android) + if((input.recipe != null && state.inventory.hasItems(input.recipe.requirements) && (!ui.hasMouse() || mobile) && control.input().drawPlace())){ input.placeMode.draw(control.input().getBlockX(), control.input().getBlockY(), @@ -434,7 +434,7 @@ public class Renderer extends RendererModule{ }else if(input.breakMode.delete && control.input().drawPlace() && (input.recipe == null || !state.inventory.hasItems(input.recipe.requirements)) - && (input.placeMode.delete || input.breakMode.both || !android)){ + && (input.placeMode.delete || input.breakMode.both || !mobile)){ if(input.breakMode == PlaceMode.holdDelete) input.breakMode.draw(tilex, tiley, 0, 0); diff --git a/core/src/io/anuke/mindustry/game/Tutorial.java b/core/src/io/anuke/mindustry/game/Tutorial.java index 041a8b79f7..538aad606e 100644 --- a/core/src/io/anuke/mindustry/game/Tutorial.java +++ b/core/src/io/anuke/mindustry/game/Tutorial.java @@ -1,7 +1,6 @@ package io.anuke.mindustry.game; import com.badlogic.gdx.math.GridPoint2; -import io.anuke.mindustry.core.GameState; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.Block; @@ -102,7 +101,7 @@ public class Tutorial{ if(current < 0 || current >= Stage.values().length){ break; - }else if(android == Stage.values()[current].androidOnly || android != Stage.values()[current].desktopOnly){ + }else if(mobile == Stage.values()[current].androidOnly || mobile != Stage.values()[current].desktopOnly){ stage = Stage.values()[current]; stage.onSwitch(); break; @@ -119,7 +118,7 @@ public class Tutorial{ if(current < 0 || current >= Stage.values().length){ return false; - }else if(android == Stage.values()[current].androidOnly || android != Stage.values()[current].desktopOnly){ + }else if(mobile == Stage.values()[current].androidOnly || mobile != Stage.values()[current].desktopOnly){ return true; } } diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 967449dfff..7d94d46476 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -292,7 +292,7 @@ public class BlockRenderer{ public void handlePreview(Block block, float rotation, float drawx, float drawy, int tilex, int tiley) { if(control.input().recipe != null && state.inventory.hasItems(control.input().recipe.requirements) - && control.input().validPlace(tilex, tiley, block) && (android || control.input().cursorNear())) { + && control.input().validPlace(tilex, tiley, block) && (mobile || control.input().cursorNear())) { if(block.isMultiblock()) { float halfBlockWidth = (block.width * tilesize) / 2; diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index 4afba7240a..6e1a32b932 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -20,8 +20,8 @@ public abstract class InputHandler extends InputAdapter{ public float breaktime = 0; public Recipe recipe; public int rotation; - public PlaceMode placeMode = android ? PlaceMode.cursor : PlaceMode.hold; - public PlaceMode breakMode = android ? PlaceMode.none : PlaceMode.holdDelete; + public PlaceMode placeMode = mobile ? PlaceMode.cursor : PlaceMode.hold; + public PlaceMode breakMode = mobile ? PlaceMode.none : PlaceMode.holdDelete; public PlaceMode lastPlaceMode = placeMode; public PlaceMode lastBreakMode = breakMode; diff --git a/core/src/io/anuke/mindustry/input/PlaceMode.java b/core/src/io/anuke/mindustry/input/PlaceMode.java index 3ccb8ab161..6a6b633332 100644 --- a/core/src/io/anuke/mindustry/input/PlaceMode.java +++ b/core/src/io/anuke/mindustry/input/PlaceMode.java @@ -28,7 +28,7 @@ public enum PlaceMode{ float x = tilex * tilesize; float y = tiley * tilesize; - boolean valid = control.input().validPlace(tilex, tiley, control.input().recipe.result) && (android || control.input().cursorNear()); + boolean valid = control.input().validPlace(tilex, tiley, control.input().recipe.result) && (mobile || control.input().cursorNear()); Vector2 offset = control.input().recipe.result.getPlaceOffset(); @@ -89,7 +89,7 @@ public enum PlaceMode{ tile = tile.getLinked(); float fin = control.input().breaktime / tile.getBreakTime(); - if(android && control.input().breaktime > 0){ + if(mobile && control.input().breaktime > 0){ Draw.color(Colors.get("breakStart"), Colors.get("break"), fin); Lines.poly(tile.drawx(), tile.drawy(), 25, 4 + (1f - fin) * 26); } @@ -170,7 +170,7 @@ public enum PlaceMode{ tilex = this.tilex; tiley = this.tiley; endx = this.endx; endy = this.endy; - if(android){ + if(mobile){ ToolFragment t = ui.toolfrag; if(!t.confirming || t.px != tilex || t.py != tiley || t.px2 != endx || t.py2 != endy) { t.confirming = true; @@ -236,7 +236,7 @@ public enum PlaceMode{ } public void draw(int tilex, int tiley, int endx, int endy){ - if(android && !Gdx.input.isTouched(0) && !control.showCursor()){ + if(mobile && !Gdx.input.isTouched(0) && !control.showCursor()){ return; } diff --git a/core/src/io/anuke/mindustry/io/versions/Save12.java b/core/src/io/anuke/mindustry/io/versions/Save12.java index cc257ff0d2..bfa64ab57c 100644 --- a/core/src/io/anuke/mindustry/io/versions/Save12.java +++ b/core/src/io/anuke/mindustry/io/versions/Save12.java @@ -114,7 +114,7 @@ public class Save12 extends SaveFileVersion { state.wave = wave; state.wavetime = wavetime; - if(!android) + if(!mobile) Vars.player.add(); //map diff --git a/core/src/io/anuke/mindustry/io/versions/Save13.java b/core/src/io/anuke/mindustry/io/versions/Save13.java index 7641d3a7fe..2d8d6faf8d 100644 --- a/core/src/io/anuke/mindustry/io/versions/Save13.java +++ b/core/src/io/anuke/mindustry/io/versions/Save13.java @@ -118,7 +118,7 @@ public class Save13 extends SaveFileVersion { state.wave = wave; state.wavetime = wavetime; - if(!android) + if(!mobile) Vars.player.add(); //map diff --git a/core/src/io/anuke/mindustry/io/versions/Save14.java b/core/src/io/anuke/mindustry/io/versions/Save14.java index 9f6e2014e7..789fac77d1 100644 --- a/core/src/io/anuke/mindustry/io/versions/Save14.java +++ b/core/src/io/anuke/mindustry/io/versions/Save14.java @@ -132,7 +132,7 @@ public class Save14 extends SaveFileVersion{ state.wave = wave; state.wavetime = wavetime; - if(!android) + if(!mobile) Vars.player.add(); //map diff --git a/core/src/io/anuke/mindustry/io/versions/Save15.java b/core/src/io/anuke/mindustry/io/versions/Save15.java index bcd5f8916d..e93d8acf8b 100644 --- a/core/src/io/anuke/mindustry/io/versions/Save15.java +++ b/core/src/io/anuke/mindustry/io/versions/Save15.java @@ -148,7 +148,7 @@ public class Save15 extends SaveFileVersion { state.wave = wave; state.wavetime = wavetime; - if(!android && !headless) + if(!mobile && !headless) player.add(); //map diff --git a/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java b/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java index b4c5a2c58c..df17f9f36c 100644 --- a/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java @@ -85,7 +85,7 @@ public class MapEditorDialog extends Dialog{ Pixmaps.write(editor.pixmap(), result); }catch (Exception e){ ui.showError(Bundles.format("text.editor.errorimagesave", Strings.parseException(e, false))); - if(!android) Log.err(e); + if(!mobile) Log.err(e); } ui.loadfrag.hide(); }); diff --git a/core/src/io/anuke/mindustry/resource/Recipes.java b/core/src/io/anuke/mindustry/resource/Recipes.java index 618f6429f4..a9b750c734 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -105,7 +105,7 @@ public class Recipes { public static Array getBy(Section section, Array r){ for(Recipe recipe : list){ - if(recipe.section == section && !(Vars.android && recipe.desktopOnly)) + if(recipe.section == section && !(Vars.mobile && recipe.desktopOnly)) r.add(recipe); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java index 665b5831dd..a6251d4c6f 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java @@ -44,6 +44,11 @@ public class ChangelogDialog extends FloatingDialog{ table.row(); table.add("$text.changelog.error.android").padTop(8); } + + if(Vars.ios){ + table.row(); + table.add("$text.changelog.error.ios").padTop(8); + } }else{ for(VersionInfo info : versions){ Table in = new Table("clear"); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java index 2aeda7122e..89e5a7bdd3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java @@ -35,7 +35,7 @@ public class PausedDialog extends FloatingDialog{ if(!Net.active()) state.set(State.paused); }); - if(!android){ + if(!mobile){ content().defaults().width(220).height(50); content().addButton("$text.back", () -> { diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 4882c69466..1878a629ec 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -85,7 +85,7 @@ public class SettingsMenuDialog extends SettingsDialog{ menu.addButton("$text.settings.graphics", () -> visible(1)); menu.row(); menu.addButton("$text.settings.sound", () -> visible(2)); - if(!Vars.android) { + if(!Vars.mobile) { menu.row(); menu.addButton("$text.settings.controls", ui.controls::show); } @@ -143,7 +143,7 @@ public class SettingsMenuDialog extends SettingsDialog{ } } - if(!android && !gwt) { + if(!mobile && !gwt) { graphics.checkPref("vsync", true, b -> Gdx.graphics.setVSync(b)); graphics.checkPref("fullscreen", false, b -> { if (b) { diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java index 0c3693ca4b..fa1a178024 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java @@ -186,7 +186,7 @@ public class BlocksFragment implements Fragment{ row(); - if(!android) { + if(!mobile) { weapons = new table("button").margin(0).fillX().end().get(); } @@ -199,7 +199,7 @@ public class BlocksFragment implements Fragment{ } public void updateWeapons(){ - if(android) return; + if(mobile) return; weapons.clearChildren(); weapons.left(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java index f4acb97e59..9d28551304 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java @@ -107,12 +107,12 @@ public class ChatFragment extends Table implements Fragment{ add(chatfield).padBottom(offsety).padLeft(offsetx).growX().padRight(offsetx).height(28); - if(Vars.android) { + if(Vars.mobile) { marginBottom(105f); marginRight(240f); } - if(Vars.android) { + if(Vars.mobile) { addImageButton("icon-arrow-right", 14 * 2, this::toggle).size(46f, 51f).visible(() -> chatOpen).pad(2f); } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index dd73be6517..351d8c9ae5 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -66,14 +66,14 @@ public class HudFragment implements Fragment{ }).get(); new imagebutton("icon-pause", isize, () -> { - if(android) DebugFragment.printDebugInfo(); - if (Net.active() && android) { + if(mobile) DebugFragment.printDebugInfo(); + if (Net.active() && mobile) { ui.listfrag.visible = !ui.listfrag.visible; } else { state.set(state.is(State.paused) ? State.playing : State.paused); } }).update(i -> { - if (Net.active() && android) { + if (Net.active() && mobile) { i.getStyle().imageUp = Core.skin.getDrawable("icon-players"); } else { i.setDisabled(Net.active()); @@ -82,7 +82,7 @@ public class HudFragment implements Fragment{ }).get(); new imagebutton("icon-settings", isize, () -> { - if (Net.active() && android) { + if (Net.active() && mobile) { if (ui.chatfrag.chatOpen()) { ui.chatfrag.hide(); } else { @@ -92,7 +92,7 @@ public class HudFragment implements Fragment{ ui.settings.show(); } }).update(i -> { - if (Net.active() && android) { + if (Net.active() && mobile) { i.getStyle().imageUp = Core.skin.getDrawable("icon-chat"); } else { i.getStyle().imageUp = Core.skin.getDrawable("icon-settings"); diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index a4133b9122..b838e578fb 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -18,7 +18,7 @@ public class MenuFragment implements Fragment{ new table(){{ visible(() -> state.is(State.menu)); - if(!android){ + if(!mobile){ new table(){{ float w = 200f; diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index c25fa3a103..c4717f2be9 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -29,7 +29,7 @@ public class PlacementFragment implements Fragment{ Label modelabel; public void build(){ - if(!android) return; + if(!mobile) return; InputHandler input = control.input(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index 7dcc657c71..12406794b7 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -63,7 +63,7 @@ public class PlayerListFragment implements Fragment{ }}.end(); update(t -> { - if(!android){ + if(!mobile){ visible = Inputs.keyDown("player_list"); } if(!(Net.active() && !state.is(State.menu))){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/ToolFragment.java b/core/src/io/anuke/mindustry/ui/fragments/ToolFragment.java index 0b31f54ed6..67cad267d4 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/ToolFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/ToolFragment.java @@ -11,8 +11,6 @@ import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Graphics; import io.anuke.ucore.scene.ui.layout.Table; -import static io.anuke.mindustry.Vars.*; - public class ToolFragment implements Fragment{ private Table tools; public int px, py, px2, py2; @@ -50,7 +48,7 @@ public class ToolFragment implements Fragment{ Core.scene.add(tools); tools.setVisible(() -> - !state.is(State.menu) && android && ((input.recipe != null && state.inventory.hasItems(input.recipe.requirements) && + !state.is(State.menu) && mobile && ((input.recipe != null && state.inventory.hasItems(input.recipe.requirements) && input.placeMode == PlaceMode.cursor) || confirming) ); diff --git a/core/src/io/anuke/mindustry/world/WorldGenerator.java b/core/src/io/anuke/mindustry/world/WorldGenerator.java index 96ad8acc58..a205b9c1af 100644 --- a/core/src/io/anuke/mindustry/world/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/world/WorldGenerator.java @@ -77,7 +77,7 @@ public class WorldGenerator { } if(color == Hue.rgb(Color.PURPLE)){ - if(!Vars.android) new Enemy(EnemyTypes.target).set(x * tilesize, y * tilesize).add(); + if(!Vars.mobile) new Enemy(EnemyTypes.target).set(x * tilesize, y * tilesize).add(); floor = Blocks.stone; } diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/WeaponFactory.java b/core/src/io/anuke/mindustry/world/blocks/types/production/WeaponFactory.java index 062288cc6c..12250134b4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/production/WeaponFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/WeaponFactory.java @@ -29,7 +29,7 @@ public class WeaponFactory extends Block{ @Override public boolean isConfigurable(Tile tile){ - return !Vars.android; + return !Vars.mobile; } @Override