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/ServerSafetyState.java5
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java8
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java)16
-rw-r--r--src/main/resources/nochatreports.mixins.json2
6 files changed, 29 insertions, 8 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index 9c26d2d..047c820 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -1,6 +1,5 @@
package com.aizistral.nochatreports.core;
-import blue.endless.jankson.annotation.Nullable;
import com.aizistral.nochatreports.gui.UnsafeServerScreen;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@@ -12,6 +11,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.jetbrains.annotations.Nullable;
+
/**
* All this global state is questionable, but we have to...
* @author Aizistral
@@ -45,7 +46,7 @@ public final class ServerSafetyState {
if (allow && connection.chatSession == null) {
Minecraft.getInstance().getProfileKeyPairManager().prepareKeyPair()
.thenAcceptAsync(optional -> optional.ifPresent(profileKeyPair -> {
- connection.setChatSession(LocalChatSession.create(profileKeyPair));
+ connection.setKeyPair(profileKeyPair);
SIGNING_ACTIONS.forEach(Runnable::run);
SIGNING_ACTIONS.clear();
}), Minecraft.getInstance());
diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java
index d5351f0..9523845 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java
@@ -1,6 +1,5 @@
package com.aizistral.nochatreports.gui;
-import blue.endless.jankson.annotation.Nullable;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.*;
import net.fabricmc.api.EnvType;
@@ -13,6 +12,8 @@ import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.network.chat.Component;
import net.minecraft.util.FormattedCharSequence;
+
+import org.jetbrains.annotations.Nullable;
import org.joml.Matrix4f;
import java.util.List;
diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java
index 6ad02f8..1ecbd34 100644
--- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java
@@ -10,6 +10,8 @@ import net.fabricmc.api.Environment;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.components.*;
import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.AnvilScreen;
+import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
@@ -48,7 +50,6 @@ public class EncryptionConfigScreen extends Screen {
@Override
protected void init() {
- this.minecraft.keyboardHandler.setSendRepeatsToGui(true);
this.clearWidgets();
super.init();
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
index c6babce..dd41e5d 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java
@@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.mojang.authlib.minecraft.TelemetrySession;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ProfileKeyPairManager;
@@ -24,4 +25,11 @@ public class MixinMinecraft {
}
}
+ @Inject(method = "allowsTelemetry", at = @At("HEAD"), cancellable = true)
+ private void onAllowsTelemetry(CallbackInfoReturnable<Boolean> info) {
+ if (NCRConfig.getClient().disableTelemetry()) {
+ info.setReturnValue(false);
+ }
+ }
+
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java
index efbd9ed..fba6efc 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientTelemetryManager.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java
@@ -4,22 +4,32 @@ import java.util.concurrent.Executor;
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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import com.aizistral.nochatreports.config.NCRConfig;
import com.mojang.authlib.minecraft.TelemetrySession;
import com.mojang.authlib.minecraft.UserApiService;
+import com.mojang.authlib.yggdrasil.YggdrasilUserApiService;
-import net.minecraft.client.ClientTelemetryManager;
+import net.minecraft.client.telemetry.ClientTelemetryManager;
-@Mixin(ClientTelemetryManager.class)
-public class MixinClientTelemetryManager {
+@Mixin(YggdrasilUserApiService.class)
+public class MixinYggdrasilUserApiService {
/**
* @reason Privacy.
* @author Aizistral
*/
+ @Inject(method = "newTelemetrySession", at = @At("HEAD"), cancellable = true)
+ private void onCreateTelemetrySession(Executor executor, CallbackInfoReturnable<TelemetrySession> info) {
+ if (NCRConfig.getClient().disableTelemetry()) {
+ info.setReturnValue(TelemetrySession.DISABLED);
+ }
+ }
+
@Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/authlib/minecraft/UserApiService;"
+ "newTelemetrySession(Ljava/util/concurrent/Executor;)Lcom/mojang/authlib/minecraft/TelemetrySession;",
remap = false))
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index d9b82f3..ed7271c 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -16,7 +16,7 @@
"client.MixinOptions",
"client.MixinChatListener",
"client.MixinChatOptionsScreen",
- "client.MixinClientTelemetryManager",
+ "client.MixinYggdrasilUserApiService",
"client.MixinPlayerEntry",
"client.MixinChatScreen",
"client.MixinConnectScreen",