summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorLoganDark2022-08-14 06:53:21 -0700
committerGitHub2022-08-14 06:53:21 -0700
commita57bda7fedd28900066e3c383cc4c9f0f1f069a8 (patch)
treedbeb313079d59cbfc8d0762b04f0f5f54a2878ce /src/main/java
parentd2ab4db35342888743566bb68b8742ff4257b20b (diff)
parent5ba2d3542d04c70552346c8698e242363341b262 (diff)
Merge branch '1.19.2-Fabric' into fabric-api
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java28
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java20
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java17
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java39
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java29
8 files changed, 42 insertions, 105 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 7f1d28d..e94e9b1 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -70,7 +70,7 @@ public class NoChatReportsClient implements ClientModInitializer {
return;
} else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) {
if (ServerSafetyState.getLastConnectedServer() != null) {
- if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastConnectedServer())) {
+ if (!NoReportsConfig.isWhitelistedServer(ServerSafetyState.getLastConnectedServer()) && !NoReportsConfig.whitelistAllServers()) {
client.setScreen(new UnsafeServerScreen());
} else {
if (ServerSafetyState.getReconnectCount() <= 0) {
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
index 20491e5..c0bd6e8 100644
--- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
@@ -42,8 +42,8 @@ public class NoReportsConfig {
private boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false,
convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true,
hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true,
- alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true,
- showReloadButton = true;
+ alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true,
+ whitelistAllServers = false;
private List<String> whitelistedServers;
private static NoReportsConfig getInstance() {
@@ -135,7 +135,7 @@ public class NoReportsConfig {
* do not feature signatures and look completely identical in the chat, with exception of gray line
* next to them added in pre-release 3. They are also unselectable for chat reporting.<br><br>
*
- * This is true by default.
+ * This is false by default.
*/
public static boolean convertToGameMessage() {
@@ -248,16 +248,6 @@ public class NoReportsConfig {
}
/**
- * @return True if "1.19.1" should be changed to "1.19.84" on titlebar and title screen.<br><br>
- *
- * This is true by default.
- */
-
- public static boolean versionEasterEgg() {
- return getInstance().versionEasterEgg;
- }
-
- /**
* @return True if sending telemetry to Mojang should be disabled.<br><br>
*
* This is true by default.
@@ -278,4 +268,16 @@ public class NoReportsConfig {
return getInstance().showReloadButton;
}
+ /**
+ * @return True if the full-screen warning should be skipped for servers that require chat signing,
+ * letting users simply join the server. Because of that, servers will no longer be added to the whitelist.
+ * <br><br>
+ *
+ * This is false by default.
+ */
+
+ public static boolean whitelistAllServers() {
+ return getInstance().whitelistAllServers;
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
index 141116d..2897c5a 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
@@ -47,6 +47,8 @@ public enum ServerSafetyLevel {
@Environment(EnvType.CLIENT)
public Component getTooltip() {
+ if(NoReportsConfig.whitelistAllServers() && this.equals(ServerSafetyLevel.INSECURE))
+ return Component.translatable("gui.nochatreports.status_insecure_whitelist_all_servers");
return Component.translatable("gui.nochatreports.status_" + this.name().toLowerCase());
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
index 274e67e..654d44a 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
@@ -44,8 +44,12 @@ public class MixinChatListener {
} else {
var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, playerInfo, instant);
- if ((evaluate == ChatTrustLevel.NOT_SECURE || evaluate == ChatTrustLevel.BROKEN_CHAIN)
- && NoReportsConfig.hideRedChatIndicators()) {
+ if (evaluate == ChatTrustLevel.BROKEN_CHAIN) {
+ info.setReturnValue(evaluate);
+ return;
+ }
+
+ if (evaluate == ChatTrustLevel.NOT_SECURE && NoReportsConfig.hideRedChatIndicators()) {
info.setReturnValue(ChatTrustLevel.SECURE);
} else if ((evaluate == ChatTrustLevel.FILTERED || evaluate == ChatTrustLevel.MODIFIED)
&& NoReportsConfig.hideYellowChatIndicators()) {
@@ -62,16 +66,4 @@ public class MixinChatListener {
}
}
- /**
- * @reason Prevent client from disconnecting when chat chain is broken.
- * Normal average user will not even understand what happened, so this is absolutely
- * useless for them.
- * @author Aizistral
- */
-
- @Inject(method = "onChatChainBroken", at = @At("HEAD"), cancellable = true)
- private void stopUselessDisconnects(CallbackInfo info) {
- info.cancel();
- }
-
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
index 7a5aaf9..dc6f0e0 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
@@ -1,7 +1,13 @@
package com.aizistral.nochatreports.mixins.client;
import com.aizistral.nochatreports.core.NoReportsConfig;
+import com.mojang.authlib.minecraft.TelemetrySession;
+import com.mojang.authlib.minecraft.UserApiService;
+
import net.minecraft.client.ClientTelemetryManager;
+
+import java.util.concurrent.Executor;
+
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@@ -14,9 +20,14 @@ public class MixinClientTelemetryManager {
* @author Aizistral
*/
- @Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/SharedConstants;IS_RUNNING_IN_IDE:Z"))
- private boolean disableTelemetrySession() {
- return NoReportsConfig.disableTelemetry();
+ @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/UserApiService;"
+ + "newTelemetrySession(Ljava/util/concurrent/Executor;)Lcom/mojang/authlib/minecraft/TelemetrySession;",
+ remap = false))
+ private TelemetrySession onCreateTelemetrySession(UserApiService service, Executor executor) {
+ if (NoReportsConfig.disableTelemetry())
+ return TelemetrySession.DISABLED;
+ else
+ return service.newTelemetrySession(executor);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
deleted file mode 100644
index 1e7b920..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-import java.time.Instant;
-import java.util.UUID;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import com.aizistral.nochatreports.core.NoReportsConfig;
-import com.mojang.authlib.minecraft.BanDetails;
-import com.mojang.authlib.minecraft.UserApiService;
-
-import net.fabricmc.fabric.mixin.client.rendering.MixinInGameHud;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.Minecraft.ChatStatus;
-import net.minecraft.world.entity.player.ChatVisiblity;
-
-@Mixin(Minecraft.class)
-public class MixinMinecraft {
-
- /**
- * @reason Replace "1.19.1" with "1.19.84" in game window title. No functional purpose.
- * @author Aizistral
- */
-
- @Inject(method = "createTitle", at = @At("RETURN"), cancellable = true, require = 0)
- private void onCreateTitle(CallbackInfoReturnable<String> info) {
- if (!NoReportsConfig.versionEasterEgg())
- return;
-
- if (info.getReturnValue().contains("1.19.1")) {
- info.setReturnValue(info.getReturnValue().replace("1.19.1", "1.19.84"));
- }
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
index e1dc8f2..70fa9fa 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
@@ -1,5 +1,6 @@
package com.aizistral.nochatreports.mixins.client;
+import com.aizistral.nochatreports.core.ServerSafetyState;
import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
import net.minecraft.client.multiplayer.ProfileKeyPairManager;
import net.minecraft.util.Signer;
@@ -9,9 +10,6 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import com.aizistral.nochatreports.NoChatReports;
-import com.aizistral.nochatreports.core.ServerSafetyState;
-
import java.util.Optional;
@Mixin(ProfileKeyPairManager.class)
@@ -36,10 +34,10 @@ public class MixinProfileKeyPairManager {
* @author Aizistral
*/
- @Inject(method = "profilePublicKeyData", at = @At("HEAD"), cancellable = true)
- private void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) {
+ @Inject(method = "parsePublicKey", at = @At("HEAD"), cancellable = true)
+ private static void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) {
if (!ServerSafetyState.allowsUnsafeServer()) {
- info.setReturnValue(Optional.empty());
+ info.setReturnValue(null);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
deleted file mode 100644
index 513c28c..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-import com.aizistral.nochatreports.core.NoReportsConfig;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import com.mojang.bridge.game.GameVersion;
-
-import net.minecraft.WorldVersion;
-import net.minecraft.client.gui.screens.TitleScreen;
-
-@Mixin(TitleScreen.class)
-public class MixinTitleScreen {
-
- /**
- * @reason Replace "1.19.1" with "1.19.84" in title screen. No functional purpose.
- * @author Aizistral
- */
-
- @Redirect(method = "render", at = @At(value = "INVOKE", remap = true, target =
- "Lnet/minecraft/WorldVersion;getName()Ljava/lang/String;"), require = 0)
- private String onGetVersionName(WorldVersion version) {
- String original = version.getName();
- if (!NoReportsConfig.versionEasterEgg()) return original;
- return original.contains("1.19.1") ? original.replace("1.19.1", "1.19.84") : original;
- }
-
-}