From 6d0d5410f95100fe9b811b7619b84066c591df22 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Sat, 9 Jul 2022 16:06:44 +0200 Subject: Remove `forceAllowMultiplayer` --- .../nochatreports/core/NoReportsConfig.java | 6 +----- .../nochatreports/mixins/MixinMinecraft.java | 21 --------------------- 2 files changed, 1 insertion(+), 26 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index 3bd8bfc..93b7a1c 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -27,7 +27,7 @@ public class NoReportsConfig { private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static NoReportsConfig INSTANCE; private boolean demandOnClient, demandOnServer, enableDebugLog, convertToGameMessage = true, - forceAllowMultiplayer = true, showServerSafety = true, suppressMessageTrustIndicators = true, + showServerSafety = true, suppressMessageTrustIndicators = true, scrambleTimestamps = true, alwaysHideReportButton = false; private List whitelistedServers; @@ -93,10 +93,6 @@ public class NoReportsConfig { return getInstance().convertToGameMessage; } - public static boolean forceAllowMultiplayer() { - return getInstance().forceAllowMultiplayer; - } - public static boolean showServerSafety() { return getInstance().showServerSafety; } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java index a4bc7a3..e1d986b 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinMinecraft.java @@ -28,25 +28,4 @@ public class MixinMinecraft { } } - @Inject(method = "multiplayerBan", at = @At("HEAD"), cancellable = true) - private void onFetchBanDetails(CallbackInfoReturnable info) { - if (NoReportsConfig.forceAllowMultiplayer()) { - info.setReturnValue(null); - } - } - - @Inject(method = "allowsMultiplayer", at = @At("HEAD"), cancellable = true) - private void onMultiplayerCheck(CallbackInfoReturnable info) { - if (NoReportsConfig.forceAllowMultiplayer()) { - info.setReturnValue(true); - } - } - - @Inject(method = "getChatStatus", at = @At("HEAD"), cancellable = true) - private void onChatStatusCheck(CallbackInfoReturnable info) { - if (NoReportsConfig.forceAllowMultiplayer()) { - info.setReturnValue(ChatStatus.ENABLED); - } - } - } -- cgit v1.2.3