From f3d35e9537469a852559779e115332567a893e85 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 28 Nov 2018 18:43:35 -0500 Subject: [PATCH] Crash fixes --- core/src/io/anuke/mindustry/editor/MapLoadDialog.java | 3 --- core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java | 2 +- core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java | 2 +- core/src/io/anuke/mindustry/ui/fragments/HudFragment.java | 2 +- core/src/io/anuke/mindustry/world/consumers/Consume.java | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java index 2c44d6befe..c819cd0a3a 100644 --- a/core/src/io/anuke/mindustry/editor/MapLoadDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapLoadDialog.java @@ -4,11 +4,9 @@ import com.badlogic.gdx.utils.Scaling; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.ui.BorderImage; import io.anuke.mindustry.ui.dialogs.FloatingDialog; -import io.anuke.ucore.core.Core; import io.anuke.ucore.function.Consumer; import io.anuke.ucore.scene.ui.ButtonGroup; import io.anuke.ucore.scene.ui.ScrollPane; -import io.anuke.ucore.scene.ui.ScrollPane.ScrollPaneStyle; import io.anuke.ucore.scene.ui.TextButton; import io.anuke.ucore.scene.ui.layout.Table; @@ -69,7 +67,6 @@ public class MapLoadDialog extends FloatingDialog{ } if(world.maps.all().size == 0){ - pane.setStyle(Core.skin.get("clear", ScrollPaneStyle.class)); table.add("$text.maps.none").center(); }else{ content().add("$text.editor.loadmap"); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java index 11bf00e2d1..4cfa262779 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -108,7 +108,7 @@ public class AboutDialog extends FloatingDialog{ dialog.content().row(); dialog.content().add("$text.contributors"); dialog.content().row(); - dialog.content().pane("clear", new Table(){{ + dialog.content().pane(new Table(){{ int i = 0; left(); for(Contributor c : contributors){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index dbce472347..bed08f9954 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -116,7 +116,7 @@ public class MapsDialog extends FloatingDialog{ table.stack(new Image(map.texture).setScaling(Scaling.fit), new BorderImage(map.texture).setScaling(Scaling.fit)).size(mapsize); - table.table("clear", desc -> { + table.table("flat", desc -> { desc.top(); Table t = new Table(); t.margin(6); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 7a8b721bc0..6e09a4c468 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -150,7 +150,7 @@ public class HudFragment extends Fragment{ //paused table parent.fill(t -> { t.top().visible(() -> state.is(State.paused) && !Net.active()); - t.table("clear", top -> top.add("$text.paused").pad(6).get().setFontScale(1.5f)); + t.table("button", top -> top.add("$text.paused").pad(6f)); }); parent.fill(t -> { diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/io/anuke/mindustry/world/consumers/Consume.java index f4ec4cb01f..f8456fc9e9 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consume.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consume.java @@ -33,7 +33,7 @@ public abstract class Consume{ } public void build(Table table){ - Table t = new Table("clear"); + Table t = new Table("flat"); t.margin(4); buildTooltip(t);