From bbd5344e0cbc070c352d601e78fff0b06a4f6e2b Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 11 Nov 2022 12:26:36 +0100 Subject: Some refactoring --- .../nochatreports/core/ServerSafetyState.java | 26 +++++++++++----------- .../mixins/client/MixinPlayerEntry.java | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java index 2af0846..e3e16bd 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java @@ -28,9 +28,9 @@ import net.minecraft.network.chat.SignedMessageChain.Encoder; @Environment(EnvType.CLIENT) public final class ServerSafetyState { - private static final List resetActions = new ArrayList<>(); - private static final List signingActions = new ArrayList<>(); - private static final AtomicBoolean allowChatSigning = new AtomicBoolean(false); + private static final List RESET_ACTIONS = new ArrayList<>(); + private static final List SIGNING_ACTIONS = new ArrayList<>(); + private static final AtomicBoolean ALLOW_CHAT_SIGNING = new AtomicBoolean(false); private volatile static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED; private volatile static ServerAddress lastServer = null; @@ -43,11 +43,11 @@ public final class ServerSafetyState { } public static boolean allowChatSigning() { - return allowChatSigning.get(); + return ALLOW_CHAT_SIGNING.get(); } public static void setAllowChatSigning(boolean allow) { - if (allowChatSigning.compareAndSet(!allow, allow)) { + if (ALLOW_CHAT_SIGNING.compareAndSet(!allow, allow)) { if (Minecraft.getInstance().player != null) { var connection = Minecraft.getInstance().player.connection; @@ -55,8 +55,8 @@ public final class ServerSafetyState { Minecraft.getInstance().getProfileKeyPairManager().prepareKeyPair() .thenAcceptAsync(optional -> optional.ifPresent(profileKeyPair -> { connection.setChatSession(LocalChatSession.create(profileKeyPair)); - signingActions.forEach(Runnable::run); - signingActions.clear(); + SIGNING_ACTIONS.forEach(Runnable::run); + SIGNING_ACTIONS.clear(); }), Minecraft.getInstance()); } } @@ -64,7 +64,7 @@ public final class ServerSafetyState { } public static void toggleChatSigning() { - setAllowChatSigning(!allowChatSigning.get()); + setAllowChatSigning(!ALLOW_CHAT_SIGNING.get()); } public static boolean isOnRealms() { @@ -86,21 +86,21 @@ public final class ServerSafetyState { } public static void scheduleResetAction(Runnable action) { - resetActions.add(action); + RESET_ACTIONS.add(action); } public static void scheduleSigningAction(Runnable action) { - signingActions.add(action); + SIGNING_ACTIONS.add(action); } public static void reset() { lastServer = null; current = ServerSafetyLevel.UNDEFINED; - allowChatSigning.set(false); + ALLOW_CHAT_SIGNING.set(false); UnsafeServerScreen.setHideThisSession(false); - resetActions.forEach(Runnable::run); - resetActions.clear(); + RESET_ACTIONS.forEach(Runnable::run); + RESET_ACTIONS.clear(); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java index 3a049df..5261121 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java @@ -34,7 +34,6 @@ 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 private Button reportButton; - @Shadow float tooltipHoverTime; @Shadow static void postRenderTooltip(SocialInteractionsScreen socialInteractionsScreen, PoseStack poseStack, List list, int i, int j) { -- cgit v1.2.3