Fix Compile error and bump version

Andre601 · May 10, 2021 · 8f84790 · 8f84790
1 parent 782b7d6
commit 8f84790
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/bungeecord/pom.xml b/bungeecord/pom.xml
@@ -123,6 +123,7 @@
                             <excludes>
                                 <exclude>META-INF/*.SF</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
+                                <exclude>META-INF/versions/16/</exclude>
                             </excludes>
                         </filter>
                     </filters>

diff --git a/core/src/main/java/com/andre601/oneversionremake/core/files/ConfigHandler.java b/core/src/main/java/com/andre601/oneversionremake/core/files/ConfigHandler.java
@@ -19,6 +19,7 @@
 package com.andre601.oneversionremake.core.files;
 
 import com.andre601.oneversionremake.core.OneVersionRemake;
+import com.andre601.oneversionremake.core.interfaces.ProxyLogger;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
@@ -34,6 +35,7 @@
 public class ConfigHandler{
 
     private final OneVersionRemake core;
+    private final ProxyLogger logger;
 
     private final File config;
     private final File path;
@@ -42,22 +44,28 @@ public class ConfigHandler{
 
     public ConfigHandler(OneVersionRemake core, Path path){
         this.core = core;
+        logger = core.getProxyLogger();
 
         this.config = new File(path.toFile(), "config.yml");
         this.path = path.toFile();
     }
 
     public boolean loadConfig(){
         if(!path.isDirectory() && !path.mkdirs()){
-            core.getProxyLogger().warn("Could not create folder for plugin!");
+            logger.warn("Could not create folder for plugin!");
             return false;
         }
 
         if(!config.exists()){
             try(InputStream is = core.getClass().getResourceAsStream("/config.yml")){
+                if(is == null){
+                    logger.warn("Unable to create config file! InputStream was null.");
+                    return false;
+                }
+
                 Files.copy(is, config.toPath());
             }catch(IOException ex){
-                core.getProxyLogger().warn("Unable to create config file!", ex);
+                logger.warn("Unable to create config file!", ex);
                 return false;
             }
         }
@@ -69,7 +77,7 @@ public boolean loadConfig(){
         try{
             node = loader.load();
         }catch(IOException ex){
-            core.getProxyLogger().warn("There was an issue while attempting to load the config.", ex);
+            logger.warn("There was an issue while attempting to load the config.", ex);
             return false;
         }
 
@@ -85,7 +93,7 @@ public boolean reload(){
             node = loader.load();
             return true;
         }catch(IOException ex){
-            core.getProxyLogger().warn("There was an issue while attempting to reload the config", ex);
+            logger.warn("There was an issue while attempting to reload the config", ex);
             return false;
         }
     }

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <plugin.version>3.4.0</plugin.version>
+        <plugin.version>3.4.1</plugin.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
     </properties>

diff --git a/velocity/pom.xml b/velocity/pom.xml
@@ -111,6 +111,7 @@
                             <excludes>
                                 <exclude>META-INF/*.SF</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
+                                <exclude>META-INF/versions/16/</exclude>
                             </excludes>
                         </filter>
                     </filters>