Merge branch 'SD-7555' into development

pom.xml

@@ -78,7 +78,7 @@
     <repositories>
         <repository>
             <id>public</id>
-            <url>http://repo.songoda.com/repository/public/</url>
+            <url>https://repo.songoda.com/repository/public/</url>
         </repository>
         <repository>
             <id>jitpack.io</id>
@@ -91,6 +91,7 @@
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
             <version>1.16.4</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>fr.mrmicky</groupId>
@@ -108,6 +109,7 @@
             <groupId>com.songoda</groupId>
             <artifactId>UltimateBottles</artifactId>
             <version>1_0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>me.clip</groupId>

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

@@ -7,7 +7,7 @@ import com.songoda.core.compatibility.CompatibleMaterial;
 import com.songoda.core.configuration.Config;
 import com.songoda.core.gui.GuiManager;
 import com.songoda.core.hooks.EconomyManager;
-import com.songoda.epicenchants.command.commands.*;
+import com.songoda.epicenchants.commands.*;
 import com.songoda.epicenchants.listeners.ArmorListener;
 import com.songoda.epicenchants.listeners.EntityListener;
 import com.songoda.epicenchants.listeners.HeldItemListener;

src/main/java/com/songoda/epicenchants/commands/CommandAlchemist.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;

src/main/java/com/songoda/epicenchants/commands/CommandApply.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.core.compatibility.CompatibleMaterial;

src/main/java/com/songoda/epicenchants/commands/CommandEnchanter.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;

src/main/java/com/songoda/epicenchants/commands/CommandGiveBook.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.CommandCommons;

src/main/java/com/songoda/epicenchants/commands/CommandGiveItemDust.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.CommandCommons;

src/main/java/com/songoda/epicenchants/commands/CommandGiveRandomBook.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;

src/main/java/com/songoda/epicenchants/commands/CommandGiveScroll.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.CommandCommons;

src/main/java/com/songoda/epicenchants/commands/CommandList.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;

src/main/java/com/songoda/epicenchants/commands/CommandReload.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;

src/main/java/com/songoda/epicenchants/commands/CommandSettings.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.core.configuration.editor.PluginConfigGui;

src/main/java/com/songoda/epicenchants/commands/CommandTinkerer.java

@@ -1,4 +1,4 @@
-package com.songoda.epicenchants.command.commands;
+package com.songoda.epicenchants.commands;
 
 import com.songoda.core.commands.AbstractCommand;
 import com.songoda.epicenchants.EpicEnchants;

src/main/java/com/songoda/epicenchants/effect/effects/Explode.java

@@ -2,6 +2,7 @@ package com.songoda.epicenchants.effect.effects;
 
 import com.songoda.epicenchants.effect.EffectExecutor;
 import com.songoda.epicenchants.enums.EventType;
+import com.songoda.epicenchants.objects.LeveledModifier;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -15,6 +16,8 @@ public class Explode extends EffectExecutor {
 
     @Override
     public void execute(@NotNull Player user, @Nullable LivingEntity opponent, int level, EventType eventType) {
-        consume(entity -> entity.getWorld().createExplosion(entity.getLocation(), getSection().getInt("magnitude")), user, opponent);
+        consume(entity -> entity.getWorld().createExplosion(entity.getLocation(), (float) LeveledModifier
+                        .of(getSection().getString("magnitude")).get(level, level, user, opponent)),
+                user, opponent);
     }
 }