diff options
| author | Aizistral | 2022-07-01 08:34:37 +0200 |
|---|---|---|
| committer | Aizistral | 2022-07-01 08:34:37 +0200 |
| commit | 0fd01b5d3440fb5f9ac53f21b69661e47fdfbc96 (patch) | |
| tree | 9490e5749118bdfc618ef45a94051134793134e0 | |
| parent | 991d059be18ffc15c544012d437df371b18b8efe (diff) | |
Minor refactoring
8 files changed, 19 insertions, 23 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java index 588f02e..9868eaf 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientTelemetryManager.java @@ -20,7 +20,7 @@ public class MixinClientTelemetryManager { @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)) - private TelemetrySession redirectNewTelemetrySession(UserApiService service, Executor executor) { + private TelemetrySession onCreateTelemetrySession(UserApiService service, Executor executor) { return TelemetrySession.DISABLED; } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java index 7ab69b2..04748e3 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinDedicatedServer.java @@ -17,7 +17,7 @@ public class MixinDedicatedServer { */ @Inject(method = "enforceSecureProfile", at = @At("RETURN"), cancellable = true) - private void enforceSecureProfile(CallbackInfoReturnable<Boolean> cir) { + private void onEnforceSecureProfile(CallbackInfoReturnable<Boolean> cir) { cir.setReturnValue(false); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java index ed8a926..2533fe5 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java @@ -25,8 +25,8 @@ public class MixinLocalPlayer { */ @Inject(method = "signMessage", at = @At("HEAD"), cancellable = true) - private void preventSigning(MessageSigner signer, Component message, CallbackInfoReturnable<MessageSignature> cir) { - cir.setReturnValue(MessageSignature.unsigned()); + private void onSignMessage(MessageSigner signer, Component message, CallbackInfoReturnable<MessageSignature> info) { + info.setReturnValue(MessageSignature.unsigned()); } /** @@ -36,8 +36,8 @@ public class MixinLocalPlayer { */ @Inject(method = "signCommandArguments", at = @At("HEAD"), cancellable = true) - private void preventSigningArgs(MessageSigner signer, ParseResults<SharedSuggestionProvider> results, @Nullable Component component, CallbackInfoReturnable<ArgumentSignatures> cir) { - cir.setReturnValue(ArgumentSignatures.empty()); + private void onSignCommand(MessageSigner signer, ParseResults<SharedSuggestionProvider> results, @Nullable Component component, CallbackInfoReturnable<ArgumentSignatures> info) { + info.setReturnValue(ArgumentSignatures.empty()); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java index 0dccdcf..0048ade 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java @@ -1,10 +1,12 @@ package com.aizistral.nochatreports.mixins; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; 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.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Player.class) @@ -18,8 +20,8 @@ public class MixinPlayer { */ @Inject(method = "getProfilePublicKey", at = @At("HEAD"), cancellable = true) - private void noServerValidation(CallbackInfoReturnable<ProfilePublicKey> cir) { - cir.setReturnValue(null); + private void onGetProfileKey(CallbackInfoReturnable<ProfilePublicKey> info) { + info.setReturnValue(null); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java index fe67d2c..5fea452 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinProfileKeyPairManager.java @@ -21,8 +21,8 @@ public class MixinProfileKeyPairManager { */ @Inject(method = "profilePublicKey", at = @At("HEAD"), cancellable = true) - private void preventServerValidation(CallbackInfoReturnable<Optional<ProfilePublicKey>> cir) { - cir.setReturnValue(Optional.empty()); + private void preventServerValidation(CallbackInfoReturnable<Optional<ProfilePublicKey>> info) { + info.setReturnValue(Optional.empty()); } /** @@ -32,8 +32,8 @@ public class MixinProfileKeyPairManager { */ @Inject(method = "profilePublicKeyData", at = @At("HEAD"), cancellable = true) - private void dontSendKeys(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> cir) { - cir.setReturnValue(Optional.empty()); + private void dontSendKeys(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) { + info.setReturnValue(Optional.empty()); } /** @@ -44,8 +44,8 @@ public class MixinProfileKeyPairManager { */ @Inject(method = "signer", at = @At("HEAD"), cancellable = true) - private void preventSignature(CallbackInfoReturnable<Optional<Signer>> cir) { - cir.setReturnValue(null); + private void preventSignature(CallbackInfoReturnable<Optional<Signer>> info) { + info.setReturnValue(null); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java index ff7c168..29c7748 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerGamePacketListenerImpl.java @@ -46,10 +46,4 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC } } - private int resolveChatTypeID(ResourceKey<ChatType> resourceKey) { - var self = (ServerGamePacketListenerImpl) (Object) this; - Registry<ChatType> registry = self.player.level.registryAccess().registryOrThrow(Registry.CHAT_TYPE_REGISTRY); - return registry.getId(registry.get(resourceKey)); - } - } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java index 600d2c6..2ab37a0 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java @@ -21,8 +21,8 @@ public class MixinServerboundChatPacket { */ @Inject(method = "getSignature", at = @At("HEAD"), cancellable = true) - private void stripSignatures(UUID uUID, CallbackInfoReturnable<MessageSignature> cir) { - cir.setReturnValue(MessageSignature.unsigned()); + private void onGetSignature(UUID id, CallbackInfoReturnable<MessageSignature> info) { + info.setReturnValue(MessageSignature.unsigned()); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java index e56b7dd..dcebc92 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinTitleScreen.java @@ -14,7 +14,7 @@ public class MixinTitleScreen { @Redirect(method = "render", at = @At(value = "INVOKE", remap = false, target = "Lnet/minecraft/WorldVersion;getName()Ljava/lang/String;"), require = 0) - private String overrideVersionName(WorldVersion version) { + private String onGetVersionName(WorldVersion version) { String original = version.getName(); return original.contains("1.19.1") ? original.replace("1.19.1", "1.19.84") : original; } |
