Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-22 15:05:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Auxilor 2022-01-18 08:33:02 +00:00
commit 5a2463b44c
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -55,7 +55,7 @@ allprojects {
}
dependencies {
compileOnly 'com.willfp:eco:6.19.0'
compileOnly 'com.willfp:eco:6.20.0'
compileOnly 'org.jetbrains:annotations:19.0.0'

2
eco-core/build.gradle
View File

@ -3,6 +3,6 @@ version rootProject.version
subprojects {
dependencies {
implementation 'com.willfp:libreforge:3.3.0'
implementation 'com.willfp:libreforge:3.4.1'
}
}

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
View File

@ -53,7 +53,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Watche
/**
* Instance of EcoEnchants for enchantments to be able to access.
*/
@Getter(AccessLevel.PROTECTED)
@Getter
private final EcoEnchantsPlugin plugin = EcoEnchantsPlugin.getInstance();
/**

1
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java
View File

@ -110,6 +110,7 @@ public abstract class Spell extends EcoEnchant {
PlaceholderManager.registerPlaceholder(
new PlaceholderEntry(
this.getPlugin(),
this.getPermissionName() + "_" + "cooldown",
player -> StringUtils.internalToString(getCooldown(this, player))
)

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantmentUtils.java
View File

@ -82,6 +82,7 @@ public class EnchantmentUtils {
public static void registerPlaceholders(@NotNull final EcoEnchant enchantment) {
PlaceholderManager.registerPlaceholder(
new PlaceholderEntry(
enchantment.getPlugin(),
enchantment.getPermissionName() + "_" + "enabled",
player -> String.valueOf(enchantment.isEnabled())
)
@ -93,6 +94,7 @@ public class EnchantmentUtils {
PlaceholderManager.registerPlaceholder(
new PlaceholderEntry(
enchantment.getPlugin(),
enchantment.getPermissionName() + "_" + key,
player -> StringUtils.internalToString(object)
)

2
gradle.properties
View File

@ -1,2 +1,2 @@
version = 8.24.1
version = 8.25.0
plugin-name = EcoEnchants