summaryrefslogtreecommitdiffstats
path: root/src/main/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/NCRClient.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java82
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java8
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java34
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/TriageWarningScreen.java47
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java44
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java6
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java3
14 files changed, 74 insertions, 176 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java
index 476f705..c336163 100644
--- a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java
+++ b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java
@@ -89,7 +89,7 @@ public class NCRClient {
if (chatScr == null) {
chatScr = new ChatScreen("", false);
- chatScr.init(mc, mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight());
+ chatScr.init(mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight());
}
chatScr.handleChatInput(ServerSafetyState.getLastMessage(), false);
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java
deleted file mode 100644
index b2709f2..0000000
--- a/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.aizistral.nochatreports.common.gui;
-
-import org.jetbrains.annotations.Nullable;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.Checkbox;
-import net.minecraft.client.gui.components.Checkbox.OnValueChange;
-import net.minecraft.client.gui.components.MultiLineLabel;
-import net.minecraft.client.gui.components.Renderable;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.multiplayer.WarningScreen;
-import net.minecraft.network.chat.Component;
-
-public abstract class AdaptiveWarningScreen extends Screen {
- private final Component title;
- private final Component content;
- private final Component narration;
- @Nullable
- protected final Screen previous;
- @Nullable
- private final Component check;
- @Nullable
- protected Checkbox stopShowing = null;
- protected MultiLineLabel message = MultiLineLabel.EMPTY;
-
- public AdaptiveWarningScreen(Component title, Component content, @Nullable Component check, @Nullable Screen previous) {
- super(title);
- this.title = title;
- this.content = content;
- this.check = check;
- this.narration = this.title.copy().append("\n").append(this.content);
- this.previous = previous;
- }
-
- @Override
- protected void init() {
- this.clearWidgets();
- super.init();
-
- this.message = MultiLineLabel.create(this.font, this.content, this.width - (this.hugeGUI() ? 65 : 100));
- int i = (this.message.getLineCount() + 1) * this.getLineHeight();
- if (this.check != null) {
- int checkY = this.hugeGUI() ? 27 : 76;
- int j = this.font.width(this.check);
-
- if (this.check != null) {
- this.stopShowing = Checkbox.builder(this.check, this.font).pos(this.width / 2 - j / 2 - 8, checkY + i)
- .build();
- this.addRenderableWidget(this.stopShowing);
- }
- }
- this.initButtons(i + (this.hugeGUI() ? 55 : 100));
- }
-
- protected abstract void initButtons(int y);
-
- @Override
- public void render(GuiGraphics graphics, int i, int j, float f) {
- super.render(graphics, i, j, f);
- this.renderTitle(graphics);
- int k = this.width / 2 - this.message.getWidth() / 2;
- this.message.render(graphics, MultiLineLabel.Align.LEFT, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), true, 0xFFFFFFFF);
- }
-
- private void renderTitle(GuiGraphics graphics) {
- graphics.drawString(this.font, this.title, 25, this.hugeGUI() ? 15 : 30, 0xFFFFFFFF);
- }
-
- private boolean hugeGUI() {
- return this.height <= 1080 / 4;
- }
-
- protected int getLineHeight() {
- if (this.hugeGUI())
- return (int) (this.minecraft.font.lineHeight * 1.5) + 1;
- else
- return this.minecraft.font.lineHeight * 2;
- }
-
-}
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 e112227..704739e 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java
@@ -8,7 +8,7 @@ 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.ResourceLocation;
+import net.minecraft.resources.Identifier;
@Environment(EnvType.CLIENT)
public class AdvancedImageButton extends ImageButton {
@@ -31,12 +31,12 @@ public class AdvancedImageButton extends ImageButton {
return this.switchable.getIndex();
}
- public ResourceLocation getCurrentTexture() {
+ public Identifier getCurrentTexture() {
return this.switchable.getCurrent().get(this.isActive(), this.isHoveredOrFocused());
}
@Override
- public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
+ 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)
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java b/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java
index ef72190..9ae97c2 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java
@@ -4,7 +4,7 @@ import com.aizistral.nochatreports.common.NCRCore;
import net.minecraft.client.gui.ComponentPath;
import net.minecraft.client.gui.components.WidgetSprites;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
public final class GUIShenanigans {
@@ -33,9 +33,9 @@ public final class GUIShenanigans {
}
public static WidgetSprites getSprites(String path, boolean hasHovered, boolean hasDisabled) {
- var normal = ResourceLocation.fromNamespaceAndPath("nochatreports", path);
- var hovered = hasHovered ? ResourceLocation.fromNamespaceAndPath("nochatreports", path + "_hovered") : normal;
- var disabled = hasDisabled ? ResourceLocation.fromNamespaceAndPath("nochatreports", path + "_hovered") : hovered;
+ var normal = Identifier.fromNamespaceAndPath("nochatreports", path);
+ var hovered = hasHovered ? Identifier.fromNamespaceAndPath("nochatreports", path + "_hovered") : normal;
+ var disabled = hasDisabled ? Identifier.fromNamespaceAndPath("nochatreports", path + "_hovered") : hovered;
return new WidgetSprites(normal, hovered, disabled);
}
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 93f5165..8e8d09d 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java
@@ -18,7 +18,7 @@ public class InvisibleButton extends Button {
}
@Override
- public void render(GuiGraphics graphics, int i, int j, float f) {
+ public void renderContents(GuiGraphics graphics, int i, int j, float f) {
// NO-OP
}
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java
index cdea3e8..75d5d61 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java
@@ -3,25 +3,34 @@ package com.aizistral.nochatreports.common.gui;
import com.aizistral.nochatreports.common.config.NCRConfig;
import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.layouts.Layout;
+import net.minecraft.client.gui.layouts.LinearLayout;
+import net.minecraft.client.gui.screens.ConfirmLinkScreen;
import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.multiplayer.WarningScreen;
+import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
+import net.minecraft.util.Util;
-public class RealmsWarningScreen extends TriageWarningScreen {
+public class RealmsWarningScreen extends WarningScreen {
private static final Component TITLE = Component.translatable("gui.nochatreports.realms_warning.header").withStyle(ChatFormatting.BOLD);
private static final Component CONTENT = Component.translatable("gui.nochatreports.realms_warning.contents");
private static final Component CHECK = Component.translatable("gui.nochatreports.realms_warning.check");
+ private static final Component NARRATION = TITLE.copy().append("\n").append(CONTENT);
private static final Component LEARN = Component.translatable("gui.nochatreports.realms_warning.learn_more");
private static final String WIKI_LINK = "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/The-Realms-Question";
private static boolean sessionSeen = false;
+ private final Screen previous;
private final Screen realms;
public RealmsWarningScreen(Screen previous, Screen realms) {
- super(TITLE, CONTENT, CHECK, LEARN, WIKI_LINK, previous);
+ super(TITLE, CONTENT, CHECK, NARRATION);
+ this.previous = previous;
this.realms = realms;
}
- @Override
protected void onProceed(Button button) {
this.minecraft.setScreen(this.realms);
if (this.stopShowing.selected()) {
@@ -31,13 +40,28 @@ public class RealmsWarningScreen extends TriageWarningScreen {
sessionSeen = true;
}
- @Override
protected void onBack(Button button) {
- this.minecraft.setScreen(null);
+ this.minecraft.setScreen(this.previous);
}
public static boolean shouldShow() {
return !sessionSeen && !NCRConfig.getClient().skipRealmsWarning();
}
+ @Override
+ protected Layout addFooterButtons() {
+ LinearLayout linearLayout = LinearLayout.horizontal().spacing(8);
+ linearLayout.addChild(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed).build());
+ linearLayout.addChild(Button.builder(LEARN, button -> {
+ Minecraft.getInstance().setScreen(new ConfirmLinkScreen(agree -> {
+ if (agree) {
+ Util.getPlatform().openUri(WIKI_LINK);
+ }
+
+ Minecraft.getInstance().setScreen(this);
+ }, WIKI_LINK, true));
+ }).build());
+ linearLayout.addChild(Button.builder(CommonComponents.GUI_BACK, this::onBack).build());
+ return linearLayout;
+ }
}
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 e0fe1f8..c87d1e1 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/TooltipHelper.java
@@ -1,6 +1,6 @@
package com.aizistral.nochatreports.common.gui;
-import net.minecraft.Util;
+import net.minecraft.util.Util;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/TriageWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/TriageWarningScreen.java
deleted file mode 100644
index 5c14d70..0000000
--- a/src/main/java/com/aizistral/nochatreports/common/gui/TriageWarningScreen.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.aizistral.nochatreports.common.gui;
-
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.ConfirmLinkScreen;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.CommonComponents;
-import net.minecraft.network.chat.Component;
-
-public abstract class TriageWarningScreen extends AdaptiveWarningScreen {
- private final Component learnMore;
- private final String wikiLink;
-
- public TriageWarningScreen(Component title, Component content, Component check, Component learn, String wikiLink, Screen previous) {
- super(title, content, check, previous);
- this.learnMore = learn;
- this.wikiLink = wikiLink;
- }
-
- @Override
- protected void initButtons(int y) {
- int offset = 28;
-
- this.addRenderableWidget(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed)
- .pos(this.width / 2 - 260 + offset, y).size(150, 20).build());
-
- this.addRenderableWidget(Button.builder(this.learnMore, button -> {
- Minecraft.getInstance().setScreen(new ConfirmLinkScreen(agree -> {
- if (agree) {
- Util.getPlatform().openUri(this.wikiLink);
- }
-
- Minecraft.getInstance().setScreen(this);
- }, this.wikiLink, true));
- }).pos(this.width / 2 - 100 + offset, y).size(150, 20).build());
-
-
- this.addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, this::onBack)
- .pos(this.width / 2 + 60 + offset, y).size(150, 20).build());
- }
-
- protected abstract void onProceed(Button button);
-
- protected abstract void onBack(Button button);
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java
index a46ce21..dd1c199 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java
@@ -7,38 +7,25 @@ import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.ChatFormatting;
import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.ChatScreen;
+import net.minecraft.client.gui.layouts.Layout;
+import net.minecraft.client.gui.layouts.LinearLayout;
import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.multiplayer.WarningScreen;
import net.minecraft.network.chat.Component;
@Environment(EnvType.CLIENT)
-public final class UnsafeServerScreen extends AdaptiveWarningScreen {
+public final class UnsafeServerScreen extends WarningScreen {
private static final Component TITLE = Component.translatable("gui.nochatreports.signing_required.header").withStyle(ChatFormatting.BOLD);
private static final Component CONTENT = Component.translatable("gui.nochatreports.signing_required.contents");
private static final Component CHECK = Component.translatable("gui.nochatreports.signing_required.check");
private static final Component NARRATION = TITLE.copy().append("\n").append(CONTENT);
+ private final Screen previous;
+
private static boolean hideThisSession = false;
public UnsafeServerScreen(Screen previous) {
- super(TITLE, CONTENT, CHECK, previous);
- }
-
- @Override
- protected void initButtons(int i) {
- this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.signing_required.allow_signing"),
- button -> {
- ServerSafetyState.setAllowChatSigning(true);
- this.minecraft.setScreen(this.previous);
- }).bounds(this.width / 2 - 155, i, 150, 20)
- .build());
-
- this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.signing_required.cancel"),
- button -> {
- if (this.stopShowing.selected()) {
- hideThisSession = true;
- }
- this.minecraft.setScreen(this.previous);
- }).bounds(this.width / 2 - 155 + 160, i, 150, 20).build());
+ super(TITLE, CONTENT, CHECK, NARRATION);
+ this.previous = previous;
}
public static void setHideThisSession(boolean hide) {
@@ -49,4 +36,19 @@ public final class UnsafeServerScreen extends AdaptiveWarningScreen {
return hideThisSession;
}
+ @Override
+ protected Layout addFooterButtons() {
+ LinearLayout linearLayout = LinearLayout.horizontal().spacing(8);
+ linearLayout.addChild(Button.builder(Component.translatable("gui.nochatreports.signing_required.allow_signing"), button -> {
+ ServerSafetyState.setAllowChatSigning(true);
+ this.minecraft.setScreen(this.previous);
+ }).build());
+ linearLayout.addChild(Button.builder(Component.translatable("gui.nochatreports.signing_required.cancel"), button -> {
+ if (this.stopShowing.selected()) {
+ hideThisSession = true;
+ }
+ this.minecraft.setScreen(this.previous);
+ }).build());
+ return linearLayout;
+ }
}
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 c973189..57ca9de 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
@@ -34,7 +34,7 @@ import net.minecraft.client.multiplayer.resolver.ServerAddress;
import net.minecraft.locale.Language;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
/**
* This is responsible for adding safety status indicator to the bottom-right corner of chat screen.
@@ -43,8 +43,8 @@ import net.minecraft.resources.ResourceLocation;
@Mixin(ChatScreen.class)
public abstract class MixinChatScreen extends Screen {
- private static final ResourceLocation CHAT_STATUS_ICONS = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/chat_status_icons_extended.png");
- private static final ResourceLocation ENCRYPTION_BUTTON = ResourceLocation.fromNamespaceAndPath("nochatreports", "textures/gui/encryption_toggle_button.png");
+ 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;
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 f9521e0..d0ca0b9 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
@@ -21,7 +21,7 @@ import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
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.resources.Identifier;
/**
* This is responsible for adding config reload button to server selection menu.
@@ -32,8 +32,8 @@ import net.minecraft.resources.ResourceLocation;
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 Identifier RELOAD_TEXTURE = Identifier.fromNamespaceAndPath("nochatreports", "textures/gui/config_reload_button.png"),
+ TOGGLE_TEXTURE = Identifier.fromNamespaceAndPath("nochatreports", "textures/gui/ncr_toggle_button.png");
private static final Component RELOAD_TOOLTIP = Component.translatable("gui.nochatreports.reload_config_tooltip");
protected MixinJoinMultiplayerScreen() {
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 776013d..d9434e4 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
@@ -13,7 +13,7 @@ import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.renderer.RenderPipelines;
import net.minecraft.locale.Language;
import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
@Mixin(ServerSelectionList.OnlineServerEntry.class)
public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry {
@Unique
- private static final ResourceLocation VERIFIED_ICON = ResourceLocation.fromNamespaceAndPath("nochatreports", "verified_server");
+ private static final Identifier VERIFIED_ICON = Identifier.fromNamespaceAndPath("nochatreports", "verified_server");
@Shadow @Final
private JoinMultiplayerScreen screen;
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 b9f31af..9954766 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
@@ -24,7 +24,7 @@ import net.minecraft.client.gui.components.WidgetSprites;
import net.minecraft.client.gui.screens.social.PlayerEntry;
import net.minecraft.client.gui.screens.social.SocialInteractionsScreen;
import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
@Mixin(PlayerEntry.class)
public class MixinPlayerEntry {
@@ -39,7 +39,7 @@ public class MixinPlayerEntry {
*/
@Inject(method = "<init>", at = @At("RETURN"))
- private void onConstructed(Minecraft minecraft, SocialInteractionsScreen screen, UUID uuid, String name, Supplier<ResourceLocation> skinGetter, boolean reportable, CallbackInfo info) {
+ private void onConstructed(Minecraft minecraft, SocialInteractionsScreen screen, UUID uuid, String name, Supplier<Identifier> skinGetter, boolean reportable, CallbackInfo info) {
if (NCRConfig.getClient().alwaysHideReportButton()) {
this.reportButton = new InvisibleButton();
this.reportButton.active = this.reportButton.visible = false;
diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java
index 4bb64ed..fac9b95 100644
--- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java
+++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java
@@ -5,6 +5,7 @@ import java.net.InetSocketAddress;
import net.minecraft.client.multiplayer.ServerStatusPinger;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
import net.minecraft.network.Connection;
+import net.minecraft.server.network.EventLoopGroupHolder;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
@@ -37,7 +38,7 @@ public abstract class MixinServerStatusPinger$1 {
private ServerDataExtension nochatreports$serverData;
@Inject(method = "<init>", at = @At("RETURN"))
- private void captureServerData(ServerStatusPinger serverStatusPinger, Connection connection, ServerData serverData, Runnable runnable, Runnable runnable2, InetSocketAddress inetSocketAddress, ServerAddress serverAddress, CallbackInfo ci){
+ private void captureServerData(ServerStatusPinger serverStatusPinger, Connection connection, ServerData serverData, Runnable runnable, Runnable runnable2, InetSocketAddress inetSocketAddress, ServerAddress serverAddress, EventLoopGroupHolder eventLoopGroupHolder, CallbackInfo ci){
this.nochatreports$serverData = (ServerDataExtension) serverData;
}