mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-13 12:16:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Removed JavaFX usage

Browse Source
This commit is contained in:
Anuken 2018-05-25 01:09:47 -04:00
parent f524be6738
commit d462d9c89b
1 changed files with 3 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
View File

@ -3,7 +3,6 @@ package io.anuke.mindustry.desktop;
import club.minnced.discord.rpc.DiscordEventHandlers; import club.minnced.discord.rpc.DiscordEventHandlers;
import club.minnced.discord.rpc.DiscordRPC; import club.minnced.discord.rpc.DiscordRPC;
import club.minnced.discord.rpc.DiscordRichPresence; import club.minnced.discord.rpc.DiscordRichPresence;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Base64Coder; import com.badlogic.gdx.utils.Base64Coder;
import io.anuke.kryonet.DefaultThreadImpl; import io.anuke.kryonet.DefaultThreadImpl;
@ -11,17 +10,13 @@ import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.core.ThreadHandler.ThreadProvider; import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.ui.dialogs.FileChooser;
import io.anuke.ucore.UCore; import io.anuke.ucore.UCore;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
import io.anuke.ucore.function.Consumer; import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.util.Strings; import io.anuke.ucore.util.Strings;
import javafx.application.Application;
import javafx.stage.FileChooser;
import javafx.stage.FileChooser.ExtensionFilter;
import javafx.stage.Stage;
import javax.swing.*; import javax.swing.*;
import java.io.File;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.NumberFormat; import java.text.NumberFormat;
@ -49,17 +44,8 @@ public class DesktopPlatform extends Platform {
} }
@Override @Override
public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, String... filter) { public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, String filter) {
new Thread(() -> { new FileChooser(text, file -> file.extension().equalsIgnoreCase(filter), open, cons).show();
FxApp.text = text;
FxApp.cons = cons;
FxApp.filter = filter;
FxApp.open = open;
FxApp.content = content;
FxApp.open();
}){{
setDaemon(true);
}}.start();
} }
@Override @Override
@ -161,56 +147,4 @@ public class DesktopPlatform extends Platform {
System.arraycopy(bytes, 0, result, 0, bytes.length); System.arraycopy(bytes, 0, result, 0, bytes.length);
return !new String(Base64Coder.encode(result)).equals("AAAAAAAAAOA="); return !new String(Base64Coder.encode(result)).equals("AAAAAAAAAOA=");
} }
public static class FxApp extends Application{
static String text;
static Consumer<FileHandle> cons;
static String[] filter;
static String content;
static boolean open;
private static FxApp instance;
static void open(){
if(instance == null){
launch();
}
ss();
}
static void ss(){
javafx.application.Platform.runLater(() -> instance.show());
}
public FxApp(){
instance = this;
ss();
}
@Override
public void start(Stage stage){
}
public void show(){
for(int i = 0; i < filter.length; i ++){
filter[i] = "*." + filter[i];
}
FileChooser chooser = new FileChooser();
chooser.setTitle(text);
chooser.getExtensionFilters().add(new ExtensionFilter(content, filter));
chooser.setInitialDirectory(new File(System.getProperty("user.home")));
File file;
if (open) {
file = chooser.showOpenDialog(null);
} else {
file = chooser.showSaveDialog(null);
}
if (file != null) {
Gdx.app.postRunnable(() -> cons.accept(Gdx.files.absolute(file.getAbsolutePath())));
}
}
}
} }