diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 793dd7b4e1..5b4d045a2b 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -338,7 +338,7 @@ public class Blocks implements ContentList{ }}; ignarock = new Floor("ignarock"){{ - + blendGroup = darksand; }}; hotrock = new Floor("hotrock"){{ diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 7c36da394e..f25eab494b 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -235,9 +235,8 @@ public class HudFragment extends Fragment{ //launch button parent.fill(t -> { - t.top().visible(() -> !state.is(State.menu)); + t.top().right().visible(() -> !state.is(State.menu)); TextButton[] testb = {null}; - TextButton button = Elements.newButton("$launch", () -> { FloatingDialog dialog = new FloatingDialog("$launch"); dialog.update(() -> { @@ -282,10 +281,8 @@ public class HudFragment extends Fragment{ }); button.setDisabled(() -> state.enemies() > 0); - button.getLabelCell().left().get().setAlignment(Align.left, Align.left); - - t.add(button).size(350f, 80f); + t.add(button).size(250f, 80f); }); //paused table diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 6fd2165d67..940ee96671 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -476,7 +476,7 @@ public class Tile implements Position, TargetTrait{ Block block = block(); Block floor = floor(); - return floor.name + ":" + block.name + "[" + x + "," + y + "] " + "entity=" + (entity == null ? "null" : (entity.getClass())) + + return floor.name + ":" + block.name + ":" + content.block(ore) + "[" + x + "," + y + "] " + "entity=" + (entity == null ? "null" : (entity.getClass())) + (link != 0 ? " link=[" + (Pack.leftByte(link) - 8) + ", " + (Pack.rightByte(link) - 8) + "]" : ""); } } \ No newline at end of file