libreforge-updater

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
     }
 }
 
@@ -44,14 +44,14 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.36.0'
-        implementation 'com.willfp:libreforge:3.66.0'
+        compileOnly 'com.willfp:eco:6.38.0'
+        implementation 'com.willfp:libreforge:3.89.0'
         implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'
         compileOnly 'com.github.ben-manes.caffeine:caffeine:3.0.6'
 
-        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.6.21'
+        compileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.7.10'
     }
 
     tasks.withType(JavaCompile) {

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt

@@ -13,10 +13,10 @@ import com.willfp.reforges.display.ReforgesDisplay
 import com.willfp.reforges.integrations.talismans.TalismansIntegration
 import com.willfp.reforges.reforges.Reforges
 import com.willfp.reforges.reforges.util.ReforgeArgParser
-import com.willfp.reforges.util.ReforgeEnableListeners
-import com.willfp.reforges.util.ReforgeLookup
 import com.willfp.reforges.util.AntiPlaceListener
 import com.willfp.reforges.util.DiscoverRecipeListener
+import com.willfp.reforges.util.ReforgeEnableListeners
+import com.willfp.reforges.util.ReforgeLookup
 import org.bukkit.event.Listener
 
 class ReforgesPlugin : LibReforgePlugin() {
@@ -64,7 +64,7 @@ class ReforgesPlugin : LibReforgePlugin() {
     }
 
     override fun getMinimumEcoVersion(): String {
-        return "6.35.1"
+        return "6.38.0"
     }
 
     companion object {

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt

@@ -3,6 +3,7 @@ package com.willfp.reforges.display
 import com.willfp.eco.core.display.Display
 import com.willfp.eco.core.display.DisplayModule
 import com.willfp.eco.core.display.DisplayPriority
+import com.willfp.eco.core.display.DisplayProperties
 import com.willfp.eco.core.fast.FastItemStack
 import com.willfp.eco.core.fast.fast
 import com.willfp.eco.util.SkullUtils
@@ -24,6 +25,7 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
     override fun display(
         itemStack: ItemStack,
         player: Player?,
+        props: DisplayProperties,
         vararg args: Any
     ) {
         val targets = ReforgeTargets.getForItem(itemStack)
@@ -44,9 +46,8 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
 
         if (reforge == null && stone == null) {
             if (plugin.configYml.getBool("reforge.show-reforgable")) {
-                if (player != null && plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
-                    val inventory = player.openInventory.topInventory
-                    if (inventory.contents.contains(itemStack) && inventory.holder == null) {
+                if (plugin.configYml.getBool("reforge.no-reforgable-in-gui")) {
+                    if (props.inGui) {
                         return
                     }
                 }

eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/util/ReforgeEnableListeners.kt

@@ -40,8 +40,8 @@ class ReforgeEnableListeners(private val plugin: EcoPlugin) : Listener {
         refresh()
         val player = event.player
         for (value in values()) {
-            for ((effect) in value.effects) {
-                effect.disableForPlayer(player)
+            for (effect in value.effects) {
+                effect.disableFor(player)
             }
         }
     }

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Mon Jun 20 14:18:01 BST 2022
-version=5.17.0
+#Mon Aug 29 10:59:43 BST 2022
+version=5.40.0
 plugin-name=Reforges