fix: Spotlight page shows tooltip twice if on the right side

Closes #128
klikli-dev · Jan 12, 2024 · 54a4407 · 54a4407
1 parent 32c4e48
commit 54a4407
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 25 deletions.
diff --git a/...rc/main/java/com/klikli_dev/modonomicon/client/render/page/BookSpotlightPageRenderer.java b/...rc/main/java/com/klikli_dev/modonomicon/client/render/page/BookSpotlightPageRenderer.java
@@ -42,7 +42,6 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float ticks)
 
         this.parentScreen.renderIngredient(guiGraphics, ITEM_X, ITEM_Y, mouseX, mouseY, this.page.getItem());
 
-
         var style = this.getClickedComponentStyleAt(mouseX, mouseY);
         if (style != null)
             this.parentScreen.renderComponentHoverEffect(guiGraphics, style, mouseX, mouseY);
@@ -64,24 +63,7 @@ public Style getClickedComponentStyleAt(double pMouseX, double pMouseY) {
                 return textStyle;
             }
 
-            //BookContentScreen.PAGE_WIDTH / 2 - 8, 15
-            if (pMouseX >= ITEM_X && pMouseX <= ITEM_X + 16 && pMouseY >= ITEM_Y && pMouseY <= ITEM_Y + 16) {
-
-                var stacks = this.page.getItem().getItems();
-                if (stacks.length > 0) {
-                    var stack = stacks[(this.parentScreen.ticksInBook / 20) % stacks.length];
-                    var itemLink = "item://" + BuiltInRegistries.ITEM.getKey(stack.getItem());
-                    if (stack.hasTag()) {
-                        itemLink += stack.getTag().toString();
-                    }
-                    var spotlightItemStyle = Style.EMPTY
-                            .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_ITEM, new HoverEvent.ItemStackInfo(stack)))
-                            .withClickEvent(new ClickEvent(ClickEvent.Action.CHANGE_PAGE, itemLink));
-
-                    return spotlightItemStyle;
-                }
-
-            }
+            //should not do item hover - that is handled by render ingredient, which also makes sure the tooltip does not go beyond the screen.
         }
         return super.getClickedComponentStyleAt(pMouseX, pMouseY);
     }

diff --git a/fabric/src/generated/resources/.cache/13ce76d12c64f3a9c0874320845bdcbe00b11956 b/fabric/src/generated/resources/.cache/13ce76d12c64f3a9c0874320845bdcbe00b11956
@@ -1,11 +1,11 @@
-// 1.20.4	2024-01-11T12:51:58.1315442	Modonomicon/Books: modonomicon
+// 1.20.4	2024-01-12T14:11:22.8995858	Modonomicon/Books: modonomicon
 1ddba68d78ad9d5a43598e837c23d1a57ceb4b3a data\modonomicon\modonomicon\books\demo\entries\features\spotlight.json
 4a0f243b77e13c86c07e8a81ccdac5d62ae54605 data\modonomicon\modonomicon\books\demo\entries\hidden\always_locked.json
 2a6c1fb1e2536858796d47d5b4e6de64526e3466 data\modonomicon\modonomicon\books\demo\categories\hidden.json
 b82c0b99b596152481f8281592d77c822fd7590e data\modonomicon\modonomicon\books\demo\categories\conditional.json
 820e09ba5a917e1b5b0ceb1806572b0801cfa52f data\modonomicon\modonomicon\books\demo\entries\formatting\always_locked.json
-9efe734dd6980e4e7945babb3595dbc3381cee46 data\modonomicon\modonomicon\books\demo\entries\features\multiblock.json
 f363cda4775931649950ee67ebbfaf32f1c4db1a data\modonomicon\modonomicon\books\demo\entries\features\condition_advancement.json
+9efe734dd6980e4e7945babb3595dbc3381cee46 data\modonomicon\modonomicon\books\demo\entries\features\multiblock.json
 bf51c62090628f3c7f0a236c14e4f316001f3bc3 data\modonomicon\modonomicon\books\demo\entries\features\empty.json
 1fcaa7ad5be1754143a21d4491c78b8a675c20b0 data\modonomicon\modonomicon\books\demo\entries\features\condition_root.json
 91921129e14250f4f9403e2ee1b4614da61f702a data\modonomicon\modonomicon\books\demo\commands\test_command.json

diff --git a/fabric/src/generated/resources/.cache/3eecf17e0b3542fa44b02bae7aa93622bb4a80e9 b/fabric/src/generated/resources/.cache/3eecf17e0b3542fa44b02bae7aa93622bb4a80e9
@@ -1,2 +1,2 @@
-// 1.20.4	2024-01-11T12:51:58.1345437	Modonomicon/Languages: en_us
+// 1.20.4	2024-01-12T14:11:22.9155851	Modonomicon/Languages: en_us
 3fcf20dd9d80f88ce542cd912e2ac2bba62946e5 assets\modonomicon\lang\en_us.json
diff --git a/fabric/src/generated/resources/.cache/e6530a5ab7a2c0d5d93ba510671319215bfabee3 b/fabric/src/generated/resources/.cache/e6530a5ab7a2c0d5d93ba510671319215bfabee3
@@ -1,4 +1,4 @@
-// 1.20.4	2024-01-11T12:51:58.1345437	Modonomicon/Model Definitions
+// 1.20.4	2024-01-12T14:11:22.9135857	Modonomicon/Model Definitions
 a4a605637998b2d6d6b7cd9c002d5ba0163622c0 assets\modonomicon\models\item\modonomicon_red.json
 4b35646623b74487675fa8ec1bb375535100c336 assets\modonomicon\models\item\modonomicon_purple.json
 83adea7fd65acd9581797454e1a6dc6122d8a826 assets\modonomicon\models\item\modonomicon_green.json

diff --git a/fabric/src/generated/resources/.cache/fbe7fdca8a3d7d4724f001a760fe02aeb76403e5 b/fabric/src/generated/resources/.cache/fbe7fdca8a3d7d4724f001a760fe02aeb76403e5
@@ -1,4 +1,4 @@
-// 1.20.4	2024-01-11T12:51:58.1335417	Modonomicon/Multiblocks: modonomicon
+// 1.20.4	2024-01-12T14:11:22.911586	Modonomicon/Multiblocks: modonomicon
 89b499dd4f3850c8099ad26ae3c286e95ac8cf99 data\modonomicon\modonomicon\multiblocks\demo_fluid.json
 9dc306d79a39ee2085be7e1384d8e39640d79e49 data\modonomicon\modonomicon\multiblocks\demo_dense.json
 fc1e7363336d456dd0d1583fcfdaa27a8c4bf23e data\modonomicon\modonomicon\multiblocks\demo_predicate.json

diff --git a/neo/src/generated/resources/.cache/1a31259611d3b927433f60e0500eb1623e6ee72d b/neo/src/generated/resources/.cache/1a31259611d3b927433f60e0500eb1623e6ee72d
@@ -1,4 +1,4 @@
-// 1.20.4	2024-01-11T12:52:21.8498177	Books: modonomicon
+// 1.20.4	2024-01-12T14:12:32.5658142	Books: modonomicon
 a30aec89de938ebb9f5e704d5262ad6f43865afd data/modonomicon/modonomicon/books/demo/book.json
 b82c0b99b596152481f8281592d77c822fd7590e data/modonomicon/modonomicon/books/demo/categories/conditional.json
 f5a6ea38b482add4c451e398f054e22fa1684ba4 data/modonomicon/modonomicon/books/demo/categories/features.json