Merge branch 'development'

2024-12-03 15:33:32 +01:00 · 2021-05-27 09:55:10 -05:00 · 2021-05-27 09:55:10 -05:00 · 8334aecfba
commit 8334aecfba
parent 95e0757ffe 853c6b2b40
22 changed files with 25 additions and 27 deletions
--- a/Core/pom.xml
+++ b/Core/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../</relativePath>
    </parent>

--- a/Core/src/main/java/com/songoda/core/SongodaCore.java
+++ b/Core/src/main/java/com/songoda/core/SongodaCore.java
@ -56,7 +56,7 @@ public class SongodaCore {
    /**
     * This has been added as of Rev 6
     */
-    private final static String coreVersion = "2.4.53";
+    private final static String coreVersion = "2.4.54";

    /**
     * This is specific to the website api
--- a/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java
+++ b/Core/src/main/java/com/songoda/core/hooks/holograms/CMIHolograms.java
@ -20,7 +20,7 @@ public class CMIHolograms extends Holograms {

    private static CMI cmi;
    private static HologramManager cmiHologramManager;
-    private static HashSet<String> ourHolograms = new HashSet();
+    private static HashSet<String> ourHolograms = new HashSet<>();
    private static Method cmi_CMIHologram_getLines;
    private static boolean useOldMethod;

@ -98,7 +98,7 @@ public class CMIHolograms extends Holograms {
                }
            } catch (Exception ex) {
                Logger.getLogger(CMIHolograms.class.getName()).log(Level.SEVERE, "CMI Hologram error!", ex);
-                holoLines = Collections.EMPTY_LIST;
+                holoLines = Collections.emptyList();
            }
            boolean isChanged = lines.size() != holoLines.size();
            if (!isChanged) {
@ -128,7 +128,6 @@ public class CMIHolograms extends Holograms {
    }

    private void createAt(Location location, List<String> lines) {
-
        final String id = locStr(location);
        CMIHologram holo = new CMIHologram(id, location);
        holo.setLines(lines);
@ -136,8 +135,6 @@ public class CMIHolograms extends Holograms {
        cmiHologramManager.addHologram(holo);
        holo.update();

-        if (!ourHolograms.contains(id)) {
-            ourHolograms.add(id);
-        }
+        ourHolograms.add(id);
    }
 }
--- a/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java
+++ b/Core/src/main/java/com/songoda/core/hooks/holograms/HolographicDisplaysHolograms.java
@ -2,6 +2,7 @@ package com.songoda.core.hooks.holograms;

 import com.gmail.filoghost.holographicdisplays.api.Hologram;
 import com.gmail.filoghost.holographicdisplays.api.HologramsAPI;
+import com.gmail.filoghost.holographicdisplays.api.line.TextLine;
 import org.bukkit.Location;
 import org.bukkit.plugin.Plugin;

--- a/NMS/NMS-API/pom.xml
+++ b/NMS/NMS-API/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_10_R1/pom.xml
+++ b/NMS/NMS-v1_10_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_11_R1/pom.xml
+++ b/NMS/NMS-v1_11_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_12_R1/pom.xml
+++ b/NMS/NMS-v1_12_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_13_R1/pom.xml
+++ b/NMS/NMS-v1_13_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_13_R2/pom.xml
+++ b/NMS/NMS-v1_13_R2/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_14_R1/pom.xml
+++ b/NMS/NMS-v1_14_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_15_R1/pom.xml
+++ b/NMS/NMS-v1_15_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_16_R1/pom.xml
+++ b/NMS/NMS-v1_16_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_16_R2/pom.xml
+++ b/NMS/NMS-v1_16_R2/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_16_R3/pom.xml
+++ b/NMS/NMS-v1_16_R3/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_8_R1/pom.xml
+++ b/NMS/NMS-v1_8_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_8_R2/pom.xml
+++ b/NMS/NMS-v1_8_R2/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_8_R3/pom.xml
+++ b/NMS/NMS-v1_8_R3/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_9_R1/pom.xml
+++ b/NMS/NMS-v1_9_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_9_R2/pom.xml
+++ b/NMS/NMS-v1_9_R2/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.53</version>
+        <version>2.4.54</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/README.md
+++ b/README.md
@ -18,7 +18,7 @@ Maven Information
 <dependency>
    <groupId>com.songoda</groupId>
    <artifactId>SongodaCore</artifactId>
-    <version>2.4.53</version>
+    <version>2.4.54</version>
    <scope>provided</scope>
 </dependency>
 ```
@ -37,6 +37,6 @@ repositories {
 * Artifact:
 ```groovy
 dependencies {
-    compileOnly 'com.songoda:SongodaCore:2.4.53'
+    compileOnly 'com.songoda:SongodaCore:2.4.54'
 }
 ```
--- a/pom.xml
+++ b/pom.xml
@ -2,7 +2,7 @@

    <groupId>com.songoda</groupId>
    <artifactId>SongodaCore-Modules</artifactId>
-    <version>2.4.53</version>
+    <version>2.4.54</version>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>