summaryrefslogtreecommitdiffstats
path: root/src/main/java/com
diff options
context:
space:
mode:
authorAizistral2022-08-09 15:09:59 +0200
committerAizistral2022-08-09 15:10:32 +0200
commitd4bc8c44da22a0bb31250ede0c422634b3bd2b44 (patch)
treeee78c4460a9ff64459cac0e10b4afd3787debd82 /src/main/java/com
parent14a1aa4698e0696ec83bc3237e7e5582ddbd94e1 (diff)
Restore parity with Fabric branch
Target version 1.19.2-v1.9.0, commit: https://github.com/Aizistral-Studios/No-Chat-Reports/commit/e7ed3e014f0df81353c32429caf95686ed0dad00
Diffstat (limited to 'src/main/java/com')
-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/core/ServerSafetyState.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java1
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinBrandingControl.java27
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java1
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java38
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java10
8 files changed, 22 insertions, 87 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
index 5faead3..4fda0d6 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 e4cbfd3..dba4038 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java
@@ -46,6 +46,8 @@ public enum ServerSafetyLevel {
@OnlyIn(Dist.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/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index a04c943..f7a0658 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -5,8 +5,6 @@ import java.util.Map;
import javax.annotation.Nullable;
-import com.aizistral.nochatreports.NoChatReports;
-
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
import net.minecraftforge.api.distmarker.Dist;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java
index c5311cf..e6e5205 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/AccessorDisconnectedScreen.java
@@ -3,6 +3,7 @@ package com.aizistral.nochatreports.mixins.client;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
+import com.aizistral.nochatreports.NoChatReportsClient;
import com.aizistral.nochatreports.gui.UnsafeServerScreen;
import net.minecraft.client.gui.screens.DisconnectedScreen;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinBrandingControl.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinBrandingControl.java
deleted file mode 100644
index 61c42f8..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinBrandingControl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.aizistral.nochatreports.mixins.client;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import com.aizistral.nochatreports.core.NoReportsConfig;
-
-import net.minecraftforge.internal.BrandingControl;
-import net.minecraftforge.versions.mcp.MCPVersion;
-
-@Mixin(value = BrandingControl.class, remap = false)
-public class MixinBrandingControl {
-
- /**
- * @reason Replace "1.19.1" with "1.19.84" in title screen. No functional purpose.
- * @author Aizistral
- */
-
- @Redirect(method = "computeBranding", at = @At(value = "INVOKE", target =
- "Lnet/minecraftforge/versions/mcp/MCPVersion;getMCVersion()Ljava/lang/String;"))
- private static String onGetMCVersion() {
- return NoReportsConfig.versionEasterEgg() && MCPVersion.getMCVersion().equals("1.19.1") ? "1.19.84"
- : MCPVersion.getMCPVersion();
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
index dc93cd0..dfb94ad 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
@@ -6,7 +6,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import com.aizistral.nochatreports.NoChatReports;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
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 3d1e002..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
+++ /dev/null
@@ -1,38 +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.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);
}
}