kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

优化标靶交互

Browse source
This commit is contained in:
Light_Quanta 2025-05-16 20:37:40 +08:00
parent cb74fc05c8
commit a4ed82306e
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
3 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/atsuishio/superbwarfare/entity/DPSGeneratorEntity.java
View file

@ -171,6 +171,10 @@ public class DPSGeneratorEntity extends LivingEntity implements GeoEntity {
player.addItem(new ItemStack(ModItems.DPS_GENERATOR_DEPLOYER.get()));
}
} else {
if (player.getMainHandItem() != ItemStack.EMPTY) {
return InteractionResult.PASS;
}
this.lookAt(EntityAnchorArgument.Anchor.EYES, new Vec3((player.getX()), this.getY(), (player.getZ())));
this.setXRot(0);
this.xRotO = this.getXRot();

4
src/main/java/com/atsuishio/superbwarfare/entity/TargetEntity.java
View file

@ -144,6 +144,10 @@ public class TargetEntity extends LivingEntity implements GeoEntity {
player.addItem(new ItemStack(ModItems.TARGET_DEPLOYER.get()));
}
} else {
if (player.getMainHandItem() != ItemStack.EMPTY) {
return InteractionResult.PASS;
}
this.lookAt(EntityAnchorArgument.Anchor.EYES, new Vec3((player.getX()), this.getY(), (player.getZ())));
this.setXRot(0);
this.xRotO = this.getXRot();

23
src/main/java/com/atsuishio/superbwarfare/item/TargetDeployer.java
View file

@ -9,6 +9,7 @@ import net.minecraft.stats.Stats;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.MobSpawnType;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
@ -24,12 +25,16 @@ import net.minecraft.world.phys.HitResult;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import java.util.function.Predicate;
public class TargetDeployer extends Item {
public TargetDeployer() {
super(new Properties());
}
private static final Predicate<Entity> IS_TARGET = e -> e instanceof TargetEntity;
@Override
public @NotNull InteractionResult useOn(UseOnContext pContext) {
Level level = pContext.getLevel();
@ -47,6 +52,15 @@ public class TargetDeployer extends Item {
pos = blockpos.relative(direction);
}
// 禁止堆叠
if (!level.getEntities(
(Entity) null,
ModEntities.TARGET.get().getSpawnAABB(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5),
IS_TARGET
).isEmpty()) {
return InteractionResult.FAIL;
}
if (ModEntities.TARGET.get().spawn((ServerLevel) level, itemstack, pContext.getPlayer(), pos, MobSpawnType.SPAWN_EGG, true, !Objects.equals(blockpos, pos) && direction == Direction.UP) != null) {
itemstack.shrink(1);
level.gameEvent(pContext.getPlayer(), GameEvent.ENTITY_PLACE, blockpos);
@ -69,6 +83,15 @@ public class TargetDeployer extends Item {
if (!(pLevel.getBlockState(blockpos).getBlock() instanceof LiquidBlock)) {
return InteractionResultHolder.pass(itemstack);
} else if (pLevel.mayInteract(pPlayer, blockpos) && pPlayer.mayUseItemAt(blockpos, blockhitresult.getDirection(), itemstack)) {
// 禁止堆叠
if (!pLevel.getEntities(
(Entity) null,
ModEntities.TARGET.get().getSpawnAABB(blockpos.getX() + 0.5, blockpos.getY() + 0.5, blockpos.getZ() + 0.5),
IS_TARGET
).isEmpty()) {
return InteractionResultHolder.fail(itemstack);
}
TargetEntity entity = ModEntities.TARGET.get().spawn((ServerLevel) pLevel, itemstack, pPlayer, blockpos, MobSpawnType.SPAWN_EGG, false, false);
if (entity == null) {
return InteractionResultHolder.pass(itemstack);