From 6bb0545f0c635f0e01458c4b8e8bbf5531eb93bd Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Mon, 14 Sep 2015 16:43:13 +0200 Subject: [PATCH] Updated version and added maven support for the build-in client version --- deploy/deploy.bat | 3 ++- pom.xml | 2 +- src/main/java/org/parabot/core/Configuration.java | 2 +- .../java/org/parabot/core/ProjectProperties.java | 8 +++----- src/main/java/org/parabot/core/ui/BotUI.java | 6 +++--- src/main/java/org/parabot/core/ui/LoginUI.java | 2 +- .../parabot/core/ui/components/VerboseLoader.java | 2 +- .../java/org/parabot/core/ui/utils/SwingUtil.java | 4 ++-- .../org/parabot/environment/scripts/Category.java | 4 ++-- src/main/resources/{ => storage}/app.properties | 0 src/main/resources/{ => storage}/images/add.png | Bin .../resources/{ => storage}/images/background.png | Bin .../{ => storage}/images/category/agility.png | Bin .../{ => storage}/images/category/combat.png | Bin .../{ => storage}/images/category/cooking.png | Bin .../{ => storage}/images/category/crafting.png | Bin .../{ => storage}/images/category/dungeoneering.png | Bin .../{ => storage}/images/category/farming.png | Bin .../{ => storage}/images/category/firemaking.png | Bin .../{ => storage}/images/category/fishing.png | Bin .../{ => storage}/images/category/fletching.png | Bin .../{ => storage}/images/category/herblore.png | Bin .../{ => storage}/images/category/hunter.png | Bin .../{ => storage}/images/category/magic.png | Bin .../{ => storage}/images/category/minigames.png | Bin .../{ => storage}/images/category/mining.png | Bin .../{ => storage}/images/category/other.png | Bin .../{ => storage}/images/category/prayer.png | Bin .../{ => storage}/images/category/runecrafting.png | Bin .../{ => storage}/images/category/script.png | Bin .../{ => storage}/images/category/slayer.png | Bin .../{ => storage}/images/category/smithing.png | Bin .../{ => storage}/images/category/thieving.png | Bin .../{ => storage}/images/category/utility.png | Bin .../{ => storage}/images/category/woodcutting.png | Bin src/main/resources/{ => storage}/images/close.png | Bin .../resources/{ => storage}/images/close_red.png | Bin src/main/resources/{ => storage}/images/icon.png | Bin src/main/resources/{ => storage}/images/para.png | Bin src/main/resources/{ => storage}/images/pause.png | Bin src/main/resources/{ => storage}/images/run.png | Bin src/main/resources/{ => storage}/images/stop.png | Bin 42 files changed, 16 insertions(+), 17 deletions(-) rename src/main/resources/{ => storage}/app.properties (100%) rename src/main/resources/{ => storage}/images/add.png (100%) rename src/main/resources/{ => storage}/images/background.png (100%) rename src/main/resources/{ => storage}/images/category/agility.png (100%) rename src/main/resources/{ => storage}/images/category/combat.png (100%) rename src/main/resources/{ => storage}/images/category/cooking.png (100%) rename src/main/resources/{ => storage}/images/category/crafting.png (100%) rename src/main/resources/{ => storage}/images/category/dungeoneering.png (100%) rename src/main/resources/{ => storage}/images/category/farming.png (100%) rename src/main/resources/{ => storage}/images/category/firemaking.png (100%) rename src/main/resources/{ => storage}/images/category/fishing.png (100%) rename src/main/resources/{ => storage}/images/category/fletching.png (100%) rename src/main/resources/{ => storage}/images/category/herblore.png (100%) rename src/main/resources/{ => storage}/images/category/hunter.png (100%) rename src/main/resources/{ => storage}/images/category/magic.png (100%) rename src/main/resources/{ => storage}/images/category/minigames.png (100%) rename src/main/resources/{ => storage}/images/category/mining.png (100%) rename src/main/resources/{ => storage}/images/category/other.png (100%) rename src/main/resources/{ => storage}/images/category/prayer.png (100%) rename src/main/resources/{ => storage}/images/category/runecrafting.png (100%) rename src/main/resources/{ => storage}/images/category/script.png (100%) rename src/main/resources/{ => storage}/images/category/slayer.png (100%) rename src/main/resources/{ => storage}/images/category/smithing.png (100%) rename src/main/resources/{ => storage}/images/category/thieving.png (100%) rename src/main/resources/{ => storage}/images/category/utility.png (100%) rename src/main/resources/{ => storage}/images/category/woodcutting.png (100%) rename src/main/resources/{ => storage}/images/close.png (100%) rename src/main/resources/{ => storage}/images/close_red.png (100%) rename src/main/resources/{ => storage}/images/icon.png (100%) rename src/main/resources/{ => storage}/images/para.png (100%) rename src/main/resources/{ => storage}/images/pause.png (100%) rename src/main/resources/{ => storage}/images/run.png (100%) rename src/main/resources/{ => storage}/images/stop.png (100%) diff --git a/deploy/deploy.bat b/deploy/deploy.bat index 20d2022..19c33a8 100644 --- a/deploy/deploy.bat +++ b/deploy/deploy.bat @@ -2,4 +2,5 @@ mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.art :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.2.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.2.3.jar -DlocalRepositoryPath=../../Maven-Repository :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.2.32 -Dpackaging=jar -Dfile=../target/Parabot-V2.2.32.jar -DlocalRepositoryPath=../../Maven-Repository -:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.2.33 -Dpackaging=jar -Dfile=../target/Parabot-V2.2.33.jar -DlocalRepositoryPath=../../Maven-Repository \ No newline at end of file +:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.2.33 -Dpackaging=jar -Dfile=../target/Parabot-V2.2.33.jar -DlocalRepositoryPath=../../Maven-Repository +:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.2.34 -Dpackaging=jar -Dfile=../target/Parabot-V2.2.34.jar -DlocalRepositoryPath=../../Maven-Repository \ No newline at end of file diff --git a/pom.xml b/pom.xml index 099abbf..d6e4b32 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot client - 2.2.33 + 2.2.34 jar diff --git a/src/main/java/org/parabot/core/Configuration.java b/src/main/java/org/parabot/core/Configuration.java index 4bb7782..b206b33 100644 --- a/src/main/java/org/parabot/core/Configuration.java +++ b/src/main/java/org/parabot/core/Configuration.java @@ -21,5 +21,5 @@ public class Configuration { public static final String DATA_API = "http://bdn.parabot.org/api/v2/data/"; public static final String ITEM_API = DATA_API + "items/"; - public static final String BOT_VERSION = "2.2.33"; + public static final String BOT_VERSION = (String) ProjectProperties.getProjectVersion(); } diff --git a/src/main/java/org/parabot/core/ProjectProperties.java b/src/main/java/org/parabot/core/ProjectProperties.java index a4c9bd9..ba5e22f 100644 --- a/src/main/java/org/parabot/core/ProjectProperties.java +++ b/src/main/java/org/parabot/core/ProjectProperties.java @@ -6,7 +6,6 @@ import java.util.Properties; /** * @author JKetelaar - * @deprecated */ public class ProjectProperties { @@ -20,13 +19,12 @@ public class ProjectProperties { private void setProperties(){ InputStream input; try { - String propertiesFileName = "/app.properties"; + String propertiesFileName = "storage/app.properties"; - Properties properties = new Properties(); - InputStream inputStream = ProjectProperties.class.getClassLoader() + input = getClass().getClassLoader() .getResourceAsStream(propertiesFileName); - cached.load(inputStream); + cached.load(input); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/org/parabot/core/ui/BotUI.java b/src/main/java/org/parabot/core/ui/BotUI.java index ddb2ff4..060b17a 100644 --- a/src/main/java/org/parabot/core/ui/BotUI.java +++ b/src/main/java/org/parabot/core/ui/BotUI.java @@ -84,15 +84,15 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener, JMenuItem exit = new JMenuItem("Exit"); run = new JMenuItem("Run"); - run.setIcon(new ImageIcon(Images.getResource("/images/run.png"))); + run.setIcon(new ImageIcon(Images.getResource("/storage/images/run.png"))); pause = new JMenuItem("Pause"); pause.setEnabled(false); - pause.setIcon(new ImageIcon(Images.getResource("/images/pause.png"))); + pause.setIcon(new ImageIcon(Images.getResource("/storage/images/pause.png"))); stop = new JMenuItem("Stop"); stop.setEnabled(false); - stop.setIcon(new ImageIcon(Images.getResource("/images/stop.png"))); + stop.setIcon(new ImageIcon(Images.getResource("/storage/images/stop.png"))); screenshot.addActionListener(this); proxy.addActionListener(this); diff --git a/src/main/java/org/parabot/core/ui/LoginUI.java b/src/main/java/org/parabot/core/ui/LoginUI.java index bc7e0b2..3bf6b35 100644 --- a/src/main/java/org/parabot/core/ui/LoginUI.java +++ b/src/main/java/org/parabot/core/ui/LoginUI.java @@ -95,7 +95,7 @@ public class LoginUI extends JFrame { RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); g.drawImage(Images - .getResource("/images/para.png"), + .getResource("/storage/images/para.png"), 0, 8, 250, 45, null); } }; 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 b9d076d..9ab8c70 100644 --- a/src/main/java/org/parabot/core/ui/components/VerboseLoader.java +++ b/src/main/java/org/parabot/core/ui/components/VerboseLoader.java @@ -51,7 +51,7 @@ public class VerboseLoader extends JPanel implements ProgressListener { throw new IllegalStateException("MainScreenComponent already made."); } current = this; - this.background = Images.getResource("/images/background.png"); + this.background = Images.getResource("/storage/images/background.png"); this.progressBar = new ProgressBar(400, 20); setLayout(new GridBagLayout()); setSize(775, 510); diff --git a/src/main/java/org/parabot/core/ui/utils/SwingUtil.java b/src/main/java/org/parabot/core/ui/utils/SwingUtil.java index e0e20a9..52b7e1a 100644 --- a/src/main/java/org/parabot/core/ui/utils/SwingUtil.java +++ b/src/main/java/org/parabot/core/ui/utils/SwingUtil.java @@ -29,7 +29,7 @@ public class SwingUtil { } public static void setParabotIcons(JFrame f) { - f.setIconImage(Images.getResource("/images/icon.png")); + f.setIconImage(Images.getResource("/storage/images/icon.png")); if(OperatingSystem.getOS() == OperatingSystem.MAC) { /** Adds the dock icon to mac users */ @@ -37,7 +37,7 @@ public class SwingUtil { Class util = Class.forName("com.apple.eawt.Application"); Object application = util.getMethod("getApplication", new Class[] { }).invoke(null); Method setDockIconImage = util.getMethod("setDockIconImage", new Class[] { Image.class }); - setDockIconImage.invoke(application, Images.getResource("/images/icon.png")); + setDockIconImage.invoke(application, Images.getResource("/storage/images/icon.png")); } catch (ClassNotFoundException | NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) { } catch (Throwable t) { t.printStackTrace(); diff --git a/src/main/java/org/parabot/environment/scripts/Category.java b/src/main/java/org/parabot/environment/scripts/Category.java index 092cc68..e34aa14 100644 --- a/src/main/java/org/parabot/environment/scripts/Category.java +++ b/src/main/java/org/parabot/environment/scripts/Category.java @@ -33,7 +33,7 @@ public enum Category */ public static BufferedImage getIcon(String s) { if (images.get(s) == null) { - images.put(s, Images.getResource("/images/category/" + s + ".png")); + images.put(s, Images.getResource("/resources/images/category/" + s + ".png")); } return images.get(s); } @@ -52,7 +52,7 @@ public enum Category private static HashMap images = new HashMap<>(); static { - images.put("script", Images.getResource("/images/category/script.png")); + images.put("script", Images.getResource("/storage/images/category/script.png")); } } diff --git a/src/main/resources/app.properties b/src/main/resources/storage/app.properties similarity index 100% rename from src/main/resources/app.properties rename to src/main/resources/storage/app.properties diff --git a/src/main/resources/images/add.png b/src/main/resources/storage/images/add.png similarity index 100% rename from src/main/resources/images/add.png rename to src/main/resources/storage/images/add.png diff --git a/src/main/resources/images/background.png b/src/main/resources/storage/images/background.png similarity index 100% rename from src/main/resources/images/background.png rename to src/main/resources/storage/images/background.png diff --git a/src/main/resources/images/category/agility.png b/src/main/resources/storage/images/category/agility.png similarity index 100% rename from src/main/resources/images/category/agility.png rename to src/main/resources/storage/images/category/agility.png diff --git a/src/main/resources/images/category/combat.png b/src/main/resources/storage/images/category/combat.png similarity index 100% rename from src/main/resources/images/category/combat.png rename to src/main/resources/storage/images/category/combat.png diff --git a/src/main/resources/images/category/cooking.png b/src/main/resources/storage/images/category/cooking.png similarity index 100% rename from src/main/resources/images/category/cooking.png rename to src/main/resources/storage/images/category/cooking.png diff --git a/src/main/resources/images/category/crafting.png b/src/main/resources/storage/images/category/crafting.png similarity index 100% rename from src/main/resources/images/category/crafting.png rename to src/main/resources/storage/images/category/crafting.png diff --git a/src/main/resources/images/category/dungeoneering.png b/src/main/resources/storage/images/category/dungeoneering.png similarity index 100% rename from src/main/resources/images/category/dungeoneering.png rename to src/main/resources/storage/images/category/dungeoneering.png diff --git a/src/main/resources/images/category/farming.png b/src/main/resources/storage/images/category/farming.png similarity index 100% rename from src/main/resources/images/category/farming.png rename to src/main/resources/storage/images/category/farming.png diff --git a/src/main/resources/images/category/firemaking.png b/src/main/resources/storage/images/category/firemaking.png similarity index 100% rename from src/main/resources/images/category/firemaking.png rename to src/main/resources/storage/images/category/firemaking.png diff --git a/src/main/resources/images/category/fishing.png b/src/main/resources/storage/images/category/fishing.png similarity index 100% rename from src/main/resources/images/category/fishing.png rename to src/main/resources/storage/images/category/fishing.png diff --git a/src/main/resources/images/category/fletching.png b/src/main/resources/storage/images/category/fletching.png similarity index 100% rename from src/main/resources/images/category/fletching.png rename to src/main/resources/storage/images/category/fletching.png diff --git a/src/main/resources/images/category/herblore.png b/src/main/resources/storage/images/category/herblore.png similarity index 100% rename from src/main/resources/images/category/herblore.png rename to src/main/resources/storage/images/category/herblore.png diff --git a/src/main/resources/images/category/hunter.png b/src/main/resources/storage/images/category/hunter.png similarity index 100% rename from src/main/resources/images/category/hunter.png rename to src/main/resources/storage/images/category/hunter.png diff --git a/src/main/resources/images/category/magic.png b/src/main/resources/storage/images/category/magic.png similarity index 100% rename from src/main/resources/images/category/magic.png rename to src/main/resources/storage/images/category/magic.png diff --git a/src/main/resources/images/category/minigames.png b/src/main/resources/storage/images/category/minigames.png similarity index 100% rename from src/main/resources/images/category/minigames.png rename to src/main/resources/storage/images/category/minigames.png diff --git a/src/main/resources/images/category/mining.png b/src/main/resources/storage/images/category/mining.png similarity index 100% rename from src/main/resources/images/category/mining.png rename to src/main/resources/storage/images/category/mining.png diff --git a/src/main/resources/images/category/other.png b/src/main/resources/storage/images/category/other.png similarity index 100% rename from src/main/resources/images/category/other.png rename to src/main/resources/storage/images/category/other.png diff --git a/src/main/resources/images/category/prayer.png b/src/main/resources/storage/images/category/prayer.png similarity index 100% rename from src/main/resources/images/category/prayer.png rename to src/main/resources/storage/images/category/prayer.png diff --git a/src/main/resources/images/category/runecrafting.png b/src/main/resources/storage/images/category/runecrafting.png similarity index 100% rename from src/main/resources/images/category/runecrafting.png rename to src/main/resources/storage/images/category/runecrafting.png diff --git a/src/main/resources/images/category/script.png b/src/main/resources/storage/images/category/script.png similarity index 100% rename from src/main/resources/images/category/script.png rename to src/main/resources/storage/images/category/script.png diff --git a/src/main/resources/images/category/slayer.png b/src/main/resources/storage/images/category/slayer.png similarity index 100% rename from src/main/resources/images/category/slayer.png rename to src/main/resources/storage/images/category/slayer.png diff --git a/src/main/resources/images/category/smithing.png b/src/main/resources/storage/images/category/smithing.png similarity index 100% rename from src/main/resources/images/category/smithing.png rename to src/main/resources/storage/images/category/smithing.png diff --git a/src/main/resources/images/category/thieving.png b/src/main/resources/storage/images/category/thieving.png similarity index 100% rename from src/main/resources/images/category/thieving.png rename to src/main/resources/storage/images/category/thieving.png diff --git a/src/main/resources/images/category/utility.png b/src/main/resources/storage/images/category/utility.png similarity index 100% rename from src/main/resources/images/category/utility.png rename to src/main/resources/storage/images/category/utility.png diff --git a/src/main/resources/images/category/woodcutting.png b/src/main/resources/storage/images/category/woodcutting.png similarity index 100% rename from src/main/resources/images/category/woodcutting.png rename to src/main/resources/storage/images/category/woodcutting.png diff --git a/src/main/resources/images/close.png b/src/main/resources/storage/images/close.png similarity index 100% rename from src/main/resources/images/close.png rename to src/main/resources/storage/images/close.png diff --git a/src/main/resources/images/close_red.png b/src/main/resources/storage/images/close_red.png similarity index 100% rename from src/main/resources/images/close_red.png rename to src/main/resources/storage/images/close_red.png diff --git a/src/main/resources/images/icon.png b/src/main/resources/storage/images/icon.png similarity index 100% rename from src/main/resources/images/icon.png rename to src/main/resources/storage/images/icon.png diff --git a/src/main/resources/images/para.png b/src/main/resources/storage/images/para.png similarity index 100% rename from src/main/resources/images/para.png rename to src/main/resources/storage/images/para.png diff --git a/src/main/resources/images/pause.png b/src/main/resources/storage/images/pause.png similarity index 100% rename from src/main/resources/images/pause.png rename to src/main/resources/storage/images/pause.png diff --git a/src/main/resources/images/run.png b/src/main/resources/storage/images/run.png similarity index 100% rename from src/main/resources/images/run.png rename to src/main/resources/storage/images/run.png diff --git a/src/main/resources/images/stop.png b/src/main/resources/storage/images/stop.png similarity index 100% rename from src/main/resources/images/stop.png rename to src/main/resources/storage/images/stop.png