Change styling of the application, add a link to the wiki in-app, bump version

Author: Novampr

bootstrap/src/main/java/org/geysermc/pack/converter/bootstrap/BootstrapLogListener.java

@@ -78,13 +78,13 @@ public void error(@NotNull String message, @Nullable Throwable exception) {
     private void appendText(String text) {
         if (gui.outputArea.getText().isEmpty()) {
             gui.outputArea.setText(
-                    text
+                    " " + text
             );
             return;
         }
 
         gui.outputArea.setText(
-                gui.outputArea.getText() + "\n" + text
+                gui.outputArea.getText() + "\n " + text
         );
 
         gui.outputArea.setCaretPosition(gui.outputArea.getDocument().getLength());

bootstrap/src/main/java/org/geysermc/pack/converter/bootstrap/Main.java

@@ -26,7 +26,6 @@
 
 package org.geysermc.pack.converter.bootstrap;
 
-import com.formdev.flatlaf.intellijthemes.FlatArcDarkIJTheme;
 import org.geysermc.pack.converter.PackConverter;
 import org.geysermc.pack.converter.converter.Converters;
 
@@ -80,8 +79,7 @@ public static void main(String[] arguments) throws IOException {
                     .convert()
                     .pack();
         } else {
-            FlatArcDarkIJTheme.setup();
-            new ThunderGUI(debug);
+            ThunderGUI.start(debug);
         }
     }
 }

bootstrap/src/main/java/org/geysermc/pack/converter/bootstrap/ThunderGUI.java

@@ -26,19 +26,27 @@
 
 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.bootstrap.components.DefaultButtonBorder;
+import org.geysermc.pack.converter.bootstrap.components.HelpButton;
+import org.geysermc.pack.converter.bootstrap.components.PrideButtonBorder;
+import org.geysermc.pack.converter.bootstrap.components.StaticButtonBorder;
 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 javax.swing.border.Border;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.RoundingMode;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.text.DecimalFormat;
@@ -62,12 +70,26 @@ public class ThunderGUI extends JFrame {
     private Path outputPath = null;
     private BufferedImage currentIcon = null;
 
+    public static void start(boolean debug) throws IOException {
+        FlatArcDarkIJTheme.setup();
+
+        new ThunderGUI(debug);
+    }
+
     public ThunderGUI(boolean debug) throws IOException {
         vanillaPackPath = Path.of(System.getenv("LOCALAPPDATA") != null ? System.getenv("LOCALAPPDATA") : System.getProperty("user.home"), "Thunder", "Vanilla-Assets.zip");
 
         decimalFormat = new DecimalFormat("#.##");
         decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
 
+        Border border;
+
+        if (LocalDate.now().getMonth().equals(Month.JUNE)) {
+            border = new PrideButtonBorder();
+        } else {
+            border = new DefaultButtonBorder();
+        }
+
         this.setTitle("Thunder");
         InputStream iconStream = Main.class.getResourceAsStream("/icon.png");
         if (iconStream != null) this.setIconImage(ImageIO.read(iconStream));
@@ -82,9 +104,26 @@ public ThunderGUI(boolean debug) throws IOException {
         this.add(packNameLabel);
 
         JTextField packName = new JTextField("");
-        packName.setBounds(295, 20, 475, 30);
+        packName.setBorder(border);
+        packName.setEnabled(false);
+        packName.setToolTipText("Please select a pack first!");
+        packName.setBounds(295, 20, 425, 30);
         this.add(packName);
 
+        JButton helpButton = new JButton(new HelpButton());
+        helpButton.setToolTipText("Open the wiki page");
+        helpButton.setFocusPainted(false);
+        helpButton.setBorder(border);
+        helpButton.setBounds(730, 20, 30, 30);
+        helpButton.addActionListener(event -> {
+            try {
+                Desktop.getDesktop().browse(new URI("https://geysermc.org/wiki/other/thunder"));
+            } catch (IOException | URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        this.add(helpButton);
+
         JLabel dataLabel = new JLabel("Input: None | Output: None");
         dataLabel.setBounds(225, 50, 535, 30);
         this.add(dataLabel);
@@ -94,9 +133,11 @@ public ThunderGUI(boolean debug) throws IOException {
         this.outputArea.setFocusable(false);
         this.outputArea.setLineWrap(true);
         this.outputArea.setTabSize(2);
+        this.outputArea.setBorder(BorderFactory.createEmptyBorder());
 
         JScrollPane scrollArea = new JScrollPane(this.outputArea, ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        scrollArea.setBounds(225, 90, 535, 125);
+        scrollArea.setBounds(225, 90, 535, 130);
+        scrollArea.setBorder(new StaticButtonBorder());
 
         this.add(scrollArea);
 
@@ -105,15 +146,15 @@ public ThunderGUI(boolean debug) throws IOException {
         if (debug) {
             debugCheckbox = new JCheckBox("Debug Mode");
             debugCheckbox.setBounds(650, 225, 105, 25);
-            debugCheckbox.addActionListener(event -> {
-                this.debugMode.set(debugCheckbox.isSelected());
-            });
+            debugCheckbox.addActionListener(event -> this.debugMode.set(debugCheckbox.isSelected()));
             this.add(debugCheckbox);
         } else {
             debugCheckbox = null;
         }
 
         JButton convertButton = new JButton("Convert");
+        convertButton.setBorder(border);
+        convertButton.setFocusPainted(false);
         convertButton.setBounds(20, 225, debug ? 625 : 740, 25);
         convertButton.setEnabled(false);
         convertButton.addActionListener(event -> {
@@ -123,6 +164,7 @@ public ThunderGUI(boolean debug) throws IOException {
             converting.set(true);
             if (debugCheckbox != null) debugCheckbox.setEnabled(false);
             convertButton.setEnabled(false);
+            this.requestFocus();
             this.outputArea.setText("");
             dataLabel.setText("Converting %s...".formatted(inputPath.getFileName().toString()));
             this.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
@@ -160,6 +202,8 @@ public ThunderGUI(boolean debug) throws IOException {
         this.add(convertButton);
 
         JButton javaPackButton = new JButton("Select Pack");
+        javaPackButton.setBorder(border);
+        javaPackButton.setFocusPainted(false);
         javaPackButton.setBounds(20, 20, 200, 200);
         javaPackButton.addActionListener(event -> {
             if (converting.get()) return;
@@ -186,9 +230,9 @@ public ThunderGUI(boolean debug) throws IOException {
                 );
                 convertButton.setEnabled(true);
 
-                if (packName.getText().isEmpty()) {
-                    packName.setText(chooser.getFile().replaceFirst("[.][^.]+$", ""));
-                }
+                packName.setToolTipText(null);
+                packName.setEnabled(true);
+                packName.setText(chooser.getFile().replaceFirst("[.][^.]+$", ""));
 
                 try {
                     ZipUtils.openFileSystem(inputPath, true, path -> {
@@ -202,13 +246,10 @@ public ThunderGUI(boolean debug) throws IOException {
 
                             LocalDate date = LocalDate.now();
 
-                            currentIcon = ImageUtil.borderRadias(
-                                    ImageUtil.resize(
-                                            ImageIO.read(Files.newInputStream(iconPath)),
-                                            198,
-                                            198
-                                    ),
-                                    5
+                            currentIcon = ImageUtil.resize(
+                                    ImageIO.read(Files.newInputStream(iconPath)),
+                                    198,
+                                    198
                             );
 
                             if (date.getMonth().equals(Month.APRIL) && date.getDayOfMonth() == 1) {

bootstrap/src/main/java/org/geysermc/pack/converter/bootstrap/components/DefaultButtonBorder.java

@@ -0,0 +1,95 @@
+/*
+ * 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.components;
+
+import com.formdev.flatlaf.ui.FlatButtonBorder;
+
+import java.awt.*;
+import java.awt.geom.Point2D;
+
+public class DefaultButtonBorder extends FlatButtonBorder {
+    @Override
+    protected Paint getBorderColor(Component c) {
+        Color[] colors = getColors(c);
+
+        if (colors.length == 1) {
+            return colors[0];
+        }
+
+        float size = ((float) 90 / colors.length) / 100;
+        float[] sizes = new float[colors.length];
+        for (int i = 0; i < colors.length; i++) {
+            sizes[i] = size * (i + 1);
+        }
+
+        return new LinearGradientPaint(getStartPoint(c), getEndPoint(c), sizes, colors);
+    }
+
+    @Override
+    protected float getBorderWidth(Component c) {
+        float base = super.getBorderWidth(c);
+        if (c.isFocusOwner()) {
+            return base * 2f;
+        } else if (!c.isEnabled()) {
+            return base;
+        } else {
+            return base * 0.5f;
+        }
+    }
+
+    @Override
+    protected int getFocusWidth(Component c) {
+        return 0;
+    }
+
+    public Color[] getColors(Component c) {
+        if (c.isFocusOwner()) {
+            return new Color[]{
+                    new Color(51, 140, 242),
+                    new Color(35, 118, 213)
+            };
+        } else if (c.isEnabled()) {
+            return new Color[]{
+                    new Color(151, 162, 168, 120),
+                    new Color(124, 136, 143, 120)
+            };
+        } else {
+            return new Color[]{
+                    new Color(151, 162, 168, 80),
+                    new Color(124, 136, 143, 80)
+            };
+        }
+    }
+
+    public Point2D getStartPoint(Component ignoredC) {
+        return new Point2D.Float(0, 0);
+    }
+
+    public Point2D getEndPoint(Component c) {
+        return new Point2D.Float(0, c.getHeight());
+    }
+}

bootstrap/src/main/java/org/geysermc/pack/converter/bootstrap/components/HelpButton.java

@@ -0,0 +1,67 @@
+/*
+ * 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.components;
+
+import com.formdev.flatlaf.ui.FlatUIUtils;
+import com.formdev.flatlaf.util.UIScale;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Path2D;
+
+// Based on FlatHelpButtonIcon and FlatAbstractIcon from FlatLaf
+// Path is entirely from FlatHelpButtonIcon
+public class HelpButton implements Icon {
+    @Override
+    public void paintIcon(Component c, Graphics graphics, int x, int y) {
+        Graphics2D g = (Graphics2D)graphics.create();
+        FlatUIUtils.setRenderingHints(g);
+        g.translate(x, y);
+        UIScale.scaleGraphics(g);
+        Path2D q = new Path2D.Float(1, 10);
+        q.moveTo(8.0F, 8.5F);
+        q.curveTo(8.25F, 7.0F, 9.66585007, 6.0F, 11.0F, 6.0F);
+        q.curveTo(12.5F, 6.0F, 14.0F, 7.0F, 14.0F, 8.5F);
+        q.curveTo(14.0F, 10.5F, 11.0F, 11.0F, 11.0F, 13.0F);
+        g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
+        g.setStroke(new BasicStroke(2.0F, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+        g.setColor(Color.WHITE);
+        g.draw(q);
+        g.fill(new Ellipse2D.Float(9.8F, 14.8F, 2.4F, 2.4F));
+    }
+
+    @Override
+    public int getIconWidth() {
+        return 22;
+    }
+
+    @Override
+    public int getIconHeight() {
+        return 22;
+    }
+}