Render hover tooltip after creative menu page size rendering (#1544)

neoforged · Sep 15, 2024 · f3bea96 · f3bea96
1 parent 237b294
commit f3bea96
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/patches/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java.patch b/patches/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java.patch
@@ -160,16 +160,19 @@
 
              this.refreshSearchResults();
          } else {
-@@ -665,7 +_,7 @@
+@@ -665,18 +_,27 @@
      public void render(GuiGraphics p_283000_, int p_281317_, int p_282770_, float p_281295_) {
          super.render(p_283000_, p_281317_, p_282770_, p_281295_);
 
 -        for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
-+        for(CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
-             if (this.checkTabHovering(p_283000_, creativemodetab, p_281317_, p_282770_)) {
-                 break;
-             }
-@@ -677,6 +_,15 @@
+-            if (this.checkTabHovering(p_283000_, creativemodetab, p_281317_, p_282770_)) {
+-                break;
+-            }
+-        }
+-
+         if (this.destroyItemSlot != null
+             && selectedTab.getType() == CreativeModeTab.Type.INVENTORY
+             && this.isHovering(this.destroyItemSlot.x, this.destroyItemSlot.y, 16, 16, (double)p_281317_, (double)p_282770_)) {
              p_283000_.renderTooltip(this.font, TRASH_SLOT_TOOLTIP, p_281317_, p_282770_);
          }
 
@@ -181,6 +184,12 @@
 +            p_283000_.pose().popPose();
 +        }
 +
++        for (CreativeModeTab creativemodetab : currentPage.getVisibleTabs()) {
++            if (this.checkTabHovering(p_283000_, creativemodetab, p_281317_, p_282770_)) {
++                break;
++            }
++        }
++
 +        com.mojang.blaze3d.systems.RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
          this.renderTooltip(p_283000_, p_281317_, p_282770_);
      }