diff --git a/src/main/java/top/infsky/timerecorder/mixins/MixinPacket.java b/src/main/java/top/infsky/timerecorder/mixins/MixinPacket.java deleted file mode 100644 index 74203fa..0000000 --- a/src/main/java/top/infsky/timerecorder/mixins/MixinPacket.java +++ /dev/null @@ -1,50 +0,0 @@ -package top.infsky.timerecorder.mixins; - - -import lombok.val; -import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket; -import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.world.entity.RelativeMovement; -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; -import top.infsky.timerecorder.Utils; - -import java.util.Objects; -import java.util.Set; - -@Mixin(ServerGamePacketListenerImpl.class) -public abstract class MixinPacket { - @Shadow public abstract ServerPlayer getPlayer(); - - @Inject(method = "teleport(DDDFFLjava/util/Set;)V", at = @At(value = "HEAD")) - public void teleport(double d, double e, double f, float g, float h, Set set, CallbackInfo ci) { - try { - val trPlayer = Objects.requireNonNull(Utils.getPlayer(this.getPlayer().getUUID())).antiCheat; - - trPlayer.manager.onTeleport(); - } catch (NullPointerException ignored) {} - } - - @Inject(method = "handleMovePlayer", at = @At(value = "HEAD"), cancellable = true) - public void handleMovePlayer(ServerboundMovePlayerPacket packet, CallbackInfo ci) { - try { - val trPlayer = Objects.requireNonNull(Utils.getPlayer(this.getPlayer().getUUID())).antiCheat; - - trPlayer.manager.onPacketReceive(packet, ci); - } catch (NullPointerException ignored) {} - } - - @Inject(method = "handleUseItemOn", at = @At(value = "HEAD"), cancellable = true) - public void handleUseItemOn(ServerboundUseItemOnPacket packet, CallbackInfo ci) { - try { - val trPlayer = Objects.requireNonNull(Utils.getPlayer(this.getPlayer().getUUID())).antiCheat; - - trPlayer.manager.onPacketReceive(packet, ci); - } catch (NullPointerException ignored) {} - } -} diff --git a/src/main/java/top/infsky/timerecorder/mixins/MixinPlayer.java b/src/main/java/top/infsky/timerecorder/mixins/MixinPlayer.java deleted file mode 100644 index 582bfd0..0000000 --- a/src/main/java/top/infsky/timerecorder/mixins/MixinPlayer.java +++ /dev/null @@ -1,29 +0,0 @@ -package top.infsky.timerecorder.mixins; - - -import com.mojang.authlib.GameProfile; -import lombok.val; -import net.minecraft.world.entity.player.Player; -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; -import top.infsky.timerecorder.Utils; - -import java.util.Objects; - -@Mixin(Player.class) -public class MixinPlayer { - @Shadow @Final private GameProfile gameProfile; - - @Inject(method = "jumpFromGround", at = @At(value = "HEAD")) - public void jumpFromGround(CallbackInfo ci) { - try { - val trPlayer = Objects.requireNonNull(Utils.getPlayer(this.gameProfile.getId())).antiCheat; - - trPlayer.manager.onJump(); - } catch (NullPointerException ignored) {} - } -} diff --git a/src/main/resources/timerecorder.mixins.json b/src/main/resources/timerecorder.mixins.json index 02df451..f9c8812 100644 --- a/src/main/resources/timerecorder.mixins.json +++ b/src/main/resources/timerecorder.mixins.json @@ -3,9 +3,7 @@ "package": "top.infsky.timerecorder.mixins", "compatibilityLevel": "JAVA_17", "mixins": [ - "MixinCommand", - "MixinPacket", - "MixinPlayer" + "MixinCommand" ], "injectors": { "defaultRequire": 1