From 376858dee24e1f79a6de4c9d45e1cd16a9cda8b6 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 6 Feb 2021 10:25:09 +0000 Subject: [PATCH] Finally updated mmo extension --- .../java/com/willfp/ecoenchants/mmo/MMOMain.java | 12 ++++++++++++ .../ecoenchants/mmo/enchants/misc/Strengthening.java | 5 +++++ .../ecoenchants/mmo/enchants/stamina/Motivate.java | 1 + .../ecoenchants/mmo/structure/MMOEnchantment.java | 1 + settings.gradle | 2 +- 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java index 7dbeee6d..afbb9d0e 100644 --- a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java @@ -3,6 +3,18 @@ package com.willfp.ecoenchants.mmo; import com.willfp.eco.util.extensions.Extension; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; +import com.willfp.ecoenchants.mmo.enchants.abilities.Discounted; +import com.willfp.ecoenchants.mmo.enchants.abilities.Recover; +import com.willfp.ecoenchants.mmo.enchants.mana.Augment; +import com.willfp.ecoenchants.mmo.enchants.mana.Drain; +import com.willfp.ecoenchants.mmo.enchants.mana.Elixir; +import com.willfp.ecoenchants.mmo.enchants.mana.Siphon; +import com.willfp.ecoenchants.mmo.enchants.mana.Spirituality; +import com.willfp.ecoenchants.mmo.enchants.misc.Strengthening; +import com.willfp.ecoenchants.mmo.enchants.stamina.Athletic; +import com.willfp.ecoenchants.mmo.enchants.stamina.Endurance; +import com.willfp.ecoenchants.mmo.enchants.stamina.Fortitude; +import com.willfp.ecoenchants.mmo.enchants.stamina.Motivate; import org.bukkit.Bukkit; import org.jetbrains.annotations.NotNull; diff --git a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/misc/Strengthening.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/misc/Strengthening.java index 91e93328..20f634ab 100644 --- a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/misc/Strengthening.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/misc/Strengthening.java @@ -3,6 +3,11 @@ package com.willfp.ecoenchants.mmo.enchants.misc; import com.willfp.eco.util.events.armorequip.ArmorEquipEvent; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; +import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; +import net.mmogroup.mmolib.MMOLib; +import net.mmogroup.mmolib.api.player.MMOPlayerData; +import net.mmogroup.mmolib.api.stat.SharedStat; +import net.mmogroup.mmolib.api.stat.modifier.StatModifier; import org.bukkit.entity.Player; public class Strengthening extends MMOEnchantment { diff --git a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java index 0efcdf78..c0895aff 100644 --- a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java @@ -5,6 +5,7 @@ import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.mmo.integrations.mmo.MMOManager; import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; +import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; diff --git a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java index 148ce21c..9effe1c7 100644 --- a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java @@ -3,6 +3,7 @@ package com.willfp.ecoenchants.mmo.structure; import com.willfp.eco.util.optional.Prerequisite; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; +import com.willfp.ecoenchants.mmo.MMOPrerequisites; public abstract class MMOEnchantment extends EcoEnchant implements MMOEnchant { protected MMOEnchantment(String key, EnchantmentType type, Prerequisite... prerequisites) { diff --git a/settings.gradle b/settings.gradle index 18340d94..4f36a7f9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ include ':eco-extensions:biomes' include ':eco-extensions:effects' include ':eco-extensions:endershot' include ':eco-extensions:firewand' -//include ':eco-extensions:mmo' +include ':eco-extensions:mmo' include ':eco-extensions:precision' include ':eco-extensions:sprint-artifacts' include ':eco-extensions:summoning'