From b79cd15ce15c96be575b09a243c44e9b14f0a5e4 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 28 Mar 2026 01:03:34 +0100 Subject: Update to 26.1 (#545) * Start porting to 26.1 Update to Gradle 9 * Delete AdvancedImageButton, AdvancedTooltip, AdvancedWidgetTooltipHolder * MixinJoinMultiplayerScreen: Replace AdvancedImageButton * MixinPlayerEntry: Replace AdvancedImageButton * MixinChatScreen: Replace AdvancedImageButton * Fix class tweaker * Update github workflows * Delete SwitchableSprites * Update ModMenu version to 18.0.0-alpha.8 * Update Mixin Java compatibility levels to Java 25 --------- Co-authored-by: Aizistral --- .../common/config/ClothConfigIntegration.java | 1 - .../common/config/NCRConfigClient.java | 8 +- .../nochatreports/common/core/SigningMode.java | 12 -- .../common/gui/AdvancedImageButton.java | 58 -------- .../nochatreports/common/gui/AdvancedTooltip.java | 117 ---------------- .../common/gui/AdvancedWidgetTooltipHolder.java | 36 ----- .../nochatreports/common/gui/InvisibleButton.java | 4 +- .../common/gui/SwitchableSprites.java | 53 ------- .../common/mixins/client/MixinChatScreen.java | 154 +++++++++------------ .../common/mixins/client/MixinGuiMessageTag.java | 2 +- .../mixins/client/MixinJoinMultiplayerScreen.java | 55 ++++---- .../mixins/client/MixinOnlineServerEntry.java | 12 +- .../common/mixins/client/MixinPlayerEntry.java | 7 +- .../common/mixins/client/MixinTitleScreen.java | 2 +- 14 files changed, 115 insertions(+), 406 deletions(-) delete mode 100644 src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java delete mode 100644 src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java delete mode 100644 src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java delete mode 100644 src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java index 4d4ee53..af765db 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java @@ -266,5 +266,4 @@ public final class ClothConfigIntegration { return builder.build(); } } - } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java index 30db481..7856669 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java @@ -26,10 +26,6 @@ public final class NCRConfigClient extends JSONConfig { return new NCRConfigClient(); } - public void toggleMod() { - this.enableMod = !this.enableMod; - } - /** * @return True if client with No Chat Reports installed should demand that mod is present on * every server that it tries to join. In that case client will not be able to join servers that @@ -180,6 +176,10 @@ public final class NCRConfigClient extends JSONConfig { return this.enableMod; } + public void setEnableMod(boolean enableMod) { + this.enableMod = enableMod; + } + /** * @return Whether warning on entering Realms screen should not be displayed. */ diff --git a/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java b/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java index 51e3d91..3668c7d 100644 --- a/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java @@ -70,18 +70,6 @@ public enum SigningMode { return Component.translatable(this.getTooltipKey()); } - public SigningMode next() { - SigningMode result = null; - - if (this.ordinal() == values().length - 1) { - result = values()[0]; - } else { - result = values()[this.ordinal() + 1]; - } - - return result.isSelectable() ? result : result.next(); - } - public SigningMode resolve() { return switch(this) { case DEFAULT -> NCRConfig.getClient().defaultSigningMode(); diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java deleted file mode 100644 index 704739e..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.aizistral.nochatreports.common.gui; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.ImageButton; -import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderPipelines; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.Identifier; - -@Environment(EnvType.CLIENT) -public class AdvancedImageButton extends ImageButton { - protected final Screen parent; - protected final SwitchableSprites switchable; - - public AdvancedImageButton(int x, int y, int xSize, int ySize, SwitchableSprites sprites, OnPress onPress, - Component name, Screen parent) { - super(x, y, xSize, ySize, sprites.getDefault(), onPress, name); - - this.parent = parent; - this.switchable = sprites; - } - - public void useSprites(int index) { - this.switchable.setIndex(index); - } - - public int getSpritesIndex() { - return this.switchable.getIndex(); - } - - public Identifier getCurrentTexture() { - return this.switchable.getCurrent().get(this.isActive(), this.isHoveredOrFocused()); - } - - @Override - public void renderContents(GuiGraphics graphics, int mouseX, int mouseY, float delta) { - graphics.blitSprite(RenderPipelines.GUI_TEXTURED, this.getCurrentTexture(), this.getX(), this.getY(), this.width, this.height); - - if (this.isHovered) - if (this.tooltip instanceof AdvancedWidgetTooltipHolder holder && holder.hasCustomRender()) { - holder.doCustomRender(this.parent, graphics, mouseX, mouseY, holder.createTooltipPositioner( - this.getRectangle(), this.isHovered(), this.isFocused())); - } - } - - @Override - public void setTooltip(Tooltip tooltip) { - if (tooltip instanceof AdvancedTooltip) { - this.tooltip = new AdvancedWidgetTooltipHolder(); - } - - super.setTooltip(tooltip); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java deleted file mode 100644 index 17e1523..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.aizistral.nochatreports.common.gui; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiGraphics; -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.gui.screens.inventory.tooltip.ClientTooltipPositioner; -import net.minecraft.network.chat.Component; -import net.minecraft.util.FormattedCharSequence; -import org.jetbrains.annotations.Nullable; -import org.joml.Vector2ic; - -import java.util.List; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -@Environment(EnvType.CLIENT) -public class AdvancedTooltip extends Tooltip { - @Nullable - protected Supplier 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 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 toCharSequence(Minecraft minecraft) { - if (this.supplier == null) { - if (this.cachedTooltip == null) { - this.cachedTooltip = splitTooltip(minecraft, this.getMessage(), this.maxWidth); - } - return this.cachedTooltip; - } else - return splitTooltip(minecraft, this.getMessage(), this.maxWidth); - } - - public boolean hasCustomRender() { - return this.renderWithoutGap; - } - - public static List splitTooltip(Minecraft minecraft, Component component, int maxWidth) { - return minecraft.font.split(component, maxWidth); - } - - public void doCustomRender(Screen screen, GuiGraphics graphics, int x, int y, ClientTooltipPositioner positioner) { - if (this.renderWithoutGap) { - this.renderTooltipNoGap(screen, graphics, splitTooltip(screen.minecraft, this.getMessage(), this.maxWidth), this.getMessage(), x, y, positioner); - } else - throw new UnsupportedOperationException("This tooltip doesn't support custom render!"); - } - - protected void renderTooltipNoGap(Screen screen, GuiGraphics poseStack, List list, Component component, int x, int y, ClientTooltipPositioner positioner) { - this.renderTooltipInternalNoGap(screen, poseStack, list.stream().map(ClientTooltipComponent::create).collect(Collectors.toList()), component, x, y, positioner); - } - - // Originates from GuiGraphics - protected void renderTooltipInternalNoGap(Screen screen, GuiGraphics graphics, List list, Component component, int i, int j, ClientTooltipPositioner clientTooltipPositioner) { - ClientTooltipComponent clientTooltipComponent2; - int t; - if (list.isEmpty()) - return; - int k = 0; - int l = list.size() == 1 ? -2 : /*0*/ -2; - for (ClientTooltipComponent clientTooltipComponent : list) { - int m = clientTooltipComponent.getWidth(screen.font); - if (m > k) { - k = m; - } - l += clientTooltipComponent.getHeight(screen.font); - } - int n = k; - int o = l; - Vector2ic vector2ic = clientTooltipPositioner.positionTooltip(graphics.guiWidth(), graphics.guiHeight(), i, j, n, o); - int p = vector2ic.x(); - int q = vector2ic.y(); - - int maxWidth = 0; - - for (t = 0; t < list.size(); ++t) { - clientTooltipComponent2 = list.get(t); - if (clientTooltipComponent2.getWidth(screen.font) > maxWidth) { - maxWidth = clientTooltipComponent2.getWidth(screen.font); - } - } - - graphics.setTooltipForNextFrame(screen.font, splitTooltip(screen.minecraft, component), p + maxWidth , q, null); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java deleted file mode 100644 index ae353dd..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.aizistral.nochatreports.common.gui; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.gui.components.WidgetTooltipHolder; -import net.minecraft.client.gui.navigation.ScreenRectangle; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner; - -public class AdvancedWidgetTooltipHolder extends WidgetTooltipHolder { - - public AdvancedWidgetTooltipHolder() { - super(); - } - - public AdvancedWidgetTooltipHolder(Tooltip tooltip) { - this(); - } - - public boolean hasCustomRender() { - return this.get() instanceof AdvancedTooltip advanced && advanced.hasCustomRender(); - } - - public void doCustomRender(Screen screen, GuiGraphics graphics, int x, int y, ClientTooltipPositioner positioner) { - ((AdvancedTooltip) this.get()).doCustomRender(screen, graphics, x, y, positioner); - } - - @Override // ideally tooltip shouldn't control it's own render like this, but for now it does - public void refreshTooltipForNextRenderPass(GuiGraphics guiGraphics, int i, int j, boolean hovered, boolean focused, ScreenRectangle screenRectangle) { - if (this.hasCustomRender()) - return; - - super.refreshTooltipForNextRenderPass(guiGraphics, i, j, hovered, focused, screenRectangle); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java index 8e8d09d..b129113 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java @@ -6,7 +6,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; @@ -18,7 +18,7 @@ public class InvisibleButton extends Button { } @Override - public void renderContents(GuiGraphics graphics, int i, int j, float f) { + public void extractContents(GuiGraphicsExtractor graphics, int i, int j, float f) { // NO-OP } diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java b/src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java deleted file mode 100644 index b1af334..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.aizistral.nochatreports.common.gui; - -import java.util.List; - -import com.google.common.collect.ImmutableList; - -import net.minecraft.client.gui.components.WidgetSprites; - -public class SwitchableSprites { - private final List sprites; - private int index = 0; - - private SwitchableSprites(WidgetSprites def, WidgetSprites... sprites) { - ImmutableList.Builder builder = ImmutableList.builder(); - - builder.add(def); - builder.add(sprites); - - this.sprites = builder.build(); - } - - public SwitchableSprites setIndex(int index) { - if (index >= this.sprites.size()) { - index = this.sprites.size() - 1; - } else if (index < 0) { - index = 0; - } - - this.index = index; - return this; - } - - public int getIndex() { - return this.index; - } - - public WidgetSprites get(int index) { - return this.sprites.get(index); - } - - public WidgetSprites getDefault() { - return this.get(0); - } - - public WidgetSprites getCurrent() { - return this.get(this.index); - } - - public static SwitchableSprites of(WidgetSprites def, WidgetSprites... sprites) { - return new SwitchableSprites(def, sprites); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index 57ca9de..9673848 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -13,18 +13,15 @@ import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerSafetyLevel; import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.core.SigningMode; -import com.aizistral.nochatreports.common.gui.AdvancedImageButton; -import com.aizistral.nochatreports.common.gui.AdvancedTooltip; import com.aizistral.nochatreports.common.gui.GUIShenanigans; -import com.aizistral.nochatreports.common.gui.SwitchableSprites; import com.aizistral.nochatreports.common.gui.TooltipHelper; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ComponentPath; -import net.minecraft.client.gui.components.Button; +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.Tooltip; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.navigation.FocusNavigationEvent; import net.minecraft.client.gui.screens.ChatScreen; @@ -45,7 +42,6 @@ import net.minecraft.resources.Identifier; public abstract class MixinChatScreen extends Screen { private static final Identifier CHAT_STATUS_ICONS = Identifier.fromNamespaceAndPath("nochatreports", "textures/gui/chat_status_icons_extended.png"); private static final Identifier ENCRYPTION_BUTTON = Identifier.fromNamespaceAndPath("nochatreports", "textures/gui/encryption_toggle_button.png"); - private AdvancedImageButton safetyStatusButton; @Shadow protected EditBox input; @@ -90,84 +86,44 @@ public abstract class MixinChatScreen extends Screen { @Inject(method = "init", at = @At("HEAD")) private void onInit(CallbackInfo info) { - int buttonX = this.width - 23; - if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) { - this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, - SwitchableSprites.of( - GUIShenanigans.getSprites("safety_state/insecure"), - GUIShenanigans.getSprites("safety_state/unintrusive"), - GUIShenanigans.getSprites("safety_state/secure"), - GUIShenanigans.getSprites("safety_state/realms"), - GUIShenanigans.getSprites("safety_state/unknown"), - GUIShenanigans.getSprites("safety_state/undefined") - ).setIndex(this.getSpriteSet()), - btn -> { + CycleButton safetyStatusButton = CycleButton.builder( + mode -> Component.empty(), + NCRConfig.getServerPreferences().getModeUnresolved(ServerSafetyState.getLastServer()) + ) + .withValues(NCRClient.areSigningKeysPresent() + ? new SigningMode[]{ SigningMode.DEFAULT, SigningMode.NEVER, SigningMode.ALWAYS, SigningMode.PROMPT, SigningMode.ON_DEMAND } + : new SigningMode[]{ SigningMode.NEVER_FORCED }) + .withSprite((btn, value) -> { + var sprites = switch (ServerSafetyState.getCurrent()) { + case INSECURE -> GUIShenanigans.getSprites("safety_state/insecure"); + case UNINTRUSIVE -> GUIShenanigans.getSprites("safety_state/unintrusive"); + case SECURE, SINGLEPLAYER -> GUIShenanigans.getSprites("safety_state/secure"); + case REALMS -> GUIShenanigans.getSprites("safety_state/realms"); + case UNKNOWN -> GUIShenanigans.getSprites("safety_state/unknown"); + case UNDEFINED -> GUIShenanigans.getSprites("safety_state/undefined"); + }; + return sprites.get(btn.isActive(), btn.isHoveredOrFocused()); + }) + .withTooltip(mode -> Tooltip.create(createSafetyTooltip(mode))) + .displayState(CycleButton.DisplayState.HIDE) + .create( + this.width - 23, this.height - 37, 20, 20, + Component.empty(), + (btn, mode) -> { if (!NCRClient.areSigningKeysPresent()) return; var address = ServerSafetyState.getLastServer(); - if (address != null) { var preferences = NCRConfig.getServerPreferences(); - preferences.setMode(address, preferences.getModeUnresolved(address).next()); + preferences.setMode(address, mode); preferences.saveFile(); } - }, Component.empty(), this); - this.safetyStatusButton.setTooltip(new AdvancedTooltip(() -> { - MutableComponent tooltip = this.getSafetyLevel().getTooltip(); - - if (ServerSafetyState.allowChatSigning()) { - tooltip = Component.translatable("gui.nochatreports.safety_status.insecure_signing"); - } else if (ServerSafetyState.isInSingleplayer()) - return tooltip; - - ServerAddress address = ServerSafetyState.getLastServer(); - SigningMode mode = NCRConfig.getServerPreferences().getModeUnresolved(address); - String signing = "gui.nochatreports.signing_status."; - - if (!this.minecraft.getConnection().getConnection().isEncrypted()) { - signing += "disabled_offline"; - } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) { - signing += "allowed_realms"; - } else if (mode.resolve() == SigningMode.ALWAYS) { - if (ServerSafetyState.allowChatSigning()) { - signing += "allowed"; - } else { - signing += "disabled_allowance_pending"; } - } else if (ServerSafetyState.allowChatSigning()) { - signing += "allowed_session"; - } else { - signing += "disabled"; - } - - tooltip.append("\n\n"); - tooltip.append(Component.translatable(signing)); - - if (ServerSafetyState.isOnRealms()) - return tooltip; + ); - tooltip.append("\n\n"); - tooltip.append(Component.translatable("gui.nochatreports.safety_status_button.controls")); - tooltip.append("\n\n"); - tooltip.append(Component.translatable("gui.nochatreports.signing_mode", - mode.getName().withStyle(ChatFormatting.BOLD, ChatFormatting.AQUA))); - tooltip.append("\n"); - tooltip.append((mode == SigningMode.DEFAULT ? mode.resolve() : mode).getTooltip()); - - return tooltip; - }).setMaxWidth(250).setRenderWithoutGap(true)); - - this.addRenderableWidget(this.safetyStatusButton); - buttonX -= 25; - } - } - - @Override - public void tick() { - if (this.safetyStatusButton != null) { - this.safetyStatusButton.useSprites(this.getSpriteSet()); + this.addRenderableWidget(safetyStatusButton); } } @@ -175,19 +131,47 @@ public abstract class MixinChatScreen extends Screen { return ServerSafetyState.getCurrent(); } - private int getSpriteSet() { - return this.getSpriteSet(this.getSafetyLevel()); - } + private Component createSafetyTooltip(SigningMode mode) { + MutableComponent tooltip = this.getSafetyLevel().getTooltip(); + + if (ServerSafetyState.allowChatSigning()) { + tooltip = Component.translatable("gui.nochatreports.safety_status.insecure_signing"); + } else if (ServerSafetyState.isInSingleplayer()) + return tooltip; + + String signing = "gui.nochatreports.signing_status."; + + if (!this.minecraft.getConnection().getConnection().isEncrypted()) { + signing += "disabled_offline"; + } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.REALMS) { + signing += "allowed_realms"; + } else if (mode.resolve() == SigningMode.ALWAYS) { + if (ServerSafetyState.allowChatSigning()) { + signing += "allowed"; + } else { + signing += "disabled_allowance_pending"; + } + } else if (ServerSafetyState.allowChatSigning()) { + signing += "allowed_session"; + } else { + signing += "disabled"; + } + + tooltip.append("\n\n"); + tooltip.append(Component.translatable(signing)); + + if (ServerSafetyState.isOnRealms()) + return tooltip; + + tooltip.append("\n\n"); + tooltip.append(Component.translatable("gui.nochatreports.safety_status_button.controls")); + tooltip.append("\n\n"); + tooltip.append(Component.translatable("gui.nochatreports.signing_mode", + mode.getName().withStyle(ChatFormatting.BOLD, ChatFormatting.AQUA))); + tooltip.append("\n"); + tooltip.append((mode == SigningMode.DEFAULT ? mode.resolve() : mode).getTooltip()); - private int getSpriteSet(ServerSafetyLevel level) { - return switch (level) { - case INSECURE -> 0; - case UNINTRUSIVE -> 1; - case SECURE, SINGLEPLAYER -> 2; - case REALMS -> 3; - case UNKNOWN -> 4; - case UNDEFINED -> 5; - }; + return tooltip; } @Shadow diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java index 9b7fac5..d968a93 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.aizistral.nochatreports.common.config.NCRConfig; -import net.minecraft.client.GuiMessageTag; +import net.minecraft.client.multiplayer.chat.GuiMessageTag; @Mixin(GuiMessageTag.class) public class MixinGuiMessageTag { diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java index d0ca0b9..3978da2 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java @@ -1,5 +1,7 @@ package com.aizistral.nochatreports.common.mixins.client; +import net.minecraft.client.gui.components.ImageButton; +import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; import net.minecraft.client.gui.layouts.LinearLayout; import org.spongepowered.asm.mixin.Final; @@ -11,10 +13,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerSafetyState; -import com.aizistral.nochatreports.common.gui.AdvancedImageButton; -import com.aizistral.nochatreports.common.gui.AdvancedTooltip; +import net.minecraft.client.gui.components.CycleButton; import com.aizistral.nochatreports.common.gui.GUIShenanigans; -import com.aizistral.nochatreports.common.gui.SwitchableSprites; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; @@ -48,36 +48,39 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { }); if (NCRConfig.getClient().showReloadButton()) { - var button = new AdvancedImageButton(0, 0, 20, 20, - SwitchableSprites.of(GUIShenanigans.getSprites("config_reload_button")), - btn -> NCRConfig.load(), CommonComponents.EMPTY, this); - button.setTooltip(new AdvancedTooltip(RELOAD_TOOLTIP).setMaxWidth(250)); + var button = new ImageButton(0, 0, 20, 20, + GUIShenanigans.getSprites("config_reload_button"), + btn -> NCRConfig.load(), CommonComponents.EMPTY); + button.setTooltip(Tooltip.create(RELOAD_TOOLTIP)); button.active = true; button.visible = true; ncrButtons.addChild(button); } if (NCRConfig.getClient().showNCRButton()) { - var button = new AdvancedImageButton(0, 0, 20, 20, - SwitchableSprites.of( - GUIShenanigans.getSprites("ncr_active_button"), - GUIShenanigans.getSprites("ncr_inactive_button") - ).setIndex(NCRConfig.getClient().enableMod() ? 0 : 1), - btn -> { - NCRConfig.getClient().toggleMod(); - boolean enabled = NCRConfig.getClient().enableMod(); + var button = CycleButton.onOffBuilder(NCRConfig.getClient().enableMod()) + .withSprite((btn, value) -> { + var sprites = GUIShenanigans.getSprites( + value ? "ncr_active_button" : "ncr_inactive_button" + ); + return sprites.get(btn.isActive(), btn.isHoveredOrFocused()); + }) + .withTooltip(value -> Tooltip.create( + Component.translatable( + "gui.nochatreports.ncr_toggle_tooltip", + Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (value ? "on" : "off")) + ) + )) + .displayState(CycleButton.DisplayState.HIDE) + .create( + 0, 0, 20, 20, + Component.empty(), + (btn, value) -> { + NCRConfig.getClient().setEnableMod(value); + ServerSafetyState.reset(); + } + ); - if (enabled) { - ((AdvancedImageButton)btn).useSprites(0); - } else { - ((AdvancedImageButton)btn).useSprites(1); - } - - ServerSafetyState.reset(); - }, 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; ncrButtons.addChild(button); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java index d9434e4..cdc1aef 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java @@ -6,7 +6,7 @@ import com.aizistral.nochatreports.common.gui.FontHelper; import com.google.common.collect.Lists; import com.mojang.blaze3d.opengl.GlStateManager; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import net.minecraft.client.gui.screens.multiplayer.ServerSelectionList; import net.minecraft.client.multiplayer.ServerData; @@ -37,8 +37,8 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { @Shadow @Final private ServerData serverData; - @Inject(method = "renderContent", at = @At("RETURN")) - private void onRender(GuiGraphics graphics, int i, int j, boolean bl, float f, CallbackInfo info) { + @Inject(method = "extractContent", at = @At("RETURN")) + private void onRender(GuiGraphicsExtractor graphics, int mouseX, int mouseY, boolean hovered, float a, CallbackInfo info) { if (!NCRConfig.getClient().verifiedIconEnabled()) return; @@ -50,13 +50,13 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { graphics.blitSprite(RenderPipelines.GUI_TEXTURED, VERIFIED_ICON, this.getContentRight() - 35 + xOffset, this.getContentY() - 1 + yOffset, 14, 14); GlStateManager._disableBlend(); - int t = i - this.getContentX(); - int u = j - this.getContentY(); + int t = mouseX - this.getContentX(); + int u = mouseY - this.getContentY(); if (t >= this.getContentWidth() - 35 + xOffset && t <= this.getContentWidth() - 22 + xOffset && u >= 0 + yOffset && u <= 11 + yOffset) { graphics.setTooltipForNextFrame(Lists.transform(FontHelper.wrap(this.minecraft.font, Language.getInstance().getOrDefault("gui.nochatreports.verified_server"), 250).stream() .map(Component::literal).collect(Collectors.toCollection(() -> - new ArrayList())), Component::getVisualOrderText), i, j); + new ArrayList())), Component::getVisualOrderText), mouseX, mouseY); } } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java index 9954766..f40b9ae 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java @@ -4,6 +4,7 @@ import java.time.Duration; import java.util.UUID; import java.util.function.Supplier; +import net.minecraft.client.gui.components.ImageButton; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -13,9 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerSafetyState; -import com.aizistral.nochatreports.common.gui.AdvancedImageButton; import com.aizistral.nochatreports.common.gui.InvisibleButton; -import com.aizistral.nochatreports.common.gui.SwitchableSprites; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; @@ -44,8 +43,8 @@ public class MixinPlayerEntry { this.reportButton = new InvisibleButton(); this.reportButton.active = this.reportButton.visible = false; } else if (ServerSafetyState.getCurrent().isSecure() && this.reportButton != null) { - this.reportButton = new AdvancedImageButton(0, 0, 20, 20, SwitchableSprites.of(REPORT_BUTTON_SPRITES), - button -> {}, Component.translatable("gui.socialInteractions.report"), screen); + this.reportButton = new ImageButton(0, 0, 20, 20, REPORT_BUTTON_SPRITES, + button -> {}, Component.translatable("gui.socialInteractions.report")); this.reportButton.setTooltip(Tooltip.create(NCR_BUTTON_TOOLTIP)); this.reportButton.setTooltipDelay(Duration.ofMillis(500L)); this.reportButton.active = false; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java index 4d6ea86..b005f5b 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java @@ -20,7 +20,7 @@ public class MixinTitleScreen extends Screen { throw new IllegalStateException("Can't touch this"); } - @Inject(method = { "method_55814", "lambda$createNormalMenuOptions$11" }, at = @At("HEAD"), cancellable = true) + @Inject(method = { "lambda$createNormalMenuOptions$2" }, at = @At("HEAD"), cancellable = true) private void onRealmsButtonClicked(Button button, CallbackInfo info) { if (RealmsWarningScreen.shouldShow()) { this.minecraft.setScreen(new RealmsWarningScreen(new TitleScreen(), new RealmsMainScreen(this))); -- cgit v1.2.3