From 781e60a31135f804124f06d245803d2946a749b7 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 20 Jun 2022 13:05:18 +0200 Subject: No public keys for the server --- .../com/aizistral/nochatreports/NoChatReports.java | 3 ++ .../nochatreports/mixins/MixinDedicatedServer.java | 23 +++++++++++ .../mixins/MixinProfileKeyPairManager.java | 48 ++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index adaf08b..a754dd8 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -7,7 +7,10 @@ import org.apache.logging.log4j.Logger; import com.aizistral.nochatreports.handlers.NoReportsConfig; +import net.minecraft.network.protocol.login.ServerboundHelloPacket; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.network.ServerGamePacketListenerImpl; +import net.minecraft.server.network.ServerLoginPacketListenerImpl; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java new file mode 100644 index 0000000..dc85bcd --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java @@ -0,0 +1,23 @@ +package com.aizistral.nochatreports.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.dedicated.DedicatedServer; + +@Mixin(DedicatedServer.class) +public class MixinDedicatedServer { + + /** + * @reason If we are present on server - we won't be using keys for anything, + * so this option ceases to make sense. + * @author Aizistral + */ + + @Overwrite + public boolean enforceSecureProfile() { + return false; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java new file mode 100644 index 0000000..7101d0d --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java @@ -0,0 +1,48 @@ +package com.aizistral.nochatreports.mixins; + +import java.util.Optional; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import net.minecraft.client.multiplayer.ProfileKeyPairManager; +import net.minecraft.network.protocol.login.ClientboundHelloPacket; +import net.minecraft.util.Signer; +import net.minecraft.world.entity.player.ProfilePublicKey; +import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; + +@Mixin(ProfileKeyPairManager.class) +public class MixinProfileKeyPairManager { + + /** + * @reason We don't have to send our keys anywhere, and thus we won't. + * @author Aizistral + */ + + @Overwrite + public Optional profilePublicKey() { + return Optional.empty(); + } + + /** + * @reason We don't have to send our keys anywhere, and thus we won't. + * @author Aizistral + */ + + @Overwrite + public Optional profilePublicKeyData() { + return Optional.empty(); + } + + /** + * @reason Prevent client from trying to produce signature in + * {@link ClientHandshakePacketListenerImpl#handleHello(ClientboundHelloPacket)}. + * @author Aizistral + */ + + @Overwrite + public Signer signer() { + return null; + } + +} -- cgit v1.2.3