diff --git a/pom.xml b/pom.xml index 872cfaa..326cf9d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,46 +2,43 @@ com.songoda UltimateRepairing 4.0.0 - 1.1 + maven-version-number - clean package + clean install + UltimateKits-${project.version} - - - - - - - - - - - - - - - - - - - - 3.6.1 org.apache.maven.plugins maven-compiler-plugin + 3.8.0 1.8 1.8 + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + prepare-package + + replace + + + + + ${project.build.directory}/classes/plugin.yml + + + maven-version-number + ${project.version} + + + + - - - src/main/resources - true - - - src/main/java @@ -53,32 +50,32 @@ org.spigotmc spigot - 1.13.2 + 1.14-pre5 com.songoda arconix - LATEST + 2.0.0 org kingdoms - LATEST + 13.0.9 net.milkbowl vault - LATEST + 1.7.1 me.ryanhamshire GriefPrevention - LATEST + 16.6 com.sk89q worldedit - LATEST + 7.0.0 com.sk89q @@ -88,12 +85,12 @@ com plotsquared - RELEASE + 3.5.0 com.palmergames.bukkit towny - LATEST + 0.93.0.0 com.wasteofplastic @@ -103,7 +100,7 @@ us.talabrek ultimateskyblock - LATEST + 2.7.2 me.markeh @@ -118,43 +115,43 @@ com.gmail.filoghost.holographicdisplays holographicdisplays-api - LATEST + 2.3.2 provided com.gmail.nossr50 mcmmo - LATEST + 1.5.09 com.gamingmesh jobs - LATEST + 4.6.0 me.botsko prism - LATEST + 2.0.6 de.diddiz logblock - LATEST + 1.10.0 net coreprotect - LATEST + 2.14.2 uk.antiperson stackmob - LATEST + 2.2.6 net.sothatsit blockstore - LATEST + 1.5.0 org.black_ixx @@ -174,12 +171,12 @@ com.earth2me essentials - LATEST + 2.0.1 bammerbom ultimatecore - LATEST + 2.1.25 diff --git a/src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java b/src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java index e693480..128e720 100644 --- a/src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java +++ b/src/main/java/com/songoda/ultimaterepairing/UltimateRepairing.java @@ -2,8 +2,8 @@ package com.songoda.ultimaterepairing; import com.songoda.ultimaterepairing.anvil.AnvilManager; import com.songoda.ultimaterepairing.anvil.UAnvil; -import com.songoda.ultimaterepairing.command.CommandManager; import com.songoda.ultimaterepairing.anvil.editor.Editor; +import com.songoda.ultimaterepairing.command.CommandManager; import com.songoda.ultimaterepairing.events.BlockListeners; import com.songoda.ultimaterepairing.events.InteractListeners; import com.songoda.ultimaterepairing.events.InventoryListeners; diff --git a/src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java b/src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java index 4ddccd0..60e2bc5 100644 --- a/src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java +++ b/src/main/java/com/songoda/ultimaterepairing/events/InventoryListeners.java @@ -52,7 +52,7 @@ public class InventoryListeners implements Listener { instance.getRepairHandler().finish(false, p); p.closeInventory(); } - } else if (event.getInventory().getTitle().equals(instance.getLocale().getMessage("interface.repair.title"))) { + } else if (event.getView().getTitle().equals(instance.getLocale().getMessage("interface.repair.title"))) { event.setCancelled(true); Location loc = instance.getRepairHandler().getDataFor(p).getLocation(); if (event.getSlot() == 11) { diff --git a/src/main/java/com/songoda/ultimaterepairing/utils/SettingsManager.java b/src/main/java/com/songoda/ultimaterepairing/utils/SettingsManager.java index f01cefb..690d08d 100644 --- a/src/main/java/com/songoda/ultimaterepairing/utils/SettingsManager.java +++ b/src/main/java/com/songoda/ultimaterepairing/utils/SettingsManager.java @@ -49,14 +49,14 @@ public class SettingsManager implements Listener { return; } - if (event.getInventory().getTitle().equals(pluginName + " Settings Manager")) { + if (event.getView().getTitle().equals(pluginName + " Settings Manager")) { event.setCancelled(true); if (clickedItem.getType().name().contains("STAINED_GLASS")) return; String type = ChatColor.stripColor(clickedItem.getItemMeta().getDisplayName()); this.cat.put((Player) event.getWhoClicked(), type); this.openEditor((Player) event.getWhoClicked()); - } else if (event.getInventory().getTitle().equals(pluginName + " Settings Editor")) { + } else if (event.getView().getTitle().equals(pluginName + " Settings Editor")) { event.setCancelled(true); if (clickedItem.getType().name().contains("STAINED_GLASS")) return;