let sparkweave handle fake player detection

Up-Mods · Jan 21, 2025 · 6552aa2 · 6552aa2
1 parent 04b7757
commit 6552aa2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 22 deletions.
diff --git 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/.../dev/cammiescorner/arcanuscontinuum/common/components/level/PocketDimensionComponent.java b/.../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
@@ -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/.../java/dev/cammiescorner/arcanuscontinuum/common/entities/magic/PocketDimensionPortal.java b/.../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