summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java48
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java181
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java38
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java161
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java103
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java22
-rw-r--r--src/main/resources/nochatreports.accesswidener14
9 files changed, 321 insertions, 258 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java
new file mode 100644
index 0000000..a2e80e1
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java
@@ -0,0 +1,48 @@
+package com.aizistral.nochatreports.gui;
+
+import java.util.function.Supplier;
+
+import javax.annotation.Nullable;
+
+import com.aizistral.nochatreports.config.NCRConfig;
+import com.mojang.blaze3d.vertex.PoseStack;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.components.Button.OnPress;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+
+@Environment(EnvType.CLIENT)
+public class AdvancedImageButton extends ImageButton {
+ protected final Screen parent;
+
+ public AdvancedImageButton(int x, int y, int xSize, int ySize, int xTexStart, int yTexStart, int yStateDiff,
+ ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress, Component name,
+ Screen parent) {
+ super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress, name);
+ this.parent = parent;
+ }
+
+ @Override
+ public void updateTooltip() {
+ if (this.tooltip instanceof AdvancedTooltip tooltip && tooltip.hasCustomRender())
+ return;
+
+ super.updateTooltip();
+ }
+
+ @Override
+ public void renderButton(PoseStack poseStack, int mouseX, int mouseY, float delta) {
+ super.renderButton(poseStack, mouseX, mouseY, delta);
+
+ if (this.tooltip instanceof AdvancedTooltip tooltip && tooltip.hasCustomRender()) {
+ tooltip.doCustomRender(this.parent, poseStack, mouseX, mouseY);
+ }
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java
new file mode 100644
index 0000000..20261c4
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java
@@ -0,0 +1,181 @@
+package com.aizistral.nochatreports.gui;
+
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import org.joml.Matrix4f;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.BufferUploader;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.VertexFormat;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.network.chat.Component;
+import net.minecraft.util.FormattedCharSequence;
+
+@Environment(EnvType.CLIENT)
+public class AdvancedTooltip extends Tooltip {
+ @Nullable
+ protected Supplier<Component> supplier;
+ protected int maxWidth = MAX_WIDTH;
+ protected boolean renderWithoutGap = false;
+
+ public AdvancedTooltip(Component message, @Nullable Component narration) {
+ super(message, narration);
+ }
+
+ public AdvancedTooltip(Component message) {
+ this(message, message);
+ }
+
+ public AdvancedTooltip(Supplier<Component> message) {
+ this(message.get());
+ this.supplier = message;
+ }
+
+ public AdvancedTooltip setMaxWidth(int maxWidth) {
+ this.maxWidth = maxWidth;
+ return this;
+ }
+
+ public AdvancedTooltip setRenderWithoutGap(boolean render) {
+ this.renderWithoutGap = render;
+ return this;
+ }
+
+ public Component getMessage() {
+ return this.supplier != null ? this.supplier.get() : this.message;
+ }
+
+ @Override
+ public List<FormattedCharSequence> toCharSequence(Minecraft minecraft) {
+ if (this.cachedTooltip == null) {
+ this.cachedTooltip = splitTooltip(minecraft, this.getMessage(), this.maxWidth);
+ }
+ return this.cachedTooltip;
+ }
+
+ public boolean hasCustomRender() {
+ return this.renderWithoutGap;
+ }
+
+ public void doCustomRender(Screen screen, PoseStack poseStack, int x, int y) {
+ if (this.renderWithoutGap) {
+ this.renderTooltipNoGap(screen, poseStack, splitTooltip(screen.minecraft, this.getMessage(), this.maxWidth), x, y);
+ } else
+ throw new UnsupportedOperationException("This tooltip doesn't support custom render!");
+ }
+
+ public static List<FormattedCharSequence> splitTooltip(Minecraft minecraft, Component component, int maxWidth) {
+ 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);
+ }
+
+ protected void renderTooltipInternalNoGap(Screen screen, PoseStack poseStack, List<ClientTooltipComponent> list, int x, int y) {
+ ClientTooltipComponent clientTooltipComponent2;
+ int v;
+ int m;
+ if (list.isEmpty())
+ return;
+ int k = 0;
+ int l = list.size() == 1 ? -2 : -2;
+ for (ClientTooltipComponent clientTooltipComponent : list) {
+ m = clientTooltipComponent.getWidth(screen.font);
+ if (m > k) {
+ k = m;
+ }
+ l += clientTooltipComponent.getHeight();
+ }
+ int n = x + 12;
+ int o = y - 12;
+ m = k;
+ int p = l;
+ if (n + k > screen.width) {
+ n -= 28 + k;
+ }
+ if (o + p + 6 > screen.height) {
+ o = screen.height - p - 6;
+ }
+ if (y - p - 8 < 0) {
+ o = y + 8;
+ }
+ poseStack.pushPose();
+ int q = -267386864;
+ int r = 0x505000FF;
+ int s = 1344798847;
+ int t = 400;
+ float f = screen.itemRenderer.blitOffset;
+ screen.itemRenderer.blitOffset = 400.0f;
+ Tesselator tesselator = Tesselator.getInstance();
+ BufferBuilder bufferBuilder = tesselator.getBuilder();
+ RenderSystem.setShader(GameRenderer::getPositionColorShader);
+ bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+ Matrix4f matrix4f = poseStack.last().pose();
+ fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
+ fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF);
+ fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847);
+ RenderSystem.enableDepthTest();
+ RenderSystem.disableTexture();
+ RenderSystem.enableBlend();
+ RenderSystem.defaultBlendFunc();
+ BufferUploader.drawWithShader(bufferBuilder.end());
+ RenderSystem.disableBlend();
+ RenderSystem.enableTexture();
+ MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
+ poseStack.translate(0.0, 0.0, 400.0);
+ int u = o;
+ for (v = 0; v < list.size(); ++v) {
+ clientTooltipComponent2 = list.get(v);
+ clientTooltipComponent2.renderText(screen.font, n, u, matrix4f, bufferSource);
+ u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/;
+ }
+ bufferSource.endBatch();
+ poseStack.popPose();
+ u = o;
+ for (v = 0; v < list.size(); ++v) {
+ clientTooltipComponent2 = list.get(v);
+ clientTooltipComponent2.renderImage(screen.font, n, u, poseStack, screen.itemRenderer, 400);
+ u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0);
+ }
+ screen.itemRenderer.blitOffset = f;
+ }
+
+ protected static void fillGradient(Matrix4f matrix4f, BufferBuilder bufferBuilder, int i, int j, int k, int l, int m, int n, int o) {
+ float f = (n >> 24 & 0xFF) / 255.0f;
+ float g = (n >> 16 & 0xFF) / 255.0f;
+ float h = (n >> 8 & 0xFF) / 255.0f;
+ float p = (n & 0xFF) / 255.0f;
+ float q = (o >> 24 & 0xFF) / 255.0f;
+ float r = (o >> 16 & 0xFF) / 255.0f;
+ float s = (o >> 8 & 0xFF) / 255.0f;
+ float t = (o & 0xFF) / 255.0f;
+ bufferBuilder.vertex(matrix4f, k, j, m).color(g, h, p, f).endVertex();
+ bufferBuilder.vertex(matrix4f, i, j, m).color(g, h, p, f).endVertex();
+ bufferBuilder.vertex(matrix4f, i, l, m).color(r, s, t, q).endVertex();
+ bufferBuilder.vertex(matrix4f, k, l, m).color(r, s, t, q).endVertex();
+ }
+
+}
diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java
index 5620a6b..bf52924 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java
@@ -9,15 +9,11 @@ import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
-public class EncryptionButton extends ImageButton {
- private final Screen parent;
+public class EncryptionButton extends AdvancedImageButton {
public EncryptionButton(int x, int y, int xSize, int ySize, int xTexStart, int yTexStart, int yStateDiff,
- ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress, OnTooltip onTooltip,
- Component name, Screen parent) {
- super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress,
- onTooltip, name);
- this.parent = parent;
+ ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress, Component name, Screen parent) {
+ super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress, name, parent);
}
@Override
diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java
index 7bd6b57..0a43fa1 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java
@@ -23,7 +23,6 @@ import net.minecraft.client.gui.components.CycleButton;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.components.ImageButton;
import net.minecraft.client.gui.components.MultiLineLabel;
-import net.minecraft.client.gui.components.TooltipAccessor;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.AbstractCommandBlockEditScreen;
import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen;
@@ -89,31 +88,28 @@ public class EncryptionConfigScreen extends Screen {
this.keyField.setResponder(this::onKeyUpdate);
this.addWidget(this.keyField);
- var button = new ImageButton(this.keyField.getX() + this.keyField.getWidth() - 15, this.keyField.getY() + 3, 12,
- 12, 0, 0, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) ->
- this.renderTooltip(poseStack, this.minecraft.font.split(this.validationIcon.yTexStart == 0
- ? VALIDATION_OK : VALIDATION_FAILED, 250), i, j), Component.empty());
+ var button = new AdvancedImageButton(this.keyField.getX() + this.keyField.getWidth() - 15, this.keyField.getY() + 3, 12,
+ 12, 0, 0, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, Component.empty(), this);
+ button.setTooltip(new AdvancedTooltip(() -> this.validationIcon.yTexStart == 0 ? VALIDATION_OK
+ : VALIDATION_FAILED).setMaxWidth(250));
button.active = false;
button.visible = true;
this.addRenderableOnly(this.validationIcon = button);
- button = new ImageButton(this.keyField.getX() - 22, this.keyField.getY() - 0, 18, 18, 0,
- 28, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) ->
- this.renderTooltip(poseStack, this.minecraft.font.split(CommonComponents.EMPTY, 250), i, j),
- Component.empty());
+ button = new AdvancedImageButton(this.keyField.getX() - 22, this.keyField.getY() - 0, 18, 18, 0,
+ 28, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, Component.empty(), this);
button.active = false;
button.visible = true;
this.addRenderableOnly(button);
- button = new ImageButton(this.keyField.getX() + this.keyField.getWidth() + 4, this.keyField.getY() - 1, 23, 20, 41,
+ button = new AdvancedImageButton(this.keyField.getX() + this.keyField.getWidth() + 4, this.keyField.getY() - 1, 23, 20, 41,
24, 20, ENCRYPTION_ICONS, 64, 64, btn -> {
this.unfocusFields();
this.keyField.setValue(this.algorithmButton.getValue().getRandomKey());
- }, (btn, poseStack, i, j) ->
- this.renderTooltip(poseStack, this.minecraft.font.split(DICE_TOOLTIP, 250), i, j),
- Component.empty());
+ }, Component.empty(), this);
+ button.setTooltip(new AdvancedTooltip(DICE_TOOLTIP).setMaxWidth(250));
button.active = true;
button.visible = true;
@@ -127,10 +123,8 @@ public class EncryptionConfigScreen extends Screen {
this.passField.setResponder(this::onPassphraseUpdate);
this.addWidget(this.passField);
- button = new ImageButton(this.passField.getX() - 22, this.passField.getY() - 0, 18, 18, 0,
- 46, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) ->
- this.renderTooltip(poseStack, this.minecraft.font.split(CommonComponents.EMPTY, 250), i, j),
- Component.empty());
+ button = new AdvancedImageButton(this.passField.getX() - 22, this.passField.getY() - 0, 18, 18, 0,
+ 46, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, Component.empty(), this);
button.active = false;
button.visible = true;
@@ -150,8 +144,8 @@ public class EncryptionConfigScreen extends Screen {
return Component.translatable("gui.nochatreports.encryption_config.algorithm",
Component.translatable("algorithm.nochatreports." + value.getID() + ".name"));
}).withValues(Encryption.getRegistered()).displayOnlyValue().withInitialValue(this.getConfig()
- .getAlgorithm()).withTooltip(value -> this.minecraft.font.split(
- Component.translatable("algorithm.nochatreports." + value.getID()), 250))
+ .getAlgorithm()).withTooltip(value -> new AdvancedTooltip(Component.translatable(
+ "algorithm.nochatreports." + value.getID())).setMaxWidth(250))
.create(this.width / 2 - 4 - 218, this.passField.getY() + 48, 218, 20, CommonComponents.EMPTY,
(cycleButton, value) -> {
this.unfocusFields();
@@ -195,9 +189,9 @@ public class EncryptionConfigScreen extends Screen {
this.passField.render(poseStack, i, j, f);
- if (this.algorithmButton != null && this.algorithmButton.isMouseOver(i, j)) {
- this.renderTooltip(poseStack, this.algorithmButton.getTooltip(), i, j);
- }
+ // if (this.algorithmButton != null && this.algorithmButton.isMouseOver(i, j)) {
+ // this.renderTooltip(poseStack, this.algorithmButton.getTooltip(), i, j);
+ // }
super.render(poseStack, i, j, f);
diff --git a/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java b/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java
index 11bf25e..4470936 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java
@@ -14,7 +14,7 @@ import net.minecraft.network.chat.MutableComponent;
public class InvisibleButton extends Button {
public InvisibleButton() {
- super(0, 0, 20, 20, Component.empty(), btn -> {}, (btn, stack, x, y) -> {}, Supplier::get);
+ super(0, 0, 20, 20, Component.empty(), btn -> {}, Supplier::get);
}
@Override
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
index 8b40b9e..7bbe308 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
@@ -14,6 +14,8 @@ import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.config.NCRConfigClient;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.gui.AdvancedImageButton;
+import com.aizistral.nochatreports.gui.AdvancedTooltip;
import com.aizistral.nochatreports.gui.EncryptionButton;
import com.aizistral.nochatreports.gui.EncryptionConfigScreen;
import com.aizistral.nochatreports.gui.EncryptionWarningScreen;
@@ -78,7 +80,7 @@ public abstract class MixinChatScreen extends Screen {
int buttonX = this.width - 23;
if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) {
- this.safetyStatusButton = new ImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(),
+ this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(),
0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> {
if (NCRConfig.getClient().whitelistAllServers())
return;
@@ -100,38 +102,39 @@ public abstract class MixinChatScreen extends Screen {
whitelist.saveFile();
}
}
- }, (btn, poseStack, i, j) -> {
- MutableComponent tooltip = this.getSafetyLevel().getTooltip();
- ServerAddress address = ServerSafetyState.getLastServer();
- String signing = "gui.nochatreports.status_signing_denied";
-
- if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) {
- signing = "gui.nochatreports.status_signing_allowed_realms";
- } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE) {
- signing = "gui.nochatreports.status_signing_denied_secure";
- } else if (NCRConfig.getServerWhitelist().isWhitelisted(address)) {
- signing = "gui.nochatreports.status_signing_allowed_whitelisted";
- } else if (ServerSafetyState.allowChatSigning()) {
- signing = "gui.nochatreports.status_signing_allowed";
- }
+ }, Component.empty(), this);
+ this.safetyStatusButton.setTooltip(new AdvancedTooltip(() -> {
+ MutableComponent tooltip = this.getSafetyLevel().getTooltip();
+ ServerAddress address = ServerSafetyState.getLastServer();
+ String signing = "gui.nochatreports.status_signing_denied";
+
+ if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) {
+ signing = "gui.nochatreports.status_signing_allowed_realms";
+ } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE) {
+ signing = "gui.nochatreports.status_signing_denied_secure";
+ } else if (NCRConfig.getServerWhitelist().isWhitelisted(address)) {
+ signing = "gui.nochatreports.status_signing_allowed_whitelisted";
+ } else if (ServerSafetyState.allowChatSigning()) {
+ signing = "gui.nochatreports.status_signing_allowed";
+ }
- tooltip.append("\n\n").append(Component.translatable(signing));
+ tooltip.append("\n\n").append(Component.translatable(signing));
- if (address != null) {
- String status = "gui.nochatreports.status_whitelist_no";
+ if (address != null) {
+ String status = "gui.nochatreports.status_whitelist_no";
- if (NCRConfig.getClient().whitelistAllServers()) {
- status = "gui.nochatreports.status_whitelist_all";
- } else if (NCRConfig.getServerWhitelist().isWhitelisted(address)) {
- status = "gui.nochatreports.status_whitelist_yes";
- }
+ if (NCRConfig.getClient().whitelistAllServers()) {
+ status = "gui.nochatreports.status_whitelist_all";
+ } else if (NCRConfig.getServerWhitelist().isWhitelisted(address)) {
+ status = "gui.nochatreports.status_whitelist_yes";
+ }
- tooltip.append("\n\n").append(Component.translatable(
- "gui.nochatreports.status_whitelist_mode", Component.translatable(status)));
- }
+ tooltip.append("\n\n").append(Component.translatable(
+ "gui.nochatreports.status_whitelist_mode", Component.translatable(status)));
+ }
- this.renderTooltipNoGap(poseStack, this.minecraft.font.split(tooltip, 250), i, j);
- }, Component.empty());
+ return tooltip;
+ }).setMaxWidth(250).setRenderWithoutGap(true));
this.addRenderableWidget(this.safetyStatusButton);
buttonX -= 25;
@@ -153,20 +156,17 @@ public abstract class MixinChatScreen extends Screen {
} else {
((EncryptionButton)btn).openEncryptionConfig();
}
- }, (btn, poseStack, i, j) -> {
- if (NCRConfig.getEncryption().isValid()) {
- this.renderTooltip(poseStack, this.minecraft.font.split(
- Component.translatable("gui.nochatreports.encryption_tooltip", Language.getInstance()
- .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption()
- .isEnabledAndValid() ? "on" : "off")), 250), 250), i, j);
- } else {
- this.renderTooltip(poseStack, this.minecraft.font.split(
- Component.translatable("gui.nochatreports.encryption_tooltip_invalid", Language.getInstance()
- .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption()
- .isEnabledAndValid() ? "on" : "off")), 250), 250), i, j);
-
- }
}, Component.empty(), this);
+ button.setTooltip(new AdvancedTooltip(() -> {
+ if (NCRConfig.getEncryption().isValid())
+ return Component.translatable("gui.nochatreports.encryption_tooltip", Language.getInstance()
+ .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption()
+ .isEnabledAndValid() ? "on" : "off")));
+ else
+ return Component.translatable("gui.nochatreports.encryption_tooltip_invalid", Language.getInstance()
+ .getOrDefault("gui.nochatreports.encryption_state_" + (NCRConfig.getEncryption()
+ .isEnabledAndValid() ? "on" : "off")));
+ }).setMaxWidth(250));
button.active = true;
button.visible = true;
@@ -199,83 +199,4 @@ public abstract class MixinChatScreen extends Screen {
};
}
- protected void renderTooltipNoGap(PoseStack poseStack, List<? extends FormattedCharSequence> list, int i, int j) {
- this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j);
- }
-
- protected void renderTooltipInternalNoGap(PoseStack poseStack, List<ClientTooltipComponent> list, int i, int j) {
- ClientTooltipComponent clientTooltipComponent2;
- int v;
- int m;
- if (list.isEmpty())
- return;
- int k = 0;
- int l = list.size() == 1 ? -2 : -2;
- for (ClientTooltipComponent clientTooltipComponent : list) {
- m = clientTooltipComponent.getWidth(this.font);
- if (m > k) {
- k = m;
- }
- l += clientTooltipComponent.getHeight();
- }
- int n = i + 12;
- int o = j - 12;
- m = k;
- int p = l;
- if (n + k > this.width) {
- n -= 28 + k;
- }
- if (o + p + 6 > this.height) {
- o = this.height - p - 6;
- }
- if (j - p - 8 < 0) {
- o = j + 8;
- }
- poseStack.pushPose();
- int q = -267386864;
- int r = 0x505000FF;
- int s = 1344798847;
- int t = 400;
- float f = this.itemRenderer.blitOffset;
- this.itemRenderer.blitOffset = 400.0f;
- Tesselator tesselator = Tesselator.getInstance();
- BufferBuilder bufferBuilder = tesselator.getBuilder();
- RenderSystem.setShader(GameRenderer::getPositionColorShader);
- bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
- Matrix4f matrix4f = poseStack.last().pose();
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847);
- RenderSystem.enableDepthTest();
- RenderSystem.disableTexture();
- RenderSystem.enableBlend();
- RenderSystem.defaultBlendFunc();
- BufferUploader.drawWithShader(bufferBuilder.end());
- RenderSystem.disableBlend();
- RenderSystem.enableTexture();
- MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
- poseStack.translate(0.0, 0.0, 400.0);
- int u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource);
- u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/;
- }
- bufferSource.endBatch();
- poseStack.popPose();
- u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400);
- u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0);
- }
- this.itemRenderer.blitOffset = f;
- }
-
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
index 66c7405..b06836a 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
@@ -11,6 +11,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.gui.AdvancedImageButton;
+import com.aizistral.nochatreports.gui.AdvancedTooltip;
import com.aizistral.nochatreports.network.ClientChannelHandler;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.BufferBuilder;
@@ -27,6 +29,7 @@ import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.locale.Language;
+import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FormattedCharSequence;
@@ -50,17 +53,16 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
@Inject(method = "init", at = @At("HEAD"))
private void onInit(CallbackInfo info) {
if (NCRConfig.getClient().showReloadButton()) {
- var button = new ImageButton(this.width/2 + 158, this.height - 52, 20, 20, 0, 0, 20,
- RELOAD_TEXTURE, 64, 64, btn -> NCRConfig.load(), (btn, poseStack, i, j) ->
- this.renderTooltipNoGap(poseStack, this.minecraft.font.split(RELOAD_TOOLTIP, 250), i, j),
- Component.translatable("gui.nochatreports.reload_config"));
+ var button = new AdvancedImageButton(this.width/2 + 158, this.height - 52, 20, 20, 0, 0, 20,
+ RELOAD_TEXTURE, 64, 64, btn -> NCRConfig.load(), CommonComponents.EMPTY, this);
+ button.setTooltip(new AdvancedTooltip(RELOAD_TOOLTIP).setMaxWidth(250).setRenderWithoutGap(true));
button.active = true;
button.visible = true;
this.addRenderableWidget(button);
}
if (NCRConfig.getClient().showNCRButton()) {
- var button = new ImageButton(this.width/2 + 158, this.height - 28, 20, 20,
+ var button = new AdvancedImageButton(this.width/2 + 158, this.height - 28, 20, 20,
NCRConfig.getClient().enableMod() ? 0 : 20, 0, 20, TOGGLE_TEXTURE, 64, 64,
btn -> {
NCRConfig.getClient().toggleMod();
@@ -75,97 +77,14 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
}
ServerSafetyState.reset();
- }, (btn, poseStack, i, j) -> this.renderTooltip(poseStack,
- this.minecraft.font.split(
- Component.translatable("gui.nochatreports.ncr_toggle_tooltip",
- Language.getInstance()
- .getOrDefault("gui.nochatreports.ncr_state_"
- + (NCRConfig.getClient().enableMod()
- ? "on" : "off"))), 250), i, j),
- Component.translatable("gui.nochatreports.ncr_toggle"));
+ }, Component.translatable("gui.nochatreports.ncr_toggle"), this);
+ button.setTooltip(new AdvancedTooltip(() -> Component.translatable("gui.nochatreports.ncr_toggle_tooltip",
+ Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (NCRConfig.getClient()
+ .enableMod() ? "on" : "off")))).setMaxWidth(250));
button.active = true;
button.visible = true;
this.addRenderableWidget(button);
}
}
- protected void renderTooltipNoGap(PoseStack poseStack, List<? extends FormattedCharSequence> list, int i, int j) {
- this.renderTooltipInternalNoGap(poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), i, j);
- }
-
- protected void renderTooltipInternalNoGap(PoseStack poseStack, List<ClientTooltipComponent> list, int i, int j) {
- ClientTooltipComponent clientTooltipComponent2;
- int v;
- int m;
- if (list.isEmpty())
- return;
- int k = 0;
- int l = list.size() == 1 ? -2 : -2;
- for (ClientTooltipComponent clientTooltipComponent : list) {
- m = clientTooltipComponent.getWidth(this.font);
- if (m > k) {
- k = m;
- }
- l += clientTooltipComponent.getHeight();
- }
- int n = i + 12;
- int o = j - 12;
- m = k;
- int p = l;
- if (n + k > this.width) {
- n -= 28 + k;
- }
- if (o + p + 6 > this.height) {
- o = this.height - p - 6;
- }
- if (j - p - 8 < 0) {
- o = j + 8;
- }
- poseStack.pushPose();
- int q = -267386864;
- int r = 0x505000FF;
- int s = 1344798847;
- int t = 400;
- float f = this.itemRenderer.blitOffset;
- this.itemRenderer.blitOffset = 400.0f;
- Tesselator tesselator = Tesselator.getInstance();
- BufferBuilder bufferBuilder = tesselator.getBuilder();
- RenderSystem.setShader(GameRenderer::getPositionColorShader);
- bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
- Matrix4f matrix4f = poseStack.last().pose();
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 4, n + m + 3, o - 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 3, n + m + 3, o + p + 4, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 4, o - 3, n - 3, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 3, o - 3, n + m + 4, o + p + 3, 400, -267386864, -267386864);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3 + 1, n - 3 + 1, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n + m + 2, o - 3 + 1, n + m + 3, o + p + 3 - 1, 400, 0x505000FF, 1344798847);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o - 3, n + m + 3, o - 3 + 1, 400, 0x505000FF, 0x505000FF);
- Screen.fillGradient(matrix4f, bufferBuilder, n - 3, o + p + 2, n + m + 3, o + p + 3, 400, 1344798847, 1344798847);
- RenderSystem.enableDepthTest();
- RenderSystem.disableTexture();
- RenderSystem.enableBlend();
- RenderSystem.defaultBlendFunc();
- BufferUploader.drawWithShader(bufferBuilder.end());
- RenderSystem.disableBlend();
- RenderSystem.enableTexture();
- MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
- poseStack.translate(0.0, 0.0, 400.0);
- int u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderText(this.font, n, u, matrix4f, bufferSource);
- u += clientTooltipComponent2.getHeight() /*+ (v == 0 ? 2 : 0)*/;
- }
- bufferSource.endBatch();
- poseStack.popPose();
- u = o;
- for (v = 0; v < list.size(); ++v) {
- clientTooltipComponent2 = list.get(v);
- clientTooltipComponent2.renderImage(this.font, n, u, poseStack, this.itemRenderer, 400);
- u += clientTooltipComponent2.getHeight() + (v == 0 ? 2 : 0);
- }
- this.itemRenderer.blitOffset = f;
- }
-
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java
index 805b1a2..3a049df 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java
@@ -15,12 +15,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.gui.AdvancedImageButton;
import com.aizistral.nochatreports.gui.InvisibleButton;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.client.gui.components.Tooltip;
import net.minecraft.client.gui.screens.social.PlayerEntry;
import net.minecraft.client.gui.screens.social.SocialInteractionsScreen;
import net.minecraft.network.chat.Component;
@@ -45,25 +47,15 @@ public class MixinPlayerEntry {
*/
@Inject(method = "<init>", at = @At("RETURN"))
- private void onConstructed(Minecraft minecraft, SocialInteractionsScreen socialInteractionsScreen, UUID uUID, String string, Supplier<ResourceLocation> supplier, boolean reportable, CallbackInfo info) {
+ private void onConstructed(Minecraft minecraft, SocialInteractionsScreen screen, UUID uUID, String string, Supplier<ResourceLocation> supplier, boolean reportable, CallbackInfo info) {
if (NCRConfig.getClient().alwaysHideReportButton()) {
this.reportButton = new InvisibleButton();
this.reportButton.active = this.reportButton.visible = false;
} else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE && this.reportButton != null) {
- this.reportButton = new ImageButton(0, 0, 20, 20, 0, 0, 20, REPORT_BUTTON_LOCATION, 64, 64, button -> {}, new Button.OnTooltip() {
- @Override
- public void onTooltip(Button button, PoseStack poseStack, int i, int j) {
- MixinPlayerEntry.this.tooltipHoverTime += minecraft.getDeltaFrameTime();
- if (MixinPlayerEntry.this.tooltipHoverTime >= 10.0f) {
- socialInteractionsScreen.setPostRenderRunnable(() -> postRenderTooltip(socialInteractionsScreen, poseStack, minecraft.font.split(NCR_BUTTON_TOOLTIP, 150), i, j));
- }
- }
-
- @Override
- public void narrateTooltip(Consumer<Component> consumer) {
- consumer.accept(NCR_BUTTON_TOOLTIP);
- }
- }, Component.translatable("gui.socialInteractions.report"));
+ this.reportButton = new AdvancedImageButton(0, 0, 20, 20, 0, 0, 20, REPORT_BUTTON_LOCATION, 64, 64,
+ button -> {}, Component.translatable("gui.socialInteractions.report"), screen);
+ this.reportButton.setTooltip(Tooltip.create(NCR_BUTTON_TOOLTIP));
+ this.reportButton.setTooltipDelay(10);
this.reportButton.active = false;
}
}
diff --git a/src/main/resources/nochatreports.accesswidener b/src/main/resources/nochatreports.accesswidener
index 816bda2..6532575 100644
--- a/src/main/resources/nochatreports.accesswidener
+++ b/src/main/resources/nochatreports.accesswidener
@@ -13,4 +13,16 @@ mutable field net/minecraft/network/chat/MutableComponent contents Lnet/minecraf
accessible field net/minecraft/client/gui/screens/multiplayer/WarningScreen message Lnet/minecraft/client/gui/components/MultiLineLabel;
accessible field net/minecraft/client/multiplayer/ClientPacketListener signedMessageEncoder Lnet/minecraft/network/chat/SignedMessageChain$Encoder;
accessible field net/minecraft/client/multiplayer/ClientPacketListener chatSession Lnet/minecraft/network/chat/LocalChatSession;
-accessible method net/minecraft/client/multiplayer/ClientPacketListener setChatSession (Lnet/minecraft/network/chat/LocalChatSession;)V \ No newline at end of file
+accessible method net/minecraft/client/multiplayer/ClientPacketListener setChatSession (Lnet/minecraft/network/chat/LocalChatSession;)V
+accessible method net/minecraft/client/gui/components/Tooltip <init> (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V
+accessible field net/minecraft/client/gui/components/Tooltip MAX_WIDTH I
+accessible field net/minecraft/client/gui/components/Tooltip message Lnet/minecraft/network/chat/Component;
+accessible field net/minecraft/client/gui/components/Tooltip narration Lnet/minecraft/network/chat/Component;
+accessible field net/minecraft/client/gui/components/Tooltip cachedTooltip Ljava/util/List;
+accessible field net/minecraft/client/gui/screens/Screen minecraft Lnet/minecraft/client/Minecraft;
+accessible field net/minecraft/client/gui/screens/Screen itemRenderer Lnet/minecraft/client/renderer/entity/ItemRenderer;
+accessible field net/minecraft/client/gui/screens/Screen font Lnet/minecraft/client/gui/Font;
+accessible field net/minecraft/client/gui/components/AbstractWidget tooltip Lnet/minecraft/client/gui/components/Tooltip;
+accessible field net/minecraft/client/gui/components/AbstractWidget tooltipMsDelay I
+accessible method net/minecraft/client/gui/components/AbstractWidget updateTooltip ()V
+extendable method net/minecraft/client/gui/components/AbstractWidget updateTooltip ()V \ No newline at end of file