Corrected the file paths for getting the plugins jar to be compatible…

… with any operating system
Taiterio · May 17, 2015 · 6b89761 · 6b89761
1 parent 469dd60
commit 6b89761
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -1,6 +1,6 @@
 name: CustomEnchantments
 main: com.taiter.ce.Main
-version: 2.3
+version: 2.3a
 
 softdepend: [WorldGuard, WorldEdit, Vault]
 

diff --git a/src/com/taiter/ce/Main.java b/src/com/taiter/ce/Main.java
@@ -500,14 +500,23 @@ public static void makeLists(boolean finalize, boolean printSuccess) {
 
 //--------------Dynamic enchantment class loading-------------------------------
     	try {
-			JarFile jar = new JarFile(plugin.getDataFolder().getParent() + "\\CustomEnchantments.jar");
+			JarFile jar = new JarFile(plugin.getDataFolder().getParent() + File.separator + "CustomEnchantments.jar");
 			Enumeration<JarEntry> entries = jar.entries();
 
             while (entries.hasMoreElements()) {
                 String entryName = entries.nextElement().getName();
                 if(!entryName.contains("$") && entryName.contains("Enchantments") && !entryName.contains("CEnchantment"))
                 	try {
-                		enchantments.add((CEnchantment) classLoader.loadClass(entryName.replace(".class", "").replaceAll("/", ".")).getDeclaredConstructor(Application.class).newInstance(Application.valueOf(entryName.split("/")[4].toUpperCase())));
+                		Application app = null;
+                		String className = entryName.replace(".class", "");
+                		if(entryName.contains("/")) {
+                			app = Application.valueOf(entryName.split("/")[4].toUpperCase());
+                			className = className.replaceAll("/", ".");
+                		} else if(entryName.contains("\\")) {
+                			app = Application.valueOf(entryName.split("\\")[4].toUpperCase());
+                			className = className.replaceAll("\\", ".");
+                		}
+                		enchantments.add((CEnchantment) classLoader.loadClass(className).getDeclaredConstructor(Application.class).newInstance(app));
                 	} catch(ClassNotFoundException e) {} //Checked exception, should never be thrown
             }