Merge pull request #18 from ProjectG-Plugins/1.2.1

don't disable when failing to load git.properties

src/main/java/dev/projectg/geyserhub/GeyserHubMain.java

@@ -31,19 +31,20 @@ public void onEnable() {
         new Metrics(this, 11427);
         // getting the logger forces the config to load before our loadConfiguration() is called...
         SelectorLogger logger = SelectorLogger.getLogger();
-        if (!Bukkit.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
-            logger.warn("This plugin works best with PlaceholderAPI! Since you don't have it installed, only %player_name% and %player_uuid% will work in the GeyserHub config!");
-        }
 
         try {
             Properties gitProperties = new Properties();
             gitProperties.load(FileUtils.getResource("git.properties"));
             logger.info("Branch: " + gitProperties.getProperty("git.branch", "Unknown") + ", Commit: " + gitProperties.getProperty("git.commit.id.abbrev", "Unknown"));
-        } catch (IOException e) {
+        } catch (IOException | NullPointerException | IllegalArgumentException e) {
             logger.warn("Unable to load resource: git.properties");
             e.printStackTrace();
         }
 
+        if (!Bukkit.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")) {
+            logger.warn("This plugin works best with PlaceholderAPI! Since you don't have it installed, only %player_name% and %player_uuid% will work in the GeyserHub config!");
+        }
+
         configManager = new ConfigManager();
         if (!configManager.loadAllConfigs()) {
             logger.severe("Disabling due to configuration error.");

src/main/java/dev/projectg/geyserhub/utils/FileUtils.java

@@ -1,14 +1,12 @@
 package dev.projectg.geyserhub.utils;
 
+import javax.annotation.Nullable;
 import java.io.InputStream;
 
 public class FileUtils {
 
+    @Nullable
     public static InputStream getResource(String resource) {
-        InputStream stream = FileUtils.class.getClassLoader().getResourceAsStream(resource);
-        if (stream == null) {
-            throw new AssertionError("Unable to find resource: " + resource);
-        }
-        return stream;
+        return FileUtils.class.getClassLoader().getResourceAsStream(resource);
     }
 }