diff --git a/src/main/java/org/parabot/core/ui/BotUI.java b/src/main/java/org/parabot/core/ui/BotUI.java index 5c7041a..0456cf9 100644 --- a/src/main/java/org/parabot/core/ui/BotUI.java +++ b/src/main/java/org/parabot/core/ui/BotUI.java @@ -1,6 +1,7 @@ package org.parabot.core.ui; import org.parabot.core.Context; +import org.parabot.core.Directories; import org.parabot.core.ui.components.GamePanel; import org.parabot.core.ui.components.VerboseLoader; import org.parabot.core.ui.images.Images; @@ -65,27 +66,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener, return instance; } - public static boolean deleteDirectory(File directory) { - if (directory.exists()) { - File[] files = directory.listFiles(); - if (files != null) { - for (int i = 0; i < files.length; i++) { - if (files[i].isDirectory()) { - deleteDirectory(files[i]); - } else { - files[i].delete(); - } - } - } - } - return (directory.delete()); - } - public static void createDirectory(File directory) { - if (!directory.exists()) { - directory.mkdir(); - } - } private void createMenu() { JMenuBar menuBar = new JMenuBar(); @@ -214,8 +195,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener, BotDialog.getInstance().setVisible(!dialog.isVisible()); break; case "Clear cache": - deleteDirectory(new File("C:/Users/Eric/Documents/Parabot/cache")); - createDirectory(new File("C:/Users/Eric/Documents/Parabot/cache")); + Directories.clearCache(); break; default: System.out.println("Invalid command: " + command); diff --git a/src/main/java/org/parabot/core/ui/components/VerboseLoader.java b/src/main/java/org/parabot/core/ui/components/VerboseLoader.java index c08e9a5..9d9e102 100755 --- a/src/main/java/org/parabot/core/ui/components/VerboseLoader.java +++ b/src/main/java/org/parabot/core/ui/components/VerboseLoader.java @@ -21,7 +21,7 @@ import java.awt.image.RescaleOp; /** * An informative JPanel which tells the user what bot is doing * - * @author Everel + * @author Everel, EmmaStone */ public class VerboseLoader extends JPanel implements ProgressListener { private static final long serialVersionUID = 7412412644921803896L; @@ -144,7 +144,6 @@ public class VerboseLoader extends JPanel implements ProgressListener { login.setOpaque(false); login.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { if (manager.login(userInput.getText(), passInput.getText(), false)) { @@ -157,17 +156,17 @@ public class VerboseLoader extends JPanel implements ProgressListener { }); - loginPanel.add(Box.createRigidArea(new Dimension(0, 5))); + loginPanel.add(Box.createRigidArea(new Dimension(0, 8))); loginPanel.add(usernameLabel); - loginPanel.add(Box.createRigidArea(new Dimension(0, 5))); + loginPanel.add(Box.createRigidArea(new Dimension(0, 4))); loginPanel.add(userInput); - loginPanel.add(Box.createRigidArea(new Dimension(0, 5))); + loginPanel.add(Box.createRigidArea(new Dimension(0, 4))); loginPanel.add(passwordLabel); - loginPanel.add(Box.createRigidArea(new Dimension(0, 5))); + loginPanel.add(Box.createRigidArea(new Dimension(0, 4))); loginPanel.add(passInput); - loginPanel.add(Box.createRigidArea(new Dimension(0, 5))); + loginPanel.add(Box.createRigidArea(new Dimension(0, 2))); loginPanel.add(login); - loginPanel.add(Box.createRigidArea(new Dimension(0, 5))); + loginPanel.add(Box.createRigidArea(new Dimension(0, 4))); add(loginPanel, new GridBagConstraints()); } @@ -205,10 +204,10 @@ public class VerboseLoader extends JPanel implements ProgressListener { g.setStroke(new BasicStroke(5)); g.setPaint(Color.WHITE); - g.draw(new Line2D.Float(0, 0, this.getWidth(), 0)); - g.draw(new Line2D.Float(0, 0, 0, 120)); - g.draw(new Line2D.Float(0, 120, this.getWidth(), 120)); - g.draw(new Line2D.Float(this.getWidth() - 6, 0, this.getWidth() - 6, 120)); + g.draw(new Line2D.Float(0, 1, this.getWidth(), 1)); //TOP + g.draw(new Line2D.Float(0, 0, 0, 120)); //LEFT + g.draw(new Line2D.Float(0, 120, this.getWidth(), 120)); //BOTTOM + g.draw(new Line2D.Float(this.getWidth() - 6, 0, this.getWidth() - 6, 120)); //RIGHT g.setColor(Color.white); @@ -284,4 +283,4 @@ public class VerboseLoader extends JPanel implements ProgressListener { public void updateDownloadSpeed(double mbPerSecond) { progressBar.setText(String.format("(%.2fMB/s)", mbPerSecond)); } -} +} \ No newline at end of file