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/gui/AdaptiveWarningScreen.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java25
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/EncryptionButton.java17
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java49
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java19
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java53
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java41
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java32
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java7
9 files changed, 182 insertions, 63 deletions
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 4fba0bf..95c846a 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java
@@ -54,7 +54,7 @@ public abstract class AdaptiveWarningScreen extends Screen {
@Override
public void render(GuiGraphics graphics, int i, int j, float f) {
- this.renderBackground(graphics);
+ this.renderBackground(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(), 0xFFFFFF);
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 f470b6a..4b4a1da 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java
@@ -6,6 +6,7 @@ import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.client.gui.components.WidgetSprites;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner;
import net.minecraft.network.chat.Component;
@@ -14,12 +15,26 @@ import net.minecraft.resources.ResourceLocation;
@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);
- 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;
+ this.switchable = sprites;
+ }
+
+ public void useSprites(int index) {
+ this.switchable.setIndex(index);
+ }
+
+ public int getSpritesIndex() {
+ return this.switchable.getIndex();
+ }
+
+ public ResourceLocation getCurrentTexture() {
+ return this.switchable.getCurrent().get(this.isActive(), this.isHoveredOrFocused());
}
@Override
@@ -32,7 +47,7 @@ public class AdvancedImageButton extends ImageButton {
@Override
public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
- super.renderWidget(graphics, mouseX, mouseY, delta);
+ graphics.blitSprite(this.getCurrentTexture(), this.getX(), this.getY(), this.width, this.height);
if (this.isHovered)
if (this.tooltip instanceof AdvancedTooltip tooltip && tooltip.hasCustomRender()) {
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionButton.java
index 44d286f..2753ab6 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionButton.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionButton.java
@@ -3,15 +3,16 @@ package com.aizistral.nochatreports.common.gui;
import com.aizistral.nochatreports.common.config.NCRConfig;
import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.WidgetSprites;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
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, Component name, Screen parent) {
- super(x, y, xSize, ySize, xTexStart, yTexStart, yStateDiff, texture, textureWidth, textureHeight, onPress, name, parent);
+ public EncryptionButton(int x, int y, int xSize, int ySize, int useSprites, OnPress onPress, Component name,
+ Screen parent) {
+ super(x, y, xSize, ySize, getSprites(useSprites), onPress, name, parent);
}
@Override
@@ -37,4 +38,14 @@ public class EncryptionButton extends AdvancedImageButton {
}
}
+ private static SwitchableSprites getSprites(int useIndex) {
+ SwitchableSprites sprites = SwitchableSprites.of(
+ GUIShenanigans.getSprites("encryption/active_button"),
+ GUIShenanigans.getSprites("encryption/inactive_button"),
+ GUIShenanigans.getSprites("encryption/error_button")
+ );
+ sprites.setIndex(useIndex);
+ return sprites;
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java
index 5e3e68a..9653b41 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java
@@ -18,6 +18,7 @@ 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.WidgetSprites;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
@@ -26,7 +27,6 @@ import net.minecraft.util.StringUtil;
@Environment(EnvType.CLIENT)
public class EncryptionConfigScreen extends Screen {
- private static final ResourceLocation ENCRYPTION_ICONS = new ResourceLocation("nochatreports", "textures/gui/encryption_gui_icons.png");
private static final Component HEADER = Component.translatable("gui.nochatreports.encryption_config.header");
private static final Component KEY_DESC = Component.translatable("gui.nochatreports.encryption_config.key_desc");
private static final Component PASS_DESC = Component.translatable("gui.nochatreports.encryption_config.passphrase_desc");
@@ -35,11 +35,12 @@ public class EncryptionConfigScreen extends Screen {
private static final Component DICE_TOOLTIP = Component.translatable("gui.nochatreports.encryption_config.dice_tooltip");
private static final Component PASS_NOT_ALLOWED = Component.translatable("gui.nochatreports.encryption_config.pass_not_allowed");
private static final Component ENCRYPT_PUBLIC = Component.translatable("gui.nochatreports.encryption_config.encrypt_public");
+ private static final ResourceLocation CROSSMARK = new ResourceLocation("nochatreports", "encryption/crossmark_big");
private static final int FIELDS_Y_START = 45;
private final Screen previous;
private CustomEditBox keyField, passField;
- private ImageButton validationIcon;
+ private AdvancedImageButton validationIcon;
private CycleButton<Encryption> algorithmButton;
private MultiLineLabel keyDesc = MultiLineLabel.EMPTY, passDesc = MultiLineLabel.EMPTY;
protected Checkbox encryptPublicCheck;
@@ -69,30 +70,36 @@ public class EncryptionConfigScreen extends Screen {
w -= 52;
- this.keyField = new CustomEditBox(this.font, (this.width - w)/2 - 2, (this.hugeGUI() ? 25 : FIELDS_Y_START) + keyDescSpace - 15,
- w, 18, CommonComponents.EMPTY);
+ this.keyField = new CustomEditBox(this.font, (this.width - w) / 2 - 2,
+ (this.hugeGUI() ? 25 : FIELDS_Y_START) + keyDescSpace - 15, w, 18, CommonComponents.EMPTY);
this.keyField.setMaxLength(512);
this.keyField.setResponder(this::onKeyUpdate);
this.addWidget(this.keyField);
- 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 != null &&
- this.validationIcon.yTexStart == 0 ? VALIDATION_OK : VALIDATION_FAILED).setMaxWidth(250));
+ var button = new AdvancedImageButton(this.keyField.getX() + this.keyField.getWidth() - 15,
+ this.keyField.getY() + 3, 12, 12, SwitchableSprites.of(
+ GUIShenanigans.getSprites("encryption/checkmark", false, false),
+ GUIShenanigans.getSprites("encryption/crossmark", false, false)
+ ), btn -> {}, Component.empty(), this);
+
+ button.setTooltip(new AdvancedTooltip(
+ () -> this.validationIcon != null && this.validationIcon.getSpritesIndex() == 0 ? VALIDATION_OK
+ : VALIDATION_FAILED).setMaxWidth(250));
button.active = false;
button.visible = true;
this.addRenderableOnly(this.validationIcon = button);
- 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 = new AdvancedImageButton(this.keyField.getX() - 22, this.keyField.getY() - 0, 18, 18,
+ SwitchableSprites.of(GUIShenanigans.getSprites("encryption/key_button", false, false)), btn -> {},
+ Component.empty(), this);
button.active = false;
button.visible = true;
this.addRenderableOnly(button);
- button = new AdvancedImageButton(this.keyField.getX() + this.keyField.getWidth() + 4, this.keyField.getY() - 1, 23, 20, 41,
- 24, 20, ENCRYPTION_ICONS, 64, 64, btn -> {
+ button = new AdvancedImageButton(this.keyField.getX() + this.keyField.getWidth() + 4, this.keyField.getY() - 1,
+ 23, 20, SwitchableSprites.of(GUIShenanigans.getSprites("encryption/random_button")), btn -> {
this.unfocusFields();
this.keyField.setValue(this.algorithmButton.getValue().getRandomKey());
}, Component.empty(), this);
@@ -110,8 +117,9 @@ public class EncryptionConfigScreen extends Screen {
this.passField.setResponder(this::onPassphraseUpdate);
this.addWidget(this.passField);
- 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 = new AdvancedImageButton(this.passField.getX() - 22, this.passField.getY() - 0, 18, 18,
+ SwitchableSprites.of(GUIShenanigans.getSprites("encryption/lock_button", false, false)),
+ btn -> {}, Component.empty(), this);
button.active = false;
button.visible = true;
@@ -164,7 +172,7 @@ public class EncryptionConfigScreen extends Screen {
this.passField.setEditable(false);
}
- this.renderBackground(graphics);
+ this.renderBackground(graphics, j, j, f);
graphics.drawCenteredString(this.font, HEADER, this.width / 2, this.hugeGUI() ? 8 : 16, 0xFFFFFF);
this.keyDesc.renderLeftAligned(graphics, this.keyField.getX() - 20, (this.hugeGUI() ? 25 : FIELDS_Y_START), this.getLineHeight(), 0xFFFFFF);
@@ -193,7 +201,7 @@ public class EncryptionConfigScreen extends Screen {
graphics.drawString(this.font, PASS_NOT_ALLOWED, this.passField.getX() + 4,
this.passField.getY() + 5, 0x999999);
RenderSystem.enableDepthTest();
- graphics.blit(ENCRYPTION_ICONS, this.passField.getX() - 20, this.passField.getY() + 3, 50, 0, 14, 13, 64, 64);
+ graphics.blitSprite(CROSSMARK, this.passField.getX() - 20, this.passField.getY() + 3, 14, 13);
}
}
@@ -204,20 +212,15 @@ public class EncryptionConfigScreen extends Screen {
return this.minecraft.font.lineHeight * 2;
}
- @Override
- public void tick() {
- this.keyField.tick();
- }
-
private void onKeyUpdate(String key) {
if (!this.settingPassKey) {
this.passField.setValue("");
}
if (!StringUtil.isNullOrEmpty(key)) {
- this.validationIcon.yTexStart = this.algorithmButton.getValue().validateKey(key) ? 0 : 12;
+ this.validationIcon.useSprites(this.algorithmButton.getValue().validateKey(key) ? 0 : 1);
} else {
- this.validationIcon.yTexStart = 0;
+ this.validationIcon.useSprites(0);
}
}
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 e34da79..fd0eb2f 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/GUIShenanigans.java
@@ -1,6 +1,10 @@
package com.aizistral.nochatreports.common.gui;
+import com.aizistral.nochatreports.common.NCRCore;
+
import net.minecraft.client.gui.ComponentPath;
+import net.minecraft.client.gui.components.WidgetSprites;
+import net.minecraft.resources.ResourceLocation;
public final class GUIShenanigans {
@@ -20,4 +24,19 @@ public final class GUIShenanigans {
return path;
}
+ public static WidgetSprites getSprites(String path) {
+ return getSprites(path, true, true);
+ }
+
+ public static WidgetSprites getSprites(String path, boolean hasHovered) {
+ return getSprites(path, hasHovered, true);
+ }
+
+ public static WidgetSprites getSprites(String path, boolean hasHovered, boolean hasDisabled) {
+ var normal = new ResourceLocation("nochatreports", path);
+ var hovered = hasHovered ? new ResourceLocation("nochatreports", path + "_hovered") : normal;
+ var disabled = hasDisabled ? new ResourceLocation("nochatreports", path + "_hovered") : hovered;
+ return new WidgetSprites(normal, hovered, disabled);
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java b/src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java
new file mode 100644
index 0000000..b1af334
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/SwitchableSprites.java
@@ -0,0 +1,53 @@
+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<WidgetSprites> sprites;
+ private int index = 0;
+
+ private SwitchableSprites(WidgetSprites def, WidgetSprites... sprites) {
+ ImmutableList.Builder<WidgetSprites> 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 dde43c3..d6c599e 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
@@ -18,6 +18,7 @@ import com.aizistral.nochatreports.common.gui.AdvancedTooltip;
import com.aizistral.nochatreports.common.gui.EncryptionButton;
import com.aizistral.nochatreports.common.gui.EncryptionWarningScreen;
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;
@@ -45,7 +46,7 @@ import net.minecraft.resources.ResourceLocation;
public abstract class MixinChatScreen extends Screen {
private static final ResourceLocation CHAT_STATUS_ICONS = new ResourceLocation("nochatreports", "textures/gui/chat_status_icons_extended.png");
private static final ResourceLocation ENCRYPTION_BUTTON = new ResourceLocation("nochatreports", "textures/gui/encryption_toggle_button.png");
- private ImageButton safetyStatusButton;
+ private AdvancedImageButton safetyStatusButton;
@Shadow
protected EditBox input;
@@ -105,8 +106,16 @@ public abstract class MixinChatScreen extends Screen {
int buttonX = this.width - 23;
if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) {
- this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(),
- 0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> {
+ 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")
+ ),
+ btn -> {
if (!NCRClient.areSigningKeysPresent())
return;
@@ -170,16 +179,16 @@ public abstract class MixinChatScreen extends Screen {
if (!NCRConfig.getEncryption().showEncryptionButton())
return;
- int xStart = !NCRConfig.getEncryption().isValid() ? 40 : (NCRConfig.getEncryption().isEnabled() ? 0 : 20);
+ int useSprites = !NCRConfig.getEncryption().isValid() ? 2 : (NCRConfig.getEncryption().isEnabled() ? 0 : 1);
- var button = new EncryptionButton(buttonX, this.height - 37, 20, 20, xStart,
- 0, 20, ENCRYPTION_BUTTON, 64, 64, btn -> {
+ var button = new EncryptionButton(buttonX, this.height - 37, 20, 20, useSprites,
+ btn -> {
if (!EncryptionWarningScreen.seenOnThisSession() && !NCRConfig.getEncryption().isWarningDisabled()
&& !NCRConfig.getEncryption().isEnabled()) {
Minecraft.getInstance().setScreen(new EncryptionWarningScreen(this));
} else if (NCRConfig.getEncryption().isValid()) {
NCRConfig.getEncryption().toggleEncryption();
- ((EncryptionButton)btn).xTexStart = NCRConfig.getEncryption().isEnabledAndValid() ? 0 : 20;
+ ((EncryptionButton)btn).useSprites(NCRConfig.getEncryption().isEnabledAndValid() ? 0 : 1);
} else {
((EncryptionButton)btn).openEncryptionConfig();
}
@@ -204,7 +213,7 @@ public abstract class MixinChatScreen extends Screen {
@Inject(method = "tick", at = @At("RETURN"))
private void onTick(CallbackInfo info) {
if (this.safetyStatusButton != null) {
- this.safetyStatusButton.xTexStart = this.getXOffset();
+ this.safetyStatusButton.useSprites(this.getSpriteSet());
}
}
@@ -212,18 +221,18 @@ public abstract class MixinChatScreen extends Screen {
return ServerSafetyState.getCurrent();
}
- private int getXOffset() {
- return this.getXOffset(this.getSafetyLevel());
+ private int getSpriteSet() {
+ return this.getSpriteSet(this.getSafetyLevel());
}
- private int getXOffset(ServerSafetyLevel level) {
+ private int getSpriteSet(ServerSafetyLevel level) {
return switch (level) {
- case SECURE, SINGLEPLAYER -> 21;
- case UNINTRUSIVE -> 42;
case INSECURE -> 0;
- case REALMS -> 63;
- case UNKNOWN -> 84;
- case UNDEFINED -> 105;
+ case UNINTRUSIVE -> 1;
+ case SECURE, SINGLEPLAYER -> 2;
+ case REALMS -> 3;
+ case UNKNOWN -> 4;
+ case UNDEFINED -> 5;
};
}
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 4e2e2d5..5705fad 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
@@ -9,6 +9,8 @@ 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 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;
@@ -37,8 +39,9 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
@Inject(method = "init", at = @At("HEAD"))
private void onInit(CallbackInfo info) {
if (NCRConfig.getClient().showReloadButton()) {
- var button = new AdvancedImageButton(this.width/2 + 158, this.height - 54, 20, 20, 0, 0, 20,
- RELOAD_TEXTURE, 64, 64, btn -> NCRConfig.load(), CommonComponents.EMPTY, this);
+ var button = new AdvancedImageButton(this.width/2 + 158, this.height - 54, 20, 20,
+ SwitchableSprites.of(GUIShenanigans.getSprites("config_reload_button")),
+ btn -> NCRConfig.load(), CommonComponents.EMPTY, this);
button.setTooltip(new AdvancedTooltip(RELOAD_TOOLTIP).setMaxWidth(250).setRenderWithoutGap(true));
button.active = true;
button.visible = true;
@@ -47,19 +50,22 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
if (NCRConfig.getClient().showNCRButton()) {
var button = new AdvancedImageButton(this.width/2 + 158, this.height - 30, 20, 20,
- NCRConfig.getClient().enableMod() ? 0 : 20, 0, 20, TOGGLE_TEXTURE, 64, 64,
- btn -> {
- NCRConfig.getClient().toggleMod();
- boolean enabled = NCRConfig.getClient().enableMod();
+ SwitchableSprites.of(
+ GUIShenanigans.getSprites("ncr_active_button"),
+ GUIShenanigans.getSprites("ncr_inactive_button")
+ ).setIndex(NCRConfig.getClient().enableMod() ? 1 : 2),
+ btn -> {
+ NCRConfig.getClient().toggleMod();
+ boolean enabled = NCRConfig.getClient().enableMod();
- if (enabled) {
- ((ImageButton)btn).xTexStart = 0;
- } else {
- ((ImageButton)btn).xTexStart = 20;
- }
+ if (enabled) {
+ ((AdvancedImageButton)btn).useSprites(0);
+ } else {
+ ((AdvancedImageButton)btn).useSprites(1);
+ }
- ServerSafetyState.reset();
- }, Component.translatable("gui.nochatreports.ncr_toggle"), this);
+ 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));
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 6f4b091..720aebe 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
@@ -14,10 +14,12 @@ 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;
import net.minecraft.client.gui.components.Tooltip;
+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;
@@ -26,7 +28,8 @@ import net.minecraft.resources.ResourceLocation;
@Mixin(PlayerEntry.class)
public class MixinPlayerEntry {
private static final Component NCR_BUTTON_TOOLTIP = Component.translatable("gui.nochatreports.no_reporting");
- @Shadow @Final private static ResourceLocation REPORT_BUTTON_LOCATION;
+
+ @Shadow @Final private static WidgetSprites REPORT_BUTTON_SPRITES;
@Shadow private Button reportButton;
/**
@@ -40,7 +43,7 @@ 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, 0, 0, 20, REPORT_BUTTON_LOCATION, 64, 64,
+ this.reportButton = new AdvancedImageButton(0, 0, 20, 20, SwitchableSprites.of(REPORT_BUTTON_SPRITES),
button -> {}, Component.translatable("gui.socialInteractions.report"), screen);
this.reportButton.setTooltip(Tooltip.create(NCR_BUTTON_TOOLTIP));
this.reportButton.setTooltipDelay(10);