diff --git a/Extensions/Alchemy/build.gradle b/Extensions/Alchemy/build.gradle deleted file mode 100644 index dec7ee33..00000000 --- a/Extensions/Alchemy/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly project(':plugin') -} - -jar{ - archiveFileName = project.name + " Extension" + ".jar" -} - -description = 'Alchemy' - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} \ No newline at end of file diff --git a/Extensions/Biomes/build.gradle b/Extensions/Biomes/build.gradle deleted file mode 100644 index 5e79620a..00000000 --- a/Extensions/Biomes/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly project(':plugin') -} - -jar{ - archiveFileName = project.name + " Extension" + ".jar" -} - -description = 'Biomes' - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} \ No newline at end of file diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java b/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java deleted file mode 100644 index 671e5237..00000000 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.willfp.ecoenchants.biomes; - -import com.willfp.ecoenchants.biomes.enchants.defensive.*; -import com.willfp.ecoenchants.biomes.enchants.offensive.*; -import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.extensions.Extension; -import org.bukkit.Bukkit; - -public class BiomesMain extends Extension { - public static final EcoEnchant ELEVATION = new Elevation(); - public static final EcoEnchant GLACIAL = new Glacial(); - public static final EcoEnchant HEAT_TREATED = new HeatTreated(); - public static final EcoEnchant OCEANIC = new Oceanic(); - public static final EcoEnchant TROPICAL = new Tropical(); - public static final EcoEnchant ALTITUDE = new Altitude(); - public static final EcoEnchant AQUAMARINE = new Aquamarine(); - public static final EcoEnchant DEHYDRATION = new Dehydration(); - public static final EcoEnchant ICELORD = new Icelord(); - public static final EcoEnchant RAINFOREST = new Rainforest(); - - @Override - public void onEnable() { - Bukkit.getPluginManager().registerEvents(ELEVATION, this.plugin); - Bukkit.getPluginManager().registerEvents(GLACIAL, this.plugin); - Bukkit.getPluginManager().registerEvents(HEAT_TREATED, this.plugin); - Bukkit.getPluginManager().registerEvents(OCEANIC, this.plugin); - Bukkit.getPluginManager().registerEvents(TROPICAL, this.plugin); - Bukkit.getPluginManager().registerEvents(ALTITUDE, this.plugin); - Bukkit.getPluginManager().registerEvents(AQUAMARINE, this.plugin); - Bukkit.getPluginManager().registerEvents(DEHYDRATION, this.plugin); - Bukkit.getPluginManager().registerEvents(ICELORD, this.plugin); - Bukkit.getPluginManager().registerEvents(RAINFOREST, this.plugin); - } - - @Override - public void onDisable() { - - } -} diff --git a/Extensions/Effects/build.gradle b/Extensions/Effects/build.gradle deleted file mode 100644 index 2eed7e85..00000000 --- a/Extensions/Effects/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly project(':plugin') -} - -jar{ - archiveFileName = project.name + " Extension" + ".jar" -} - -description = 'Effects' - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} \ No newline at end of file diff --git a/Extensions/Endershot/build.gradle b/Extensions/Endershot/build.gradle deleted file mode 100644 index 7fa536bb..00000000 --- a/Extensions/Endershot/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly project(':plugin') -} - -jar{ - archiveFileName = project.name + " Extension" + ".jar" -} - -description = 'Endershot' - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} \ No newline at end of file diff --git a/Extensions/Firewand/build.gradle b/Extensions/Firewand/build.gradle deleted file mode 100644 index 8acda628..00000000 --- a/Extensions/Firewand/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly project(':plugin') -} - -jar{ - archiveFileName = project.name + " Extension" + ".jar" -} - -description = 'FireWand' - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} \ No newline at end of file diff --git a/Extensions/MMO/build.gradle b/Extensions/MMO/build.gradle deleted file mode 100644 index 72dfe63d..00000000 --- a/Extensions/MMO/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -plugins { - id 'com.github.johnrengelman.shadow' version '5.2.0' -} - -repositories { - maven { - url 'https://mvn.lumine.io/repository/maven-public/' - } -} - -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly project(':plugin') - compileOnly 'net.Indyuce:MMOCore:1.6' - compileOnly 'net.Indyuce:MMOItems:6.5' - compileOnly 'net.Indyuce:MMOLib:1.7.3' -} - -jar{ - archiveFileName = project.name + " Extension" + ".jar" -} - -description = 'MMO' - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} - -configurations.all { - exclude group: 'com.mojang', module: 'authlib' -} \ No newline at end of file diff --git a/Extensions/Precision/build.gradle b/Extensions/Precision/build.gradle deleted file mode 100644 index 7f12f931..00000000 --- a/Extensions/Precision/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly project(':plugin') -} - -jar{ - archiveFileName = project.name + " Extension" + ".jar" -} - -description = 'Precision' - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} \ No newline at end of file diff --git a/Extensions/SprintArtifacts/build.gradle b/Extensions/SprintArtifacts/build.gradle deleted file mode 100644 index 68596f6c..00000000 --- a/Extensions/SprintArtifacts/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly project(':plugin') -} - -jar{ - archiveFileName = project.name + " Extension" + ".jar" -} - -description = 'Sprint Artifacts' - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} \ No newline at end of file diff --git a/Extensions/Summoning/build.gradle b/Extensions/Summoning/build.gradle deleted file mode 100644 index 62e6f7e6..00000000 --- a/Extensions/Summoning/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' - compileOnly project(':plugin') -} - -jar{ - archiveFileName = project.name + " Extension" + ".jar" -} - -description = 'Summoning' - -tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 60fe94ab..242a19bd 100644 --- a/build.gradle +++ b/build.gradle @@ -32,13 +32,9 @@ allprojects { options.encoding = 'UTF-8' } - tasks.withType(Jar) { - destinationDirectory = file("$rootDir/bin/") - } - processResources { filesNotMatching(["**/*.png", "**/models/**", "**/textures/**"]) { - expand projectVersion: findProperty("version") + expand projectVersion: project.version } } @@ -46,13 +42,17 @@ allprojects { compileJava.dependsOn clean } +tasks.withType(Jar) { + destinationDirectory = file("$rootDir/bin/") +} + clean.doLast { file("${rootDir}/bin").deleteDir() } shadowJar { - relocate('org.bstats.bukkit', 'com.willfp.eco.core.util.shaded.bstats') - relocate('org.apache.maven', 'com.willfp.eco.core.util.shaded.maven') + relocate('org.bstats.bukkit', 'com.willfp.eco.util.shaded.bstats') + relocate('org.apache.maven', 'com.willfp.eco.util.shaded.maven') archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" } @@ -62,7 +62,7 @@ jar { group = 'com.willfp' archivesBaseName = project.name -version = project.version +version = findProperty("version") java.sourceCompatibility = JavaVersion.VERSION_1_8 compileJava.options.encoding = 'UTF-8' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java index ab336f2d..ae8d7738 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java @@ -1,5 +1,7 @@ package com.willfp.ecoenchants; +import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.command.AbstractCommand; import com.willfp.eco.util.integrations.IntegrationLoader; import com.willfp.eco.util.interfaces.EcoRunnable; @@ -68,7 +70,7 @@ public class EcoEnchantsPlugin extends AbstractEcoPlugin { this.getLog().info("&cNo extensions found"); } else { this.getLog().info("Extensions Loaded:"); - EcoEnchantsPlugin.getInstance().getExtensionLoader().getLoadedExtensions().forEach((extension) -> { + this.getExtensionLoader().getLoadedExtensions().forEach((extension) -> { this.getLog().info("- " + extension.getName() + " v" + extension.getVersion()); }); } @@ -86,6 +88,8 @@ public class EcoEnchantsPlugin extends AbstractEcoPlugin { this.getLog().info(EcoEnchants.values().size() + " Enchantments Loaded:"); this.getLog().info(EcoEnchants.values().stream().map(ecoEnchant -> ecoEnchant.getType().getColor() + ecoEnchant.getName()).collect(Collectors.joining(", "))); + + this.getTelekineticTests().registerTest(player -> ProxyUtils.getProxy(FastGetEnchantsProxy.class).getLevelOnItem(player.getInventory().getItemInMainHand(), EcoEnchants.TELEKINESIS) > 0); } @Override @@ -105,7 +109,7 @@ public class EcoEnchantsPlugin extends AbstractEcoPlugin { @Override public void load() { - + // Nothing needs to be called on load } @Override diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentYamlConfig.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentYamlConfig.java index 8c7948ad..7daf2732 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentYamlConfig.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentYamlConfig.java @@ -1,7 +1,7 @@ package com.willfp.ecoenchants.config; import com.willfp.eco.util.injection.PluginDependent; -import com.willfp.ecoenchants.EcoEnchantsPlugin; +import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; @@ -34,7 +34,7 @@ public abstract class EnchantmentYamlConfig extends PluginDependent { * @param type The enchantment type */ public EnchantmentYamlConfig(String name, Class source, EnchantmentType type) { - super(EcoEnchantsPlugin.getInstance()); + super(AbstractEcoPlugin.getInstance()); this.name = name; this.source = source; this.type = type; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java index 4146e72a..13d00fd9 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java @@ -3,7 +3,6 @@ package com.willfp.ecoenchants.display; import com.google.common.collect.Lists; import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.plugin.AbstractEcoPlugin; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.display.options.DisplayOptions; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; @@ -26,7 +25,7 @@ import java.util.List; */ @SuppressWarnings("DeprecatedIsStillUsed") public class EnchantDisplay { - private static final AbstractEcoPlugin plugin = EcoEnchantsPlugin.getInstance(); + private static final AbstractEcoPlugin plugin = AbstractEcoPlugin.getInstance(); /** * The meta key to hide enchantments in lore diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/Integration.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/Integration.java deleted file mode 100644 index 2bbfc456..00000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/Integration.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.willfp.ecoenchants.integrations; - -/** - * Interface for all integrations with optional dependencies - */ -public interface Integration { - /** - * Get the name of integration - * @return The name - */ - String getPluginName(); -} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/anticheat/AnticheatWrapper.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/anticheat/AnticheatWrapper.java index f5055318..b57c9725 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/anticheat/AnticheatWrapper.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/anticheat/AnticheatWrapper.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.integrations.anticheat; -import com.willfp.ecoenchants.integrations.Integration; +import com.willfp.eco.util.integrations.Integration; import org.bukkit.entity.Player; /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/AntigriefWrapper.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/AntigriefWrapper.java index 82085871..bf20ee12 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/AntigriefWrapper.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/antigrief/AntigriefWrapper.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.integrations.antigrief; -import com.willfp.ecoenchants.integrations.Integration; +import com.willfp.eco.util.integrations.Integration; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.LivingEntity; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsWrapper.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsWrapper.java index 4330a61c..1c858496 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsWrapper.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsWrapper.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.integrations.essentials; -import com.willfp.ecoenchants.integrations.Integration; +import com.willfp.eco.util.integrations.Integration; /** * Interface for Essentials Integration diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/mcmmo/McmmoIntegration.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/mcmmo/McmmoIntegration.java index 3e7c3cfc..86a29234 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/mcmmo/McmmoIntegration.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/mcmmo/McmmoIntegration.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.integrations.mcmmo; -import com.willfp.ecoenchants.integrations.Integration; +import com.willfp.eco.util.integrations.Integration; import org.bukkit.event.Event; /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/worldguard/WorldguardWrapper.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/worldguard/WorldguardWrapper.java index 1206e2d5..45844534 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/worldguard/WorldguardWrapper.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/worldguard/WorldguardWrapper.java @@ -1,10 +1,11 @@ package com.willfp.ecoenchants.integrations.worldguard; +import com.willfp.eco.util.integrations.Integration; import com.willfp.ecoenchants.enchantments.EcoEnchant; import org.bukkit.Location; import org.bukkit.entity.Player; -public interface WorldguardWrapper { +public interface WorldguardWrapper extends Integration { void registerFlag(String name, boolean def); boolean enabledForPlayer(EcoEnchant enchant, Player player, Location location); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/worldguard/plugins/WorldguardIntegrationImpl.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/worldguard/plugins/WorldguardIntegrationImpl.java index 64add0de..79e40b71 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/worldguard/plugins/WorldguardIntegrationImpl.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/integrations/worldguard/plugins/WorldguardIntegrationImpl.java @@ -26,4 +26,9 @@ public class WorldguardIntegrationImpl implements WorldguardWrapper { if(WorldGuard.getInstance().getPlatform().getSessionManager().hasBypass(WorldGuardPlugin.inst().wrapPlayer(player), BukkitAdapter.adapt(location.getWorld()))) return true; return WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().queryState(BukkitAdapter.adapt(location), WorldGuardPlugin.inst().wrapPlayer(player), (StateFlag) REGISTRY.get(enchant.getKey().getKey() + "-enabled")) == StateFlag.State.ALLOW; } + + @Override + public String getPluginName() { + return "WorldGuard"; + } } diff --git a/eco-extensions/alchemy/build.gradle b/eco-extensions/alchemy/build.gradle new file mode 100644 index 00000000..75d32af1 --- /dev/null +++ b/eco-extensions/alchemy/build.gradle @@ -0,0 +1,3 @@ +group 'com.willfp' +version '3.0.0' +description = 'Alchemy Extension' \ No newline at end of file diff --git a/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java b/eco-extensions/alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java similarity index 92% rename from Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java rename to eco-extensions/alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java index 94e258bb..e2a431f1 100644 --- a/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java +++ b/eco-extensions/alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java @@ -1,6 +1,8 @@ package com.willfp.ecoenchants.alchemy; + import com.willfp.ecoenchants.enchantments.EcoEnchant; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.Bukkit; @@ -15,7 +17,7 @@ public class Alchemy extends EcoEnchant { super("alchemy", EnchantmentType.NORMAL); } - private static final FixedMetadataValue TRUE = new FixedMetadataValue(this.plugin, true); + private final FixedMetadataValue TRUE = this.plugin.getMetadataValueFactory().create(true); @EventHandler public void onPotionEffect(EntityPotionEffectEvent event) { diff --git a/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/AlchemyMain.java b/eco-extensions/alchemy/src/main/java/com/willfp/ecoenchants/alchemy/AlchemyMain.java similarity index 85% rename from Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/AlchemyMain.java rename to eco-extensions/alchemy/src/main/java/com/willfp/ecoenchants/alchemy/AlchemyMain.java index af78536e..655c25fb 100644 --- a/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/AlchemyMain.java +++ b/eco-extensions/alchemy/src/main/java/com/willfp/ecoenchants/alchemy/AlchemyMain.java @@ -1,7 +1,7 @@ package com.willfp.ecoenchants.alchemy; +import com.willfp.eco.util.extensions.Extension; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.extensions.Extension; public class AlchemyMain extends Extension { public static final EcoEnchant ALCHEMY = new Alchemy(); diff --git a/Extensions/Alchemy/src/main/resources/enchants/normal/alchemy.yml b/eco-extensions/alchemy/src/main/resources/enchants/normal/alchemy.yml similarity index 100% rename from Extensions/Alchemy/src/main/resources/enchants/normal/alchemy.yml rename to eco-extensions/alchemy/src/main/resources/enchants/normal/alchemy.yml diff --git a/Extensions/Alchemy/src/main/resources/extension.yml b/eco-extensions/alchemy/src/main/resources/extension.yml similarity index 100% rename from Extensions/Alchemy/src/main/resources/extension.yml rename to eco-extensions/alchemy/src/main/resources/extension.yml diff --git a/eco-extensions/biomes/build.gradle b/eco-extensions/biomes/build.gradle new file mode 100644 index 00000000..94439d11 --- /dev/null +++ b/eco-extensions/biomes/build.gradle @@ -0,0 +1,3 @@ +group 'com.willfp' +version '3.0.0' +description = 'Biomes Extension' \ No newline at end of file diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java similarity index 95% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java index 35536a0b..3e24c19a 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java @@ -1,8 +1,9 @@ package com.willfp.ecoenchants.biomes; +import com.willfp.eco.util.optional.Prerequisite; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.util.optional.Prerequisite; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; diff --git a/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java new file mode 100644 index 00000000..71ea54b8 --- /dev/null +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java @@ -0,0 +1,38 @@ +package com.willfp.ecoenchants.biomes; + + +import com.willfp.eco.util.extensions.Extension; +import com.willfp.ecoenchants.biomes.enchants.defensive.Elevation; +import com.willfp.ecoenchants.biomes.enchants.defensive.Glacial; +import com.willfp.ecoenchants.biomes.enchants.defensive.HeatTreated; +import com.willfp.ecoenchants.biomes.enchants.defensive.Oceanic; +import com.willfp.ecoenchants.biomes.enchants.defensive.Tropical; +import com.willfp.ecoenchants.biomes.enchants.offensive.Altitude; +import com.willfp.ecoenchants.biomes.enchants.offensive.Aquamarine; +import com.willfp.ecoenchants.biomes.enchants.offensive.Dehydration; +import com.willfp.ecoenchants.biomes.enchants.offensive.Icelord; +import com.willfp.ecoenchants.biomes.enchants.offensive.Rainforest; +import com.willfp.ecoenchants.enchantments.EcoEnchant; + +public class BiomesMain extends Extension { + public static final EcoEnchant ELEVATION = new Elevation(); + public static final EcoEnchant GLACIAL = new Glacial(); + public static final EcoEnchant HEAT_TREATED = new HeatTreated(); + public static final EcoEnchant OCEANIC = new Oceanic(); + public static final EcoEnchant TROPICAL = new Tropical(); + public static final EcoEnchant ALTITUDE = new Altitude(); + public static final EcoEnchant AQUAMARINE = new Aquamarine(); + public static final EcoEnchant DEHYDRATION = new Dehydration(); + public static final EcoEnchant ICELORD = new Icelord(); + public static final EcoEnchant RAINFOREST = new Rainforest(); + + @Override + public void onEnable() { + + } + + @Override + public void onDisable() { + + } +} diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Elevation.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Elevation.java similarity index 87% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Elevation.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Elevation.java index 4b4a7118..598d37fe 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Elevation.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Elevation.java @@ -1,6 +1,8 @@ package com.willfp.ecoenchants.biomes.enchants.defensive; + import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Glacial.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Glacial.java similarity index 87% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Glacial.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Glacial.java index 7ea0036e..25b344c8 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Glacial.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Glacial.java @@ -1,6 +1,8 @@ package com.willfp.ecoenchants.biomes.enchants.defensive; + import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/HeatTreated.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/HeatTreated.java similarity index 88% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/HeatTreated.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/HeatTreated.java index ab7f8301..cefb6c08 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/HeatTreated.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/HeatTreated.java @@ -1,6 +1,8 @@ package com.willfp.ecoenchants.biomes.enchants.defensive; + import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Oceanic.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Oceanic.java similarity index 87% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Oceanic.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Oceanic.java index 234afaba..6c372ee3 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Oceanic.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Oceanic.java @@ -1,6 +1,8 @@ package com.willfp.ecoenchants.biomes.enchants.defensive; + import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Tropical.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Tropical.java similarity index 87% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Tropical.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Tropical.java index 6a6cb7c7..70cbdb3a 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Tropical.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/defensive/Tropical.java @@ -1,6 +1,8 @@ package com.willfp.ecoenchants.biomes.enchants.defensive; + import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Altitude.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Altitude.java similarity index 88% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Altitude.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Altitude.java index b1546970..f45f4ff7 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Altitude.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Altitude.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.biomes.enchants.offensive; import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Aquamarine.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Aquamarine.java similarity index 87% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Aquamarine.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Aquamarine.java index 75e7fe40..0b2e6aab 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Aquamarine.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Aquamarine.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.biomes.enchants.offensive; import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Dehydration.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Dehydration.java similarity index 88% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Dehydration.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Dehydration.java index bb428005..75285998 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Dehydration.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Dehydration.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.biomes.enchants.offensive; import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Icelord.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Icelord.java similarity index 88% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Icelord.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Icelord.java index 06df6a72..7adc5f01 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Icelord.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Icelord.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.biomes.enchants.offensive; import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Rainforest.java b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Rainforest.java similarity index 87% rename from Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Rainforest.java rename to eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Rainforest.java index 77918be2..fb2e0088 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Rainforest.java +++ b/eco-extensions/biomes/src/main/java/com/willfp/ecoenchants/biomes/enchants/offensive/Rainforest.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.biomes.enchants.offensive; import com.willfp.ecoenchants.biomes.BiomesEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.block.Biome; import java.util.Arrays; diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/altitude.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/altitude.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/altitude.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/altitude.yml diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/aquamarine.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/aquamarine.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/aquamarine.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/aquamarine.yml diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/dehydration.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/dehydration.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/dehydration.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/dehydration.yml diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/elevation.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/elevation.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/elevation.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/elevation.yml diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/glacial.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/glacial.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/glacial.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/glacial.yml diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/heattreated.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/heattreated.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/heattreated.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/heattreated.yml diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/icelord.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/icelord.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/icelord.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/icelord.yml diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/oceanic.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/oceanic.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/oceanic.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/oceanic.yml diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/rainforest.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/rainforest.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/rainforest.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/rainforest.yml diff --git a/Extensions/Biomes/src/main/resources/enchants/normal/tropical.yml b/eco-extensions/biomes/src/main/resources/enchants/normal/tropical.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/enchants/normal/tropical.yml rename to eco-extensions/biomes/src/main/resources/enchants/normal/tropical.yml diff --git a/Extensions/Biomes/src/main/resources/extension.yml b/eco-extensions/biomes/src/main/resources/extension.yml similarity index 100% rename from Extensions/Biomes/src/main/resources/extension.yml rename to eco-extensions/biomes/src/main/resources/extension.yml diff --git a/eco-extensions/build.gradle b/eco-extensions/build.gradle new file mode 100644 index 00000000..0453eedd --- /dev/null +++ b/eco-extensions/build.gradle @@ -0,0 +1,19 @@ +group 'com.willfp' +version rootProject.version + +subprojects { + dependencies { + compileOnly project(":eco-core:core-plugin") + compileOnly project(":eco-core:core-proxy") + compileOnly project(":eco-util") + compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' + } + + tasks.withType(Jar) { + destinationDirectory = file("$rootDir/bin/") + } + + jar{ + archiveFileName = project.description + " v" + project.version + ".jar" + } +} \ No newline at end of file diff --git a/eco-extensions/effects/build.gradle b/eco-extensions/effects/build.gradle new file mode 100644 index 00000000..c83cf19a --- /dev/null +++ b/eco-extensions/effects/build.gradle @@ -0,0 +1,3 @@ +group 'com.willfp' +version '3.0.0' +description = 'Effects Extension' \ No newline at end of file diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java similarity index 88% rename from Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java rename to eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java index 14c070fa..cc5359ca 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java +++ b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java @@ -1,9 +1,11 @@ package com.willfp.ecoenchants.effects; + +import com.willfp.eco.util.events.armorequip.ArmorEquipEvent; +import com.willfp.eco.util.optional.Prerequisite; import com.willfp.ecoenchants.enchantments.EcoEnchant; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; -import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent; -import com.willfp.ecoenchants.util.optional.Prerequisite; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/JumpBoost.java b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/JumpBoost.java similarity index 85% rename from Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/JumpBoost.java rename to eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/JumpBoost.java index 9c1ec7b8..03091f03 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/JumpBoost.java +++ b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/JumpBoost.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.effects.enchants; import com.willfp.ecoenchants.effects.EffectsEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.potion.PotionEffectType; public class JumpBoost extends EffectsEnchantment { diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/NightVision.java b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/NightVision.java similarity index 86% rename from Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/NightVision.java rename to eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/NightVision.java index 55ccb811..5a554089 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/NightVision.java +++ b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/NightVision.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.effects.enchants; import com.willfp.ecoenchants.effects.EffectsEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.potion.PotionEffectType; public class NightVision extends EffectsEnchantment { diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Regeneration.java b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Regeneration.java similarity index 86% rename from Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Regeneration.java rename to eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Regeneration.java index 023893d9..f3e218e0 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Regeneration.java +++ b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Regeneration.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.effects.enchants; import com.willfp.ecoenchants.effects.EffectsEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.potion.PotionEffectType; public class Regeneration extends EffectsEnchantment { diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Speed.java b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Speed.java similarity index 85% rename from Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Speed.java rename to eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Speed.java index 23094384..53e2a3ea 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Speed.java +++ b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/Speed.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.effects.enchants; import com.willfp.ecoenchants.effects.EffectsEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.potion.PotionEffectType; public class Speed extends EffectsEnchantment { diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/WaterBreathing.java b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/WaterBreathing.java similarity index 86% rename from Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/WaterBreathing.java rename to eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/WaterBreathing.java index e448c01e..02637995 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/enchants/WaterBreathing.java +++ b/eco-extensions/effects/src/main/java/com/willfp/ecoenchants/effects/enchants/WaterBreathing.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.effects.enchants; import com.willfp.ecoenchants.effects.EffectsEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import org.bukkit.potion.PotionEffectType; public class WaterBreathing extends EffectsEnchantment { diff --git a/Extensions/Effects/src/main/resources/enchants/normal/jumpboost.yml b/eco-extensions/effects/src/main/resources/enchants/normal/jumpboost.yml similarity index 100% rename from Extensions/Effects/src/main/resources/enchants/normal/jumpboost.yml rename to eco-extensions/effects/src/main/resources/enchants/normal/jumpboost.yml diff --git a/Extensions/Effects/src/main/resources/enchants/normal/nightvision.yml b/eco-extensions/effects/src/main/resources/enchants/normal/nightvision.yml similarity index 100% rename from Extensions/Effects/src/main/resources/enchants/normal/nightvision.yml rename to eco-extensions/effects/src/main/resources/enchants/normal/nightvision.yml diff --git a/Extensions/Effects/src/main/resources/enchants/normal/regeneration.yml b/eco-extensions/effects/src/main/resources/enchants/normal/regeneration.yml similarity index 100% rename from Extensions/Effects/src/main/resources/enchants/normal/regeneration.yml rename to eco-extensions/effects/src/main/resources/enchants/normal/regeneration.yml diff --git a/Extensions/Effects/src/main/resources/enchants/normal/speed.yml b/eco-extensions/effects/src/main/resources/enchants/normal/speed.yml similarity index 100% rename from Extensions/Effects/src/main/resources/enchants/normal/speed.yml rename to eco-extensions/effects/src/main/resources/enchants/normal/speed.yml diff --git a/Extensions/Effects/src/main/resources/enchants/normal/waterbreathing.yml b/eco-extensions/effects/src/main/resources/enchants/normal/waterbreathing.yml similarity index 100% rename from Extensions/Effects/src/main/resources/enchants/normal/waterbreathing.yml rename to eco-extensions/effects/src/main/resources/enchants/normal/waterbreathing.yml diff --git a/Extensions/Effects/src/main/resources/extension.yml b/eco-extensions/effects/src/main/resources/extension.yml similarity index 100% rename from Extensions/Effects/src/main/resources/extension.yml rename to eco-extensions/effects/src/main/resources/extension.yml diff --git a/eco-extensions/endershot/build.gradle b/eco-extensions/endershot/build.gradle new file mode 100644 index 00000000..4513c547 --- /dev/null +++ b/eco-extensions/endershot/build.gradle @@ -0,0 +1,3 @@ +group 'com.willfp' +version '3.0.0' +description = 'Endershot Extension' \ No newline at end of file diff --git a/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java b/eco-extensions/endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java similarity index 97% rename from Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java rename to eco-extensions/endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java index 09588ff9..a4a63e81 100644 --- a/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java +++ b/eco-extensions/endershot/src/main/java/com/willfp/ecoenchants/endershot/Endershot.java @@ -2,6 +2,7 @@ package com.willfp.ecoenchants.endershot; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.mcmmo.McmmoManager; import org.bukkit.GameMode; diff --git a/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java b/eco-extensions/endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java similarity index 67% rename from Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java rename to eco-extensions/endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java index 3da85d47..7937181a 100644 --- a/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java +++ b/eco-extensions/endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java @@ -1,15 +1,15 @@ package com.willfp.ecoenchants.endershot; + +import com.willfp.eco.util.extensions.Extension; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.extensions.Extension; -import org.bukkit.Bukkit; public class EndershotMain extends Extension { public static final EcoEnchant ENDERSHOT = new Endershot(); @Override public void onEnable() { - Bukkit.getPluginManager().registerEvents(ENDERSHOT, this.plugin); + } @Override diff --git a/Extensions/Endershot/src/main/resources/enchants/normal/endershot.yml b/eco-extensions/endershot/src/main/resources/enchants/normal/endershot.yml similarity index 100% rename from Extensions/Endershot/src/main/resources/enchants/normal/endershot.yml rename to eco-extensions/endershot/src/main/resources/enchants/normal/endershot.yml diff --git a/Extensions/Endershot/src/main/resources/extension.yml b/eco-extensions/endershot/src/main/resources/extension.yml similarity index 100% rename from Extensions/Endershot/src/main/resources/extension.yml rename to eco-extensions/endershot/src/main/resources/extension.yml diff --git a/eco-extensions/firewand/build.gradle b/eco-extensions/firewand/build.gradle new file mode 100644 index 00000000..69973f05 --- /dev/null +++ b/eco-extensions/firewand/build.gradle @@ -0,0 +1,3 @@ +group 'com.willfp' +version '3.0.0' +description = 'Firewand Extension' \ No newline at end of file diff --git a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java b/eco-extensions/firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java similarity index 99% rename from Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java rename to eco-extensions/firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java index bd33fbf2..f95fef0d 100644 --- a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java +++ b/eco-extensions/firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants.firewand; + import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.itemtypes.Spell; import org.bukkit.entity.Player; diff --git a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java b/eco-extensions/firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java similarity index 67% rename from Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java rename to eco-extensions/firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java index 6d40a4c4..f388e959 100644 --- a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java +++ b/eco-extensions/firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java @@ -1,15 +1,13 @@ package com.willfp.ecoenchants.firewand; +import com.willfp.eco.util.extensions.Extension; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.extensions.Extension; -import org.bukkit.Bukkit; public class FirewandMain extends Extension { public static final EcoEnchant FIREWAND = new Firewand(); @Override public void onEnable() { - Bukkit.getPluginManager().registerEvents(FIREWAND, this.plugin); } @Override diff --git a/Extensions/Firewand/src/main/resources/enchants/spell/firewand.yml b/eco-extensions/firewand/src/main/resources/enchants/spell/firewand.yml similarity index 100% rename from Extensions/Firewand/src/main/resources/enchants/spell/firewand.yml rename to eco-extensions/firewand/src/main/resources/enchants/spell/firewand.yml diff --git a/Extensions/Firewand/src/main/resources/extension.yml b/eco-extensions/firewand/src/main/resources/extension.yml similarity index 100% rename from Extensions/Firewand/src/main/resources/extension.yml rename to eco-extensions/firewand/src/main/resources/extension.yml diff --git a/eco-extensions/mmo/build.gradle b/eco-extensions/mmo/build.gradle new file mode 100644 index 00000000..4cb9f9f4 --- /dev/null +++ b/eco-extensions/mmo/build.gradle @@ -0,0 +1,19 @@ +group 'com.willfp' +version '3.0.0' +description = 'MMO Extension' + +repositories { + maven { + url 'https://mvn.lumine.io/repository/maven-public/' + } +} + +dependencies { + compileOnly 'net.Indyuce:MMOCore:1.6' + compileOnly 'net.Indyuce:MMOItems:6.5' + compileOnly 'net.Indyuce:MMOLib:1.7.3' +} + +configurations.all { + exclude group: 'com.mojang', module: 'authlib' +} \ No newline at end of file diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java similarity index 80% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java index a6fd16ba..e4961268 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java @@ -1,7 +1,7 @@ package com.willfp.ecoenchants.mmo; +import com.willfp.eco.util.extensions.Extension; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.extensions.Extension; import com.willfp.ecoenchants.mmo.enchants.abilities.Discounted; import com.willfp.ecoenchants.mmo.enchants.abilities.Recover; import com.willfp.ecoenchants.mmo.enchants.mana.Augment; @@ -14,8 +14,6 @@ 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 com.willfp.ecoenchants.mmo.structure.MMOEnchant; -import com.willfp.ecoenchants.util.internal.Logger; import org.bukkit.Bukkit; public class MMOMain extends Extension { @@ -35,14 +33,10 @@ public class MMOMain extends Extension { @Override protected void onEnable() { if(!MMOPrerequisites.HAS_MMOCORE.isMet()) { - Logger.error("MMO Extension requires MMOCore to be installed!"); - Logger.error("Disabling..."); + Bukkit.getLogger().severe("MMO Extension requires MMOCore to be installed!"); + Bukkit.getLogger().severe("Disabling..."); this.disable(); } - - MMOEnchant.REGISTRY.forEach(mmoEnchant -> { - Bukkit.getPluginManager().registerEvents((EcoEnchant) mmoEnchant, this.plugin); - }); } @Override diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java similarity index 94% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java index 2796a63c..a577f514 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.mmo; -import com.willfp.ecoenchants.util.optional.Prerequisite; + +import com.willfp.eco.util.optional.Prerequisite; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Discounted.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Discounted.java similarity index 94% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Discounted.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Discounted.java index 0310545a..df7b7566 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Discounted.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Discounted.java @@ -1,9 +1,10 @@ package com.willfp.ecoenchants.mmo.enchants.abilities; import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; -import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import com.willfp.ecoenchants.mmo.MMOPrerequisites; +import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import net.Indyuce.mmoitems.api.event.AbilityUseEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Recover.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Recover.java similarity index 94% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Recover.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Recover.java index a9e2ef92..19f1327d 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Recover.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/abilities/Recover.java @@ -1,9 +1,10 @@ package com.willfp.ecoenchants.mmo.enchants.abilities; import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; -import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import com.willfp.ecoenchants.mmo.MMOPrerequisites; +import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import net.Indyuce.mmoitems.api.event.AbilityUseEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Augment.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Augment.java similarity index 90% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Augment.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Augment.java index c33bcfbb..c1c4b5df 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Augment.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Augment.java @@ -1,7 +1,8 @@ package com.willfp.ecoenchants.mmo.enchants.mana; +import com.willfp.eco.util.events.armorequip.ArmorEquipEvent; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent; +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; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Drain.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Drain.java similarity index 100% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Drain.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Drain.java diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java similarity index 82% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java index 5fdbb2f1..80f7cae3 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java @@ -1,9 +1,12 @@ package com.willfp.ecoenchants.mmo.enchants.mana; + +import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.mmo.integrations.mmo.MMOManager; -import com.willfp.ecoenchants.nms.Cooldown; +import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -21,7 +24,7 @@ public class Elixir extends MMOEnchantment { Player pVictim = (Player) victim; boolean notcharged = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged"); - if (Cooldown.getCooldown(pAttacker) != 1.0f && !notcharged) + if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown(pAttacker) != 1.0f && !notcharged) return; double victimMana = MMOManager.getMana(pVictim); diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Siphon.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Siphon.java similarity index 94% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Siphon.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Siphon.java index ecee0ca1..4e64b7ad 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Siphon.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Siphon.java @@ -1,8 +1,9 @@ package com.willfp.ecoenchants.mmo.enchants.mana; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.mmo.integrations.mmo.MMOManager; +import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Spirituality.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Spirituality.java similarity index 94% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Spirituality.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Spirituality.java index 6c48b666..cfbb1d25 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Spirituality.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Spirituality.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.mmo.enchants.mana; import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import net.Indyuce.mmocore.api.event.PlayerRegenResourceEvent; diff --git a/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 similarity index 91% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/misc/Strengthening.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/misc/Strengthening.java index 57808c3d..c6fdd9c0 100644 --- a/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 @@ -1,7 +1,9 @@ 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.events.armorequip.ArmorEquipEvent; +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; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Athletic.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Athletic.java similarity index 90% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Athletic.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Athletic.java index 05311af7..f2c3362c 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Athletic.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Athletic.java @@ -1,7 +1,8 @@ package com.willfp.ecoenchants.mmo.enchants.stamina; +import com.willfp.eco.util.events.armorequip.ArmorEquipEvent; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent; +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; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Endurance.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Endurance.java similarity index 94% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Endurance.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Endurance.java index dfcda6fe..45a1c127 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Endurance.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Endurance.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.mmo.enchants.stamina; import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import net.Indyuce.mmocore.api.event.PlayerRegenResourceEvent; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Fortitude.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Fortitude.java similarity index 94% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Fortitude.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Fortitude.java index 557ad6ad..6b07c7b9 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Fortitude.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Fortitude.java @@ -1,8 +1,9 @@ package com.willfp.ecoenchants.mmo.enchants.stamina; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.mmo.integrations.mmo.MMOManager; +import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/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 similarity index 83% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java index b7c1c99d..4976239e 100644 --- a/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 @@ -1,9 +1,12 @@ package com.willfp.ecoenchants.mmo.enchants.stamina; + +import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.mmo.integrations.mmo.MMOManager; -import com.willfp.ecoenchants.nms.Cooldown; +import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -21,7 +24,7 @@ public class Motivate extends MMOEnchantment { Player pVictim = (Player) victim; boolean notcharged = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged"); - if (Cooldown.getCooldown(pAttacker) != 1.0f && !notcharged) + if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown(pAttacker) != 1.0f && !notcharged) return; double victimStamina = MMOManager.getStamina(pVictim); diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOIntegration.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOIntegration.java similarity index 89% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOIntegration.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOIntegration.java index 4b435df6..ccc7d8f9 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOIntegration.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOIntegration.java @@ -1,6 +1,7 @@ package com.willfp.ecoenchants.mmo.integrations.mmo; -import com.willfp.ecoenchants.integrations.Integration; + +import com.willfp.eco.util.integrations.Integration; import org.bukkit.entity.Player; public interface MMOIntegration extends Integration { diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOManager.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOManager.java similarity index 100% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOManager.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/MMOManager.java diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/plugins/MMOCore.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/plugins/MMOCore.java similarity index 100% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/plugins/MMOCore.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/integrations/mmo/plugins/MMOCore.java diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchant.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchant.java similarity index 100% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchant.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchant.java diff --git a/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 similarity index 80% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java index 95881174..4c2a77e1 100644 --- a/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 @@ -1,8 +1,10 @@ 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; -import com.willfp.ecoenchants.util.optional.Prerequisite; public abstract class MMOEnchantment extends EcoEnchant implements MMOEnchant { protected MMOEnchantment(String key, EnchantmentType type, Prerequisite... prerequisites) { diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java similarity index 88% rename from Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java rename to eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java index ed1f8cb9..1bba69f4 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java @@ -1,8 +1,8 @@ package com.willfp.ecoenchants.mmo.structure; +import com.willfp.eco.util.optional.Prerequisite; import com.willfp.ecoenchants.enchantments.itemtypes.Spell; import com.willfp.ecoenchants.mmo.MMOPrerequisites; -import com.willfp.ecoenchants.util.optional.Prerequisite; public abstract class MMOSpell extends Spell implements MMOEnchant { protected MMOSpell(String key, Prerequisite... prerequisites) { diff --git a/Extensions/MMO/src/main/resources/enchants/normal/athletic.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/athletic.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/athletic.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/athletic.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/augment.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/augment.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/augment.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/augment.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/discounted.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/discounted.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/discounted.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/discounted.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/elixir.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/elixir.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/elixir.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/elixir.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/endurance.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/endurance.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/endurance.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/endurance.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/fortitude.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/fortitude.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/fortitude.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/fortitude.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/motivate.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/motivate.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/motivate.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/motivate.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/recover.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/recover.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/recover.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/recover.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/siphon.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/siphon.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/siphon.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/siphon.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/spirituality.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/spirituality.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/spirituality.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/spirituality.yml diff --git a/Extensions/MMO/src/main/resources/enchants/normal/strengthening.yml b/eco-extensions/mmo/src/main/resources/enchants/normal/strengthening.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/normal/strengthening.yml rename to eco-extensions/mmo/src/main/resources/enchants/normal/strengthening.yml diff --git a/Extensions/MMO/src/main/resources/enchants/spell/drain.yml b/eco-extensions/mmo/src/main/resources/enchants/spell/drain.yml similarity index 100% rename from Extensions/MMO/src/main/resources/enchants/spell/drain.yml rename to eco-extensions/mmo/src/main/resources/enchants/spell/drain.yml diff --git a/Extensions/MMO/src/main/resources/extension.yml b/eco-extensions/mmo/src/main/resources/extension.yml similarity index 100% rename from Extensions/MMO/src/main/resources/extension.yml rename to eco-extensions/mmo/src/main/resources/extension.yml diff --git a/eco-extensions/precision/build.gradle b/eco-extensions/precision/build.gradle new file mode 100644 index 00000000..b396f374 --- /dev/null +++ b/eco-extensions/precision/build.gradle @@ -0,0 +1,3 @@ +group 'com.willfp' +version '3.0.0' +description = 'Precision Extension' \ No newline at end of file diff --git a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java b/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java similarity index 91% rename from Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java rename to eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java index 082e6345..26cfd266 100644 --- a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java +++ b/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java @@ -1,9 +1,13 @@ package com.willfp.ecoenchants.precision; + +import com.willfp.eco.core.proxy.proxies.TridentStackProxy; +import com.willfp.eco.util.ProxyUtils; +import com.willfp.eco.util.bukkit.scheduling.EcoBukkitRunnable; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; -import com.willfp.ecoenchants.nms.TridentStack; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.entity.Enderman; @@ -43,7 +47,7 @@ public class Precision extends EcoEnchant { Player player = (Player) event.getEntity().getShooter(); Trident trident = (Trident) event.getEntity(); - ItemStack itemStack = TridentStack.getTridentStack(trident); + ItemStack itemStack = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); if (!EnchantChecks.item(itemStack, this)) return; if(this.getDisabledWorlds().contains(player.getWorld())) return; @@ -86,7 +90,7 @@ public class Precision extends EcoEnchant { final int checks = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "checks-per-level") * level; AtomicInteger checksPerformed = new AtomicInteger(0); - new BukkitRunnable() { + new EcoBukkitRunnable(this.plugin) { @Override public void run() { checksPerformed.addAndGet(1); diff --git a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java b/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java similarity index 67% rename from Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java rename to eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java index ea5109fe..792e810d 100644 --- a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java +++ b/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java @@ -1,15 +1,13 @@ package com.willfp.ecoenchants.precision; +import com.willfp.eco.util.extensions.Extension; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.extensions.Extension; -import org.bukkit.Bukkit; public class PrecisionMain extends Extension { public static final EcoEnchant PRECISION = new Precision(); @Override public void onEnable() { - Bukkit.getPluginManager().registerEvents(PRECISION, this.plugin); } @Override diff --git a/Extensions/Precision/src/main/resources/enchants/special/precision.yml b/eco-extensions/precision/src/main/resources/enchants/special/precision.yml similarity index 100% rename from Extensions/Precision/src/main/resources/enchants/special/precision.yml rename to eco-extensions/precision/src/main/resources/enchants/special/precision.yml diff --git a/Extensions/Precision/src/main/resources/extension.yml b/eco-extensions/precision/src/main/resources/extension.yml similarity index 100% rename from Extensions/Precision/src/main/resources/extension.yml rename to eco-extensions/precision/src/main/resources/extension.yml diff --git a/eco-extensions/sprint-artifacts/build.gradle b/eco-extensions/sprint-artifacts/build.gradle new file mode 100644 index 00000000..fdd10d58 --- /dev/null +++ b/eco-extensions/sprint-artifacts/build.gradle @@ -0,0 +1,3 @@ +group 'com.willfp' +version '3.0.0' +description = 'Sprint Artifacts Extension' \ No newline at end of file diff --git a/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java b/eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java similarity index 94% rename from Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java rename to eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java index 8b74cee6..33f4c1d4 100644 --- a/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java +++ b/eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java @@ -3,6 +3,7 @@ package com.willfp.ecoenchants.sprintartifacts; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -30,7 +31,7 @@ public class SprintArtifactsListener implements Listener { Optional matching = bootsMeta.getEnchants().keySet().stream() .map(EcoEnchants::getFromEnchantment) .filter(Objects::nonNull) - .filter(enchantment -> enchantment.getType().equals(EcoEnchant.EnchantmentType.ARTIFACT)) + .filter(enchantment -> enchantment.getType().equals(EnchantmentType.ARTIFACT)) .findFirst(); if(!matching.isPresent()) return; Artifact artifact = (Artifact) matching.get(); diff --git a/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java b/eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java similarity index 86% rename from Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java rename to eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java index b3243658..fdff2212 100644 --- a/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java +++ b/eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.sprintartifacts; -import com.willfp.ecoenchants.extensions.Extension; +import com.willfp.eco.util.extensions.Extension; import org.bukkit.Bukkit; public class SprintArtifactsMain extends Extension { diff --git a/Extensions/SprintArtifacts/src/main/resources/extension.yml b/eco-extensions/sprint-artifacts/src/main/resources/extension.yml similarity index 100% rename from Extensions/SprintArtifacts/src/main/resources/extension.yml rename to eco-extensions/sprint-artifacts/src/main/resources/extension.yml diff --git a/eco-extensions/summoning/build.gradle b/eco-extensions/summoning/build.gradle new file mode 100644 index 00000000..07d3503c --- /dev/null +++ b/eco-extensions/summoning/build.gradle @@ -0,0 +1,3 @@ +group 'com.willfp' +version '3.0.0' +description = 'Summoning Extension' \ No newline at end of file diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java similarity index 90% rename from Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java rename to eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java index 6e338578..9f0cbaa0 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java @@ -1,11 +1,13 @@ package com.willfp.ecoenchants.summoning; +import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.NumberUtils; +import com.willfp.eco.util.ProxyUtils; +import com.willfp.eco.util.optional.Prerequisite; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.nms.Cooldown; -import com.willfp.ecoenchants.util.NumberUtils; -import com.willfp.ecoenchants.util.optional.Prerequisite; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; @@ -59,7 +61,7 @@ public abstract class SummoningEnchantment extends EcoEnchant { if(summoningType.equals(SummoningType.MELEE)) { if (attacker instanceof Player) { - if (Cooldown.getCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) return; } } diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java similarity index 53% rename from Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java rename to eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java index 7abaf0f9..c6c5e78b 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java @@ -1,9 +1,12 @@ package com.willfp.ecoenchants.summoning; +import com.willfp.eco.util.extensions.Extension; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.extensions.Extension; -import com.willfp.ecoenchants.summoning.enchants.*; -import org.bukkit.Bukkit; +import com.willfp.ecoenchants.summoning.enchants.Crawler; +import com.willfp.ecoenchants.summoning.enchants.Firestorm; +import com.willfp.ecoenchants.summoning.enchants.Ghoul; +import com.willfp.ecoenchants.summoning.enchants.Metallic; +import com.willfp.ecoenchants.summoning.enchants.Mortality; public class SummoningMain extends Extension { public static final EcoEnchant METALLIC = new Metallic(); @@ -14,11 +17,7 @@ public class SummoningMain extends Extension { @Override public void onEnable() { - Bukkit.getPluginManager().registerEvents(FIRESTORM, this.plugin); - Bukkit.getPluginManager().registerEvents(METALLIC, this.plugin); - Bukkit.getPluginManager().registerEvents(MORTALITY, this.plugin); - Bukkit.getPluginManager().registerEvents(GHOUL, this.plugin); - Bukkit.getPluginManager().registerEvents(CRAWLER, this.plugin); + } @Override diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningType.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningType.java similarity index 100% rename from Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningType.java rename to eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningType.java diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Crawler.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Crawler.java similarity index 87% rename from Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Crawler.java rename to eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Crawler.java index 2d1ebdad..89999425 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Crawler.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Crawler.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants.summoning.enchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.summoning.SummoningEnchantment; import com.willfp.ecoenchants.summoning.SummoningType; import org.bukkit.entity.EntityType; diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Firestorm.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Firestorm.java similarity index 87% rename from Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Firestorm.java rename to eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Firestorm.java index 7ec9214e..3849de91 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Firestorm.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Firestorm.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants.summoning.enchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.summoning.SummoningEnchantment; import com.willfp.ecoenchants.summoning.SummoningType; import org.bukkit.entity.EntityType; diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Ghoul.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Ghoul.java similarity index 87% rename from Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Ghoul.java rename to eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Ghoul.java index 089762c4..00c1ce48 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Ghoul.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Ghoul.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants.summoning.enchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.summoning.SummoningEnchantment; import com.willfp.ecoenchants.summoning.SummoningType; import org.bukkit.entity.EntityType; diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Metallic.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Metallic.java similarity index 87% rename from Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Metallic.java rename to eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Metallic.java index 87804e3b..a1941965 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Metallic.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Metallic.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants.summoning.enchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.summoning.SummoningEnchantment; import com.willfp.ecoenchants.summoning.SummoningType; import org.bukkit.entity.EntityType; diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Mortality.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Mortality.java similarity index 87% rename from Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Mortality.java rename to eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Mortality.java index e7351658..e366b660 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Mortality.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Mortality.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants.summoning.enchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.summoning.SummoningEnchantment; import com.willfp.ecoenchants.summoning.SummoningType; import org.bukkit.entity.EntityType; diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Sniper.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Sniper.java similarity index 87% rename from Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Sniper.java rename to eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Sniper.java index 0a044e3e..0f452cba 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Sniper.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/enchants/Sniper.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants.summoning.enchants; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.summoning.SummoningEnchantment; import com.willfp.ecoenchants.summoning.SummoningType; import org.bukkit.entity.EntityType; diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/crawler.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/crawler.yml similarity index 100% rename from Extensions/Summoning/src/main/resources/enchants/normal/crawler.yml rename to eco-extensions/summoning/src/main/resources/enchants/normal/crawler.yml diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/firestorm.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/firestorm.yml similarity index 100% rename from Extensions/Summoning/src/main/resources/enchants/normal/firestorm.yml rename to eco-extensions/summoning/src/main/resources/enchants/normal/firestorm.yml diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/ghoul.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/ghoul.yml similarity index 100% rename from Extensions/Summoning/src/main/resources/enchants/normal/ghoul.yml rename to eco-extensions/summoning/src/main/resources/enchants/normal/ghoul.yml diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/mortality.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/mortality.yml similarity index 100% rename from Extensions/Summoning/src/main/resources/enchants/normal/mortality.yml rename to eco-extensions/summoning/src/main/resources/enchants/normal/mortality.yml diff --git a/Extensions/Summoning/src/main/resources/enchants/normal/sniper.yml b/eco-extensions/summoning/src/main/resources/enchants/normal/sniper.yml similarity index 100% rename from Extensions/Summoning/src/main/resources/enchants/normal/sniper.yml rename to eco-extensions/summoning/src/main/resources/enchants/normal/sniper.yml diff --git a/Extensions/Summoning/src/main/resources/enchants/special/metallic.yml b/eco-extensions/summoning/src/main/resources/enchants/special/metallic.yml similarity index 100% rename from Extensions/Summoning/src/main/resources/enchants/special/metallic.yml rename to eco-extensions/summoning/src/main/resources/enchants/special/metallic.yml diff --git a/Extensions/Summoning/src/main/resources/extension.yml b/eco-extensions/summoning/src/main/resources/extension.yml similarity index 100% rename from Extensions/Summoning/src/main/resources/extension.yml rename to eco-extensions/summoning/src/main/resources/extension.yml diff --git a/eco-util/src/main/java/com/willfp/eco/util/drops/internal/InternalDropQueue.java b/eco-util/src/main/java/com/willfp/eco/util/drops/internal/InternalDropQueue.java index 845c8b8f..1b3bbf04 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/drops/internal/InternalDropQueue.java +++ b/eco-util/src/main/java/com/willfp/eco/util/drops/internal/InternalDropQueue.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.drops.internal; -import com.willfp.eco.util.drops.telekinesis.TelekineticTests; +import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; @@ -118,7 +118,7 @@ public class InternalDropQueue implements AbstractDropQueue { * Push the queue */ public void push() { - if(!hasTelekinesis) hasTelekinesis = TelekineticTests.testPlayer(player); + if(!hasTelekinesis) hasTelekinesis = AbstractEcoPlugin.getInstance().getTelekineticTests().testPlayer(player); World world = loc.getWorld(); assert world != null; diff --git a/eco-util/src/main/java/com/willfp/eco/util/drops/telekinesis/TelekineticTests.java b/eco-util/src/main/java/com/willfp/eco/util/drops/telekinesis/TelekineticTests.java index 175239b1..a6bcb12f 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/drops/telekinesis/TelekineticTests.java +++ b/eco-util/src/main/java/com/willfp/eco/util/drops/telekinesis/TelekineticTests.java @@ -1,19 +1,25 @@ package com.willfp.eco.util.drops.telekinesis; +import com.willfp.eco.util.injection.PluginDependent; import com.willfp.eco.util.lambda.ObjectBiCallable; +import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.entity.Player; import java.util.HashSet; import java.util.Set; -public class TelekineticTests { - private static final Set> tests = new HashSet<>(); +public class TelekineticTests extends PluginDependent { + private final Set> tests = new HashSet<>(); - public static void registerTest(ObjectBiCallable test) { + public TelekineticTests(AbstractEcoPlugin plugin) { + super(plugin); + } + + public void registerTest(ObjectBiCallable test) { tests.add(test); } - public static boolean testPlayer(Player player) { + public boolean testPlayer(Player player) { for (ObjectBiCallable test : tests) { if(test.call(player)) return true; } diff --git a/eco-util/src/main/java/com/willfp/eco/util/extensions/Extension.java b/eco-util/src/main/java/com/willfp/eco/util/extensions/Extension.java index 73bc8ae8..a5b3ec74 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/extensions/Extension.java +++ b/eco-util/src/main/java/com/willfp/eco/util/extensions/Extension.java @@ -1,5 +1,6 @@ package com.willfp.eco.util.extensions; +import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.apache.commons.lang.Validate; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -9,6 +10,8 @@ import org.jetbrains.annotations.NotNull; * Syntactically similar to Bukkit Plugins. */ public abstract class Extension { + protected final AbstractEcoPlugin plugin = AbstractEcoPlugin.getInstance(); + /** * Metadata containing version and name */ diff --git a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java index a3a913ca..b8129671 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java +++ b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java @@ -13,6 +13,7 @@ import com.willfp.eco.util.command.AbstractCommand; import com.willfp.eco.util.config.Configs; import com.willfp.eco.util.drops.internal.DropManager; import com.willfp.eco.util.drops.internal.FastCollatedDropQueue; +import com.willfp.eco.util.drops.telekinesis.TelekineticTests; import com.willfp.eco.util.events.armorequip.ArmorListener; import com.willfp.eco.util.events.armorequip.DispenserArmorListener; import com.willfp.eco.util.events.entitydeathbyentity.EntityDeathByEntityListeners; @@ -54,6 +55,7 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { private final NamespacedKeyFactory namespacedKeyFactory; private final MetadataValueFactory metadataValueFactory; private final ExtensionLoader extensionLoader; + private final TelekineticTests telekineticTests; protected boolean outdated = false; @@ -68,6 +70,7 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { this.namespacedKeyFactory = new NamespacedKeyFactory(this); this.metadataValueFactory = new MetadataValueFactory(this); this.extensionLoader = new EcoExtensionLoader(this); + this.telekineticTests = new TelekineticTests(this); } @Override @@ -210,6 +213,10 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { public abstract List getListeners(); + public final TelekineticTests getTelekineticTests() { + return telekineticTests; + } + public final Logger getLog() { return log; } diff --git a/settings.gradle b/settings.gradle index 8c6e99b5..da85b0ba 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,4 +10,16 @@ include ':eco-core:core-nms:v1_16_R1' include ':eco-core:core-nms:v1_16_R2' include ':eco-core:core-nms:v1_16_R3' include ':eco-core:core-proxy' -include ':eco-core:core-plugin' \ No newline at end of file +include ':eco-core:core-plugin' + +// Extensions +include ':eco-extensions' +include ':eco-extensions:alchemy' +include ':eco-extensions:biomes' +include ':eco-extensions:effects' +include ':eco-extensions:endershot' +include ':eco-extensions:firewand' +include ':eco-extensions:mmo' +include ':eco-extensions:precision' +include ':eco-extensions:sprint-artifacts' +include ':eco-extensions:summoning' \ No newline at end of file