summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java14
-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
-rw-r--r--src/main/resources/fabric.mod.json2
-rw-r--r--src/main/resources/nochatreports.mixins.json2
6 files changed, 7 insertions, 89 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
index d7de215..60993ec 100644
--- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
@@ -43,8 +43,8 @@ public class NoReportsConfig {
public 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, whitelistAllServers = false;
+ alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true,
+ whitelistAllServers = false;
private List<String> whitelistedServers;
public static NoReportsConfig getInstance() {
@@ -249,16 +249,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.
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;
- }
-
-}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index a78c3cd..11e3947 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -36,7 +36,7 @@
"depends": {
"fabricloader": ">=0.14.6",
"fabric": "*",
- "minecraft": "=1.19.1",
+ "minecraft": "=1.19.2",
"java": ">=17"
},
"suggests": {},
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index 4e0f080..10f0fd2 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -18,8 +18,6 @@
"client.MixinChatOptionsScreen",
"client.MixinProfileKeyPairManager",
"client.MixinClientTelemetryManager",
- "client.MixinTitleScreen",
- "client.MixinMinecraft",
"client.MixinPlayerEntry",
"client.MixinChatScreen",
"client.AccessorDisconnectedScreen",