From 6552aa2a19867e51216113265243d0bd91f25f60 Mon Sep 17 00:00:00 2001 From: Up Date: Tue, 21 Jan 2025 06:45:47 +0100 Subject: [PATCH] let sparkweave handle fake player detection --- .../arcanuscontinuum/api/entities/Targetable.java | 8 ++++---- .../components/level/PocketDimensionComponent.java | 7 ++++--- .../common/entities/magic/MagicRune.java | 3 +-- .../common/entities/magic/PocketDimensionPortal.java | 4 ++-- .../arcanuscontinuum/common/util/PlayerHelper.java | 11 ----------- 5 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 src/main/java/dev/cammiescorner/arcanuscontinuum/common/util/PlayerHelper.java diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/api/entities/Targetable.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/api/entities/Targetable.java index fca3c39f..805470bf 100644 --- a/src/main/java/dev/cammiescorner/arcanuscontinuum/api/entities/Targetable.java +++ b/src/main/java/dev/cammiescorner/arcanuscontinuum/api/entities/Targetable.java @@ -1,12 +1,12 @@ package dev.cammiescorner.arcanuscontinuum.api.entities; -import dev.cammiescorner.arcanuscontinuum.common.util.PlayerHelper; -import net.minecraft.world.entity.Entity; +import dev.upcraft.sparkweave.api.util.fakeplayer.FakePlayerHelper; +import net.minecraft.world.entity.player.Player; public interface Targetable { default boolean arcanus$canBeTargeted() { - if(this instanceof Entity self) { - return !PlayerHelper.isFakePlayer(self); + if(this instanceof Player player) { + return !FakePlayerHelper.isFakePlayer(player); } return false; diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/components/level/PocketDimensionComponent.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/components/level/PocketDimensionComponent.java index 8e040a8f..f96aa3e4 100644 --- a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/components/level/PocketDimensionComponent.java +++ b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/components/level/PocketDimensionComponent.java @@ -9,7 +9,7 @@ import dev.cammiescorner.arcanuscontinuum.common.data.ArcanusDimensions; import dev.cammiescorner.arcanuscontinuum.common.registry.ArcanusBlocks; import dev.cammiescorner.arcanuscontinuum.common.registry.ArcanusComponents; -import dev.cammiescorner.arcanuscontinuum.common.util.PlayerHelper; +import dev.upcraft.sparkweave.api.util.fakeplayer.FakePlayerHelper; import net.fabricmc.fabric.api.dimension.v1.FabricDimensions; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -28,6 +28,7 @@ import net.minecraft.util.Tuple; import net.minecraft.world.Clearable; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; @@ -145,7 +146,7 @@ else if(!chunksExist(plot, pocketDim)) { } public boolean teleportOutOfPocketDimension(Entity entity) { - if(PlayerHelper.isFakePlayer(entity) || entity.level().isClientSide() || entity.level().dimension() != ArcanusDimensions.POCKET_DIMENSION) + if((entity instanceof Player player && FakePlayerHelper.isFakePlayer(player)) || entity.level().isClientSide() || entity.level().dimension() != ArcanusDimensions.POCKET_DIMENSION) return false; UUID ownerId = existingPlots.values().stream().filter(plot -> entity.getBoundingBox().intersects(AABB.of(plot.getBounds()))).map(PocketDimensionPlot::ownerId).findFirst().orElse(null); @@ -273,7 +274,7 @@ public boolean replacePlotSpace(UUID target, ServerLevel pocketDim, RegenerateTy if(regenerateType.clearInterior()) { pocketDim.getEntitiesOfClass(Entity.class, AABB.of(plot.getBounds())).forEach(entity -> { - if(PlayerHelper.isFakePlayer(entity) || !(entity instanceof ServerPlayer player)) { + if(!(entity instanceof ServerPlayer player) || FakePlayerHelper.isFakePlayer(player)) { entity.discard(); return; } diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/MagicRune.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/MagicRune.java index 67cbaa3f..76b46b62 100644 --- a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/MagicRune.java +++ b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/MagicRune.java @@ -7,7 +7,6 @@ import dev.cammiescorner.arcanuscontinuum.api.spells.SpellGroup; import dev.cammiescorner.arcanuscontinuum.api.spells.SpellShape; import dev.cammiescorner.arcanuscontinuum.common.data.ArcanusEntityTags; -import dev.cammiescorner.arcanuscontinuum.common.util.PlayerHelper; import net.minecraft.Util; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -141,7 +140,7 @@ public void setProperties(UUID casterId, Entity sourceEntity, Vec3 pos, ItemStac } private static boolean isValidTarget(LivingEntity livingEntity) { - if(!livingEntity.isAlive() || livingEntity.isSpectator() || livingEntity.isIgnoringBlockTriggers() || PlayerHelper.isFakePlayer(livingEntity)) { + if(!livingEntity.isAlive() || livingEntity.isSpectator() || livingEntity.isIgnoringBlockTriggers()) { return false; } diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/PocketDimensionPortal.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/PocketDimensionPortal.java index 897ca90f..d0bb1eb9 100644 --- a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/PocketDimensionPortal.java +++ b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/PocketDimensionPortal.java @@ -5,7 +5,7 @@ import dev.cammiescorner.arcanuscontinuum.common.components.level.PocketDimensionComponent; import dev.cammiescorner.arcanuscontinuum.common.data.ArcanusEntityTags; import dev.cammiescorner.arcanuscontinuum.common.registry.ArcanusComponents; -import dev.cammiescorner.arcanuscontinuum.common.util.PlayerHelper; +import dev.upcraft.sparkweave.api.util.fakeplayer.FakePlayerHelper; import net.minecraft.Util; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; @@ -145,7 +145,7 @@ public void setProperties(UUID casterId, Vec3 pos, double pullStrength) { } private static boolean canTeleportSafely(Entity entity) { - if(entity.isSpectator() || !entity.isAlive() || !entity.canChangeDimensions() || PlayerHelper.isFakePlayer(entity)) + if(entity.isSpectator() || !entity.isAlive() || !entity.canChangeDimensions() || (entity instanceof Player player && FakePlayerHelper.isFakePlayer(player))) return false; return !entity.getType().is(ArcanusEntityTags.SPATIAL_RIFT_IMMUNE); diff --git a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/util/PlayerHelper.java b/src/main/java/dev/cammiescorner/arcanuscontinuum/common/util/PlayerHelper.java deleted file mode 100644 index 4ff6f0d6..00000000 --- a/src/main/java/dev/cammiescorner/arcanuscontinuum/common/util/PlayerHelper.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.cammiescorner.arcanuscontinuum.common.util; - -import net.fabricmc.fabric.api.entity.FakePlayer; -import net.minecraft.world.entity.Entity; - -public class PlayerHelper { - - public static boolean isFakePlayer(Entity entity) { - return entity instanceof FakePlayer; - } -}