summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorAizistral2022-07-11 22:47:27 +0200
committerAizistral2022-07-11 22:47:47 +0200
commita05169d10dbb5dc139cb2be6ddc8a6513255bffe (patch)
treebaf1a1acd4a11d681f12e08119f496cbc0520ff5 /src/main
parent096eb3c71600495f52f1f0d8f1c79367dd0f3073 (diff)
Remove timestamp scrambler
Closes #67
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java7
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/TimestampScrambler.java43
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/MixinMessageSigner.java26
-rw-r--r--src/main/resources/nochatreports.mixins.json3
5 files changed, 3 insertions, 79 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
index 93b7a1c..1a35202 100644
--- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
@@ -27,8 +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,
- showServerSafety = true, suppressMessageTrustIndicators = true,
- scrambleTimestamps = true, alwaysHideReportButton = false;
+ showServerSafety = true, suppressMessageTrustIndicators = true, alwaysHideReportButton = false;
private List<String> whitelistedServers;
private static NoReportsConfig getInstance() {
@@ -113,10 +112,6 @@ public class NoReportsConfig {
return getInstance().enableDebugLog;
}
- public static boolean scrambleTimestamps() {
- return getInstance().scrambleTimestamps;
- }
-
public static boolean alwaysHideReportButton() {
return getInstance().alwaysHideReportButton;
}
diff --git a/src/main/java/com/aizistral/nochatreports/core/TimestampScrambler.java b/src/main/java/com/aizistral/nochatreports/core/TimestampScrambler.java
deleted file mode 100644
index d074969..0000000
--- a/src/main/java/com/aizistral/nochatreports/core/TimestampScrambler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.aizistral.nochatreports.core;
-
-import java.time.Instant;
-import java.util.Random;
-
-import com.aizistral.nochatreports.NoChatReports;
-
-import net.minecraft.network.chat.MessageSigner;
-
-/**
- * My implementation is independent, but I credit
- * {@link <a href = "https://modrinth.com/mod/delayedreports">Delayed Reports<a/>}
- * for the idea.
- *
- * @author Aizistral
- */
-
-public class TimestampScrambler {
- private static final Random THEY_SEE_ME_ROLLIN = new Random();
- private static final int MIN_OFFSET = -270, MAX_OFFSET = 90;
- private static Instant lastTimestamp = Instant.now().plusSeconds(MIN_OFFSET);
-
- private TimestampScrambler() {
- throw new IllegalStateException("Can't touch this");
- }
-
- public static MessageSigner randomizeTimestamp(MessageSigner original) {
- return new MessageSigner(original.sender(), randomizeTimestamp(original.timeStamp()), original.salt());
- }
-
- public static Instant randomizeTimestamp(Instant original) {
- long diff = -(original.getEpochSecond() - lastTimestamp.getEpochSecond());
- long offset = between(diff < MIN_OFFSET ? MIN_OFFSET : diff, MAX_OFFSET);
-
- return original.plusSeconds(offset).isBefore(lastTimestamp) ? randomizeTimestamp(original)
- : (lastTimestamp = original.plusSeconds(offset)); // just to be 100% sure
- }
-
- private static long between(long one, long two) {
- return one + THEY_SEE_ME_ROLLIN.nextLong(two - one);
- }
-
-}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java
index 05ee513..c9f129a 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java
@@ -2,7 +2,6 @@ package com.aizistral.nochatreports.mixins;
import com.aizistral.nochatreports.core.NoReportsConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
-import com.aizistral.nochatreports.core.TimestampScrambler;
import com.mojang.brigadier.ParseResults;
import net.minecraft.Util;
@@ -37,7 +36,7 @@ public class MixinLocalPlayer {
@Inject(method = "signMessage", at = @At("HEAD"), cancellable = true)
private void onSignMessage(MessageSigner signer, Component message, CallbackInfoReturnable<MessageSignature> info) {
if (!ServerSafetyState.forceSignedMessages()) {
- info.setReturnValue(new MessageSignature(Util.NIL_UUID, signer.timeStamp(), SaltSignaturePair.EMPTY));
+ info.setReturnValue(MessageSignature.unsigned(signer.sender()));
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinMessageSigner.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinMessageSigner.java
deleted file mode 100644
index 46aaaa8..0000000
--- a/src/main/java/com/aizistral/nochatreports/mixins/MixinMessageSigner.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.aizistral.nochatreports.mixins;
-
-import java.util.UUID;
-
-import org.spongepowered.asm.mixin.Mixin;
-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.NoReportsConfig;
-import com.aizistral.nochatreports.core.TimestampScrambler;
-
-import net.minecraft.network.chat.MessageSigner;
-
-@Mixin(MessageSigner.class)
-public class MixinMessageSigner {
-
- @Inject(method = "create", at = @At("RETURN"), cancellable = true)
- private static void onCreate(UUID id, CallbackInfoReturnable<MessageSigner> info) {
- if (NoReportsConfig.scrambleTimestamps()) {
- info.setReturnValue(TimestampScrambler.randomizeTimestamp(info.getReturnValue()));
- }
- }
-
-}
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index 2eb8812..72c4625 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -22,8 +22,7 @@
"AccessorDisconnectedScreen",
"MixinConnectScreen",
"MixinClientboundHelloPacket",
- "MixinJoinMultiplayerScreen",
- "MixinMessageSigner"
+ "MixinJoinMultiplayerScreen"
],
"server": [
"MixinDedicatedServer"