Adds support to 1.17

Adds ManagerDirector#isPlaceholderAPIEnabled
anjoismysign · Oct 22, 2023 · 0806ee7 · 0806ee7
1 parent 8c6b3c3
commit 0806ee7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/ci-pom.xml b/ci-pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>us.mytheria</groupId>
         <artifactId>BlobLib</artifactId>
-        <version>1.697.20</version>
+        <version>1.697.21</version>
         <relativePath>pom.xml</relativePath>
     </parent>
     <artifactId>bloblib</artifactId>

diff --git a/local-pom.xml b/local-pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>us.mytheria</groupId>
         <artifactId>BlobLib</artifactId>
-        <version>1.697.20</version>
+        <version>1.697.21</version>
         <relativePath>pom.xml</relativePath>
     </parent>
     <artifactId>bloblib</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>us.mytheria</groupId>
     <artifactId>BlobLib</artifactId>
-    <version>1.697.20</version>
+    <version>1.697.21</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/src/main/java/us/mytheria/bloblib/managers/ManagerDirector.java b/src/main/java/us/mytheria/bloblib/managers/ManagerDirector.java
@@ -258,14 +258,23 @@ public <T extends BlobSerializable> void addListenerBlobSerializableManager(Stri
      * @param consumer   The consumer that will consume the expansion
      */
     public void instantiateBlobPHExpansion(String identifier, Consumer<BlobPHExpansion> consumer) {
-        if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") == null) {
-            getPlugin().getAnjoLogger().log("PlaceholderAPI not found, not registering PlaceholderAPI expansion for " + getPlugin().getName());
+        if (!isPlaceholderAPIEnabled()) {
+            getPlugin().getAnjoLogger().log("PlaceholderAPI not found, not instantiating PlaceholderAPI expansion for " + getPlugin().getName());
             return;
         }
         BlobPHExpansion expansion = new BlobPHExpansion(getPlugin(), identifier);
         consumer.accept(expansion);
     }
 
+    /**
+     * Checks whether PlaceholderAPI is enabled.
+     *
+     * @return Whether PlaceholderAPI is enabled.
+     */
+    public boolean isPlaceholderAPIEnabled() {
+        return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
+    }
+
     /**
      * Adds a wallet owner manager to the director.
      *

diff --git a/src/main/java/us/mytheria/bloblib/utilities/ResourceUtil.java b/src/main/java/us/mytheria/bloblib/utilities/ResourceUtil.java
@@ -45,12 +45,15 @@ public static void writeNewValues(File existingFile, YamlConfiguration updateYam
         Set<String> keys = updateYamlConfiguration.getConfigurationSection("").getKeys(true);
         keys.forEach(key -> {
             if (!updateYamlConfiguration.isConfigurationSection(key)) {
-                List<String> comments = updateYamlConfiguration.getComments(key);
-                List<String> inLine = updateYamlConfiguration.getInlineComments(key);
-                if (comments.size() > 0)
-                    existingYamlConfig.setComments(key, comments);
-                if (inLine.size() > 0)
-                    existingYamlConfig.setInlineComments(key, inLine);
+                try {
+                    List<String> comments = updateYamlConfiguration.getComments(key);
+                    List<String> inLine = updateYamlConfiguration.getInlineComments(key);
+                    if (comments.size() > 0)
+                        existingYamlConfig.setComments(key, comments);
+                    if (inLine.size() > 0)
+                        existingYamlConfig.setInlineComments(key, inLine);
+                } catch (NoSuchMethodError ignored) {
+                }
                 // if it's not a section, it's a value
                 if (existingYamlConfig.contains(key)) return;
             }