22w42a

src/main/java/carpet/mixins/ClientPacketListener_clientCommandMixin.java

@@ -3,27 +3,32 @@ package carpet.mixins;
 import carpet.CarpetServer;
 import carpet.network.CarpetClient;
 import carpet.api.settings.SettingsManager;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.network.chat.Component;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(LocalPlayer.class)
-public class LocalPlayer_clientCommandMixin
+@Mixin(ClientPacketListener.class)
+public class ClientPacketListener_clientCommandMixin
 {
-    @Inject(method = "commandSigned", at = @At("HEAD"))
-    private void inspectMessage(String string, Component component, CallbackInfo ci)
+    @Shadow @Final private Minecraft minecraft;
+
+    @Inject(method = "sendCommand", at = @At("HEAD"))
+    private void inspectMessage(String string, CallbackInfo ci)
     {
         if (string.startsWith("call "))
         {
             String command = string.substring(5);
             CarpetClient.sendClientCommand(command);
         }
-        if (CarpetServer.minecraft_server == null && !CarpetClient.isCarpet())
+        if (CarpetServer.minecraft_server == null && !CarpetClient.isCarpet() && minecraft.player != null)
         {
-            LocalPlayer playerSource = (LocalPlayer)(Object) this;
+            LocalPlayer playerSource = minecraft.player;
             CarpetServer.settingsManager.inspectClientsideCommand(playerSource.createCommandSourceStack(),  "/"+string);
             CarpetServer.extensions.forEach(e -> {
                 SettingsManager sm = e.extensionSettingsManager();

src/main/java/carpet/mixins/ServerPlayer_actionPackMixin.java

@@ -3,10 +3,10 @@ package carpet.mixins;
 import carpet.fakes.ServerPlayerEntityInterface;
 import carpet.helpers.EntityPlayerActionPack;
 import com.mojang.authlib.GameProfile;
+import net.minecraft.network.chat.RemoteChatSession;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.player.ProfilePublicKey;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -25,7 +25,7 @@ public abstract class ServerPlayer_actionPackMixin implements ServerPlayerEntity
     }
 
     @Inject(method = "<init>", at = @At(value = "RETURN"))
-    private void onServerPlayerEntityContructor(MinecraftServer foo, ServerLevel bar, GameProfile baz, ProfilePublicKey qux, CallbackInfo ci)
+    private void onServerPlayerEntityContructor(MinecraftServer minecraftServer, ServerLevel serverLevel, GameProfile gameProfile, RemoteChatSession remoteChatSession, CallbackInfo ci)
     {
         this.actionPack = new EntityPlayerActionPack((ServerPlayer) (Object) this);
     }

src/main/java/carpet/mixins/ServerPlayer_scarpetEventMixin.java

@@ -14,7 +14,6 @@ import net.minecraft.world.InteractionHand;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.entity.player.ProfilePublicKey;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
@@ -39,8 +38,8 @@ public abstract class ServerPlayer_scarpetEventMixin extends Player implements S
     @Unique
     private boolean isInvalidReference = false;
 
-    public ServerPlayer_scarpetEventMixin(Level level, BlockPos blockPos, float f, GameProfile gameProfile, ProfilePublicKey profilePublicKey) {
-        super(level, blockPos, f, gameProfile, profilePublicKey);
+    public ServerPlayer_scarpetEventMixin(Level level, BlockPos blockPos, float f, GameProfile gameProfile) {
+        super(level, blockPos, f, gameProfile);
     }
 
     @Shadow protected abstract void completeUsingItem();