Merge branch 'development'

2024-11-23 18:45:34 +01:00 · 2021-01-21 10:09:14 -06:00 · 2021-01-21 10:09:14 -06:00 · 2f7c165c01
commit 2f7c165c01
parent d71bf5aa5a 5154324e78
21 changed files with 44 additions and 26 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.38</version>
+        <version>2.4.39</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.38";
+    private final static String coreVersion = "2.4.39";

    /**
     * This is specific to the website api
--- a/Core/src/main/java/com/songoda/core/utils/ItemUtils.java
+++ b/Core/src/main/java/com/songoda/core/utils/ItemUtils.java
@ -7,6 +7,7 @@ import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import com.songoda.core.compatibility.CompatibleHand;
 import com.songoda.core.compatibility.CompatibleMaterial;
+import com.songoda.core.compatibility.CompatibleSound;
 import com.songoda.core.compatibility.ServerVersion;
 import com.songoda.core.nms.NmsManager;
 import org.apache.commons.lang.StringUtils;
@ -120,21 +121,38 @@ public class ItemUtils {
    }

    public static ItemStack addDamage(ItemStack item, int damage) {
-        if (item == null) {
+        return addDamage(null, item, damage);
+    }
+
+    public static ItemStack addDamage(Player player, ItemStack item, int damage) {
+        if (item == null)
            return null;
-        } else if (ServerVersion.isServerVersionBelow(ServerVersion.V1_11)
-                        ? NmsManager.getNbt().of(item).has("Unbreakable")
-                        : item.getItemMeta().isUnbreakable()) {
+
+        int maxDurability = item.getType().getMaxDurability();
+        int durability;
+
+        if (ServerVersion.isServerVersionBelow(ServerVersion.V1_11)
+                ? NmsManager.getNbt().of(item).has("Unbreakable")
+                : item.getItemMeta().isUnbreakable()) {
            return item;
        } else if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) {
            // ItemStack.setDurability(short) still works in 1.13-1.14, but use these methods now
            ItemMeta meta = item.getItemMeta();
            if (meta instanceof Damageable) {
-                ((Damageable) meta).setDamage(((Damageable) meta).getDamage() + damage);
+                Damageable damageable = ((Damageable) meta);
+                damageable.setDamage(((Damageable) meta).getDamage() + damage);
                item.setItemMeta(meta);
+                durability = damageable.getDamage();
+            } else {
+                return item;
            }
        } else {
            item.setDurability((short) Math.max(0, item.getDurability() + damage));
+            durability = item.getDurability();
+        }
+        if (durability >= maxDurability && player != null) {
+            player.getInventory().removeItem(item);
+            CompatibleSound.ENTITY_ITEM_BREAK.play(player);
        }
        return 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.4.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+        <version>2.4.39</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.38</version>
+    <version>2.4.39</version>
    <scope>provided</scope>
 </dependency>
 ```
@ -37,6 +37,6 @@ repositories {
 * Artifact:
 ```groovy
 dependencies {
-    compileOnly 'com.songoda:SongodaCore:2.4.38'
+    compileOnly 'com.songoda:SongodaCore:2.4.39'
 }
 ```
--- a/pom.xml
+++ b/pom.xml
@ -2,7 +2,7 @@

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