diff --git a/pom.xml b/pom.xml index 1008849..910dc7c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,75 +1,76 @@ - 4.0.0 - de.iani.cubeside - TreasureChest - 1.3-SNAPSHOT - - UTF-8 - DEV - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/groups/public - - - vault-repo - http://nexus.hc.to/content/repositories/pub_releases - - - brokko-repo - https://www.iani.de/nexus/content/groups/public - - - - - org.spigotmc - spigot-api - 1.13-R0.1-SNAPSHOT - provided - - - de.iani.cubeside - PlayerUUIDCache - 1.4.0 - provided - - - net.milkbowl.vault - VaultAPI - 1.6 - provided - - - - - - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - - - - - - src/main/resources - true - - - - - - nexus - Releases - https://www.iani.de/nexus/content/repositories/releases/ - - - nexus - Snapshot - https://www.iani.de/nexus/content/repositories/snapshots/ - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + de.iani.cubeside + TreasureChest + 1.4-SNAPSHOT + + UTF-8 + DEV + + + + spigotmc-repo + https://hub.spigotmc.org/nexus/content/groups/public + + + vault-repo + http://nexus.hc.to/content/repositories/pub_releases + + + brokko-repo + https://www.iani.de/nexus/content/groups/public + + + + + org.spigotmc + spigot-api + 1.13.1-R0.1-SNAPSHOT + provided + + + de.iani.cubeside + PlayerUUIDCache + 1.4.0 + provided + + + net.milkbowl.vault + VaultAPI + 1.6 + provided + + + + ${project.name} + + + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + + + + + + src/main/resources + true + + + + + + nexus + Releases + https://www.iani.de/nexus/content/repositories/releases/ + + + nexus + Snapshot + https://www.iani.de/nexus/content/repositories/snapshots/ + + \ No newline at end of file diff --git a/src/main/java/de/iani/treasurechest/ChestInventoryListener.java b/src/main/java/de/iani/treasurechest/ChestInventoryListener.java index 4844d93..4f3aa1b 100644 --- a/src/main/java/de/iani/treasurechest/ChestInventoryListener.java +++ b/src/main/java/de/iani/treasurechest/ChestInventoryListener.java @@ -21,6 +21,7 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.Damageable; import org.bukkit.inventory.meta.ItemMeta; public class ChestInventoryListener implements Listener { @@ -70,10 +71,14 @@ t.append(stack.getAmount()).append(" "); } t.append(TreasureChest.capitalize(stack.getType().name(), true)); - if (stack.getDurability() > 0) { - t.append(':').append(stack.getDurability()); + ItemMeta stackMeta = stack.getItemMeta(); + if (stackMeta instanceof Damageable) { + Damageable damageable = (Damageable) stackMeta; + if (damageable.hasDamage()) { + t.append(':').append(damageable.getDamage()); + } } - if (stack.getItemMeta().hasDisplayName()) { + if (stackMeta.hasDisplayName()) { t.append(" (benanntes Item)"); } lore.add(t.toString()); @@ -148,12 +153,15 @@ t.append(stack.getAmount()).append(" "); } t.append(TreasureChest.capitalize(stack.getType().name(), true)); - if (stack.getDurability() > 0) { - t.append(':').append(stack.getDurability()); + ItemMeta stackMeta = stack.getItemMeta(); + if (stackMeta instanceof Damageable) { + Damageable damageable = (Damageable) stackMeta; + if (damageable.hasDamage()) { + t.append(':').append(damageable.getDamage()); + } } - ItemMeta meta = stack.getItemMeta(); - if (meta.hasDisplayName()) { - t.append(" (").append(meta.getDisplayName()).append(ChatColor.YELLOW).append(")"); + if (stackMeta.hasDisplayName()) { + t.append(" (").append(stackMeta.getDisplayName()).append(ChatColor.YELLOW).append(")"); } plugin.sendMessage(player, t.toString()); } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 9521d59..847e597 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -5,6 +5,7 @@ description: Treasure Chests for Events softdepend: [Vault] depend: [PlayerUUIDCache] +api-version: 1.13 commands: treasurechest: