diff options
| author | Aizistral | 2023-02-23 16:19:30 +0100 |
|---|---|---|
| committer | Aizistral | 2023-02-23 16:19:30 +0100 |
| commit | 2209436f0418a0c7c85b0bcedf8db6f3c74d489b (patch) | |
| tree | 57b825d5b9e745bf757d0714d49dca1fb39ca88d /src/main/java/com/aizistral | |
| parent | 771e3636c5bf6637b7c68804f79f92b63efeda4b (diff) | |
Update custom tooltip rendering logic
Diffstat (limited to 'src/main/java/com/aizistral')
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java index 247e5f2..13ad030 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java @@ -6,6 +6,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -34,7 +35,7 @@ public class AdvancedImageButton extends ImageButton { if (this.isHovered) if (this.tooltip instanceof AdvancedTooltip tooltip && tooltip.hasCustomRender()) { - tooltip.doCustomRender(this.parent, poseStack, mouseX, mouseY); + tooltip.doCustomRender(this.parent, poseStack, mouseX, mouseY, this.createTooltipPositioner()); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java index e2dc05a..7e24c33 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java @@ -80,9 +80,9 @@ public class AdvancedTooltip extends Tooltip { return this.renderWithoutGap; } - public void doCustomRender(Screen screen, PoseStack poseStack, int x, int y) { + public void doCustomRender(Screen screen, PoseStack poseStack, int x, int y, ClientTooltipPositioner positioner) { if (this.renderWithoutGap) { - this.renderTooltipNoGap(screen, poseStack, splitTooltip(screen.minecraft, this.getMessage(), this.maxWidth), x, y); + this.renderTooltipNoGap(screen, poseStack, splitTooltip(screen.minecraft, this.getMessage(), this.maxWidth), x, y, positioner); } else throw new UnsupportedOperationException("This tooltip doesn't support custom render!"); } @@ -91,8 +91,8 @@ public class AdvancedTooltip extends Tooltip { return minecraft.font.split(component, maxWidth); } - protected void renderTooltipNoGap(Screen screen, PoseStack poseStack, List<? extends FormattedCharSequence> list, int x, int y) { - this.renderTooltipInternalNoGap(screen, poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), x, y, DefaultTooltipPositioner.INSTANCE); + protected void renderTooltipNoGap(Screen screen, PoseStack poseStack, List<? extends FormattedCharSequence> list, int x, int y, ClientTooltipPositioner positioner) { + this.renderTooltipInternalNoGap(screen, poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), x, y, positioner); } protected void renderTooltipInternalNoGap(Screen screen, PoseStack poseStack, List<ClientTooltipComponent> list, int i2, int j2, ClientTooltipPositioner clientTooltipPositioner) { @@ -101,7 +101,7 @@ public class AdvancedTooltip extends Tooltip { if (list.isEmpty()) return; int k2 = 0; - int l2 = list.size() == 1 ? -2 : -2; + int l2 = list.size() == 1 ? -2 : /*0*/ -2; for (ClientTooltipComponent clientTooltipComponent : list) { int m2 = clientTooltipComponent.getWidth(screen.font); if (m2 > k2) { @@ -132,7 +132,7 @@ public class AdvancedTooltip extends Tooltip { for (t = 0; t < list.size(); ++t) { clientTooltipComponent2 = list.get(t); clientTooltipComponent2.renderText(screen.font, p, s, matrix4f2, bufferSource); - s += clientTooltipComponent2.getHeight() + (t == 0 ? 2 : 0); + s += clientTooltipComponent2.getHeight() + /*(t == 0 ? 2 : 0)*/ 0; } bufferSource.endBatch(); poseStack.popPose(); @@ -140,7 +140,7 @@ public class AdvancedTooltip extends Tooltip { for (t = 0; t < list.size(); ++t) { clientTooltipComponent2 = list.get(t); clientTooltipComponent2.renderImage(screen.font, p, s, poseStack, screen.itemRenderer, 400); - s += clientTooltipComponent2.getHeight() + (t == 0 ? 2 : 0); + s += clientTooltipComponent2.getHeight() + /*(t == 0 ? 2 : 0)*/ 0; } } |
