This commit is contained in:
LZX committed 2026-08-07 20:11:43 +08:00
1 parent f20f755a06
commit 66a1396f3b
9 files changed
+57 -57

No files matched your search

@@ -5,40 +5,33 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
public class PlayerMana { public class PlayerMana {
public static final int DEFAULT_MAX_MANA = 20; public static final int DEFAULT_BASE_MAX_MANA = 20;
public static final double DEFAULT_RECOVER_RATE = 1.0D; public static final double DEFAULT_RECOVER_RATE = 1.0D;
public static final int MAX_TOTAL_MANA = 400; public static final int MAX_BASE_MANA = 200;
public static final int MAX_MANA = 400;
public static final Codec<PlayerMana> CODEC = RecordCodecBuilder.create(instance -> instance.group( public static final Codec<PlayerMana> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.INT.optionalFieldOf("mana", DEFAULT_MAX_MANA).forGetter(PlayerMana::getMana), Codec.INT.optionalFieldOf("mana", DEFAULT_BASE_MAX_MANA).forGetter(PlayerMana::getMana),
Codec.INT.optionalFieldOf("max_mana", DEFAULT_MAX_MANA).forGetter(PlayerMana::getBaseMaxMana), Codec.INT.optionalFieldOf("base_max_mana", DEFAULT_BASE_MAX_MANA).forGetter(PlayerMana::getBaseMaxMana),
Codec.DOUBLE.optionalFieldOf("consume_progress", 0.0D).forGetter(PlayerMana::getConsumeProgress), Codec.DOUBLE.optionalFieldOf("consume_progress", 0.0D).forGetter(PlayerMana::getConsumeProgress),
Codec.DOUBLE.optionalFieldOf("recover_progress", 0.0D).forGetter(PlayerMana::getRecoverProgress), Codec.DOUBLE.optionalFieldOf("recover_progress", 0.0D).forGetter(PlayerMana::getRecoverProgress),
Codec.INT.optionalFieldOf("recover_delay", 0).forGetter(PlayerMana::getRecoverDelay) Codec.INT.optionalFieldOf("recover_delay", 0).forGetter(PlayerMana::getRecoverDelay)
).apply(instance, PlayerMana::new)); ).apply(instance, PlayerMana::new));
private int mana; private int mana;
private int maxMana; private int baseMaxMana;
private int bonusMaxMana; private int bonusMaxMana;
private double consumeProgress; private double consumeProgress;
private double recoverProgress; private double recoverProgress;
private int recoverDelay; private int recoverDelay;
public PlayerMana() { public PlayerMana() {
this(DEFAULT_MAX_MANA, DEFAULT_MAX_MANA, 0.0D, 0.0D, 0); this(DEFAULT_BASE_MAX_MANA, DEFAULT_BASE_MAX_MANA, 0.0D, 0.0D, 0);
} }
public PlayerMana(int mana, int maxMana) { public PlayerMana(int mana, int baseMaxMana, double consumeProgress, double recoverProgress, int recoverDelay) {
this(mana, maxMana, 0.0D, 0.0D, 0); this.baseMaxMana = Math.max(0, baseMaxMana);
} this.mana = Mth.clamp(mana, 0, getMaxMana());
public PlayerMana(int mana, int maxMana, double consumeProgress, double recoverProgress) {
this(mana, maxMana, consumeProgress, recoverProgress, 0);
}
public PlayerMana(int mana, int maxMana, double consumeProgress, double recoverProgress, int recoverDelay) {
this.maxMana = Math.max(0, maxMana);
this.mana = Mth.clamp(mana, 0, this.maxMana);
this.consumeProgress = Math.max(0.0D, consumeProgress); this.consumeProgress = Math.max(0.0D, consumeProgress);
this.recoverProgress = Math.max(0.0D, recoverProgress); this.recoverProgress = Math.max(0.0D, recoverProgress);
this.recoverDelay = Math.max(0, recoverDelay); this.recoverDelay = Math.max(0, recoverDelay);
@@ -53,15 +46,15 @@ public class PlayerMana {
} }
public int getMaxMana() { public int getMaxMana() {
return Math.min(maxMana + bonusMaxMana, MAX_TOTAL_MANA); return Math.min(baseMaxMana + bonusMaxMana, MAX_MANA);
} }
public int getBaseMaxMana() { public int getBaseMaxMana() {
return maxMana; return baseMaxMana;
} }
public void setMaxMana(int maxMana) { public void setBaseMaxMana(int baseMaxMana) {
this.maxMana = Math.max(0, maxMana); this.baseMaxMana = Math.max(0, baseMaxMana);
this.mana = Math.min(mana, getMaxMana()); this.mana = Math.min(mana, getMaxMana());
} }
@@ -74,16 +67,6 @@ public class PlayerMana {
this.mana = Math.min(mana, getMaxMana()); this.mana = Math.min(mana, getMaxMana());
} }
public int increaseMaxMana(int amount, int maxLimit) {
if(amount <= 0 || maxMana >= maxLimit) return 0;
int oldMaxMana = maxMana;
setMaxMana(Math.min(maxMana + amount, maxLimit));
int increase = maxMana - oldMaxMana;
setMana(mana + increase);
return increase;
}
public double getConsumeProgress() { public double getConsumeProgress() {
return consumeProgress; return consumeProgress;
} }
@@ -100,8 +83,20 @@ public class PlayerMana {
return mana > 0; return mana > 0;
} }
//通过魔力水晶增加基础最大魔力
public int increaseBaseMaxMana(int amount) {
if(amount <= 0 || baseMaxMana >= MAX_BASE_MANA) return 0;
int oldBaseMaxMana = baseMaxMana;
setBaseMaxMana(Math.min(baseMaxMana + amount, MAX_BASE_MANA));
int increase = baseMaxMana - oldBaseMaxMana;
setMana(mana + increase);
return increase;
}
//通过累加计数器恢复魔力
public boolean recoverMana(double amount) { public boolean recoverMana(double amount) {
if(amount <= 0.0D || mana >= maxMana) return false; if(amount <= 0.0D || mana >= getMaxMana()) return false;
int recoverAmount = addManaProgress(false, amount); int recoverAmount = addManaProgress(false, amount);
if(recoverAmount <= 0) return true; if(recoverAmount <= 0) return true;
@@ -111,14 +106,16 @@ public class PlayerMana {
return mana != oldMana; return mana != oldMana;
} }
//直接恢复指定值的魔力
public boolean recoverManaImmediately(int amount) { public boolean recoverManaImmediately(int amount) {
if(amount <= 0 || mana >= maxMana) return false; if(amount <= 0 || mana >= getMaxMana()) return false;
int oldMana = mana; int oldMana = mana;
setMana(mana + amount); setMana(mana + amount);
return mana != oldMana; return mana != oldMana;
} }
//通过累加计数器消耗魔力
public boolean consumeMana(double amount) { public boolean consumeMana(double amount) {
if(amount <= 0.0D) return true; if(amount <= 0.0D) return true;
if(mana <= 0) return false; if(mana <= 0) return false;
@@ -135,18 +132,16 @@ public class PlayerMana {
return true; return true;
} }
//设置恢复延迟
public void applyRecoverDelay() { public void applyRecoverDelay() {
if(maxMana <= 0) return; if(getMaxMana() <= 0) return;
double emptyRatio = 1.0D - (double) mana / maxMana; double emptyRatio = 1.0D - (double) mana / getMaxMana();
recoverDelay = Math.max(recoverDelay, (int) Math.ceil(0.7D * (emptyRatio * 240.0D + 45.0D))); recoverDelay = Math.max(recoverDelay, (int) Math.ceil(0.7D * (emptyRatio * 240.0D + 45.0D)));
recoverProgress = 0.0D; recoverProgress = 0.0D;
} }
public boolean tickRecoverDelay() { //减少恢复延迟,返回延迟是否完成
return tickRecoverDelay(1.0D);
}
public boolean tickRecoverDelay(double delayMultiplier) { public boolean tickRecoverDelay(double delayMultiplier) {
if(recoverDelay <= 0) return false; if(recoverDelay <= 0) return false;
@@ -155,6 +150,7 @@ public class PlayerMana {
return recoverDelay > 0; return recoverDelay > 0;
} }
//累计计数器
private int addManaProgress(boolean consume, double amount) { private int addManaProgress(boolean consume, double amount) {
double progress = (consume ? consumeProgress : recoverProgress) + amount; double progress = (consume ? consumeProgress : recoverProgress) + amount;
int wholeAmount = (int)Math.floor(progress); int wholeAmount = (int)Math.floor(progress);
@@ -43,7 +43,7 @@ public class PlayerManaSyncEventHandler {
public static void onPlayerTick(PlayerTickEvent.Post event) { public static void onPlayerTick(PlayerTickEvent.Post event) {
if(!(event.getEntity() instanceof ServerPlayer player)) return; if(!(event.getEntity() instanceof ServerPlayer player)) return;
//刷新饰品最大魔力加成(基础/加成分离:水晶升级不受饰品影响) //刷新饰品最大魔力加成
if(player.tickCount % 20 == 0) { if(player.tickCount % 20 == 0) {
PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA);
int bonus = AccessoryUtil.getMaxManaBonus(player); int bonus = AccessoryUtil.getMaxManaBonus(player);
@@ -76,7 +76,7 @@ public class PlayerManaSyncEventHandler {
public static void sync(ServerPlayer player) { public static void sync(ServerPlayer player) {
PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA);
PacketDistributor.sendToPlayer(player, new ManaSyncPayload(mana.getMana(), mana.getMaxMana())); PacketDistributor.sendToPlayer(player, new ManaSyncPayload(mana.getMana(), mana.getBaseMaxMana(), mana.getBonusMaxMana()));
} }
public static void playMaxManaSoundIfRecovered(ServerPlayer player, int oldMana, PlayerMana mana) { public static void playMaxManaSoundIfRecovered(ServerPlayer player, int oldMana, PlayerMana mana) {
@@ -38,14 +38,14 @@ public class ManaRegenerationBand extends AccessoryItem implements ManaRegenerat
public static final ConfigDouble REGEN_BONUS_SCALE = new ConfigDouble( public static final ConfigDouble REGEN_BONUS_SCALE = new ConfigDouble(
"accessory.mana_regeneration_band.regen_bonus_scale", "accessory.mana_regeneration_band.regen_bonus_scale",
"mana_regen_bonus_scale", "mana_regen_bonus_scale",
11.5D, 0.575D,
0.0D, 0.0D,
400.0D 400.0D
); );
public static final ConfigDouble REGEN_BONUS_BASE = new ConfigDouble( public static final ConfigDouble REGEN_BONUS_BASE = new ConfigDouble(
"accessory.mana_regeneration_band.regen_bonus_base", "accessory.mana_regeneration_band.regen_bonus_base",
"mana_regen_bonus_base", "mana_regen_bonus_base",
2.875D, 0.14375D,
0.0D, 0.0D,
400.0D 400.0D
); );
@@ -21,7 +21,6 @@ import java.util.List;
public class ManaCrystal extends Food { public class ManaCrystal extends Food {
public static final int USE_DURATION = 10; public static final int USE_DURATION = 10;
public static final int MANA_INCREASE = 20; public static final int MANA_INCREASE = 20;
public static final int MAX_MANA = 200;
public ManaCrystal() { public ManaCrystal() {
super(new Item.Properties().rarity(Rarity.UNCOMMON), USE_DURATION); super(new Item.Properties().rarity(Rarity.UNCOMMON), USE_DURATION);
@@ -29,14 +28,13 @@ public class ManaCrystal extends Food {
@Override @Override
protected boolean canEat(Level level, Player player, ItemStack stack) { protected boolean canEat(Level level, Player player, ItemStack stack) {
//只看基础最大魔力(水晶升级部分),饰品加成不会顶掉水晶使用次数 return player.getData(ModAttachments.PLAYER_MANA).getBaseMaxMana() < PlayerMana.MAX_BASE_MANA;
return player.getData(ModAttachments.PLAYER_MANA).getBaseMaxMana() < MAX_MANA;
} }
@Override @Override
protected boolean onEat(Level level, Player player, ItemStack stack) { protected boolean onEat(Level level, Player player, ItemStack stack) {
PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA);
if(mana.increaseMaxMana(MANA_INCREASE, MAX_MANA) <= 0) return false; if(mana.increaseBaseMaxMana(MANA_INCREASE) <= 0) return false;
player.setData(ModAttachments.PLAYER_MANA, mana); player.setData(ModAttachments.PLAYER_MANA, mana);
if(player instanceof ServerPlayer serverPlayer) { if(player instanceof ServerPlayer serverPlayer) {
@@ -1,5 +1,6 @@
package com.lzxnone.terraria.item.weapon; package com.lzxnone.terraria.item.weapon;
import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.ModAttachments;
import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.attachment.PlayerMana;
import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.enchantment.ModEnchantments;
@@ -89,9 +90,12 @@ public class MagicWeapon extends Weapon {
//是否可以继续使用魔法武器 //是否可以继续使用魔法武器
protected boolean canUseMagic(ItemStack stack, LivingEntity entity) { protected boolean canUseMagic(ItemStack stack, LivingEntity entity) {
if(entity.hasInfiniteMaterials()) return true; if(entity.hasInfiniteMaterials()) return true;
if(entity instanceof ServerPlayer player && player.getData(ModAttachments.PLAYER_MANA).hasMana()) return true; if(entity instanceof Player player) {
if(entity instanceof ServerPlayer player) return tryAutoUseManaPotion(player); if(player.getData(ModAttachments.PLAYER_MANA).hasMana()) return true;
return entity instanceof Player player && canAutoUseManaPotion(player) && findManaPotionSlot(player) >= 0; if(player instanceof ServerPlayer serverPlayer) return tryAutoUseManaPotion(serverPlayer);
return canAutoUseManaPotion(player) && findManaPotionSlot(player) >= 0;
}
return false;
} }
//进行魔力消耗 //进行魔力消耗
@@ -9,7 +9,8 @@ public class ManaSyncHandler {
public static void handle(final ManaSyncPayload payload, final IPayloadContext context) { public static void handle(final ManaSyncPayload payload, final IPayloadContext context) {
context.enqueueWork(() -> { context.enqueueWork(() -> {
PlayerMana mana = context.player().getData(ModAttachments.PLAYER_MANA); PlayerMana mana = context.player().getData(ModAttachments.PLAYER_MANA);
mana.setMaxMana(payload.maxMana()); mana.setBaseMaxMana(payload.baseMaxMana());
mana.setBonusMaxMana(payload.bonusMaxMana());
mana.setMana(payload.mana()); mana.setMana(payload.mana());
context.player().setData(ModAttachments.PLAYER_MANA, mana); context.player().setData(ModAttachments.PLAYER_MANA, mana);
}); });
@@ -6,14 +6,15 @@ import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
public record ManaSyncPayload(int mana, int maxMana) implements CustomPacketPayload { public record ManaSyncPayload(int mana, int baseMaxMana, int bonusMaxMana) implements CustomPacketPayload {
public static final Type<ManaSyncPayload> TYPE = new Type<>( public static final Type<ManaSyncPayload> TYPE = new Type<>(
ResourceLocation.fromNamespaceAndPath("lzxnoneterraria", "mana_sync_payload") ResourceLocation.fromNamespaceAndPath("lzxnoneterraria", "mana_sync_payload")
); );
public static final StreamCodec<FriendlyByteBuf, ManaSyncPayload> CODEC = StreamCodec.composite( public static final StreamCodec<FriendlyByteBuf, ManaSyncPayload> CODEC = StreamCodec.composite(
ByteBufCodecs.INT, ManaSyncPayload::mana, ByteBufCodecs.INT, ManaSyncPayload::mana,
ByteBufCodecs.INT, ManaSyncPayload::maxMana, ByteBufCodecs.INT, ManaSyncPayload::baseMaxMana,
ByteBufCodecs.INT, ManaSyncPayload::bonusMaxMana,
ManaSyncPayload::new ManaSyncPayload::new
); );
@@ -228,7 +228,7 @@
"tooltip.lzxnoneterraria.lava_immunity": "Immune to lava for %s seconds", "tooltip.lzxnoneterraria.lava_immunity": "Immune to lava for %s seconds",
"tooltip.lzxnoneterraria.lava_damage_reduction": "Lava damage -%s%%", "tooltip.lzxnoneterraria.lava_damage_reduction": "Lava damage -%s%%",
"tooltip.lzxnoneterraria.panic": "Increases movement speed after taking damage", "tooltip.lzxnoneterraria.panic": "Increases movement speed after taking damage",
"tooltip.lzxnoneterraria.life_regen": "Life Regeneration +%s", "tooltip.lzxnoneterraria.life_regen": "Life Regeneration +%s/s",
"lzxnoneterraria.configuration.damage_immunity": "Damage Immunity", "lzxnoneterraria.configuration.damage_immunity": "Damage Immunity",
"lzxnoneterraria.configuration.damage_immunity.tooltip": "Chance to negate incoming damage", "lzxnoneterraria.configuration.damage_immunity.tooltip": "Chance to negate incoming damage",
"lzxnoneterraria.configuration.lava_immunity_ticks": "Lava Immunity Duration (ticks)", "lzxnoneterraria.configuration.lava_immunity_ticks": "Lava Immunity Duration (ticks)",
@@ -242,7 +242,7 @@
"lzxnoneterraria.configuration.mana_regen_bonus_scale": "Mana Regen Bonus Scale", "lzxnoneterraria.configuration.mana_regen_bonus_scale": "Mana Regen Bonus Scale",
"lzxnoneterraria.configuration.mana_regen_bonus_scale.tooltip": "Bonus regen = scale × current mana ratio + base", "lzxnoneterraria.configuration.mana_regen_bonus_scale.tooltip": "Bonus regen = scale × current mana ratio + base",
"lzxnoneterraria.configuration.mana_regen_bonus_base": "Mana Regen Bonus Base", "lzxnoneterraria.configuration.mana_regen_bonus_base": "Mana Regen Bonus Base",
"lzxnoneterraria.configuration.mana_regen_bonus_base.tooltip": "Bonus regen when current mana is 0 (points per second)", "lzxnoneterraria.configuration.mana_regen_bonus_base.tooltip": "Bonus regen when current mana is 0 (per tick)",
"lzxnoneterraria.configuration.lava_damage_reduction": "Lava Damage Reduction", "lzxnoneterraria.configuration.lava_damage_reduction": "Lava Damage Reduction",
"lzxnoneterraria.configuration.lava_damage_reduction.tooltip": "Reduces lava damage taken while equipped", "lzxnoneterraria.configuration.lava_damage_reduction.tooltip": "Reduces lava damage taken while equipped",
"lzxnoneterraria.configuration.panic_duration": "Panic Duration", "lzxnoneterraria.configuration.panic_duration": "Panic Duration",
@@ -228,7 +228,7 @@
"tooltip.lzxnoneterraria.lava_immunity": "%s秒内对岩浆免疫", "tooltip.lzxnoneterraria.lava_immunity": "%s秒内对岩浆免疫",
"tooltip.lzxnoneterraria.lava_damage_reduction": "岩浆伤害 -%s%%", "tooltip.lzxnoneterraria.lava_damage_reduction": "岩浆伤害 -%s%%",
"tooltip.lzxnoneterraria.panic": "受到伤害后提高移动速度", "tooltip.lzxnoneterraria.panic": "受到伤害后提高移动速度",
"tooltip.lzxnoneterraria.life_regen": "生命再生 +%s", "tooltip.lzxnoneterraria.life_regen": "生命再生 +%s/s",
"lzxnoneterraria.configuration.damage_immunity": "伤害免疫概率", "lzxnoneterraria.configuration.damage_immunity": "伤害免疫概率",
"lzxnoneterraria.configuration.damage_immunity.tooltip": "抵消承受伤害的概率", "lzxnoneterraria.configuration.damage_immunity.tooltip": "抵消承受伤害的概率",
"lzxnoneterraria.configuration.lava_immunity_ticks": "岩浆免疫时长(刻)", "lzxnoneterraria.configuration.lava_immunity_ticks": "岩浆免疫时长(刻)",
@@ -242,7 +242,7 @@
"lzxnoneterraria.configuration.mana_regen_bonus_scale": "魔力再生加成系数", "lzxnoneterraria.configuration.mana_regen_bonus_scale": "魔力再生加成系数",
"lzxnoneterraria.configuration.mana_regen_bonus_scale.tooltip": "额外再生 = 系数 × 当前魔力比例 + 基础值", "lzxnoneterraria.configuration.mana_regen_bonus_scale.tooltip": "额外再生 = 系数 × 当前魔力比例 + 基础值",
"lzxnoneterraria.configuration.mana_regen_bonus_base": "魔力再生加成基础值", "lzxnoneterraria.configuration.mana_regen_bonus_base": "魔力再生加成基础值",
"lzxnoneterraria.configuration.mana_regen_bonus_base.tooltip": "当前魔力为 0 时的额外再生量(点/秒)", "lzxnoneterraria.configuration.mana_regen_bonus_base.tooltip": "当前魔力为 0 时的额外再生量(每 tick)",
"lzxnoneterraria.configuration.lava_damage_reduction": "岩浆伤害减免", "lzxnoneterraria.configuration.lava_damage_reduction": "岩浆伤害减免",
"lzxnoneterraria.configuration.lava_damage_reduction.tooltip": "佩戴后受到的岩浆伤害减免比例", "lzxnoneterraria.configuration.lava_damage_reduction.tooltip": "佩戴后受到的岩浆伤害减免比例",
"lzxnoneterraria.configuration.panic_duration": "恐慌持续时间", "lzxnoneterraria.configuration.panic_duration": "恐慌持续时间",