Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial creation of Arc port

Browse Source
This commit is contained in:
Anuken
2018-12-20 11:49:32 -05:00
parent 6dc64cf2f6
commit cabcfc7136
235 changed files with 698 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/ui/BorderImage.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.graphics.g2d.Batch;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Lines;

4
core/src/io/anuke/mindustry/ui/ContentDisplay.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.OrderedMap;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.utils.OrderedMap;
import io.anuke.mindustry.entities.units.UnitType;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.type.Item;

4
core/src/io/anuke/mindustry/ui/GridImage.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.arc.graphics.g2d.Batch;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.scene.Element;

2
core/src/io/anuke/mindustry/ui/ImageStack.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.ucore.scene.ui.Image;
import io.anuke.ucore.scene.ui.layout.Stack;

2
core/src/io/anuke/mindustry/ui/ItemImage.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.ucore.function.Supplier;
import io.anuke.ucore.scene.ui.Image;

2
core/src/io/anuke/mindustry/ui/Links.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.Color;
import io.anuke.arc.graphics.Color;
import io.anuke.ucore.util.Bundles;
public class Links{

4
core/src/io/anuke/mindustry/ui/MenuButton.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Align;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.utils.Align;
import io.anuke.ucore.scene.ui.TextButton;
public class MenuButton extends TextButton{

4
core/src/io/anuke/mindustry/ui/Minimap.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.Texture.TextureFilter;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.arc.graphics.Texture.TextureFilter;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.graphics.Shaders;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics;

2
core/src/io/anuke/mindustry/ui/MobileButton.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.utils.Align;
import io.anuke.arc.utils.Align;
import io.anuke.ucore.scene.ui.ImageButton;
public class MobileButton extends ImageButton{

12
core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.ObjectSet;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.ObjectSet;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.io.Contributors;
import io.anuke.mindustry.io.Contributors.Contributor;
@@ -69,9 +69,9 @@ public class AboutDialog extends FloatingDialog{
}).padLeft(8);
table.addImageButton("icon-link", 14 * 3, () -> {
if(!Gdx.net.openURI(link.link)){
if(!Core.net.openURI(link.link)){
ui.showError("$text.linkfail");
Gdx.app.getClipboard().setContents(link.link);
Core.app.getClipboard().setContents(link.link);
}
}).size(h - 5, h);

8
core/src/io/anuke/mindustry/ui/dialogs/ChangelogDialog.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.Core;
import io.anuke.arc.utils.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.io.Changelogs;
import io.anuke.mindustry.io.Changelogs.VersionInfo;
@@ -28,10 +28,10 @@ public class ChangelogDialog extends FloatingDialog{
if(!ios && !OS.isMac){
Changelogs.getChangelog(result -> {
versions = result;
Gdx.app.postRunnable(this::setup);
Core.app.postRunnable(this::setup);
}, t -> {
Log.err(t);
Gdx.app.postRunnable(this::setup);
Core.app.postRunnable(this::setup);
});
}
}

4
core/src/io/anuke/mindustry/ui/dialogs/ColorPickDialog.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.Color;
import io.anuke.arc.Input.Keys;
import io.anuke.arc.graphics.Color;
import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.scene.ui.Dialog;
import io.anuke.ucore.scene.ui.ImageButton;

4
core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.utils.Align;
import io.anuke.arc.Input.Keys;
import io.anuke.arc.utils.Align;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.ucore.scene.ui.Image;
import io.anuke.ucore.scene.ui.KeybindDialog;

10
core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Scaling;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.utils.Align;
import io.anuke.arc.utils.Scaling;
import io.anuke.mindustry.game.Difficulty;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.maps.Map;
@@ -38,7 +38,7 @@ public class CustomGameDialog extends FloatingDialog{
ScrollPane pane = new ScrollPane(maps);
pane.setFadeScrollBars(false);
int maxwidth = (Gdx.graphics.getHeight() > Gdx.graphics.getHeight() ? 2 : 4);
int maxwidth = (Core.graphics.getHeight() > Core.graphics.getHeight() ? 2 : 4);
Table selmode = new Table();
ButtonGroup<TextButton> group = new ButtonGroup<>();

10
core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.ucore.scene.ui.Dialog;
@@ -40,12 +40,12 @@ public class DiscordDialog extends Dialog{
buttons().addButton("$text.back", this::hide);
buttons().addButton("$text.copylink", () -> {
Gdx.app.getClipboard().setContents(discordURL);
Core.app.getClipboard().setContents(discordURL);
});
buttons().addButton("$text.openlink", () -> {
if(!Gdx.net.openURI(discordURL)){
if(!Core.net.openURI(discordURL)){
ui.showError("$text.linkfail");
Gdx.app.getClipboard().setContents(discordURL);
Core.app.getClipboard().setContents(discordURL);
}
});
}

18
core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
View File

@@ -1,10 +1,10 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.g2d.GlyphLayout;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.Core;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.graphics.g2d.GlyphLayout;
import io.anuke.arc.utils.Align;
import io.anuke.arc.utils.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Platform;
import io.anuke.ucore.core.Core;
@@ -27,8 +27,8 @@ public class FileChooser extends FloatingDialog{
public static Predicate<FileHandle> jpegFilter = file -> file.extension().equalsIgnoreCase("png") || file.extension().equalsIgnoreCase("jpg") || file.extension().equalsIgnoreCase("jpeg");
public static Predicate<FileHandle> defaultFilter = file -> true;
private Table files;
private FileHandle homeDirectory = Gdx.files.absolute(OS.isMac ? OS.getProperty("user.home") + "/Downloads/" :
Gdx.files.getExternalStoragePath());
private FileHandle homeDirectory = Core.files.absolute(OS.isMac ? OS.getProperty("user.home") + "/Downloads/" :
Core.files.getExternalStoragePath());
private FileHandle directory = homeDirectory;
private ScrollPane pane;
private TextField navigation, filefield;
@@ -82,7 +82,7 @@ public class FileChooser extends FloatingDialog{
pane = new ScrollPane(files){
public float getPrefHeight(){
return Gdx.graphics.getHeight();
return Core.graphics.getHeight();
}
};
pane.setOverscroll(false, false);
@@ -142,7 +142,7 @@ public class FileChooser extends FloatingDialog{
content.add(icontable).expandX().fillX();
content.row();
content.center().add(pane).width(UIUtils.portrait() ? Gdx.graphics.getWidth() / Unit.dp.scl(1) : Gdx.graphics.getWidth() / Unit.dp.scl(2)).colspan(3).grow();
content.center().add(pane).width(UIUtils.portrait() ? Core.graphics.getWidth() / Unit.dp.scl(1) : Core.graphics.getWidth() / Unit.dp.scl(2)).colspan(3).grow();
content.row();
if(!open){

10
core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.utils.Align;
import io.anuke.arc.Core;
import io.anuke.arc.Input.Keys;
import io.anuke.arc.utils.Align;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.EventType.ResizeEvent;
import io.anuke.mindustry.graphics.Palette;
@@ -43,7 +43,7 @@ public class FloatingDialog extends Dialog{
boolean[] done = {false};
shown(() -> Gdx.app.postRunnable(() ->
shown(() -> Core.app.postRunnable(() ->
forEach(child -> {
if(done[0]) return;
@@ -68,7 +68,7 @@ public class FloatingDialog extends Dialog{
keyDown(key -> {
if(key == Keys.ESCAPE || key == Keys.BACK) {
Gdx.app.postRunnable(this::hide);
Core.app.postRunnable(this::hide);
}
});
}

14
core/src/io/anuke/mindustry/ui/dialogs/GenViewDialog.java
View File

@@ -1,11 +1,11 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Pixmap.Format;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.async.AsyncExecutor;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.Pixmap;
import io.anuke.arc.graphics.Pixmap.Format;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.async.AsyncExecutor;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult;
@@ -89,7 +89,7 @@ public class GenViewDialog extends FloatingDialog{
pixmap.drawPixel(i, sectorSize - 1 - j, ColorMapper.colorFor(result.floor, result.wall, Team.none, result.elevation, (byte)0));
}
}
Gdx.app.postRunnable(() -> map.put(wx, wy, new Texture(pixmap)));
Core.app.postRunnable(() -> map.put(wx, wy, new Texture(pixmap)));
return pixmap;
});

2
core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.graphics.Color;
import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.net.Net;

6
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.math.MathUtils;
import io.anuke.arc.utils.Array;
import io.anuke.annotations.Annotations.Serialize;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Platform;

8
core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.Core;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.utils.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.Platform;
@@ -98,7 +98,7 @@ public class LoadDialog extends FloatingDialog{
}, false, saveExtension);
}else{
try{
FileHandle file = Gdx.files.local("save-" + slot.getName() + "." + Vars.saveExtension);
FileHandle file = Core.files.local("save-" + slot.getName() + "." + Vars.saveExtension);
slot.exportFile(file);
Platform.instance.shareFile(file);
}catch(Exception e){

2
core/src/io/anuke/mindustry/ui/dialogs/LocalPlayerDialog.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.utils.Scaling;
import io.anuke.arc.utils.Scaling;
import io.anuke.mindustry.entities.Player;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.scene.ui.Image;

4
core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Scaling;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.utils.Scaling;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.io.MapIO;

2
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Input.Keys;
import io.anuke.arc.Input.Keys;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.scene.style.Drawable;

12
core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
View File

@@ -1,10 +1,10 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.math.Vector2;
import io.anuke.arc.utils.Align;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.maps.Sector;
@@ -118,7 +118,7 @@ public class SectorsDialog extends FloatingDialog{
}).pad(-5).growX().padTop(0);
table.pack();
table.act(Gdx.graphics.getDeltaTime());
table.act(Core.graphics.getDeltaTime());
}
public Sector getSelected(){

20
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Align;
import io.anuke.arc.Core;
import io.anuke.arc.Input.Keys;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.utils.Align;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.graphics.Palette;
@@ -178,7 +178,7 @@ public class SettingsMenuDialog extends SettingsDialog{
file.deleteDirectory();
}
Gdx.app.exit();
Core.app.exit();
});
});
dialog.content().row();
@@ -192,18 +192,18 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.sliderPref("fpscap", 125, 5, 125, 5, s -> (s > 120 ? Bundles.get("setting.fpscap.none") : Bundles.format("setting.fpscap.text", s)));
if(!mobile){
graphics.checkPref("vsync", true, b -> Gdx.graphics.setVSync(b));
graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b));
graphics.checkPref("fullscreen", false, b -> {
if(b){
Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode());
}else{
Gdx.graphics.setWindowedMode(600, 480);
Core.graphics.setWindowedMode(600, 480);
}
});
Gdx.graphics.setVSync(Settings.getBool("vsync"));
Core.graphics.setVSync(Settings.getBool("vsync"));
if(Settings.getBool("fullscreen")){
Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
Core.graphics.setFullscreenMode(Core.graphics.getDisplayMode());
}
}

2
core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.utils.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.game.UnlockableContent;

7
core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.graphics.Shaders;
@@ -18,7 +18,6 @@ public class BackgroundFragment extends Fragment{
@Override
public void build(Group parent){
Core.scene.table().addRect((a, b, w, h) -> {
Draw.colorl(0.1f);
Fill.crect(0, 0, w, h);
@@ -28,7 +27,7 @@ public class BackgroundFragment extends Fragment{
Graphics.shader();
Draw.color();
boolean portrait = Gdx.graphics.getWidth() < Gdx.graphics.getHeight();
boolean portrait = Core.graphics.getWidth() < Core.graphics.getHeight();
float logoscl = (int) Unit.dp.scl(7) * (portrait ? 5f / 7f : 1f);
TextureRegion logo = Core.skin.getRegion("logotext");
float logow = logo.getRegionWidth() * logoscl;

10
core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import io.anuke.arc.Core;
import io.anuke.arc.math.Interpolation;
import io.anuke.arc.math.Vector2;
import io.anuke.arc.utils.Align;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.input.InputHandler;
@@ -75,7 +75,7 @@ public class BlockConfigFragment extends Fragment{
}
public boolean hasConfigMouse(){
Element e = Core.scene.hit(Gdx.input.getX(), Gdx.graphics.getHeight() - Gdx.input.getY(), true);
Element e = Core.scene.hit(Core.input.getX(), Core.graphics.getHeight() - Core.input.getY(), true);
return e != null && (e == table || e.isDescendantOf(table));
}

12
core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java
View File

@@ -1,10 +1,10 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.ObjectSet;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.math.Vector2;
import io.anuke.arc.utils.Align;
import io.anuke.arc.utils.ObjectSet;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.graphics.Palette;
@@ -91,7 +91,7 @@ public class BlockConsumeFragment extends Fragment{
table.setPosition(v.x, v.y, Align.topRight);
});
table.act(Gdx.graphics.getDeltaTime());
table.act(Core.graphics.getDeltaTime());
}
public void hide(){

8
core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.IntSet;
import io.anuke.arc.math.Interpolation;
import io.anuke.arc.math.Vector2;
import io.anuke.arc.utils.Align;
import io.anuke.arc.utils.IntSet;
import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.core.GameState.State;

20
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
View File

@@ -1,13 +1,13 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.GlyphLayout;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.Core;
import io.anuke.arc.Input.Keys;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.graphics.g2d.Batch;
import io.anuke.arc.graphics.g2d.BitmapFont;
import io.anuke.arc.graphics.g2d.GlyphLayout;
import io.anuke.arc.utils.Align;
import io.anuke.arc.utils.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.gen.Call;
@@ -129,7 +129,7 @@ public class ChatFragment extends Table{
chatfield.appendText(to.getText());
chatfield.change();
dialog.hide();
Gdx.input.setOnscreenKeyboardVisible(false);
Core.input.setOnscreenKeyboardVisible(false);
toggle();
}).width(90f).name("okb");
@@ -137,7 +137,7 @@ public class ChatFragment extends Table{
Timers.runTask(1f, () -> {
to.setCursorPosition(to.getText().length());
Core.scene.setKeyboardFocus(to);
Gdx.input.setOnscreenKeyboardVisible(true);
Core.input.setOnscreenKeyboardVisible(true);
});
});
}

16
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -1,12 +1,12 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Scaling;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.math.Interpolation;
import io.anuke.arc.utils.Align;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.Scaling;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.EventType.StateChangeEvent;
import io.anuke.mindustry.game.Team;
@@ -134,7 +134,7 @@ public class HudFragment extends Fragment{
IntFormat fps = new IntFormat("text.fps");
IntFormat tps = new IntFormat("text.tps");
IntFormat ping = new IntFormat("text.ping");
t.label(() -> fps.get(Gdx.graphics.getFramesPerSecond())).padRight(10);
t.label(() -> fps.get(Core.graphics.getFramesPerSecond())).padRight(10);
t.row();
if(Net.hasClient()){
t.label(() -> ping.get(Net.getPing())).visible(Net::client).colspan(2);

8
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.Gdx;
import io.anuke.arc.Core;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.game.EventType.ResizeEvent;
@@ -50,7 +50,7 @@ public class MenuFragment extends Fragment{
private void buildMobile(){
container.clear();
container.setSize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
container.setSize(Core.graphics.getWidth(), Core.graphics.getHeight());
float size = 120f;
float isize = 14f * 4;
@@ -66,7 +66,7 @@ public class MenuFragment extends Fragment{
unlocks = new MobileButton("icon-unlocks", isize, "$text.unlocks", ui.unlocks::show),
donate = new MobileButton("icon-donate", isize, "$text.donate", Platform.instance::openDonations);
if(Gdx.graphics.getWidth() > Gdx.graphics.getHeight()){
if(Core.graphics.getWidth() > Core.graphics.getHeight()){
container.add(play);
container.add(join);
container.add(load);
@@ -134,7 +134,7 @@ public class MenuFragment extends Fragment{
out.row();
out.add(new MenuButton("icon-exit", "$text.quit", Gdx.app::exit)).width(bw).colspan(2);
out.add(new MenuButton("icon-exit", "$text.quit", Core.app::exit)).width(bw).colspan(2);
});
}

8
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.math.Interpolation;
import io.anuke.arc.math.Vector2;
import io.anuke.arc.utils.Array;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;

6
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.Batch;
import io.anuke.arc.Core;
import io.anuke.arc.graphics.g2d.Batch;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Palette;
@@ -39,7 +39,7 @@ public class PlayerListFragment extends Fragment{
if(visible && timer.get(20)){
rebuild();
content.pack();
content.act(Gdx.graphics.getDeltaTime());
content.act(Core.graphics.getDeltaTime());
//TODO hack
Core.scene.act(0f);
}