From 7df016a51f9251adaece0cf31fd20d35c436442d Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 26 Aug 2022 18:04:26 +0200 Subject: Add some backwards compatibility with 1.19.1 Closes #170 --- .../mixins/client/MixinProfileKeyPairManager.java | 16 ++++++++++++++++ src/main/resources/fabric.mod.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) 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 03af7d2..74a1f34 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java @@ -10,6 +10,7 @@ import net.minecraft.util.Signer; import net.minecraft.world.entity.player.ProfilePublicKey; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Group; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @@ -37,6 +38,7 @@ public class MixinProfileKeyPairManager { * @author Aizistral */ + @Group(min = 1, max = 1) @Inject(method = "parsePublicKey", at = @At("HEAD"), cancellable = true) private static void onParsePublicKey(KeyPairResponse response, CallbackInfoReturnable info) { if (!ServerSafetyState.allowsUnsafeServer()) { @@ -44,6 +46,20 @@ public class MixinProfileKeyPairManager { } } + /** + * @reason Accomplishes the same thing as {@link #onParsePublicKey(KeyPairResponse, CallbackInfoReturnable)}, + * but only in 1.19.1. + * @author Aizistral + */ + + @Group(min = 1, max = 1) + @Inject(method = "profilePublicKeyData", at = @At("HEAD"), cancellable = true) + private void onProfilePublicKeyData(CallbackInfoReturnable> info) { + if (!ServerSafetyState.allowsUnsafeServer()) { + info.setReturnValue(Optional.empty()); + } + } + /** * @reason Prevent client from trying to produce signature in * {@link ClientHandshakePacketListenerImpl#handleHello}. diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cbc106f..9ff7627 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -39,7 +39,7 @@ "fabric-screen-api-v1": "*", "fabric-rendering-v1": "*", "fabric-resource-loader-v0": "*", - "minecraft": "=1.19.2", + "minecraft": [ "=1.19.1", "=1.19.2" ], "java": ">=17" }, "suggests": {}, -- cgit v1.2.3