From d8f503a506d94fc671fce9d296ea5074233475b8 Mon Sep 17 00:00:00 2001 From: Madis Date: Sun, 31 Jul 2022 22:01:24 +0300 Subject: Skip whitelist --- .../com/aizistral/nochatreports/NoChatReportsClient.java | 2 +- .../com/aizistral/nochatreports/core/NoReportsConfig.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 7f1d28d..9021812 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.skipWhitelist()) { 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..01ee847 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -43,7 +43,7 @@ public class NoReportsConfig { convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true, hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true, - showReloadButton = true; + showReloadButton = true, skipWhitelist = false; private List whitelistedServers; private static NoReportsConfig getInstance() { @@ -278,4 +278,16 @@ public class NoReportsConfig { return getInstance().showReloadButton; } + /** + * @return True if the full-screen warning should be skipped, letting users simply join the server with + * signing. Because of that, servers will no longer be added to the whitelist. + *

+ * + * This is false by default. + */ + + public static boolean skipWhitelist() { + return getInstance().skipWhitelist; + } + } -- cgit v1.2.3 From 871ecb8e789a96fd8d21f069b8cf3003a4e51e73 Mon Sep 17 00:00:00 2001 From: Madis Date: Sun, 31 Jul 2022 23:54:38 +0300 Subject: Renamed the variable --- .../java/com/aizistral/nochatreports/NoChatReportsClient.java | 2 +- .../java/com/aizistral/nochatreports/core/NoReportsConfig.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 9021812..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()) && !NoReportsConfig.skipWhitelist()) { + 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 01ee847..5849882 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -43,7 +43,7 @@ public class NoReportsConfig { convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true, hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true, - showReloadButton = true, skipWhitelist = false; + showReloadButton = true, whitelistAllServers = false; private List whitelistedServers; private static NoReportsConfig getInstance() { @@ -279,15 +279,15 @@ public class NoReportsConfig { } /** - * @return True if the full-screen warning should be skipped, letting users simply join the server with - * signing. Because of that, servers will no longer be added to the whitelist. + * @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. *

* * This is false by default. */ - public static boolean skipWhitelist() { - return getInstance().skipWhitelist; + public static boolean whitelistAllServers() { + return getInstance().whitelistAllServers; } } -- cgit v1.2.3 From 6e8e743b17e547593d02ff6b80ae860ac27287fd Mon Sep 17 00:00:00 2001 From: Madis Date: Mon, 1 Aug 2022 19:33:35 +0300 Subject: Different warning tooltip --- .../java/com/aizistral/nochatreports/core/ServerSafetyLevel.java | 2 ++ src/main/resources/assets/nochatreports/lang/en_us.json | 1 + src/main/resources/assets/nochatreports/lang/et_ee.json | 7 ++++--- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/main/java/com') 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/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index ef7e613..b881a0d 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -5,6 +5,7 @@ "gui.nochatreports.status_secure": "This server has No Chat Reports installed, or prevents your messages from being reportable in some other known way. You can chat safely.", "gui.nochatreports.status_unintrusive": "This server does not prevent chat reports, but allows you to send unsigned messages which cannot be reported to Mojang. Vanilla clients will still send signed messages, display unsigned messages as \"Not Secure\" and not show them if \"Only Show Secure Chat\" is enabled in chat options.", "gui.nochatreports.status_insecure": "This server demands all chat messages to be signed and you agreed to proceed with this arrangement. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can manually remove this server from NoChatReports.json in your config folder to get warned again.", + "gui.nochatreports.status_insecure_whitelist_all_servers": "This server demands all chat messages to be signed and you disabled the full-screen warning for it. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can disable \"whitelistAllServers\" from NoChatReports.json in your config folder to get warned again.", "gui.nochatreports.status_unknown": "No Chat Reports could not evaluate the safety of this server. This should never happen, please report it as a bug to the mod developer.", "gui.nochatreports.unsafe_server.header": "Caution: Unsafe Server", "gui.nochatreports.unsafe_server.contents": "This server requires all chat messages to be signed, which means they can be reported to Mojang, which may result in a ban from all multiplayer servers. This likely means that the server owner kept \"enforce-secure-profile\" enabled in the server.properties, which is the default since 1.19.1. You can choose to play anyway, but No Chat Reports will not be able to protect you.", diff --git a/src/main/resources/assets/nochatreports/lang/et_ee.json b/src/main/resources/assets/nochatreports/lang/et_ee.json index 048c7d7..611f3df 100644 --- a/src/main/resources/assets/nochatreports/lang/et_ee.json +++ b/src/main/resources/assets/nochatreports/lang/et_ee.json @@ -2,9 +2,10 @@ "gui.nochatreport.secureChat": "See funktsioon ei saa töötada modiga No Chat Reports, kuna kinnitatavad signatuurid puuduvad.", "gui.nochatreport.noReporting": "Selles serveris on mängijast teatamine keelatud modi No Chat Reports olemasolu tõttu.", "disconnect.nochatreports.client": "Sellest serverist puudub mod No Chat Reports ning sinu seadistused nõuavad selle olemasolu serveris.", - "gui.nochatreports.status_secure": "Sellele serverile on paigaldatud mod No Chat Reports või see piirab kõigi sõnumitest teatamist mõnel muul teadaoleval viisil. Keegi ei näe punast riba, (!)-sümbolit ega saa sõnumeid peita valikuga \"Vaid turvaline vestlus\". Sa saad turvaliselt vestelda.", - "gui.nochatreports.status_unintrusive": "See server võimaldab saata signeerimata sõnumeid, mida ei saa Mojangile teatada. Siiski, vanilliklientidele kuvavad need sõnumid vasakul punast riba, paremal (!)-sümbolit ning igaüks, kes lubab valiku \"Vaid turvaline vestlus\" ei näe su sõnumeid üldse.", - "gui.nochatreports.status_insecure": "See server nõuab kõikide mängijasõnumite signeerimist ning sa nõustusid selle korraldusega. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid selle serveri käsitsi config kaustas olevast NoChatReports.json failist eemaldada.", + "gui.nochatreports.status_secure": "Sellele serverile on paigaldatud mod No Chat Reports või see piirab sinu sõnumitest teatamist mõnel muul teadaoleval viisil. Sa saad turvaliselt vestelda.", + "gui.nochatreports.status_unintrusive": "See server ei piira sõnumitest teatamist, kuid võimaldab saata signeerimata sõnumeid, mida ei saa Mojangile teatada. Vanillikliendid saadavad siiski signeeritud sõnumeid, kuvavad signeerimata sõnumeid \"ebaturvalistena\" ning ei kuva neid üldse, kui vestlusseadetes on lubatud \"Vaid turvaline vestlus\".", + "gui.nochatreports.status_insecure": "See server nõuab kõikide mängijasõnumite signeerimist ning sa nõustusid selle korraldusega. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid selle serveri config kaustas olevast NoChatReports.json failist eemaldada.", + "gui.nochatreports.status_insecure_whitelist_all_servers": "See server nõuab kõikide mängijasõnumite signeerimist ning sa keelasid seda tähistava täisekraanis hoiatuse. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid keelata config kaustas olevas NoChatReports.json failis \"whitelistAllServers\".", "gui.nochatreports.status_unknown": "No Chat Reports ei suutnud selle serveri turvalisust hinnata. Seda ei tohiks kunagi juhtuda, palun teata sellest veast modi arendajale.", "gui.nochatreports.unsafe_server.header": "Hoiatus: ebaturvaline server", "gui.nochatreports.unsafe_server.contents": "See server nõuab kõikide vestlussõnumite signeerimist, seega neid saab Mojangile raporteerida ning tagajärjeks võib olla blokeering kõigist mitmikmängu serveritest. See tõenäoliselt tähendab, et serveri omanik jättis failis server.properties valiku \"enforce-secure-profile\" lubatuks, mis on ka vaikeväärtus alates versioonist 1.19.1. Sa võid siiski seal mängida, kuid No Chat Reports ei saa sind kaitsta.", -- cgit v1.2.3 From 87f322c4ef9eeabd01fc5481918545db49ed011e Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 5 Aug 2022 13:27:21 +0200 Subject: Let client disconnect whenever it likes --- .../nochatreports/mixins/client/MixinChatListener.java | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/main/java/com') 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..eda465f 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -62,16 +62,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(); - } - } -- cgit v1.2.3 From 7d696bf6ee1e431bb69cd696a00135dc5074758e Mon Sep 17 00:00:00 2001 From: Madis Otenurm Date: Fri, 5 Aug 2022 18:04:47 +0300 Subject: Update NoReportsConfig.java --- src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index 20491e5..403b3ff 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -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.

* - * This is true by default. + * This is false by default. */ public static boolean convertToGameMessage() { -- cgit v1.2.3 From d5d880047b7e50f57c6d0d912d09224cc4ff7815 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Sat, 6 Aug 2022 06:21:32 +0200 Subject: This time for sure --- .../aizistral/nochatreports/mixins/client/MixinChatListener.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/com') 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 eda465f..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()) { -- cgit v1.2.3 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 --- build.gradle | 4 ++-- docs/README.md | 4 ++-- docs/changelog.html | 5 +++++ gradle.properties | 10 +++++----- .../mixins/client/MixinProfileKeyPairManager.java | 10 ++++------ src/main/resources/fabric.mod.json | 4 ++-- 6 files changed, 20 insertions(+), 17 deletions(-) (limited to 'src/main/java/com') diff --git a/build.gradle b/build.gradle index 514e73d..8b4103f 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,7 @@ curseforge { changelog = file('docs/changelog.html') mainArtifact(remapJar) - addGameVersion '1.19.1' + addGameVersion '1.19.2' addGameVersion 'Fabric' addGameVersion 'Quilt' addGameVersion 'Java 17' @@ -111,7 +111,7 @@ modrinth { versionType = "release" changelog = rootProject.file("docs/changelog.html").text uploadFile = remapJar - gameVersions = ["1.19.1"] + gameVersions = ["1.19.2"] loaders = ['fabric', 'quilt'] dependencies { diff --git a/docs/README.md b/docs/README.md index 1c402ac..d14e1fb 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,8 +1,8 @@ # No Chat Reports -**Current Version:** 1.19.1-v1.8.4 +**Current Version:** 1.19.2-v1.8.5 -**Minecraft Version:** 1.19.1 +**Minecraft Version:** 1.19.2 Strips cryptographic signatures from player messages, making it impossible to track and associate them with your Mojang/Microsoft account, as well as use Player Chat Reporting feature. diff --git a/docs/changelog.html b/docs/changelog.html index 95d9614..babd58b 100644 --- a/docs/changelog.html +++ b/docs/changelog.html @@ -1,5 +1,10 @@

The Changelog:


+
[Release 1.19.2-v1.8.5]:
+

+  - Updated Mod to 1.19.2.
+



+

[Release 1.19.1-v1.8.4]:

 - Ensured change from previous release works properly.
diff --git a/gradle.properties b/gradle.properties index de782b4..0456626 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ org.gradle.daemon=false # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.19.1 -yarn_mappings=1.19.1+build.1 -loader_version=0.14.8 +minecraft_version=1.19.2 +yarn_mappings=1.19.2+build.1 +loader_version=0.14.9 # Mod Properties -mod_version=1.19.1-v1.8.4 +mod_version=1.19.2-v1.8.5 maven_group=com.aizistral.nochatreports archives_base_name=NoChatReports-FABRIC # Dependencies -fabric_version=0.58.4+1.19.1 +fabric_version=0.59.0+1.19.2 # Publishing curse_id=634062 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); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f1fbb09..5583bf3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,9 +31,9 @@ ], "depends": { - "fabricloader": ">=0.14.6", + "fabricloader": ">=0.14.9", "fabric": "*", - "minecraft": "=1.19.1", + "minecraft": "=1.19.2", "java": ">=17" }, "suggests": {}, -- 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') 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 From bc7ddbb004a1282eea4bd561d819936b3ce85d74 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Tue, 9 Aug 2022 15:10:49 +0200 Subject: Restore old way of telemetry suppression --- .../mixins/client/MixinClientTelemetryManager.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java/com') 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..109d030 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,11 @@ public class MixinClientTelemetryManager { * @author Aizistral */ - @Redirect(method = "", at = @At(value = "FIELD", target = "Lnet/minecraft/SharedConstants;IS_RUNNING_IN_IDE:Z")) - private boolean disableTelemetrySession() { - return NoReportsConfig.disableTelemetry(); + @Redirect(method = "", 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) { + return TelemetrySession.DISABLED; } } -- cgit v1.2.3 From e4836b0924156ec0aa7cef504cd6cea7990a9206 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Tue, 9 Aug 2022 15:14:02 +0200 Subject: Make telemetry toggleable --- .../nochatreports/mixins/client/MixinClientTelemetryManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/com') 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 109d030..dc6f0e0 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java @@ -24,7 +24,10 @@ public class MixinClientTelemetryManager { + "newTelemetrySession(Ljava/util/concurrent/Executor;)Lcom/mojang/authlib/minecraft/TelemetrySession;", remap = false)) private TelemetrySession onCreateTelemetrySession(UserApiService service, Executor executor) { - return TelemetrySession.DISABLED; + if (NoReportsConfig.disableTelemetry()) + return TelemetrySession.DISABLED; + else + return service.newTelemetrySession(executor); } } -- cgit v1.2.3