Merge branch 'development'

2024-11-23 18:45:34 +01:00 · 2021-02-19 12:45:13 -06:00 · 2021-02-19 12:45:13 -06:00 · 4d51cf9b8a
commit 4d51cf9b8a
parent 5f7d3de35c fdbe0da191
22 changed files with 27 additions and 24 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.44</version>
+        <version>2.4.45</version>
        <relativePath>../</relativePath>
    </parent>

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

    /**
     * This is specific to the website api
--- a/Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
+++ b/Core/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
@ -1464,9 +1464,10 @@ public enum CompatibleMaterial {
            if (legacyBlock != null) {
                return lookupMap.get(legacyBlock.name());
            }
+            CompatibleMaterial withData = lookupMap.get(mat.name() + ":" + block.getData());
+            return withData == null ? lookupMap.get(mat.name()) : withData;
        }
-        CompatibleMaterial withData = lookupMap.get(mat.name() + ":" + block.getData());
-        return withData == null ? lookupMap.get(mat.name()) : withData;
+        return lookupMap.get(mat.name());
    }

    /**
--- a/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java
+++ b/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java
@ -1,6 +1,7 @@
 package com.songoda.core.gui;

 import com.songoda.core.compatibility.CompatibleMaterial;
+import com.songoda.core.compatibility.ServerVersion;
 import com.songoda.core.configuration.Config;
 import com.songoda.core.configuration.ConfigSection;
 import com.songoda.core.gui.methods.Clickable;
@ -624,7 +625,8 @@ public class CustomizableGui extends Gui {
        public boolean applyItem(ItemStack item) {
            if (item == null) return false;
            item.setType(this.item.getMaterial());
-            item.setDurability(this.item.getData());
+            if (ServerVersion.isServerVersionAtOrBelow(ServerVersion.V1_13))
+                item.setDurability(this.item.getData());
            applyMeta(item);
            return true;
        }
--- 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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+        <version>2.4.45</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.44</version>
+    <version>2.4.45</version>
    <scope>provided</scope>
 </dependency>
 ```
@ -37,6 +37,6 @@ repositories {
 * Artifact:
 ```groovy
 dependencies {
-    compileOnly 'com.songoda:SongodaCore:2.4.44'
+    compileOnly 'com.songoda:SongodaCore:2.4.45'
 }
 ```
--- a/pom.xml
+++ b/pom.xml
@ -2,7 +2,7 @@

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