From 9fce6a6d74bffb384f76064522b0c015d0cec2ce Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sun, 24 Jul 2022 15:44:19 +0100
Subject: [PATCH] Updated eco, fixed display

---
 build.gradle                                               | 2 +-
 .../src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt  | 6 +++---
 .../kotlin/com/willfp/reforges/display/ReforgesDisplay.kt  | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index fa79098..a74688d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:6.36.0'
+        compileOnly 'com.willfp:eco:6.38.0'
         implementation 'com.willfp:libreforge:3.76.2'
         implementation 'org.joml:joml:1.10.4'
 
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt
index 8132b04..d188af2 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt
+++ b/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 {
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt
index 024dd98..9f0603f 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt
+++ b/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
                     }
                 }