From 8bcf4cb72b745e88ed7d4b421e50fa035b70ce47 Mon Sep 17 00:00:00 2001 From: CraftingDragon007 Date: Sun, 7 Aug 2022 11:28:47 +0200 Subject: Updated to 1.19.2 --- .../mixins/client/MixinProfileKeyPairManager.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/aizistral/nochatreports') 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> info) { + @Inject(method = "parsePublicKey", at = @At("HEAD"), cancellable = true) + private static void onProfilePublicKeyData(CallbackInfoReturnable> info) { if (!ServerSafetyState.allowsUnsafeServer()) { - info.setReturnValue(Optional.empty()); + info.setReturnValue(null); } } -- cgit v1.2.3 From 10d2e5ec421c57f11889f571bcf9c83d41495968 Mon Sep 17 00:00:00 2001 From: Madis Date: Sun, 7 Aug 2022 16:20:06 +0300 Subject: Remove version easter egg --- .../nochatreports/core/NoReportsConfig.java | 14 ++------ .../mixins/client/MixinMinecraft.java | 39 ---------------------- .../mixins/client/MixinTitleScreen.java | 29 ---------------- src/main/resources/nochatreports.mixins.json | 2 -- 4 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java (limited to 'src/main/java/com/aizistral/nochatreports') diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index 214c676..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, whitelistAllServers = false; + alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, + whitelistAllServers = false; private List whitelistedServers; private static NoReportsConfig getInstance() { @@ -247,16 +247,6 @@ public class NoReportsConfig { return getInstance().alwaysHideReportButton; } - /** - * @return True if "1.19.1" should be changed to "1.19.84" on titlebar and title screen.

- * - * This is true by default. - */ - - public static boolean versionEasterEgg() { - return getInstance().versionEasterEgg; - } - /** * @return True if sending telemetry to Mojang should be disabled.

* 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 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/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/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", -- cgit v1.2.3