makes addon icons now

Author: xFN10x

app/bin/main/fn10/bedrockr/addons/source/jsonClasses/WPFile.class

@@ -3,10 +3,14 @@
 public class WPFile {
     public String WorkspaceName;
     public String MinimumEngineVersion;
+    public String Description;
+    public String IconExtension;
 
 
-    public WPFile(String WPName, String MEV) {
+    public WPFile(String WPName, String MEV, String DES, String IE) {
         this.WorkspaceName = WPName;
         this.MinimumEngineVersion = MEV;
+        this.Description = DES;
+        this.IconExtension = IE;
     }
 }

app/bin/main/fn10/bedrockr/windows/RNewAddon.class

@@ -1,8 +1,12 @@
 package fn10.bedrockr.windows;
 
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 import javax.imageio.ImageIO;
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
@@ -11,6 +15,7 @@
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.SpringLayout;
@@ -19,6 +24,7 @@
 import javax.swing.filechooser.FileNameExtensionFilter;
 
 import fn10.bedrockr.Launcher;
+import fn10.bedrockr.addons.source.jsonClasses.WPFile;
 import fn10.bedrockr.windows.base.RDialog;
 import fn10.bedrockr.windows.base.RLoadingScreen;
 import fn10.bedrockr.windows.utils.ImageUtilites;
@@ -34,9 +40,12 @@ public class RNewAddon extends RDialog implements ActionListener {
             "1.21.80",
             "1.21.90"
     };
-    protected JLabel AddonIcon;
     protected ImageIcon ChosenIcon = ImageUtilites.ResizeImageByURL(getClass().getResource("/addons/DefaultIcon.png"),
             250, 250);
+    protected JFileChooser file = new JFileChooser();
+    protected String imageExtension = "png";
+
+    protected JLabel AddonIcon = new JLabel(ChosenIcon);
     protected JTextArea DescInput = new JTextArea("My new addon, made in bedrockR");
     protected JTextField NameInput = new JTextField("New AddonR");
     protected JComboBox<String> MinimumEngineVersionSelection = new JComboBox<String>(PICKABLE_VERSIONS);
@@ -47,7 +56,6 @@ public RNewAddon(JFrame Parent) {
                 "New Addon",
                 new Dimension(459, 350));
 
-        AddonIcon = new JLabel(ChosenIcon);
         AddonIcon.setSize(new Dimension(300, 300));
         AddonIcon.setHorizontalAlignment(SwingConstants.CENTER);
         AddonIcon.setVerticalAlignment(SwingConstants.CENTER);
@@ -122,17 +130,27 @@ public RNewAddon(JFrame Parent) {
         add(CreateButton);
     }
 
+    private static void showError(Component parent, String msg, String title, Exception ex) {
+        StringWriter sw = new StringWriter();
+        ex.printStackTrace(new PrintWriter(sw));
+        JOptionPane.showMessageDialog(parent,
+                msg + "\n" + sw.toString(),
+                title, JOptionPane.ERROR_MESSAGE);
+    }
+
     @Override
     public void actionPerformed(ActionEvent e) {
         if (e.getActionCommand() == "changeIcon") {
             try {
-                var file = new JFileChooser();
                 file.setDialogTitle("Choose Addon Icon");
                 file.setFileFilter(
-                        new FileNameExtensionFilter("Image Files (*.png,*.jpg/jpeg)", "png", "jpg", "jpeg", "tga"));
+                        new FileNameExtensionFilter("Image Files (*.png,*.jpg)", "png", "jpg"));
                 file.showOpenDialog(this);
                 ChosenIcon = ImageUtilites.ResizeIcon(new ImageIcon(ImageIO.read(file.getSelectedFile())), 250, 250);
                 AddonIcon.setIcon(ChosenIcon);
+                Launcher.LOG.info(file.getSelectedFile().getName());
+                imageExtension = file.getSelectedFile().getName().split(".")[1];
+                Launcher.LOG.info("Icon extension will be: " + imageExtension);
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
@@ -148,9 +166,17 @@ public void actionPerformed(ActionEvent e) {
                     loading.setVisible(true);
                 });
 
-                RFileOperations.createWorkspace(loading, name, MinimumEngineVersionSelection.getSelectedItem().toString());
+                RFileOperations.createWorkspace(loading,
+
+                        new WPFile(NameInput.getText(),
+                                MinimumEngineVersionSelection.getSelectedItem().toString(), DescInput.getText(),
+                                imageExtension),
+
+                        (ImageIcon) AddonIcon.getIcon());
             } catch (Exception ex) {
                 ex.printStackTrace();
+                showError(this, "Failed to make new addon.", "Grrrr", ex);
+                return;
             }
 
         } else {

app/bin/main/fn10/bedrockr/windows/base/RLoadingScreen.class

@@ -5,31 +5,29 @@
 import javax.swing.JProgressBar;
 import javax.swing.SpringLayout;
 import javax.swing.SwingUtilities;
-import javax.swing.border.LineBorder;
-
 import fn10.bedrockr.windows.utils.ImageUtilites;
 import fn10.bedrockr.windows.utils.RFonts;
 
 import java.awt.*;
 
 public class RLoadingScreen extends RDialog {
 
-    protected JProgressBar MAINBAR;
-    protected JLabel MAIN_TEXT;
+    protected JProgressBar MainBar = new JProgressBar();
+    protected JLabel MainText = new JLabel("Loading...");;
 
     public Integer Steps = null;
 
     public void changeText(String text) {
         SwingUtilities.invokeLater(() -> {
-            MAIN_TEXT.setText(text);
+            MainText.setText(text);
         });
     }
 
     public void increaseProgress(int increase,@Nullable String TextChange) {
 
         changeText(TextChange);
         SwingUtilities.invokeLater(() -> {
-            MAINBAR.setValue(MAINBAR.getValue() + increase);
+            MainBar.setValue(MainBar.getValue() + increase);
         });
     }
 
@@ -45,7 +43,7 @@ public void increaseProgressBySteps(@Nullable String TextChange) throws IllegalA
         changeText(TextChange);
 
         SwingUtilities.invokeLater(() -> {
-            MAINBAR.setValue(MAINBAR.getValue() + 100 / Steps);
+            MainBar.setValue(MainBar.getValue() + 100 / Steps);
         });
     }
 
@@ -63,7 +61,7 @@ public RLoadingScreen(Frame Parent) {
                 .ResizeImageByURL(getClass().getResource("/branding/BrandingFullWShadow.png"), titleImgW, titleImageH));
         Branding.setPreferredSize(new Dimension(titleImgW, titleImageH));
 
-        var MainBar = new JProgressBar();
+        
         MainBar.setPreferredSize(new Dimension(600, 20));
         // MainBar.setBackground(getForeground());
         MainBar.setOrientation(JProgressBar.HORIZONTAL);
@@ -75,7 +73,7 @@ public RLoadingScreen(Frame Parent) {
         // MainBar.setStringPainted(true);
         // MainBar.setString("Loading...");
 
-        var MainText = new JLabel("Loading...");
+        
         MainText.setFont(RFonts.RegMinecraftFont.deriveFont(2, 18));
         MainText.setForeground(Color.WHITE);
 
@@ -96,6 +94,5 @@ public RLoadingScreen(Frame Parent) {
         add(MainBar);
 
         add(BG); // always add last!
-        MAINBAR = MainBar;
     }
 }

app/bin/main/fn10/bedrockr/windows/utils/RFileOperations.class

@@ -1,13 +1,18 @@
 package fn10.bedrockr.windows.utils;
 
 import java.awt.Component;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.Files;
 
+import javax.imageio.ImageIO;
+import javax.swing.ImageIcon;
 import javax.swing.JOptionPane;
 
 import fn10.bedrockr.addons.source.SourceWPFile;
@@ -54,10 +59,11 @@ public static File getFileFromWorkspace(Component windowDoingThis, String Worksp
             e.printStackTrace();
             return null;
         }
-        
+
     }
 
-    public static boolean createWorkspace(RLoadingScreen loading, String workspaceName, String minimumVersion)
+    public static boolean createWorkspace(RLoadingScreen loading, // String workspaceName, String minimumVersion)
+            WPFile wpf, ImageIcon imgIcon)
             throws DirectoryNotEmptyException, IOException {
 
         String[] wsFolders = {
@@ -67,7 +73,7 @@ public static boolean createWorkspace(RLoadingScreen loading, String workspaceNa
 
         File base = getBaseDirectory(loading);
 
-        File wsFolder = new File(base.getAbsolutePath() + "/workspace/" + workspaceName + "/");
+        File wsFolder = new File(base.getAbsolutePath() + "/workspace/" + wpf.WorkspaceName + "/");
 
         if (wsFolder.exists()) { // throw if folder is already here
             var e = new IOException("Folder " + wsFolder.getAbsolutePath() + " already exists.");
@@ -91,16 +97,25 @@ public static boolean createWorkspace(RLoadingScreen loading, String workspaceNa
 
                 loading.changeText("Creating workspace...");
 
-                var srcWPF = new SourceWPFile(new WPFile(workspaceName, minimumVersion));
-                srcWPF.buildJSONFile(loading, workspaceName);
+                var srcWPF = new SourceWPFile(wpf);
+                srcWPF.buildJSONFile(loading, wpf.WorkspaceName);
+
+                var srcIcon = new File(wsFolder.getAbsolutePath() + "/icon." + wpf.IconExtension);
+                trying = srcIcon;
+
+                // make buffered image
+                var image = imgIcon.getImage();
+                BufferedImage BI = new BufferedImage(image.getWidth(null),
+                        image.getHeight(null),
+                        BufferedImage.TYPE_INT_ARGB);
+                BI.getGraphics().drawImage(BI, 0, 0, null);
+
+                ImageIO.write(BI, wpf.IconExtension, srcIcon);
 
                 return true;
 
             } catch (Exception e) { // handle exception
-                JOptionPane.showMessageDialog(loading,
-                        "Failed to make Directory " + wsFolder.getAbsolutePath() + ". \n"
-                                + e.getStackTrace().toString(),
-                        "Failed to make workspace.", JOptionPane.ERROR_MESSAGE);
+                showError(loading, "IO Error, with path " + wsFolder.getAbsolutePath(), "IO Error", e);
                 throw e;
             }
         }