fixes hotbar inaccessible when opening double chest... round 2

blackd · Aug 22, 2021 · 41862c1 · 41862c1
1 parent d8cb872
commit 41862c1
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 16 deletions.
diff --git a/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/gui/inject/InsertWidgetHandler.kt b/platforms/fabric-1.16/src/main/java/org/anti_ad/mc/ipnext/gui/inject/InsertWidgetHandler.kt
@@ -13,12 +13,11 @@ object InsertWidgetHandler : ScreenEventListener {
 
 
     fun insertWidget(widgets: List<Widget>?) {
+        currentWidgets.clear()
+        currentScreen = null
         if (widgets != null) {
             currentWidgets.addAll(widgets)
             currentScreen = Vanilla.screen()
-        } else {
-            currentWidgets.clear()
-            currentScreen = null
         }
     }
     /*

diff --git a/...bric-1.16/src/main/java/org/anti_ad/mc/ipnext/gui/inject/SortingButtonCollectionWidget.kt b/...bric-1.16/src/main/java/org/anti_ad/mc/ipnext/gui/inject/SortingButtonCollectionWidget.kt
@@ -61,7 +61,7 @@ class PlayerUICollectionWidget(override val screen: ContainerScreen<*>): Inserta
                                       partialTicks: Float) {
         rStandardGlState()
         rClearDepth()
-        overflow = Overflow.VISIBLE
+        //overflow = Overflow.VISIBLE
         val parentBounds = screen.`(containerBounds)`
         absoluteBounds = parentBounds.copy(y = parentBounds.bottom + 3, height = 20)
         init()
@@ -165,6 +165,11 @@ class PlayerUICollectionWidget(override val screen: ContainerScreen<*>): Inserta
                                     mouseY)
             }
         }
+        override fun mouseClicked(x: Int,
+                                  y: Int,
+                                  button: Int): Boolean {
+            return super.mouseClicked(x,y,button) && visible
+        }
     }
 }
 

diff --git a/platforms/fabric-1.17/src/main/java/org/anti_ad/mc/ipnext/gui/inject/InsertWidgetHandler.kt b/platforms/fabric-1.17/src/main/java/org/anti_ad/mc/ipnext/gui/inject/InsertWidgetHandler.kt
@@ -13,12 +13,11 @@ object InsertWidgetHandler : ScreenEventListener {
 
 
     fun insertWidget(widgets: List<Widget>?) {
+        currentWidgets.clear()
+        currentScreen = null
         if (widgets != null) {
             currentWidgets.addAll(widgets)
             currentScreen = Vanilla.screen()
-        } else {
-            currentWidgets.clear()
-            currentScreen = null
         }
     }
     /*

diff --git a/...bric-1.17/src/main/java/org/anti_ad/mc/ipnext/gui/inject/SortingButtonCollectionWidget.kt b/...bric-1.17/src/main/java/org/anti_ad/mc/ipnext/gui/inject/SortingButtonCollectionWidget.kt
@@ -143,6 +143,12 @@ class PlayerUICollectionWidget(override val screen: ContainerScreen<*>): Inserta
         val flex = BiFlex(this,
                           Axis.HORIZONTAL)
 
+        override var visible: Boolean
+            get() = super.visible
+            set(value) {
+                super.visible = value
+            }
+
     }
 
     inner class ActiveProfileButtonWidget(onClick: () -> Unit): ButtonWidget(onClick) {
@@ -165,6 +171,11 @@ class PlayerUICollectionWidget(override val screen: ContainerScreen<*>): Inserta
                                     mouseY)
             }
         }
+        override fun mouseClicked(x: Int,
+                                  y: Int,
+                                  button: Int): Boolean {
+            return super.mouseClicked(x,y,button) && visible
+        }
     }
 }
 

diff --git a/platforms/forge-1.16/src/main/java/org/anti_ad/mc/ipnext/gui/inject/InsertWidgetHandler.kt b/platforms/forge-1.16/src/main/java/org/anti_ad/mc/ipnext/gui/inject/InsertWidgetHandler.kt
@@ -13,12 +13,11 @@ object InsertWidgetHandler : ScreenEventListener {
 
 
     fun insertWidget(widgets: List<Widget>?) {
+        currentWidgets.clear()
+        currentScreen = null
         if (widgets != null) {
             currentWidgets.addAll(widgets)
             currentScreen = Vanilla.screen()
-        } else {
-            currentWidgets.clear()
-            currentScreen = null
         }
     }
     /*

diff --git a/...orge-1.16/src/main/java/org/anti_ad/mc/ipnext/gui/inject/SortingButtonCollectionWidget.kt b/...orge-1.16/src/main/java/org/anti_ad/mc/ipnext/gui/inject/SortingButtonCollectionWidget.kt
@@ -61,7 +61,7 @@ class PlayerUICollectionWidget(override val screen: ContainerScreen<*>): Inserta
                                       partialTicks: Float) {
         rStandardGlState()
         rClearDepth()
-        overflow = Overflow.VISIBLE
+        //overflow = Overflow.VISIBLE
         val parentBounds = screen.`(containerBounds)`
         absoluteBounds = parentBounds.copy(y = parentBounds.bottom + 3, height = 20)
         init()
@@ -165,6 +165,11 @@ class PlayerUICollectionWidget(override val screen: ContainerScreen<*>): Inserta
                                     mouseY)
             }
         }
+        override fun mouseClicked(x: Int,
+                                  y: Int,
+                                  button: Int): Boolean {
+            return super.mouseClicked(x,y,button) && visible
+        }
     }
 }
 

diff --git a/platforms/forge-1.17/build.gradle.kts b/platforms/forge-1.17/build.gradle.kts
@@ -11,7 +11,7 @@ val supported_minecraft_versions = listOf("1.17.1")
 val mod_loader = "forge"
 val mod_version = project.version
 val minecraft_version = "1.17.1"
-val forge_version = "37.0.36"
+val forge_version = "37.0.42"
 
 
 logger.lifecycle("""

diff --git a/platforms/forge-1.17/src/main/java/org/anti_ad/mc/ipnext/gui/inject/InsertWidgetHandler.kt b/platforms/forge-1.17/src/main/java/org/anti_ad/mc/ipnext/gui/inject/InsertWidgetHandler.kt
@@ -13,12 +13,11 @@ object InsertWidgetHandler : ScreenEventListener {
 
 
     fun insertWidget(widgets: List<Widget>?) {
+        currentWidgets.clear()
+        currentScreen = null
         if (widgets != null) {
             currentWidgets.addAll(widgets)
             currentScreen = Vanilla.screen()
-        } else {
-            currentWidgets.clear()
-            currentScreen = null
         }
     }
     /*

diff --git a/...orge-1.17/src/main/java/org/anti_ad/mc/ipnext/gui/inject/SortingButtonCollectionWidget.kt b/...orge-1.17/src/main/java/org/anti_ad/mc/ipnext/gui/inject/SortingButtonCollectionWidget.kt
@@ -61,7 +61,7 @@ class PlayerUICollectionWidget(override val screen: ContainerScreen<*>): Inserta
                                       partialTicks: Float) {
         rStandardGlState()
         rClearDepth()
-        overflow = Overflow.VISIBLE
+        //overflow = Overflow.VISIBLE
         val parentBounds = screen.`(containerBounds)`
         absoluteBounds = parentBounds.copy(y = parentBounds.bottom + 3, height = 20)
         init()
@@ -165,6 +165,11 @@ class PlayerUICollectionWidget(override val screen: ContainerScreen<*>): Inserta
                                     mouseY)
             }
         }
+        override fun mouseClicked(x: Int,
+                                  y: Int,
+                                  button: Int): Boolean {
+            return super.mouseClicked(x,y,button) && visible
+        }
     }
 }