Merge pull request #341 from Dragon-Seeker/1.21.4-TooltipFix

gliscowo · web-flow · commit 8ecca4f12d2d · 2024-12-15T23:44:12.000+01:00
[1.21.4] Fix issues where tooltip would stop rendering after screen reinits
diff --git a/src/main/java/io/wispforest/owo/ui/base/BaseOwoHandledScreen.java b/src/main/java/io/wispforest/owo/ui/base/BaseOwoHandledScreen.java
@@ -85,16 +85,16 @@ protected void init() {
                 this.build(this.uiAdapter.rootComponent);
 
                 this.uiAdapter.inflateAndMount();
-
-                ScreenEvents.afterRender(this).register((screen, drawContext, mouseX, mouseY, tickDelta) -> {
-                    if (this.uiAdapter != null) this.uiAdapter.drawTooltip(drawContext, mouseX, mouseY, tickDelta);
-                });
             } catch (Exception error) {
                 Owo.LOGGER.warn("Could not initialize owo screen", error);
                 UIErrorToast.report(error);
                 this.invalid = true;
             }
         }
+
+        ScreenEvents.afterRender(this).register((screen, drawContext, mouseX, mouseY, tickDelta) -> {
+            if (this.uiAdapter != null) this.uiAdapter.drawTooltip(drawContext, mouseX, mouseY, tickDelta);
+        });
     }
 
     /**
diff --git a/src/main/java/io/wispforest/owo/ui/base/BaseOwoScreen.java b/src/main/java/io/wispforest/owo/ui/base/BaseOwoScreen.java
@@ -92,16 +92,16 @@ protected void init() {
                 this.build(this.uiAdapter.rootComponent);
 
                 this.uiAdapter.inflateAndMount();
-
-                ScreenEvents.afterRender(this).register((screen, drawContext, mouseX, mouseY, tickDelta) -> {
-                    if (this.uiAdapter != null) this.uiAdapter.drawTooltip(drawContext, mouseX, mouseY, tickDelta);
-                });
             } catch (Exception error) {
                 Owo.LOGGER.warn("Could not initialize owo screen", error);
                 UIErrorToast.report(error);
                 this.invalid = true;
             }
         }
+
+        ScreenEvents.afterRender(this).register((screen, drawContext, mouseX, mouseY, tickDelta) -> {
+            if (this.uiAdapter != null) this.uiAdapter.drawTooltip(drawContext, mouseX, mouseY, tickDelta);
+        });
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -85,16 +85,16 @@ protected void init() {`
`85`	`85`	`this.build(this.uiAdapter.rootComponent);`
`86`	`86`
`87`	`87`	`this.uiAdapter.inflateAndMount();`
`88`		`-`
`89`		`- ScreenEvents.afterRender(this).register((screen, drawContext, mouseX, mouseY, tickDelta) -> {`
`90`		`- if (this.uiAdapter != null) this.uiAdapter.drawTooltip(drawContext, mouseX, mouseY, tickDelta);`
`91`		`- });`
`92`	`88`	`} catch (Exception error) {`
`93`	`89`	`Owo.LOGGER.warn("Could not initialize owo screen", error);`
`94`	`90`	`UIErrorToast.report(error);`
`95`	`91`	`this.invalid = true;`
`96`	`92`	`}`
`97`	`93`	`}`
	`94`	`+`
	`95`	`+ ScreenEvents.afterRender(this).register((screen, drawContext, mouseX, mouseY, tickDelta) -> {`
	`96`	`+ if (this.uiAdapter != null) this.uiAdapter.drawTooltip(drawContext, mouseX, mouseY, tickDelta);`
	`97`	`+ });`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -92,16 +92,16 @@ protected void init() {`
`92`	`92`	`this.build(this.uiAdapter.rootComponent);`
`93`	`93`
`94`	`94`	`this.uiAdapter.inflateAndMount();`
`95`		`-`
`96`		`- ScreenEvents.afterRender(this).register((screen, drawContext, mouseX, mouseY, tickDelta) -> {`
`97`		`- if (this.uiAdapter != null) this.uiAdapter.drawTooltip(drawContext, mouseX, mouseY, tickDelta);`
`98`		`- });`
`99`	`95`	`} catch (Exception error) {`
`100`	`96`	`Owo.LOGGER.warn("Could not initialize owo screen", error);`
`101`	`97`	`UIErrorToast.report(error);`
`102`	`98`	`this.invalid = true;`
`103`	`99`	`}`
`104`	`100`	`}`
	`101`	`+`
	`102`	`+ ScreenEvents.afterRender(this).register((screen, drawContext, mouseX, mouseY, tickDelta) -> {`
	`103`	`+ if (this.uiAdapter != null) this.uiAdapter.drawTooltip(drawContext, mouseX, mouseY, tickDelta);`
	`104`	`+ });`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`/**`