fix: take text offsets into account on all text based pages when dete…

…cting click/hover style Closes #251
klikli-dev · Sep 1, 2024 · 9c55805 · 9c55805
1 parent 7a7ee0b
commit 9c55805
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/...n/src/main/java/com/klikli_dev/modonomicon/client/render/page/BookEntityPageRenderer.java b/...n/src/main/java/com/klikli_dev/modonomicon/client/render/page/BookEntityPageRenderer.java
@@ -118,8 +118,12 @@ public Style getClickedComponentStyleAt(double pMouseX, double pMouseY) {
                 }
             }
 
-            var textY = this.getTextY();
-            var textStyle = this.getClickedComponentStyleAtForTextHolder(this.page.getText(), 0, textY, BookEntryScreen.PAGE_WIDTH, BookEntryScreen.PAGE_HEIGHT - textY, pMouseX, pMouseY);
+            var x = this.parentScreen.getBook().getBookTextOffsetX();
+            var y = this.getTextY() + this.parentScreen.getBook().getBookTextOffsetY();
+            var width = BookEntryScreen.PAGE_WIDTH + this.parentScreen.getBook().getBookTextOffsetWidth() - x; //always remove the offset x from the width to avoid overflow
+            var height = BookEntryScreen.PAGE_HEIGHT + this.parentScreen.getBook().getBookTextOffsetHeight() - y; //always remove the offset y from the height to avoid overflow
+
+            var textStyle = this.getClickedComponentStyleAtForTextHolder(this.page.getText(), x, y, width, height, pMouseX, pMouseY);
             if (textStyle != null) {
                 return textStyle;
             }

diff --git a/...c/main/java/com/klikli_dev/modonomicon/client/render/page/BookMultiblockPageRenderer.java b/...c/main/java/com/klikli_dev/modonomicon/client/render/page/BookMultiblockPageRenderer.java
@@ -250,8 +250,12 @@ public Style getClickedComponentStyleAt(double pMouseX, double pMouseY) {
                 return multiblockNameStyle;
             }
 
-            var textY = this.getTextY();
-            var textStyle = this.getClickedComponentStyleAtForTextHolder(this.page.getText(), 0, textY, BookEntryScreen.PAGE_WIDTH, BookEntryScreen.PAGE_HEIGHT - textY, pMouseX, pMouseY);
+            var x = this.parentScreen.getBook().getBookTextOffsetX();
+            var y = this.getTextY() + this.parentScreen.getBook().getBookTextOffsetY();
+            var width = BookEntryScreen.PAGE_WIDTH + this.parentScreen.getBook().getBookTextOffsetWidth() - x; //always remove the offset x from the width to avoid overflow
+            var height = BookEntryScreen.PAGE_HEIGHT + this.parentScreen.getBook().getBookTextOffsetHeight() - y; //always remove the offset y from the height to avoid overflow
+
+            var textStyle = this.getClickedComponentStyleAtForTextHolder(this.page.getText(), x, y, width, height, pMouseX, pMouseY);
             if (textStyle != null) {
                 return textStyle;
             }

diff --git a/...n/src/main/java/com/klikli_dev/modonomicon/client/render/page/BookRecipePageRenderer.java b/...n/src/main/java/com/klikli_dev/modonomicon/client/render/page/BookRecipePageRenderer.java
@@ -67,8 +67,12 @@ public Style getClickedComponentStyleAt(double pMouseX, double pMouseY) {
 
             //titles are not markdown enabled here, so no links
 
-            var textY = this.getTextY();
-            var textStyle = this.getClickedComponentStyleAtForTextHolder(this.page.getText(), 0, textY, BookEntryScreen.PAGE_WIDTH, BookEntryScreen.PAGE_HEIGHT - textY, pMouseX, pMouseY);
+            var x = this.parentScreen.getBook().getBookTextOffsetX();
+            var y = this.getTextY() + this.parentScreen.getBook().getBookTextOffsetY();
+            var width = BookEntryScreen.PAGE_WIDTH + this.parentScreen.getBook().getBookTextOffsetWidth() - x; //always remove the offset x from the width to avoid overflow
+            var height = BookEntryScreen.PAGE_HEIGHT + this.parentScreen.getBook().getBookTextOffsetHeight() - y; //always remove the offset y from the height to avoid overflow
+
+            var textStyle = this.getClickedComponentStyleAtForTextHolder(this.page.getText(), x, y, width, height, pMouseX, pMouseY);
             if (textStyle != null) {
                 return textStyle;
             }

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
@@ -67,8 +67,12 @@ public Style getClickedComponentStyleAt(double pMouseX, double pMouseY) {
                 }
             }
 
-            var textY = this.getTextY();
-            var textStyle = this.getClickedComponentStyleAtForTextHolder(this.page.getText(), 0, textY, BookEntryScreen.PAGE_WIDTH, BookEntryScreen.PAGE_HEIGHT - textY, pMouseX, pMouseY);
+            var x = this.parentScreen.getBook().getBookTextOffsetX();
+            var y = this.getTextY() + this.parentScreen.getBook().getBookTextOffsetY();
+            var width = BookEntryScreen.PAGE_WIDTH + this.parentScreen.getBook().getBookTextOffsetWidth() - x; //always remove the offset x from the width to avoid overflow
+            var height = BookEntryScreen.PAGE_HEIGHT + this.parentScreen.getBook().getBookTextOffsetHeight() - y; //always remove the offset y from the height to avoid overflow
+
+            var textStyle = this.getClickedComponentStyleAtForTextHolder(this.page.getText(), x, y, width, height, pMouseX, pMouseY);
             if (textStyle != null) {
                 return textStyle;
             }