diff --git a/src/main/java/com/lzxnone/terraria/client/model/armor/RobeModel.java b/src/main/java/com/lzxnone/terraria/client/model/armor/RobeModel.java index 24eb6fb..b5d627b 100644 --- a/src/main/java/com/lzxnone/terraria/client/model/armor/RobeModel.java +++ b/src/main/java/com/lzxnone/terraria/client/model/armor/RobeModel.java @@ -36,7 +36,7 @@ public class RobeModel extends HumanoidArmorModel { .texOffs(46, 0).addBox(-2.5F, 0.0F, -2.5F, 5.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) .texOffs(76, 0).addBox(-3.8F, 0.5F, -2.8F, 2.0F, 6.0F, 1.0F, new CubeDeformation(0.0F)) .texOffs(76, 0).mirror().addBox(1.8F, 0.5F, -2.8F, 2.0F, 6.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(60, 0).addBox(-1.0F, 4.0F, -3.2F, 2.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(60, 0).addBox(-1.0F, 2.0F, -3.2F, 2.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)) .texOffs(68, 0).addBox(-1.0F, 6.0F, -2.5F, 2.0F, 6.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.ZERO ); @@ -69,7 +69,7 @@ public class RobeModel extends HumanoidArmorModel { .texOffs(64, 36).addBox(-3.0F, 6.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)) .texOffs(10, 52).addBox(-2.4F, 0.0F, -2.9F, 2.0F, 6.0F, 1.0F, new CubeDeformation(0.0F)) .texOffs(30, 52).addBox(-3.3F, 6.0F, -1.5F, 1.0F, 6.0F, 3.0F, new CubeDeformation(0.0F)), - PartPose.offset(-1.9F, 12.0F, 0.0F) + PartPose.offset(-2.0F, 12.0F, 0.0F) ); // 左腿 (长袍内衬 + 左半侧裙摆,随左腿前后摆动) @@ -79,7 +79,7 @@ public class RobeModel extends HumanoidArmorModel { .texOffs(64, 36).mirror().addBox(-2.0F, 6.0F, -3.0F, 5.0F, 6.0F, 6.0F, new CubeDeformation(0.0F)).mirror(false) .texOffs(10, 52).mirror().addBox(0.4F, 0.0F, -2.9F, 2.0F, 6.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) .texOffs(30, 52).mirror().addBox(2.3F, 6.0F, -1.5F, 1.0F, 6.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false), - PartPose.offset(1.9F, 12.0F, 0.0F) + PartPose.offset(2.0F, 12.0F, 0.0F) ); return LayerDefinition.create(meshdefinition, 128, 128); diff --git a/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java b/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java index 9a5dc4d..a9348f9 100644 --- a/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java +++ b/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java @@ -81,28 +81,45 @@ public class FallenStar extends Item { ); if(players.isEmpty()) return false; - ServerPlayer player = players.getFirst(); + // 1. 标准包围盒碰撞检测捡起 + for (ServerPlayer player : players) { + if (player.getBoundingBox().intersects(summon.getBoundingBox())) { + ItemStack stack = new ItemStack(ModItems.FALLEN_STAR.get()); + if (player.getInventory().add(stack)) { + player.take(summon, 1); + player.containerMenu.broadcastChanges(); + player.playNotifySound( + SoundEvents.ITEM_PICKUP, + SoundSource.PLAYERS, + 0.2F, + ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F + ); + onDied(summon); + return true; + } + } + } - double attractRange = Math.max(AccessoryUtil.getStarPickupRange(player), MIN_ATTRACT_RADIUS); - Vec3 dir = player.getBoundingBox().getCenter().subtract(summon.position()); - double dist = dir.length(); - if(dist <= attractRange) { - summon.setDeltaMovement(dir.scale(ATTRACT_SPEED)); + // 2. 吸引逻辑(保持原有吸引范围,寻找最近的可吸引玩家) + ServerPlayer closestPlayer = null; + double closestDistSq = Double.MAX_VALUE; + for (ServerPlayer player : players) { + double distSq = summon.distanceToSqr(player); + if (distSq < closestDistSq) { + closestDistSq = distSq; + closestPlayer = player; + } } - if(dist <= PICKUP_RADIUS) { - ItemStack stack = new ItemStack(ModItems.FALLEN_STAR.get()); - if(!player.getInventory().add(stack)) return false; - player.take(summon, 1); - player.containerMenu.broadcastChanges(); - player.playNotifySound( - SoundEvents.ITEM_PICKUP, - SoundSource.PLAYERS, - 0.2F, - ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F - ); - onDied(summon); - return true; + + if (closestPlayer != null) { + double attractRange = Math.max(AccessoryUtil.getStarPickupRange(closestPlayer), MIN_ATTRACT_RADIUS); + Vec3 dir = closestPlayer.getBoundingBox().getCenter().subtract(summon.position()); + double dist = dir.length(); + if (dist <= attractRange) { + summon.setDeltaMovement(dir.scale(ATTRACT_SPEED)); + } } + return false; } }; diff --git a/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java b/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java index 5642fa0..54a6e6b 100644 --- a/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java +++ b/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java @@ -54,7 +54,7 @@ public class ManaStar extends Item { summon.getEntityData().set(StaticSummon.AGE, age + 1); } - private boolean tryPickup(StaticSummon summon) { + private boolean tryPickup(StaticSummon summon) { List players = summon.level().getEntitiesOfClass( ServerPlayer.class, summon.getBoundingBox().inflate(MAX_PICKUP_RADIUS), @@ -62,22 +62,39 @@ public class ManaStar extends Item { ); if(players.isEmpty()) return false; - ServerPlayer player = players.getFirst(); - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - double attractRange = Math.max(AccessoryUtil.getStarPickupRange(player), customData.contains("min_attract_range") ? customData.getDouble("min_attract_range") : 4.0D); - Vec3 dir = player.getBoundingBox().getCenter().subtract(summon.position()); - double dist = dir.length(); - if(dist <= attractRange) { - summon.setDeltaMovement(dir.scale(ATTRACT_SPEED)); + + // 1. 标准包围盒碰撞检测捡起 + for (ServerPlayer player : players) { + if (player.getBoundingBox().intersects(summon.getBoundingBox())) { + int amount = customData.contains("mana") ? customData.getInt("mana") : 0; + PlayerMana.recoverMana(player, amount); + player.addEffect(new MobEffectInstance(ModEffects.MANA_SURGE, MANA_SURGE_DURATION_TICKS, 0)); + onDied(summon); + return true; + } } - if(dist <= PICKUP_RADIUS) { - int amount = customData.contains("mana") ? customData.getInt("mana") : 0; - PlayerMana.recoverMana(player, amount); - player.addEffect(new MobEffectInstance(ModEffects.MANA_SURGE, MANA_SURGE_DURATION_TICKS, 0)); - onDied(summon); - return true; + + // 2. 吸引逻辑(保持原有基础吸引范围不变,寻找最近的可吸引玩家) + ServerPlayer closestPlayer = null; + double closestDistSq = Double.MAX_VALUE; + for (ServerPlayer player : players) { + double distSq = summon.distanceToSqr(player); + if (distSq < closestDistSq) { + closestDistSq = distSq; + closestPlayer = player; + } } + + if (closestPlayer != null) { + double attractRange = Math.max(AccessoryUtil.getStarPickupRange(closestPlayer), customData.contains("min_attract_range") ? customData.getDouble("min_attract_range") : 4.0D); + Vec3 dir = closestPlayer.getBoundingBox().getCenter().subtract(summon.position()); + double dist = dir.length(); + if (dist <= attractRange) { + summon.setDeltaMovement(dir.scale(ATTRACT_SPEED)); + } + } + return false; } }; diff --git a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/amber_robe_layer_1.png b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/amber_robe_layer_1.png index e7bb272..eccb4fe 100644 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/amber_robe_layer_1.png and b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/amber_robe_layer_1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/amethyst_robe_layer_1.png b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/amethyst_robe_layer_1.png index 25b094a..a518f91 100644 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/amethyst_robe_layer_1.png and b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/amethyst_robe_layer_1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/diamond_robe_layer_1.png b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/diamond_robe_layer_1.png index b06cffb..21f00e8 100644 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/diamond_robe_layer_1.png and b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/diamond_robe_layer_1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/emerald_robe_layer_1.png b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/emerald_robe_layer_1.png index 90326a3..a1bcd1d 100644 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/emerald_robe_layer_1.png and b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/emerald_robe_layer_1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/robe_layer_1.png b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/robe_layer_1.png index c76f660..9121182 100644 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/robe_layer_1.png and b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/robe_layer_1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/ruby_robe_layer_1.png b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/ruby_robe_layer_1.png index ed5dc16..62d620b 100644 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/ruby_robe_layer_1.png and b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/ruby_robe_layer_1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/sapphire_robe_layer_1.png b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/sapphire_robe_layer_1.png index 7d29f0f..ffd89db 100644 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/sapphire_robe_layer_1.png and b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/sapphire_robe_layer_1.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/topaz_robe_layer_1.png b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/topaz_robe_layer_1.png index ba0eca8..0f6e082 100644 Binary files a/src/main/resources/assets/lzxnoneterraria/textures/models/armor/topaz_robe_layer_1.png and b/src/main/resources/assets/lzxnoneterraria/textures/models/armor/topaz_robe_layer_1.png differ