Merge pull request #43 from Parabot/master

[MERGE] Master into Development

README.md

@@ -1,6 +1,6 @@
 # Parabot
 
-Parabot V2.4
+Parabot V2.4.
 
 #### Website
 

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

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.parabot</groupId>
     <artifactId>client</artifactId>
-    <version>2.4.1.1</version>
+    <version>2.4.3.2</version>
 
     <packaging>jar</packaging>
 

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() + "...");

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