Merge remote-tracking branch 'origin/master'

Auxilor · Jul 12, 2023 · da0668f · da0668f
2 parents aaf68dd + 2fbf7d4
commit da0668f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 190 deletions.
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/EcoEnchantsPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/EcoEnchantsPlugin.kt
@@ -65,7 +65,7 @@ class EcoEnchantsPlugin : LibreforgePlugin() {
         registerPlayerRefreshFunction { it.clearEnchantCache() }
         registerHolderPlaceholderProvider<FoundEcoEnchantLevel> { it, _ ->
             listOf(
-                NamedValue("level", it.level),
+                NamedValue("level", it.level.level),
                 NamedValue("active_level", it.activeLevel)
             )
         }

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchants.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/EcoEnchants.kt
@@ -3,14 +3,11 @@ package com.willfp.ecoenchants.enchants
 import com.google.common.collect.HashBiMap
 import com.google.common.collect.ImmutableSet
 import com.willfp.eco.core.config.interfaces.Config
-import com.willfp.eco.core.config.updating.ConfigUpdater
 import com.willfp.ecoenchants.EcoEnchantsPlugin
 import com.willfp.ecoenchants.enchants.impl.EnchantmentPermanenceCurse
-import com.willfp.ecoenchants.enchants.impl.EnchantmentRapid
 import com.willfp.ecoenchants.enchants.impl.EnchantmentRepairing
 import com.willfp.ecoenchants.enchants.impl.EnchantmentReplenish
 import com.willfp.ecoenchants.enchants.impl.EnchantmentSoulbound
-import com.willfp.ecoenchants.enchants.impl.EnchantmentTelekinesis
 import com.willfp.ecoenchants.integrations.EnchantRegistrations
 import com.willfp.ecoenchants.rarity.EnchantmentRarities
 import com.willfp.ecoenchants.target.EnchantmentTargets
@@ -20,7 +17,6 @@ import com.willfp.libreforge.loader.configs.ConfigCategory
 import org.bukkit.ChatColor
 import org.bukkit.NamespacedKey
 import org.bukkit.enchantments.Enchantment
-import org.bukkit.event.Listener
 
 @Suppress("UNUSED")
 object EcoEnchants : ConfigCategory("enchant", "enchants") {
@@ -195,10 +191,8 @@ object EcoEnchants : ConfigCategory("enchant", "enchants") {
     private fun registerHardcodedEnchantments(
         plugin: EcoEnchantsPlugin
     ) {
-        EnchantmentTelekinesis(plugin)
         EnchantmentPermanenceCurse(plugin)
         EnchantmentRepairing(plugin)
-        EnchantmentRapid(plugin)
         EnchantmentReplenish(plugin)
         EnchantmentSoulbound(plugin)
     }

diff --git a/...core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/impl/EnchantmentRapid.kt b/...core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/impl/EnchantmentRapid.kt
diff --git a/...ore-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/impl/EnchantmentTelekinesis.kt b/...ore-plugin/src/main/kotlin/com/willfp/ecoenchants/enchants/impl/EnchantmentTelekinesis.kt
diff --git a/eco-core/core-plugin/src/main/resources/enchants/rapid.yml b/eco-core/core-plugin/src/main/resources/enchants/rapid.yml
@@ -13,6 +13,9 @@ tradeable: true
 discoverable: true
 enchantable: true
 
-conditions: [ ]
+effects:
+  - id: rapid_bows
+    args:
+      percent_faster: "15 * %level%"
 
-percent-faster-per-level: 15
+conditions: [ ]
diff --git a/eco-core/core-plugin/src/main/resources/enchants/telekinesis.yml b/eco-core/core-plugin/src/main/resources/enchants/telekinesis.yml
@@ -14,6 +14,7 @@ tradeable: true
 discoverable: true
 enchantable: true
 
-conditions: [ ]
+effects:
+  - id: telekinesis
 
-not-on-players: true
+conditions: [ ]
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 #libreforge-updater
-#Wed Jun 21 10:23:37 BST 2023
+#Sun Jul 09 17:24:20 BST 2023
 kotlin.code.style=official
-libreforge-version=4.20.1
-version=10.20.1
+libreforge-version=4.22.0
+version=10.22.0