v1.1.6 Update

- Major ConfigManager.java fixes - Minor bug fixes
AlbeMiglio · Nov 8, 2020 · fc84b1d · fc84b1d
1 parent 489b515
commit fc84b1d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/Example/pom.xml b/Example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PowerLibAPI</artifactId>
         <groupId>it.mycraft</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>PowerLibExample</artifactId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>it.mycraft</groupId>
             <artifactId>PowerLib</artifactId>
-            <version>1.1.5</version>
+            <version>1.1.6</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/Java/pom.xml b/Java/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PowerLibAPI</artifactId>
         <groupId>it.mycraft</groupId>
-        <version>1.1.5</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/Java/src/main/java/it/mycraft/powerlib/PowerLib.java b/Java/src/main/java/it/mycraft/powerlib/PowerLib.java
@@ -23,11 +23,11 @@ public class PowerLib extends JavaPlugin implements Listener {
     @Getter
     private static PowerLib instance;
 
-    private PluginUpdater pluginUpdater;
+    private PluginUpdater updater;
 
     public void onEnable() {
         instance = this;
-        this.pluginUpdater = new PluginUpdater(this).setSpigotURL(83274);
+        this.updater = new PluginUpdater(this).setSpigotURL(83274);
         Bukkit.getPluginManager().registerEvents(this, this);
     }
 
@@ -37,13 +37,13 @@ public void onJoin(PlayerJoinEvent event) {
         if (!player.isOp() && !player.hasPermission("powerlib.update")) {
             return;
         }
-        if (this.pluginUpdater.needsUpdate()) {
+        if (this.updater.needsUpdate()) {
             Message m = new Message("&c&lYour version of PowerLib is outdated!");
             Message m1 = new Message("&a&nClick here to update to v{version}!")
-                    .addPlaceHolder("{version}", this.pluginUpdater.getLatestVersion());
+                    .addPlaceHolder("{version}", this.updater.getLatestVersion());
             TextComponent update = new TextComponent((m1.getText()));
             update.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL,
-                    "https://spigotmc.org/resources/83274/download?version=" + this.pluginUpdater.getSpigotVersionId()));
+                    "https://spigotmc.org/resources/83274/download?version=" + this.updater.getSpigotVersionId()));
             m.send(player);
             player.spigot().sendMessage(update);
         }

diff --git a/Java/src/main/java/it/mycraft/powerlib/config/ConfigManager.java b/Java/src/main/java/it/mycraft/powerlib/config/ConfigManager.java
@@ -49,6 +49,7 @@ public FileConfiguration create(String file, String source) {
         if (!resourcePath.exists()) {
             createYAML(resourcePath.getName(), source, false);
         }
+        else this.reload(file);
         return this.configs.get(file);
     }
 
@@ -110,7 +111,6 @@ public void reload(String file) {
             } else {
                 yamlConfig = YamlConfiguration.loadConfiguration(new InputStreamReader(defStream, Charsets.UTF_8));
             }
-
             conf.setDefaults(yamlConfig);
             this.put(file, conf);
         }
@@ -185,8 +185,7 @@ private void createYAML(String resourcePath, String source, boolean replace) {
                 }
 
             }
-            FileConfiguration conf = this.load(resourcePath);
-            this.put(resourcePath, conf);
+            this.reload(resourcePath);
         } else {
             throw new IllegalArgumentException("ResourcePath cannot be null or empty");
         }

diff --git a/Java/src/main/java/it/mycraft/powerlib/item/ItemBuilder.java b/Java/src/main/java/it/mycraft/powerlib/item/ItemBuilder.java
@@ -333,9 +333,10 @@ private ItemStack setPlayerSkin(ItemBuilder itemBuilder, String playerName) {
     private ItemStack setColorToArmor(int red, int green, int blue, ItemBuilder itemBuilder) {
         ItemStack leatherArmor = itemBuilder.setMaterial(material).setName(name).setLore(lore).build();
         LeatherArmorMeta leatherArmorMeta = (LeatherArmorMeta) leatherArmor.getItemMeta();
-        Color color = Color.fromRGB(red, green, blue);
-
-        leatherArmorMeta.setColor(color);
+        try {
+            Color color = Color.fromRGB(red, green, blue);
+            leatherArmorMeta.setColor(color);
+        } catch(Exception ignored) { }
         leatherArmor.setItemMeta(leatherArmorMeta);
         return leatherArmor;
     }

diff --git a/Java/src/main/resources/plugin.yml b/Java/src/main/resources/plugin.yml
@@ -1,4 +1,4 @@
 name: PowerLib
 authors: [AlbeMiglio, pompiere1]
 main: it.mycraft.powerlib.PowerLib
-version: 1.1.5
+version: 1.1.6
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@
 	    <dependency>
             	<groupId>it.albemiglio.PowerLib</groupId>
             	<artifactId>PowerLib</artifactId>
-            	<version>1.1.5</version>
+            	<version>1.1.6</version>
             </dependency>
 	</dependencies>
 ```
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>it.mycraft</groupId>
     <artifactId>PowerLibAPI</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
     <modules>
         <module>Example</module>
         <module>Java</module>