From 90d369a28078c6953fb683ad62690c0725dfbe81 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sat, 26 Dec 2015 17:37:46 +0100 Subject: [PATCH 1/7] [CLEANUP] Added dot in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd09b0e..d39fe36 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Parabot -Parabot V2.4 +Parabot V2.4. #### Website From 1b1fbaa3fea81d98a287c51a13d4431f34f15695 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 30 Dec 2015 15:30:43 +0100 Subject: [PATCH 2/7] [RELEASE] Released Parabot V2.4.1.1 --- org/parabot/client/2.4.1.1/client-2.4.1.1.pom | 9 +++++++++ org/parabot/client/maven-metadata-local.xml | 12 ++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 org/parabot/client/2.4.1.1/client-2.4.1.1.pom create mode 100644 org/parabot/client/maven-metadata-local.xml diff --git a/org/parabot/client/2.4.1.1/client-2.4.1.1.pom b/org/parabot/client/2.4.1.1/client-2.4.1.1.pom new file mode 100644 index 0000000..8f70aa5 --- /dev/null +++ b/org/parabot/client/2.4.1.1/client-2.4.1.1.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + org.parabot + client + 2.4.1.1 + POM was created from install:install-file + diff --git a/org/parabot/client/maven-metadata-local.xml b/org/parabot/client/maven-metadata-local.xml new file mode 100644 index 0000000..47ebf92 --- /dev/null +++ b/org/parabot/client/maven-metadata-local.xml @@ -0,0 +1,12 @@ + + + org.parabot + client + + 2.4.1.1 + + 2.4.1.1 + + 20151230142942 + + From 2da4ac0a380297c869a4fe81d7ed3d5dd186a512 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 30 Dec 2015 17:42:48 +0100 Subject: [PATCH 3/7] [BUGFIX] Remove maven repository out of main git --- org/parabot/client/2.4.1.1/client-2.4.1.1.pom | 9 --------- org/parabot/client/maven-metadata-local.xml | 12 ------------ 2 files changed, 21 deletions(-) delete mode 100644 org/parabot/client/2.4.1.1/client-2.4.1.1.pom delete mode 100644 org/parabot/client/maven-metadata-local.xml diff --git a/org/parabot/client/2.4.1.1/client-2.4.1.1.pom b/org/parabot/client/2.4.1.1/client-2.4.1.1.pom deleted file mode 100644 index 8f70aa5..0000000 --- a/org/parabot/client/2.4.1.1/client-2.4.1.1.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - org.parabot - client - 2.4.1.1 - POM was created from install:install-file - diff --git a/org/parabot/client/maven-metadata-local.xml b/org/parabot/client/maven-metadata-local.xml deleted file mode 100644 index 47ebf92..0000000 --- a/org/parabot/client/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - org.parabot - client - - 2.4.1.1 - - 2.4.1.1 - - 20151230142942 - - From 586cbf2423d00b41b09dab1f44d7f797e5b593df Mon Sep 17 00:00:00 2001 From: thekushstyle Date: Thu, 7 Jan 2016 00:41:29 +0100 Subject: [PATCH 4/7] Added MoneyMaking --- .../org/parabot/environment/scripts/Category.java | 2 +- .../storage/images/category/moneymaking.png | Bin 0 -> 848 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/main/resources/storage/images/category/moneymaking.png diff --git a/src/main/java/org/parabot/environment/scripts/Category.java b/src/main/java/org/parabot/environment/scripts/Category.java index fd0300e..9cad4c4 100644 --- a/src/main/java/org/parabot/environment/scripts/Category.java +++ b/src/main/java/org/parabot/environment/scripts/Category.java @@ -16,7 +16,7 @@ import java.util.HashMap; public enum Category { - AGILITY, COMBAT, COOKING, CRAFTING, CONSTRUCTION, DUNGEONEERING, FARMING, FIREMAKING, FISHING, FLETCHING, HERBLORE, HUNTER, MAGIC, MINIGAMES, MINING, OTHER, PRAYER, RUNECRAFTING, SLAYER, SMITHING, THIEVING, UTILITY, WOODCUTTING; + AGILITY, COMBAT, COOKING, CRAFTING, CONSTRUCTION, DUNGEONEERING, FARMING, FIREMAKING, FISHING, FLETCHING, HERBLORE, HUNTER, MAGIC, MINIGAMES, MINING, MONEYMAKING, OTHER, PRAYER, RUNECRAFTING, SLAYER, SMITHING, THIEVING, UTILITY, WOODCUTTING; /** * Gets image belonging to this category diff --git a/src/main/resources/storage/images/category/moneymaking.png b/src/main/resources/storage/images/category/moneymaking.png new file mode 100644 index 0000000000000000000000000000000000000000..e9ff388840491b4bac4b75fe138afa010cbf9a0c GIT binary patch literal 848 zcmV-W1F!svP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0>Mc{K~y+Tt&>|wR8bU$k289lac=6&IpZ*M zoKVu}p$y4D2+~sU!7dhQsgUJ^M2U10FDaEZS^8v!w@k4TXU1E0v3iLpB!!>?$x21+ zBE9wGBE2?jvg@LR?s^HWl&43PAwdhHPJDRaK>t-a2z39ljM-rY{nun{OBUA$Ek1MN zv&Vt%It$b)4$`y4XmcDE$2NcgHz!1d25s3W;>Qyw-uK$ka?Xr)YR{+(oUF(sFT14c0~n)4rS`#r8nKVV8-t48v0}rzsH<-)NIAv zh(iByNObr>ZZdg>K)shFl;rAzL2NN`&yMB_GxvhE#>^hNDdTLR5zkv}$la;+n?BB_ zHqa=eqQJ=3ga`mldmXgVikx&U#Bc#WsWnzyo^Qb0PCL#VF~Vx*hA+*L*(`VZ@M@4y zkgdb3RvTO=W1-Uu_)gvo@?rxfy6tEvi-BTQ@r|=X3fwLkWqI7wV9?QQJ)hF;^Jb)O z67h~&b-S$8nh78K92{hqxlfp(*7_P`l=_Af1X360=&1!8nJDw4&&JD�UYCJq}bI zi-tzzt&M;2DtLHB_M069s+@8w@X~0jX#;DkqekLI%(r3Eo-}@Dib>fdpk>;oR6@Iewv(^UrBc1oZpMUmCQY5=q>+Co;V8R4ihQd~znzN=+!xT2Ztt3tt5U a0O2pTni9;iK5{Go0000 Date: Sat, 9 Jan 2016 18:59:17 +0100 Subject: [PATCH 5/7] resized MoneyMaking --- .../storage/images/category/moneymaking.png | Bin 848 -> 893 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/storage/images/category/moneymaking.png b/src/main/resources/storage/images/category/moneymaking.png index e9ff388840491b4bac4b75fe138afa010cbf9a0c..ddcf50f04e52b11b350bd7094b6a78fbe76da0c5 100644 GIT binary patch delta 825 zcmV-91IGN&2K@$*7YY&x1^@s6R?d!BkuDnw!T0S(=%a zOQV(>Emj~zB%&DIG;D>X*^Z(!dH!kOtba$-89i>D(nBueFvoLd9Y5MuBA}&6KuxZW^7)Pz=ZN^!C*gIA z1uf_FaB=x5)LCx8`yP=A1ud0RKG*T$1cDErJVS&=+RV6dLI=qxqX9AWt^1+@GyM`8 zNv6Te{votxxdI=0Bn&n9q3Vzpw@HbSAqpC#>?{*7)hXh7o_{YQf?O8~>2}5`ZOL&e z8#!A;0~Gk!E8+Q7Bkq$7?iT4$kgBFZLH9}pjM*)?c3g+JDEEaz(JK`VMHw0trurao ziTq($paQfccvO zkh*DUpGhCO%6|peNh#eG#`!YNr*Bogo9rM%AX#SEyeQYpMCNdGoTOWq?~4FY4wH_@ zG|9+bMx9l7cEt~SH+jO#gH3N@s!L=a$WHX8cWOTndLdhbN7Y8;Bzd#FneJP{gtE4) z@Uq^_$~FtEyjj}pcG9a%M@9>TI9sd-25U`hN}_>hJAc$)WyG;PY794Df;)=;m z3mJfbw9S7IdQoR$`$2=7$;ek*6)M4EFh2A_(X?@n}vEL#Vr=1P*GE>xGg;u24wAE^$%@}b(b1X z>rtAe#pPVxSIH#%R5(BD3c~;Z4#NS*Z>VIE zMkjy4NkldZOgFms$x(&(WK$v_CwQt-hp7HO%F<%2|t zbQ3Qrl{H!VWQDg(u@Yy-TXwN}i6|t6paRKCMeHKI_2lE<+It+CK^tFM@XxT%TKhX^ z{cCRlz<-hNXYD8qkcvGBh`?M((2mYp3)+9GNYxgEtA&*!y*6yJ>!O72dI_zRr$?0` zK?|c!e0bnM|5Z5%bpNu9*9a~u}OHh=*) zCq#q>ZP_T|#}g;s_uA2N&Wv_y&!`LIg~K-G9-C7ALN$Y^NE`#25*tkdSH9mh) zDrun6im!tT_b($gauq1Abe{ny_8QotJ|#)SucuDDxD|(m$MJaGW<#P~&2q_}>oUF( zsFT14c0~n)4rS`#r8nKVV8-t48v0}rzsH<-)NIAvh(iByNObr>ZZdg>K)shFl;rAz zL2NN`&yMB_GxvhE#>^hNDdTLR5zl{HY{=cI^_xDh+fF;q95KRb=7ulLk=ZPF`tWLyP>`*|t5zFaCu5=03iwXm4Dw6pLkiq38D)9g(_qliY(1aS?ek`&ZW8g1T6Mdu)S3w&`y789WS6;5 zn4#AC8f29Eh7$x*7w71y1sjGQ9CrEMkm&awgJBO(@V>QM4=zUj+mJ;V-tD63ntbax4G<002ov JPDHLkV1js-b;JMw From 968738243cdf38789fe826e778c03611d2080876 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sun, 10 Jan 2016 20:31:06 +0100 Subject: [PATCH 6/7] [BUGFIX] Solved an issue that causes JavaFX not to be parsed correctly --- deploy/deploy.bat | 1 + pom.xml | 2 +- .../org/parabot/environment/Environment.java | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/deploy/deploy.bat b/deploy/deploy.bat index 94fc6d1..0ed46fe 100644 --- a/deploy/deploy.bat +++ b/deploy/deploy.bat @@ -1,3 +1,4 @@ mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.artifactId} -Dversion=${project.version} -Dpackaging=jar -Dfile=../target/${project.build.finalName}-fat.jar -DlocalRepositoryPath=../../Maven-Repository :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository +:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.3-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository diff --git a/pom.xml b/pom.xml index 7640c2e..c388333 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot client - 2.4.1.1 + 2.4.3 jar diff --git a/src/main/java/org/parabot/environment/Environment.java b/src/main/java/org/parabot/environment/Environment.java index c8c8759..7964123 100644 --- a/src/main/java/org/parabot/environment/Environment.java +++ b/src/main/java/org/parabot/environment/Environment.java @@ -33,14 +33,16 @@ public class Environment { libs.add(new Naga()); for(Library lib : libs) { - if(!lib.hasJar() && lib.requiresJar()) { - Core.verbose("Downloading " + lib.getLibraryName() + "..."); - VerboseLoader.setState("Downloading " + lib.getLibraryName() + "..."); - WebUtil.downloadFile(lib.getDownloadLink(), lib.getJarFile(), VerboseLoader.get()); - Core.verbose("Downloaded " + lib.getLibraryName() + "."); + if (lib.requiresJar()) { + if (!lib.hasJar()) { + Core.verbose("Downloading " + lib.getLibraryName() + "..."); + VerboseLoader.setState("Downloading " + lib.getLibraryName() + "..."); + WebUtil.downloadFile(lib.getDownloadLink(), lib.getJarFile(), VerboseLoader.get()); + Core.verbose("Downloaded " + lib.getLibraryName() + "."); + } + Core.verbose("Initializing " + lib.getLibraryName()); + lib.init(); } - Core.verbose("Initializing " + lib.getLibraryName()); - lib.init(); } Core.verbose("Loading server: " + desc.toString() + "..."); From 3835bc235553a26c72311ca8211c0fe91cb655c8 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sun, 10 Jan 2016 20:31:49 +0100 Subject: [PATCH 7/7] [RELEASE] Released Parabot V2.4.3.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c388333..d82d201 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot client - 2.4.3 + 2.4.3.2 jar