From f30dc7dcd952b53205cf40f25e45dcd5490a80ac Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 10 Sep 2019 21:20:28 -0400 Subject: [PATCH] Cleanup --- core/assets/bundles/bundle.properties | 1 + .../src/io/anuke/mindustry/core/Platform.java | 17 +---- core/src/io/anuke/mindustry/core/UI.java | 2 - .../mindustry/editor/MapEditorDialog.java | 1 - .../ui/dialogs/BrowseMapsDialog.java | 75 ------------------- .../mindustry/ui/fragments/MenuFragment.java | 3 +- .../mindustry/desktop/DesktopLauncher.java | 5 ++ 7 files changed, 9 insertions(+), 95 deletions(-) delete mode 100644 core/src/io/anuke/mindustry/ui/dialogs/BrowseMapsDialog.java diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index e7844f0635..ee88b583a9 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -224,6 +224,7 @@ editor.generation = Generation: editor.ingame = Edit In-Game editor.publish.workshop = Publish On Workshop editor.newmap = New Map +workshop = Workshop waves.title = Waves waves.remove = Remove waves.never = diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index 9affc53dfa..7ccb700499 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/core/src/io/anuke/mindustry/core/Platform.java @@ -2,7 +2,6 @@ package io.anuke.mindustry.core; import io.anuke.arc.*; import io.anuke.arc.Input.*; -import io.anuke.arc.collection.*; import io.anuke.arc.files.*; import io.anuke.arc.function.*; import io.anuke.arc.math.*; @@ -26,8 +25,8 @@ public interface Platform{ /** Steam: Share a map on the workshop.*/ default void publishMap(Map map){} - /** Steam: Find workshop maps.*/ - default void findMaps(String query, Consumer> result){} + /** Steam: Open workshop for maps.*/ + default void openWorkshop(){} /** Get the networking implementation.*/ default NetProvider getNet(){ @@ -111,16 +110,4 @@ public interface Platform{ /** Stops forcing the app into landscape orientation.*/ default void endForceLandscape(){ } - - /** Specifies a map posted in the steam workshop.*/ - interface PostedMap{ - String name(); - String author(); - String description(); - String gamemode(); - void openPage(); - void subscribe(); - boolean subscribed(); - void preview(Consumer file); - } } \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 57f98e84ea..cc30b3cbe9 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -67,7 +67,6 @@ public class UI implements ApplicationListener, Loadable{ public DeployDialog deploy; public TechTreeDialog tech; public MinimapDialog minimap; - public BrowseMapsDialog browse; public Cursor drillCursor, unloadCursor; @@ -218,7 +217,6 @@ public class UI implements ApplicationListener, Loadable{ deploy = new DeployDialog(); tech = new TechTreeDialog(); minimap = new MinimapDialog(); - browse = new BrowseMapsDialog(); Group group = Core.scene.root; diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index e4b21ff05c..8f2dd20d92 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -582,7 +582,6 @@ public class MapEditorDialog extends Dialog implements Disposable{ if(Core.input.ctrl()){ //alt mode select - //TODO these keycode are unusable, tweak later for(int i = 0; i < view.getTool().altModes.length + 1; i++){ if(Core.input.keyTap(KeyCode.valueOf("NUM_" + (i + 1)))){ view.getTool().mode = i - 1; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/BrowseMapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/BrowseMapsDialog.java deleted file mode 100644 index b9d82891c7..0000000000 --- a/core/src/io/anuke/mindustry/ui/dialogs/BrowseMapsDialog.java +++ /dev/null @@ -1,75 +0,0 @@ -package io.anuke.mindustry.ui.dialogs; - -import io.anuke.arc.*; -import io.anuke.arc.assets.*; -import io.anuke.arc.graphics.*; -import io.anuke.arc.math.*; -import io.anuke.arc.scene.ui.*; -import io.anuke.arc.scene.ui.layout.*; -import io.anuke.arc.util.*; -import io.anuke.mindustry.*; -import io.anuke.mindustry.core.Platform.*; -import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; -import io.anuke.mindustry.ui.*; - -import static io.anuke.mindustry.Vars.platform; - -public class BrowseMapsDialog extends FloatingDialog{ - - public BrowseMapsDialog(){ - super("$maps.browse"); - shown(this::setup); - } - - void setup(){ - cont.clear(); - - cont.addImage(Icon.refresh); - platform.findMaps("", list -> { - Table maps = new Table(); - maps.marginRight(24); - - ScrollPane pane = new ScrollPane(maps); - pane.setFadeScrollBars(false); - - int maxwidth = Mathf.clamp((int)(Core.graphics.getWidth() / Scl.scl(230)), 1, 8); - float mapsize = 200f; - - int i = 0; - for(PostedMap map : list){ - - if(i % maxwidth == 0){ - maps.row(); - } - - TextButton button = maps.addButton("", Styles.cleart, map::openPage).width(mapsize).pad(8).get(); - button.clearChildren(); - button.margin(9); - button.add(map.name()).width(mapsize - 18f).center().get().setEllipsis(true); - button.row(); - button.addImage().growX().pad(4).color(Pal.gray); - button.row(); - Stack stack = button.stack(new Image(Icon.refresh)).size(mapsize - 20f).get(); - map.preview(file -> { - Core.assets.load(new AssetDescriptor<>(file, Texture.class)).loaded = ct -> { - Texture tex = (Texture)ct; - stack.clearChildren(); - stack.add(new Image(tex).setScaling(Scaling.fit)); - stack.add(new BorderImage(tex).setScaling(Scaling.fit)); - }; - }); - - i++; - } - - if(Vars.maps.all().size == 0){ - maps.add("$maps.none"); - } - - cont.add(buttons).growX(); - cont.row(); - cont.add(pane).uniformX(); - }); - } -} diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 470c7d5d6e..e435bdcfa1 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -153,7 +153,6 @@ public class MenuFragment extends Fragment{ container.table(background, t -> { t.defaults().width(width).height(70f); - //todo buttons should be small buttons(t, new Buttoni("$play", Icon.play2Small, new Buttoni("$campaign", Icon.play2Small, ui.deploy::show), @@ -162,7 +161,7 @@ public class MenuFragment extends Fragment{ new Buttoni("$loadgame", Icon.loadSmall, ui.load::show), new Buttoni("$tutorial", Icon.infoSmall, control::playTutorial) ), - steam ? new Buttoni("$maps.browse", Icon.saveSmall, ui.browse::show) : null, + steam ? new Buttoni("$workshop", Icon.saveSmall, platform::openWorkshop) : null, new Buttoni("$editor", Icon.editorSmall, ui.maps::show), new Buttoni("$settings", Icon.toolsSmall, ui.settings::show), new Buttoni("$about.button", Icon.infoSmall, ui.about::show), diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index a5a6c69288..7e4ed508c5 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -171,6 +171,11 @@ public class DesktopLauncher extends ClientLauncher{ return steam ? SVars.net : new ArcNetImpl(); } + @Override + public void openWorkshop(){ + SVars.net.friends.activateGameOverlayToWebPage("https://steamcommunity.com/app/1127400/workshop/"); + } + @Override public void publishMap(Map map){ SVars.workshop.publishMap(map);