23w51b
This commit is contained in:
1 parent
ab79e76b51
commit
d76d013acb
9 files changed
+58
-56
No files matched your search
@@ -1,32 +1,39 @@
|
||||
package carpet.mixins;
|
||||
|
||||
import carpet.CarpetSettings;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.server.level.ServerPlayerGameMode;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(value = ServerPlayerGameMode.class, priority = 69420) // not that important for carpet
|
||||
public class ServerPlayerGameMode_antiCheatMixin
|
||||
@Mixin(value = ServerPlayer.class)
|
||||
public abstract class ServerPlayerGameMode_antiCheatMixin extends Player
|
||||
{
|
||||
// that shoudn't've been a constant at the first place
|
||||
// resolves problems with mobs using reach entity attributes.
|
||||
|
||||
@Redirect(method = "handleBlockBreakAction", at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/server/level/ServerPlayer;getEyePosition()Lnet/minecraft/world/phys/Vec3;"
|
||||
))
|
||||
private Vec3 getEyePos(ServerPlayer instance,
|
||||
final BlockPos pos, final ServerboundPlayerActionPacket.Action action, final Direction direction, final int maxBuildHeight, final int sequence)
|
||||
public ServerPlayerGameMode_antiCheatMixin(final Level level, final BlockPos blockPos, final float f, final GameProfile gameProfile)
|
||||
{
|
||||
if (CarpetSettings.antiCheatDisabled &&
|
||||
instance.getEyePosition().distanceToSqr(Vec3.atCenterOf(pos)) < 1024
|
||||
) return Vec3.atCenterOf(pos);
|
||||
return instance.getEyePosition();
|
||||
super(level, blockPos, f, gameProfile);
|
||||
}
|
||||
|
||||
@Inject(method = "canInteractWithBlock", at = @At("HEAD"), cancellable = true)
|
||||
private void canInteractLongRangeBlock(BlockPos pos, CallbackInfoReturnable<Boolean> cir)
|
||||
{
|
||||
double maxRange = blockInteractionRange() + 1.0;
|
||||
maxRange = maxRange * maxRange;
|
||||
if (CarpetSettings.antiCheatDisabled && maxRange < 1024 && getEyePosition().distanceToSqr(Vec3.atCenterOf(pos)) < 1024) cir.setReturnValue(true);
|
||||
}
|
||||
|
||||
@Inject(method = "canInteractWithEntity", at = @At("HEAD"), cancellable = true)
|
||||
private void canInteractLongRangeEntity(AABB aabb, CallbackInfoReturnable<Boolean> cir)
|
||||
{
|
||||
double maxRange = entityInteractionRange() + 1.0;
|
||||
maxRange = maxRange * maxRange;
|
||||
if (CarpetSettings.antiCheatDisabled && maxRange < 1024 && aabb.distanceToSqr(getEyePosition()) < 1024) cir.setReturnValue(true);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user