mirror of
https://github.com/GeyserMC/PackConverter.git
synced 2025-12-19 14:59:21 +00:00
Move the GUI to its own class
This commit is contained in:
Aurora
@@ -30,20 +30,16 @@ import org.geysermc.pack.converter.util.LogListener;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
public class BootstrapLogListener implements LogListener {
|
||||
private final JTextArea output;
|
||||
public final AtomicBoolean isDebug = new AtomicBoolean(false);
|
||||
private final ThunderGUI gui;
|
||||
|
||||
public BootstrapLogListener(JTextArea output) {
|
||||
this.output = output;
|
||||
public BootstrapLogListener(ThunderGUI gui) {
|
||||
this.gui = gui;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void debug(@NotNull String message) {
|
||||
if (this.isDebug.get()) {
|
||||
if (gui.debugMode.get()) {
|
||||
appendText("DEBUG: " + message);
|
||||
}
|
||||
}
|
||||
@@ -69,17 +65,17 @@ public class BootstrapLogListener implements LogListener {
|
||||
}
|
||||
|
||||
private void appendText(String text) {
|
||||
if (output.getText().isEmpty()) {
|
||||
output.setText(
|
||||
if (gui.outputArea.getText().isEmpty()) {
|
||||
gui.outputArea.setText(
|
||||
text
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
output.setText(
|
||||
output.getText() + "\n" + text
|
||||
gui.outputArea.setText(
|
||||
gui.outputArea.getText() + "\n" + text
|
||||
);
|
||||
|
||||
output.setCaretPosition(output.getDocument().getLength());
|
||||
gui.outputArea.setCaretPosition(gui.outputArea.getDocument().getLength());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,34 +27,15 @@
|
||||
package org.geysermc.pack.converter.bootstrap;
|
||||
|
||||
import com.formdev.flatlaf.intellijthemes.FlatArcDarkIJTheme;
|
||||
import com.twelvemonkeys.image.BufferedImageIcon;
|
||||
import org.geysermc.pack.converter.PackConverter;
|
||||
import org.geysermc.pack.converter.converter.Converters;
|
||||
import org.geysermc.pack.converter.util.ImageUtil;
|
||||
import org.geysermc.pack.converter.util.ZipUtils;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.io.*;
|
||||
import java.math.RoundingMode;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
public class Main {
|
||||
private Path javaPackPath = null;
|
||||
private Path output = null;
|
||||
|
||||
private final JFrame frame;
|
||||
private final AtomicBoolean converting = new AtomicBoolean(false);
|
||||
private final AtomicLong startTime = new AtomicLong(0);
|
||||
private final BootstrapLogListener logListener;
|
||||
|
||||
public static void main(String[] arguments) throws IOException {
|
||||
List<String> args = Arrays.asList(arguments);
|
||||
boolean debug = args.contains("debug");
|
||||
@@ -68,7 +49,7 @@ public class Main {
|
||||
|
||||
String inputPath = args.get(args.indexOf("--input") + 1);
|
||||
|
||||
String outputPath = inputPath.substring(0, inputPath.length() - 4);
|
||||
String outputPath;
|
||||
|
||||
if (args.contains("--output")) {
|
||||
if (args.indexOf("--output") + 1 >= args.size()) {
|
||||
@@ -76,6 +57,8 @@ public class Main {
|
||||
}
|
||||
|
||||
outputPath = args.get(args.indexOf("--output") + 1);
|
||||
} else {
|
||||
outputPath = inputPath.substring(0, inputPath.length() - 4);
|
||||
}
|
||||
|
||||
new PackConverter()
|
||||
@@ -85,154 +68,8 @@ public class Main {
|
||||
.convert()
|
||||
.pack();
|
||||
} else {
|
||||
new Main(debug);
|
||||
}
|
||||
}
|
||||
|
||||
private Main(boolean debug) throws IOException {
|
||||
DecimalFormat df = new DecimalFormat("#.##");
|
||||
df.setRoundingMode(RoundingMode.HALF_UP);
|
||||
|
||||
FlatArcDarkIJTheme.setup();
|
||||
|
||||
frame = new JFrame();
|
||||
frame.setTitle("Thunder");
|
||||
InputStream iconStream = Main.class.getResourceAsStream("/icon.png");
|
||||
if (iconStream != null) frame.setIconImage(ImageIO.read(iconStream));
|
||||
frame.setSize(800, 300);
|
||||
frame.setLayout(null);
|
||||
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
|
||||
frame.setResizable(false);
|
||||
|
||||
JLabel dataLabel = new JLabel("Input: None | Output: None");
|
||||
dataLabel.setBounds(225, 20, 535, 50);
|
||||
frame.add(dataLabel);
|
||||
|
||||
JTextArea outputArea = new JTextArea("");
|
||||
outputArea.setEditable(false);
|
||||
outputArea.setFocusable(false);
|
||||
outputArea.setDisabledTextColor(Color.BLACK);
|
||||
outputArea.setLineWrap(true);
|
||||
logListener = new BootstrapLogListener(outputArea);
|
||||
|
||||
JScrollPane scrollArea = new JScrollPane(outputArea, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
|
||||
scrollArea.setBounds(225, 90, 535, 125);
|
||||
|
||||
frame.add(scrollArea);
|
||||
|
||||
JCheckBox debugCheckbox;
|
||||
|
||||
if (debug) {
|
||||
debugCheckbox = new JCheckBox("Debug Mode");
|
||||
debugCheckbox.setBounds(650, 225, 105, 25);
|
||||
debugCheckbox.addActionListener(event -> {
|
||||
logListener.isDebug.set(debugCheckbox.isSelected());
|
||||
});
|
||||
frame.add(debugCheckbox);
|
||||
} else {
|
||||
debugCheckbox = null;
|
||||
}
|
||||
|
||||
JButton convertButton = new JButton("Convert");
|
||||
convertButton.setBounds(20, 225, debug ? 625 : 740, 25);
|
||||
convertButton.setEnabled(false);
|
||||
convertButton.addActionListener(event -> {
|
||||
if (converting.get()) return;
|
||||
|
||||
startTime.set(System.currentTimeMillis());
|
||||
converting.set(true);
|
||||
if (debugCheckbox != null) debugCheckbox.setEnabled(false);
|
||||
convertButton.setEnabled(false);
|
||||
outputArea.setText("");
|
||||
dataLabel.setText("Converting %s...".formatted(javaPackPath.getFileName().toString()));
|
||||
frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
|
||||
try {
|
||||
new Thread(() -> {
|
||||
try {
|
||||
new PackConverter()
|
||||
.input(javaPackPath)
|
||||
.output(output)
|
||||
.converters(Converters.defaultConverters(logListener.isDebug.get()))
|
||||
.logListener(logListener)
|
||||
.convert()
|
||||
.pack();
|
||||
|
||||
logListener.info("Converted pack.");
|
||||
dataLabel.setText("%s Converted! Time elapsed: %ss".formatted(javaPackPath.getFileName().toString(), df.format((System.currentTimeMillis() - startTime.get()) / 1000d)));
|
||||
converting.set(false);
|
||||
convertButton.setEnabled(true);
|
||||
if (debugCheckbox != null) debugCheckbox.setEnabled(true);
|
||||
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}).start();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
converting.set(false);
|
||||
convertButton.setEnabled(true);
|
||||
if (debugCheckbox != null) debugCheckbox.setEnabled(true);
|
||||
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
|
||||
}
|
||||
});
|
||||
frame.add(convertButton);
|
||||
|
||||
JButton javaPackButton = new JButton("Select Pack");
|
||||
javaPackButton.setBounds(20, 20, 200, 200);
|
||||
javaPackButton.addActionListener(event -> {
|
||||
FileDialog chooser = new FileDialog(frame);
|
||||
chooser.setTitle("Select Resource Pack");
|
||||
chooser.setMultipleMode(false);
|
||||
chooser.setMode(FileDialog.LOAD);
|
||||
chooser.setFilenameFilter((dir, name) -> name.endsWith(".zip") || name.endsWith(".jar"));
|
||||
chooser.setVisible(true);
|
||||
|
||||
if (chooser.getFile() == null) return;
|
||||
|
||||
javaPackPath = Path.of(chooser.getDirectory(), chooser.getFile());
|
||||
|
||||
if (!javaPackPath.toString().endsWith(".zip") && !javaPackPath.toString().endsWith(".jar")) {
|
||||
dataLabel.setText("Please provide a Java Edition resource pack.");
|
||||
convertButton.setEnabled(false);
|
||||
} else {
|
||||
String name = javaPackPath.toAbsolutePath().toString();
|
||||
output = Path.of(name.substring(0, name.length() - 4) + ".mcpack");
|
||||
|
||||
dataLabel.setText(
|
||||
"Input: %s | Output: %s"
|
||||
.formatted(javaPackPath.toAbsolutePath().toString(), output.toAbsolutePath().toString())
|
||||
);
|
||||
convertButton.setEnabled(true);
|
||||
|
||||
try {
|
||||
ZipUtils.openFileSystem(javaPackPath, true, path -> {
|
||||
Path iconPath = path.resolve("pack.png");
|
||||
|
||||
if (!Files.exists(iconPath)) {
|
||||
javaPackButton.setText("No Icon.");
|
||||
javaPackButton.setIcon(null);
|
||||
} else {
|
||||
javaPackButton.setText(null);
|
||||
javaPackButton.setIcon(
|
||||
new BufferedImageIcon(
|
||||
ImageUtil.resize(ImageIO.read(Files.newInputStream(iconPath)), 175, 175)
|
||||
)
|
||||
);
|
||||
}
|
||||
});
|
||||
} catch (IOException e) {
|
||||
javaPackButton.setText("No Icon.");
|
||||
javaPackButton.setIcon(null);
|
||||
new ThunderGUI(debug);
|
||||
}
|
||||
}
|
||||
});
|
||||
frame.add(javaPackButton);
|
||||
|
||||
JLabel outputLabel = new JLabel("Output:");
|
||||
outputLabel.setBounds(225, 50, 535, 50);
|
||||
frame.add(outputLabel);
|
||||
|
||||
|
||||
frame.setVisible(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,199 @@
|
||||
/*
|
||||
* Copyright (c) 2025 GeyserMC. http://geysermc.org
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
* @author GeyserMC
|
||||
* @link https://github.com/GeyserMC/PackConverter
|
||||
*
|
||||
*/
|
||||
|
||||
package org.geysermc.pack.converter.bootstrap;
|
||||
|
||||
import com.twelvemonkeys.image.BufferedImageIcon;
|
||||
import org.geysermc.pack.converter.PackConverter;
|
||||
import org.geysermc.pack.converter.converter.Converters;
|
||||
import org.geysermc.pack.converter.util.ImageUtil;
|
||||
import org.geysermc.pack.converter.util.ZipUtils;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.math.RoundingMode;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
public class ThunderGUI extends JFrame {
|
||||
private final DecimalFormat decimalFormat;
|
||||
private final AtomicBoolean converting = new AtomicBoolean(false);
|
||||
private final AtomicLong startTime = new AtomicLong(0);
|
||||
private final BootstrapLogListener logListener = new BootstrapLogListener(this);
|
||||
protected final AtomicBoolean debugMode = new AtomicBoolean(false);
|
||||
protected final JTextArea outputArea;
|
||||
|
||||
private Path inputPath = null;
|
||||
private Path outputPath = null;
|
||||
|
||||
public ThunderGUI(boolean debug) throws IOException {
|
||||
decimalFormat = new DecimalFormat("#.##");
|
||||
decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
|
||||
|
||||
this.setTitle("Thunder");
|
||||
InputStream iconStream = Main.class.getResourceAsStream("/icon.png");
|
||||
if (iconStream != null) this.setIconImage(ImageIO.read(iconStream));
|
||||
this.setSize(800, 300);
|
||||
this.setLayout(null);
|
||||
this.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
|
||||
this.setResizable(false);
|
||||
|
||||
JLabel dataLabel = new JLabel("Input: None | Output: None");
|
||||
dataLabel.setBounds(225, 20, 535, 50);
|
||||
this.add(dataLabel);
|
||||
|
||||
this.outputArea = new JTextArea("");
|
||||
this.outputArea.setEditable(false);
|
||||
this.outputArea.setFocusable(false);
|
||||
this.outputArea.setDisabledTextColor(Color.BLACK);
|
||||
this.outputArea.setLineWrap(true);
|
||||
|
||||
JScrollPane scrollArea = new JScrollPane(this.outputArea, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
|
||||
scrollArea.setBounds(225, 90, 535, 125);
|
||||
|
||||
this.add(scrollArea);
|
||||
|
||||
JCheckBox debugCheckbox;
|
||||
|
||||
if (debug) {
|
||||
debugCheckbox = new JCheckBox("Debug Mode");
|
||||
debugCheckbox.setBounds(650, 225, 105, 25);
|
||||
debugCheckbox.addActionListener(event -> {
|
||||
this.debugMode.set(debugCheckbox.isSelected());
|
||||
});
|
||||
this.add(debugCheckbox);
|
||||
} else {
|
||||
debugCheckbox = null;
|
||||
}
|
||||
|
||||
JButton convertButton = new JButton("Convert");
|
||||
convertButton.setBounds(20, 225, debug ? 625 : 740, 25);
|
||||
convertButton.setEnabled(false);
|
||||
convertButton.addActionListener(event -> {
|
||||
if (converting.get()) return;
|
||||
|
||||
startTime.set(System.currentTimeMillis());
|
||||
converting.set(true);
|
||||
if (debugCheckbox != null) debugCheckbox.setEnabled(false);
|
||||
convertButton.setEnabled(false);
|
||||
this.outputArea.setText("");
|
||||
dataLabel.setText("Converting %s...".formatted(inputPath.getFileName().toString()));
|
||||
this.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
|
||||
try {
|
||||
new Thread(() -> {
|
||||
try {
|
||||
new PackConverter()
|
||||
.input(inputPath)
|
||||
.output(outputPath)
|
||||
.converters(Converters.defaultConverters(this.debugMode.get()))
|
||||
.logListener(logListener)
|
||||
.convert()
|
||||
.pack();
|
||||
|
||||
logListener.info("Converted pack.");
|
||||
dataLabel.setText("%s Converted! Time elapsed: %ss".formatted(inputPath.getFileName().toString(), decimalFormat.format((System.currentTimeMillis() - startTime.get()) / 1000d)));
|
||||
converting.set(false);
|
||||
convertButton.setEnabled(true);
|
||||
if (debugCheckbox != null) debugCheckbox.setEnabled(true);
|
||||
this.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}).start();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
converting.set(false);
|
||||
convertButton.setEnabled(true);
|
||||
if (debugCheckbox != null) debugCheckbox.setEnabled(true);
|
||||
this.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
|
||||
}
|
||||
});
|
||||
this.add(convertButton);
|
||||
|
||||
JButton javaPackButton = new JButton("Select Pack");
|
||||
javaPackButton.setBounds(20, 20, 200, 200);
|
||||
javaPackButton.addActionListener(event -> {
|
||||
FileDialog chooser = new FileDialog(this);
|
||||
chooser.setTitle("Select Resource Pack");
|
||||
chooser.setMultipleMode(false);
|
||||
chooser.setMode(FileDialog.LOAD);
|
||||
chooser.setFilenameFilter((dir, name) -> name.endsWith(".zip") || name.endsWith(".jar"));
|
||||
chooser.setVisible(true);
|
||||
|
||||
if (chooser.getFile() == null) return;
|
||||
|
||||
inputPath = Path.of(chooser.getDirectory(), chooser.getFile());
|
||||
|
||||
if (!inputPath.toString().endsWith(".zip") && !inputPath.toString().endsWith(".jar")) {
|
||||
dataLabel.setText("Please provide a Java Edition resource pack.");
|
||||
convertButton.setEnabled(false);
|
||||
} else {
|
||||
String name = inputPath.toAbsolutePath().toString();
|
||||
outputPath = Path.of(name.substring(0, name.length() - 4) + ".mcpack");
|
||||
|
||||
dataLabel.setText(
|
||||
"Input: %s | Output: %s"
|
||||
.formatted(inputPath.toAbsolutePath().toString(), outputPath.toAbsolutePath().toString())
|
||||
);
|
||||
convertButton.setEnabled(true);
|
||||
|
||||
try {
|
||||
ZipUtils.openFileSystem(inputPath, true, path -> {
|
||||
Path iconPath = path.resolve("pack.png");
|
||||
|
||||
if (!Files.exists(iconPath)) {
|
||||
javaPackButton.setText("No Icon.");
|
||||
javaPackButton.setIcon(null);
|
||||
} else {
|
||||
javaPackButton.setText(null);
|
||||
javaPackButton.setIcon(
|
||||
new BufferedImageIcon(
|
||||
ImageUtil.resize(ImageIO.read(Files.newInputStream(iconPath)), 175, 175)
|
||||
)
|
||||
);
|
||||
}
|
||||
});
|
||||
} catch (IOException e) {
|
||||
javaPackButton.setText("No Icon.");
|
||||
javaPackButton.setIcon(null);
|
||||
}
|
||||
}
|
||||
});
|
||||
this.add(javaPackButton);
|
||||
|
||||
JLabel outputLabel = new JLabel("Output:");
|
||||
outputLabel.setBounds(225, 50, 535, 50);
|
||||
this.add(outputLabel);
|
||||
|
||||
this.setVisible(true);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user