Merge branch 'development'

2024-11-23 18:45:34 +01:00 · 2021-06-13 13:23:39 -05:00 · 2021-06-13 13:23:39 -05:00 · b7a6981a83
commit b7a6981a83
parent 24099116f7 947e0d5b2d
23 changed files with 28 additions and 22 deletions
--- a/Compatibility/pom.xml
+++ b/Compatibility/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
        <relativePath>../</relativePath>
    </parent>

--- a/Compatibility/src/com/songoda/core/compatibility/ClassMapping.java
+++ b/Compatibility/src/com/songoda/core/compatibility/ClassMapping.java
@ -37,7 +37,7 @@ public enum ClassMapping {

    CRAFT_BLOCK("block", "CraftBlock"),
    CRAFT_BLOCK_DATA("block.data", "CraftBlockData"),
-    CRAFT_CHUNK("craftChunk"),
+    CRAFT_CHUNK("CraftChunk"),
    CRAFT_ENTITY("entity", "CraftEntity"),
    CRAFT_PLAYER("entity", "CraftPlayer"),
    CRAFT_WORLD("CraftWorld");
--- a/Core/pom.xml
+++ b/Core/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</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.5.2";
+    private final static String coreVersion = "2.5.3";

    /**
     * This is specific to the website api
--- a/Core/src/main/java/com/songoda/core/world/SItemStack.java
+++ b/Core/src/main/java/com/songoda/core/world/SItemStack.java
@ -1,5 +1,6 @@
 package com.songoda.core.world;

+import com.songoda.core.compatibility.CompatibleHand;
 import com.songoda.core.compatibility.CompatibleSound;
 import com.songoda.core.compatibility.ServerVersion;
 import com.songoda.core.nms.NmsManager;
@ -20,6 +21,11 @@ public class SItemStack {
        this.sItem = NmsManager.getWorld().getItemStack(item);
    }

+    public SItemStack(CompatibleHand hand, Player player) {
+        this.item = hand.getItem(player);
+        this.sItem = NmsManager.getWorld().getItemStack(item);
+    }
+
    /**
     * Damage the selected item
     *
--- 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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/NMS/NMS-v1_17_R1/pom.xml
+++ b/NMS/NMS-v1_17_R1/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</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.5.2</version>
+        <version>2.5.3</version>
        <relativePath>../../</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -2,7 +2,7 @@

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