Upstream/EpicEnchants
1
0
Fork 0
mirror of https://github.com/songoda/EpicEnchants.git synced 2024-12-22 17:18:41 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'SD-7555' into development

Browse Source
This commit is contained in:
Christian Koop 2021-04-13 17:56:17 +02:00
commit bba7394942
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
14 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -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>

2
src/main/java/com/songoda/epicenchants/EpicEnchants.java
View File

@ -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;

2
src/main/java/com/songoda/epicenchants/commands/CommandAlchemist.java
View File

@ -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;

4
src/main/java/com/songoda/epicenchants/commands/CommandApply.java
View File

@ -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;
@ -22,7 +22,7 @@ import static com.songoda.epicenchants.utils.single.GeneralUtils.getMessageFromR
public class CommandApply extends AbstractCommand {
private final EpicEnchants plugin;
public CommandApply(EpicEnchants plugin) {
super(true, "apply");
this.plugin = plugin;

2
src/main/java/com/songoda/epicenchants/commands/CommandEnchanter.java
View File

@ -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;

4
src/main/java/com/songoda/epicenchants/commands/CommandGiveBook.java
View File

@ -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;
@ -17,7 +17,7 @@ import java.util.stream.Collectors;
public class CommandGiveBook extends AbstractCommand {
private final EpicEnchants plugin;
public CommandGiveBook(EpicEnchants plugin) {
super(false, "givebook");
this.plugin = plugin;

4
src/main/java/com/songoda/epicenchants/commands/CommandGiveItemDust.java
View File

@ -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;
@ -15,7 +15,7 @@ import java.util.List;
import java.util.stream.Collectors;
public class CommandGiveItemDust extends AbstractCommand {
private final EpicEnchants plugin;
public CommandGiveItemDust(EpicEnchants plugin) {

4
src/main/java/com/songoda/epicenchants/commands/CommandGiveRandomBook.java
View File

@ -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;
@ -14,7 +14,7 @@ import java.util.stream.Collectors;
public class CommandGiveRandomBook extends AbstractCommand {
private final EpicEnchants plugin;
public CommandGiveRandomBook(EpicEnchants plugin) {
super(false, "giverandombook");
this.plugin = plugin;

4
src/main/java/com/songoda/epicenchants/commands/CommandGiveScroll.java
View File

@ -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;
@ -14,7 +14,7 @@ import java.util.List;
import java.util.stream.Collectors;
public class CommandGiveScroll extends AbstractCommand {
private final EpicEnchants plugin;
public CommandGiveScroll(EpicEnchants plugin) {

4
src/main/java/com/songoda/epicenchants/commands/CommandList.java
View File

@ -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;
@ -10,7 +10,7 @@ import java.util.List;
import java.util.stream.Collectors;
public class CommandList extends AbstractCommand {
private final EpicEnchants plugin;
public CommandList(EpicEnchants plugin) {

2
src/main/java/com/songoda/epicenchants/commands/CommandReload.java
View File

@ -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;

4
src/main/java/com/songoda/epicenchants/commands/CommandSettings.java
View File

@ -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;
@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
import java.util.List;
public class CommandSettings extends AbstractCommand {
private final EpicEnchants plugin;
public CommandSettings(EpicEnchants plugin) {

4
src/main/java/com/songoda/epicenchants/commands/CommandTinkerer.java
View File

@ -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;
@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
import java.util.List;
public class CommandTinkerer extends AbstractCommand {
private final EpicEnchants plugin;
public CommandTinkerer(EpicEnchants plugin) {

5
src/main/java/com/songoda/epicenchants/effect/effects/Explode.java
View File

@ -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);
}
}