From d096a7ceb1610e4b3adbb4e1fac34ec889c06f33 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 23 May 2018 10:37:14 -0400 Subject: [PATCH] Merge fixes --- core/src/io/anuke/mindustry/core/Control.java | 1 - core/src/io/anuke/mindustry/core/Platform.java | 6 ++++++ core/src/io/anuke/mindustry/editor/MapEditorDialog.java | 1 + core/src/io/anuke/mindustry/editor/MapInfoDialog.java | 2 +- core/src/io/anuke/mindustry/editor/MapSaveDialog.java | 2 +- core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java | 1 + core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java | 1 + 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index e55999f340..53401d0d4d 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -15,7 +15,6 @@ import io.anuke.mindustry.input.DefaultKeybinds; import io.anuke.mindustry.input.DesktopInput; import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.io.Map; -import io.anuke.mindustry.io.Platform; import io.anuke.mindustry.io.Saves; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.Item; diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index 5f88611cd3..847da450da 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/core/src/io/anuke/mindustry/core/Platform.java @@ -6,8 +6,10 @@ import io.anuke.mindustry.core.ThreadHandler.ThreadProvider; import io.anuke.ucore.core.Settings; import io.anuke.ucore.entities.Entity; import io.anuke.ucore.entities.EntityGroup; +import io.anuke.ucore.function.Consumer; import io.anuke.ucore.scene.ui.TextField; +import java.io.InputStream; import java.util.Date; import java.util.Locale; import java.util.Random; @@ -63,6 +65,10 @@ public abstract class Platform { } /**Only used for iOS or android: open the share menu for a map or save.*/ public void shareFile(FileHandle file){} + /**Download a file. Only used on GWT backend.*/ + public void downloadFile(String name, byte[] bytes){} + /**Open a file chooser. Only used on GWT backend.*/ + public void openFile(Consumer cons){} /**Use the default thread provider from the kryonet module for this.*/ public ThreadProvider getThreadProvider(){ return new ThreadProvider() { diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index fe69b08ef6..6194a83ccb 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -8,6 +8,7 @@ import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.utils.ObjectMap; import io.anuke.mindustry.content.blocks.Blocks; +import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.io.*; import io.anuke.mindustry.ui.dialogs.FileChooser; diff --git a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java index b2b44b4954..30ce569782 100644 --- a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.editor; import com.badlogic.gdx.utils.ObjectMap; -import io.anuke.mindustry.io.Platform; +import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.ucore.core.Settings; import io.anuke.ucore.scene.ui.TextArea; diff --git a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java b/core/src/io/anuke/mindustry/editor/MapSaveDialog.java index acabbfa970..cc4956ef5a 100644 --- a/core/src/io/anuke/mindustry/editor/MapSaveDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapSaveDialog.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.editor; import io.anuke.mindustry.io.Map; -import io.anuke.mindustry.io.Platform; +import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.ucore.function.Consumer; import io.anuke.ucore.scene.ui.TextButton; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index 9d2ddc4805..a2474e892c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.g2d.GlyphLayout; import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Pools; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Timers; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java index dd618df507..4ccf89ffdd 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java @@ -6,6 +6,7 @@ import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Json; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; +import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.io.Version; import io.anuke.mindustry.net.Host; import io.anuke.mindustry.net.Net;