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

Project-wide refactoring, link crash fixes

Browse Source
This commit is contained in:
Anuken
2018-01-24 16:48:07 -05:00
parent 257335ebaf
commit 8c39e05f58
60 changed files with 302 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,8 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Lines;
import io.anuke.ucore.scene.ui.Image;
import io.anuke.ucore.scene.ui.layout.Unit;
@@ -36,8 +37,8 @@ public class BorderImage extends Image{
float scaleY = getScaleY();
Draw.color(Colors.get("accent"));
Draw.thick(Unit.dp.scl(thickness));
Draw.linerect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY);
Lines.stroke(Unit.dp.scl(thickness));
Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY);
Draw.reset();
}
}

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

@@ -3,7 +3,7 @@ package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.scene.Element;
public class GridImage extends Element{

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

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui.dialogs;
import io.anuke.mindustry.Mindustry;
import com.badlogic.gdx.Gdx;
import io.anuke.mindustry.Vars;
import io.anuke.ucore.scene.ui.Dialog;
@@ -13,7 +13,7 @@ public class DiscordDialog extends Dialog {
content().row();
content().add("[orange]"+ Vars.discordURL);
buttons().defaults().size(200f, 50);
buttons().addButton("$text.openlink", () -> Mindustry.platforms.openLink(Vars.discordURL));
buttons().addButton("$text.openlink", () -> Gdx.net.openURI(Vars.discordURL));
buttons().addButton("$text.back", this::hide);
}
}

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

@@ -4,7 +4,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.scene.ui.layout.Unit;
public class BackgroundFragment implements Fragment {

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

@@ -11,7 +11,7 @@ import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.input.InputHandler;
import io.anuke.mindustry.resource.*;
import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Hue;
import io.anuke.ucore.scene.actions.Actions;
import io.anuke.ucore.scene.builders.table;

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

@@ -7,7 +7,7 @@ import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.Packets.KickReason;
import io.anuke.mindustry.ui.BorderImage;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.core.Inputs;
import io.anuke.ucore.scene.builders.label;
import io.anuke.ucore.scene.builders.table;