diff options
Diffstat (limited to 'src')
10 files changed, 31 insertions, 21 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java index 589210b..476f705 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java @@ -88,7 +88,7 @@ public class NCRClient { var chatScr = mc.screen instanceof ChatScreen chat ? chat : null; if (chatScr == null) { - chatScr = new ChatScreen(""); + chatScr = new ChatScreen("", false); chatScr.init(mc, mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight()); } diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java index 6a91bfd..b2709f2 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java @@ -61,7 +61,7 @@ public abstract class AdaptiveWarningScreen extends Screen { super.render(graphics, i, j, f); this.renderTitle(graphics); int k = this.width / 2 - this.message.getWidth() / 2; - this.message.renderLeftAligned(graphics, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFFFF); + this.message.render(graphics, MultiLineLabel.Align.LEFT, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), true, 0xFFFFFFFF); } private void renderTitle(GuiGraphics graphics) { diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java b/src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java index 54e0e49..e0fe1f8 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.common.gui; +import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -11,7 +12,7 @@ public final class TooltipHelper { } public static MutableComponent getCtrl() { - if (Minecraft.ON_OSX) + if (Util.getPlatform() == Util.OS.OSX) return Component.translatable("key.nochatreports.cmd"); else return Component.translatable("key.nochatreports.ctrl"); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java index 849650d..0480908 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java @@ -72,7 +72,7 @@ public class MixinChatListener { if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.PROMPT)) { Screen returnScreen = Minecraft.getInstance().screen instanceof ChatScreen chat ? chat - : new ChatScreen(""); + : new ChatScreen("", false); Screen unsafeScreen = new UnsafeServerScreen(returnScreen); Minecraft.getInstance().setScreen(unsafeScreen); 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 5711ca3..f9521e0 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,6 +1,10 @@ package com.aizistral.nochatreports.common.mixins.client; +import net.minecraft.client.gui.layouts.HeaderAndFooterLayout; +import net.minecraft.client.gui.layouts.LinearLayout; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -12,7 +16,6 @@ import com.aizistral.nochatreports.common.gui.AdvancedTooltip; import com.aizistral.nochatreports.common.gui.GUIShenanigans; import com.aizistral.nochatreports.common.gui.SwitchableSprites; -import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import net.minecraft.locale.Language; @@ -27,6 +30,8 @@ import net.minecraft.resources.ResourceLocation; @Mixin(JoinMultiplayerScreen.class) public abstract class MixinJoinMultiplayerScreen extends Screen { + @Shadow @Final + private HeaderAndFooterLayout layout; private static final ResourceLocation RELOAD_TEXTURE = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/config_reload_button.png"), TOGGLE_TEXTURE = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/ncr_toggle_button.png"); private static final Component RELOAD_TOOLTIP = Component.translatable("gui.nochatreports.reload_config_tooltip"); @@ -38,18 +43,22 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { @Inject(method = "init", at = @At("HEAD")) private void onInit(CallbackInfo info) { + LinearLayout ncrButtons = this.layout.addToFooter(LinearLayout.vertical().spacing(4), layoutSettings -> { + layoutSettings.paddingLeft(336); + }); + if (NCRConfig.getClient().showReloadButton()) { - var button = new AdvancedImageButton(this.width/2 + 158, this.height - 54, 20, 20, + 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)); button.active = true; button.visible = true; - this.addRenderableWidget(button); + ncrButtons.addChild(button); } if (NCRConfig.getClient().showNCRButton()) { - var button = new AdvancedImageButton(this.width/2 + 158, this.height - 30, 20, 20, + var button = new AdvancedImageButton(0, 0, 20, 20, SwitchableSprites.of( GUIShenanigans.getSprites("ncr_active_button"), GUIShenanigans.getSprites("ncr_inactive_button") @@ -71,7 +80,7 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { .enableMod() ? "on" : "off")))).setMaxWidth(250)); button.active = true; button.visible = true; - this.addRenderableWidget(button); + 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 c85c02e..776013d 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 @@ -37,8 +37,8 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { @Shadow @Final private ServerData serverData; - @Inject(method = "render", at = @At("RETURN")) - private void onRender(GuiGraphics graphics, int i, int j, int k, int l, int m, int n, int o, boolean bl, float f, CallbackInfo info) { + @Inject(method = "renderContent", at = @At("RETURN")) + private void onRender(GuiGraphics graphics, int i, int j, boolean bl, float f, CallbackInfo info) { if (!NCRConfig.getClient().verifiedIconEnabled()) return; @@ -47,16 +47,16 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { yOffset = NCRConfig.getClient().getVerifiedIconOffsetY(); GlStateManager._enableBlend(); - graphics.blitSprite(RenderPipelines.GUI_TEXTURED, VERIFIED_ICON, k + l - 35 + xOffset, j - 1 + yOffset, 14, 14); + graphics.blitSprite(RenderPipelines.GUI_TEXTURED, VERIFIED_ICON, this.getContentRight() - 35 + xOffset, this.getContentY() - 1 + yOffset, 14, 14); GlStateManager._disableBlend(); - int t = n - k; - int u = o - j; - if (t >= l - 35 + xOffset && t <= l - 22 + xOffset && u >= 0 + yOffset && u <= 11 + yOffset) { + int t = i - this.getContentX(); + int u = j - 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>())), Component::getVisualOrderText), n, o); + new ArrayList<Component>())), Component::getVisualOrderText), i, j); } } } 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 a36a4aa..4d6ea86 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$10" }, at = @At("HEAD"), cancellable = true) + @Inject(method = { "method_55814", "lambda$createNormalMenuOptions$11" }, 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))); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java index d1a4c5d..e63502d 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java @@ -20,7 +20,7 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.Utf8String; import net.minecraft.network.codec.ByteBufCodecs; -@Mixin(targets = "net.minecraft.network.codec.ByteBufCodecs$35") +@Mixin(targets = "net.minecraft.network.codec.ByteBufCodecs$34") public class MixinJsonByteBufCodec { @Shadow @Final private static Gson GSON; diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java index d69e495..5dbceb2 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java @@ -24,7 +24,7 @@ public class MixinServerboundChatSessionUpdatePacket { private void onHandle(ServerGamePacketListener listener, CallbackInfo info) { var impl = (ServerGamePacketListenerImpl) listener; - if (!impl.getPlayer().getServer().isSingleplayerOwner(impl.getPlayer().getGameProfile())) { + if (!impl.getPlayer().level().getServer().isSingleplayerOwner(impl.getPlayer().nameAndId())) { if (NCRConfig.getCommon().demandOnClient()) { impl.disconnect(Component.literal(NCRConfig.getCommon().demandOnClientMessage())); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 624d299..fc13ee8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -38,9 +38,9 @@ ], "depends": { - "fabricloader": ">=0.16.14", + "fabricloader": ">=0.17.2", "fabric-api": "*", - "minecraft": [ ">=1.21.7" ], + "minecraft": [ ">=1.21.9" ], "java": ">=21" }, "suggests": {}, |
