Merge branch 'development'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.craftaro</groupId>
     <artifactId>EpicEnchants</artifactId>
-    <version>2.0.0</version>
+    <version>2.2.0</version>
 
     <name>EpicEnchants</name>
     <description>Unlock the potential of your weapons, tools and armor by making your own custom enchants.</description>
@@ -36,7 +36,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -73,10 +73,10 @@
                                     <excludeDefaults>false</excludeDefaults>
                                     <includes>
                                         <include>**/nms/v*/**</include>
+                                        <include>**/third_party/net/kyori/**</include>
                                     </includes>
                                     <excludes>
                                         <exclude>**/third_party/org/apache/**</exclude>
-                                        <exclude>**/third_party/net/kyori/**</exclude>
                                         <exclude>**/third_party/com/zaxxer/**</exclude>
                                         <exclude>**/third_party/org/jooq/**</exclude>
                                         <exclude>**/third_party/org/mariadb/**</exclude>
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>com.craftaro</groupId>
             <artifactId>CraftaroCore</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.5.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 

src/main/java/com/craftaro/epicenchants/EpicEnchants.java

@@ -4,10 +4,19 @@ import com.craftaro.core.SongodaCore;
 import com.craftaro.core.SongodaPlugin;
 import com.craftaro.core.commands.CommandManager;
 import com.craftaro.core.configuration.Config;
-import com.craftaro.core.dependency.Dependency;
 import com.craftaro.core.gui.GuiManager;
 import com.craftaro.core.hooks.EconomyManager;
-import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.epicenchants.commands.CommandAlchemist;
+import com.craftaro.epicenchants.commands.CommandApply;
+import com.craftaro.epicenchants.commands.CommandEnchanter;
+import com.craftaro.epicenchants.commands.CommandGiveBook;
+import com.craftaro.epicenchants.commands.CommandGiveItemDust;
+import com.craftaro.epicenchants.commands.CommandGiveRandomBook;
+import com.craftaro.epicenchants.commands.CommandGiveScroll;
+import com.craftaro.epicenchants.commands.CommandList;
+import com.craftaro.epicenchants.commands.CommandReload;
+import com.craftaro.epicenchants.commands.CommandSettings;
+import com.craftaro.epicenchants.commands.CommandTinkerer;
 import com.craftaro.epicenchants.listeners.ArmorListener;
 import com.craftaro.epicenchants.listeners.EntityListener;
 import com.craftaro.epicenchants.listeners.HeldItemListener;
@@ -21,28 +30,16 @@ import com.craftaro.epicenchants.managers.FileManager;
 import com.craftaro.epicenchants.managers.GroupManager;
 import com.craftaro.epicenchants.managers.InfoManager;
 import com.craftaro.epicenchants.objects.Enchant;
-import com.craftaro.epicenchants.commands.CommandAlchemist;
-import com.craftaro.epicenchants.commands.CommandApply;
-import com.craftaro.epicenchants.commands.CommandEnchanter;
-import com.craftaro.epicenchants.commands.CommandGiveBook;
-import com.craftaro.epicenchants.commands.CommandGiveItemDust;
-import com.craftaro.epicenchants.commands.CommandGiveRandomBook;
-import com.craftaro.epicenchants.commands.CommandGiveScroll;
-import com.craftaro.epicenchants.commands.CommandList;
-import com.craftaro.epicenchants.commands.CommandReload;
-import com.craftaro.epicenchants.commands.CommandSettings;
-import com.craftaro.epicenchants.commands.CommandTinkerer;
 import com.craftaro.epicenchants.utils.EnchantUtils;
 import com.craftaro.epicenchants.utils.SpecialItems;
 import com.craftaro.epicenchants.utils.objects.FastInv;
 import com.craftaro.epicenchants.utils.settings.Settings;
 import com.craftaro.epicenchants.utils.single.ItemGroup;
+import com.craftaro.third_party.com.cryptomorin.xseries.XMaterial;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginManager;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 public class EpicEnchants extends SongodaPlugin {
@@ -57,11 +54,6 @@ public class EpicEnchants extends SongodaPlugin {
     private EnchantUtils enchantUtils;
     private ItemGroup itemGroup;
 
-    @Override
-    protected Set<Dependency> getDependencies() {
-        return new HashSet<>();
-    }
-
     @Override
     public void onPluginLoad() {
     }

src/main/java/com/craftaro/epicenchants/listeners/item/BookListener.java

@@ -106,11 +106,11 @@ public class BookListener extends ItemListener {
         useItem(event);
         event.getPlayer().getInventory().addItem(enchant.get().getBook().get(enchant.get(), level));
 
-        event.getPlayer().sendMessage(this.instance.getLocale().getMessage("book.discover")
+        this.instance.getLocale().getMessage("book.discover")
                 .processPlaceholder("group_name", group.getName())
                 .processPlaceholder("group_color", group.getColor())
                 .processPlaceholder("enchant_format", enchant.get().getFormat())
                 .processPlaceholder("level", level)
-                .getPrefixedMessage());
+                .sendPrefixedMessage(event.getPlayer());
     }
 }

src/main/java/com/craftaro/epicenchants/menus/EnchanterMenu.java

@@ -62,12 +62,12 @@ public class EnchanterMenu extends FastInv {
 
                         if (EconomyManager.isEnabled()) {
                             EconomyManager.withdrawBalance(player, ecoCost);
-                            event.getPlayer().sendMessage(instance.getLocale().getMessage("enchanter.success")
+                            instance.getLocale().getMessage("enchanter.success")
                                     .processPlaceholder("group_name", group.getName())
                                     .processPlaceholder("group_color", group.getColor())
                                     .processPlaceholder("eco_cost", ecoCost)
                                     .processPlaceholder("exp_cost", expCost)
-                                    .getPrefixedMessage());
+                                    .sendPrefixedMessage(event.getPlayer());
                         }
 
                         changeExp(player, -expCost);