diff --git a/src/main/java/com/lzxnone/terraria/attachment/LavaImmunity.java b/src/main/java/com/lzxnone/terraria/attachment/LavaImmunity.java new file mode 100644 index 0000000..557b5cf --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/attachment/LavaImmunity.java @@ -0,0 +1,32 @@ +package com.lzxnone.terraria.attachment; + +//岩浆免疫计时(不序列化,客户端本地状态) +public class LavaImmunity { + private int maxTicks; + private int currentTicks; + + public LavaImmunity() { + this(0, 0); + } + + public LavaImmunity(int maxTicks, int currentTicks) { + this.maxTicks = maxTicks; + this.currentTicks = currentTicks; + } + + public int getMaxTicks() { + return maxTicks; + } + + public void setMaxTicks(int maxTicks) { + this.maxTicks = maxTicks; + } + + public int getCurrentTicks() { + return currentTicks; + } + + public void setCurrentTicks(int currentTicks) { + this.currentTicks = currentTicks; + } +} diff --git a/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java b/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java index 751d819..cdb6254 100644 --- a/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java +++ b/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java @@ -24,12 +24,6 @@ public class ModAttachments { public static final Supplier> DEVILS_DEVASTATION_HIT_COUNT = ATTACHMENT_TYPES.register("devils_devastation_hit_count", () -> AttachmentType.builder(() -> 0).serialize(Codec.INT).build()); - public static final Supplier>> SUMMON_WEAPON_SUMMONS = - ATTACHMENT_TYPES.register("summon_weapon_summons", () -> AttachmentType.>builder((Supplier>) ArrayList::new).serialize(Codec.list(Codec.STRING.xmap(UUID::fromString, UUID::toString))).build()); - - public static final Supplier> SUMMON_ATTACK_MODE = - ATTACHMENT_TYPES.register("summon_attack_mode", () -> AttachmentType.builder(() -> 2).serialize(Codec.INT).build()); - public static final Supplier> PLAYER_SUMMON = ATTACHMENT_TYPES.register("player_summon", () -> AttachmentType.builder(PlayerSummon::new).serialize(PlayerSummon.CODEC).copyOnDeath().build()); @@ -42,4 +36,7 @@ public class ModAttachments { public static final Supplier>> PALADIN_GUARDIAN_SOURCE = ATTACHMENT_TYPES.register("paladin_guardian_source", () -> AttachmentType.>builder(Optional::empty).serialize(Codec.STRING.xmap(UUID::fromString, UUID::toString).optionalFieldOf("guardian").codec()).build()); + public static final Supplier> LAVA_IMMUNITY = + ATTACHMENT_TYPES.register("lava_immunity", () -> AttachmentType.builder(LavaImmunity::new).build()); + } diff --git a/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java b/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java index 1e6b4e8..0fa1494 100644 --- a/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java +++ b/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java @@ -7,10 +7,11 @@ import net.minecraft.util.Mth; public class PlayerMana { public static final int DEFAULT_MAX_MANA = 20; public static final double DEFAULT_RECOVER_RATE = 1.0D; + public static final int MAX_TOTAL_MANA = 400; public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( Codec.INT.optionalFieldOf("mana", DEFAULT_MAX_MANA).forGetter(PlayerMana::getMana), - Codec.INT.optionalFieldOf("max_mana", DEFAULT_MAX_MANA).forGetter(PlayerMana::getMaxMana), + Codec.INT.optionalFieldOf("max_mana", DEFAULT_MAX_MANA).forGetter(PlayerMana::getBaseMaxMana), Codec.DOUBLE.optionalFieldOf("consume_progress", 0.0D).forGetter(PlayerMana::getConsumeProgress), Codec.DOUBLE.optionalFieldOf("recover_progress", 0.0D).forGetter(PlayerMana::getRecoverProgress), Codec.INT.optionalFieldOf("recover_delay", 0).forGetter(PlayerMana::getRecoverDelay) @@ -18,6 +19,7 @@ public class PlayerMana { private int mana; private int maxMana; + private int bonusMaxMana; private double consumeProgress; private double recoverProgress; private int recoverDelay; @@ -47,16 +49,29 @@ public class PlayerMana { } public void setMana(int mana) { - this.mana = Mth.clamp(mana, 0, maxMana); + this.mana = Mth.clamp(mana, 0, getMaxMana()); } public int getMaxMana() { + return Math.min(maxMana + bonusMaxMana, MAX_TOTAL_MANA); + } + + public int getBaseMaxMana() { return maxMana; } public void setMaxMana(int maxMana) { this.maxMana = Math.max(0, maxMana); - this.mana = Math.min(mana, this.maxMana); + this.mana = Math.min(mana, getMaxMana()); + } + + public int getBonusMaxMana() { + return bonusMaxMana; + } + + public void setBonusMaxMana(int bonusMaxMana) { + this.bonusMaxMana = Math.max(0, bonusMaxMana); + this.mana = Math.min(mana, getMaxMana()); } public int increaseMaxMana(int amount, int maxLimit) { @@ -129,10 +144,15 @@ public class PlayerMana { } public boolean tickRecoverDelay() { + return tickRecoverDelay(1.0D); + } + + public boolean tickRecoverDelay(double delayMultiplier) { if(recoverDelay <= 0) return false; - recoverDelay--; - return true; + int step = Math.max(1, (int) Math.ceil(1.0D / Math.max(0.01D, delayMultiplier))); + recoverDelay = Math.max(0, recoverDelay - step); + return recoverDelay > 0; } private int addManaProgress(boolean consume, double amount) { diff --git a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java index bb68b52..0d26ff4 100644 --- a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java +++ b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java @@ -116,6 +116,18 @@ public class ModCreativeModeTabs { output.accept(ModItems.FROZEN_TURTLE_SHELL.get()); output.accept(ModItems.MAGMA_STONE.get()); output.accept(ModItems.FIRE_GAUNTLET.get()); + output.accept(ModItems.LAVA_CHARM.get()); + output.accept(ModItems.OBSIDIAN_ROSE.get()); + output.accept(ModItems.MAGMA_SKULL.get()); + output.accept(ModItems.MOLTEN_CHARM.get()); + output.accept(ModItems.OBSIDIAN_SKULL_ROSE.get()); + output.accept(ModItems.MOLTEN_SKULL_ROSE.get()); + output.accept(ModItems.PANIC_NECKLACE.get()); + output.accept(ModItems.SWEETHEART_NECKLACE.get()); + output.accept(ModItems.ARCANE_FLOWER.get()); + output.accept(ModItems.REGENERATION_BAND.get()); + output.accept(ModItems.BAND_OF_STARPOWER.get()); + output.accept(ModItems.MANA_REGENERATION_BAND.get()); output.accept(ModItems.EYE_OF_GOLEM.get()); output.accept(ModItems.DESTROYER_EMBLEM.get()); output.accept(ModItems.MOON_STONE.get()); diff --git a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java index 8cfab9b..bb06465 100644 --- a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java +++ b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java @@ -36,4 +36,6 @@ public class ModEffects { MOB_EFFECTS.register("paladins_shield", PaladinsShieldEffect::new); public static final DeferredHolder ICE_BARRIER = MOB_EFFECTS.register("ice_barrier", IceBarrierEffect::new); + public static final DeferredHolder PANIC = + MOB_EFFECTS.register("panic", PanicEffect::new); } diff --git a/src/main/java/com/lzxnone/terraria/effect/PanicEffect.java b/src/main/java/com/lzxnone/terraria/effect/PanicEffect.java new file mode 100644 index 0000000..d6b081e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/effect/PanicEffect.java @@ -0,0 +1,47 @@ +package com.lzxnone.terraria.effect; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; + +public class PanicEffect extends MobEffect { + public static final ConfigDouble SPEED_BOOST = new ConfigDouble( + "effect.panic.speed_boost", + "panic_speed_boost", + 1.0D, + 0.0D, + 10.0D + ); + + public PanicEffect() { + super(MobEffectCategory.BENEFICIAL, 0xFF6B4A); + addAttributeModifier( + Attributes.MOVEMENT_SPEED, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "panic_effect_movement_speed"), + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL, + level -> SPEED_BOOST.get() + ); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(SPEED_BOOST); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "panic", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/panic.png"), + Component.translatable("effect.lzxnoneterraria.panic"), + CONFIG_DATA + ); +} diff --git a/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java b/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java index 938d8ed..d6e6bf5 100644 --- a/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java @@ -1,6 +1,8 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.attachment.LavaImmunity; +import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.item.accessory.AccessoryItem; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; @@ -26,5 +28,9 @@ public class AccessoryEventHandler { if(instance != null) instance.removeModifier(attributeModifier.id()); }); } + //岩浆免疫上限:穿戴/脱下都刷新为当前所有饰品最大值,当前值收敛到上限内(不破坏自恢复机制) + LavaImmunity lavaImmunity = entity.getData(ModAttachments.LAVA_IMMUNITY); + lavaImmunity.setMaxTicks(AccessoryUtil.getLavaImmunityTicks(entity)); + lavaImmunity.setCurrentTicks(Math.min(lavaImmunity.getMaxTicks(), lavaImmunity.getCurrentTicks())); } } diff --git a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index 1f70298..6b1f54b 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -1,11 +1,13 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.attachment.LavaImmunity; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.effect.MidasEffect; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.effect.PaladinsShieldEffect; import com.lzxnone.terraria.effect.IceBarrierEffect; +import com.lzxnone.terraria.item.accessory.PanicNecklace; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; @@ -51,6 +53,18 @@ public class EntityEventHandler { return; } } + //岩浆免疫(仅岩浆,不免疫岩浆块) + if(source.is(DamageTypes.LAVA) && entity instanceof Player player) { + LavaImmunity lavaImmunity = player.getData(ModAttachments.LAVA_IMMUNITY); + if(lavaImmunity.getCurrentTicks() > 0) { + event.setCanceled(true); + return; + } + double reduction = AccessoryUtil.getLavaDamageReduction(player); + if(reduction > 0.0D) { + event.setAmount(event.getAmount() * (float) (1.0D - reduction)); + } + } //进行护甲穿透 if(!source.is(DamageTypeTags.BYPASSES_ARMOR)) { if(attacker instanceof LivingEntity livingEntity) AccessoryUtil.applyTargetArmorModifiers(livingEntity, entity); @@ -109,6 +123,10 @@ public class EntityEventHandler { AccessoryUtil.applyInvulnerableTimeModifier(player); AccessoryUtil.applyFallenStarSummoner(player); AccessoryUtil.applyBeeSummoner(player); + //恐慌项链:受到伤害后触发恐慌加速(重复受击自动刷新持续时间) + if(AccessoryUtil.canApplyPanic(player) && PanicNecklace.DURATION.get() > 0) { + player.addEffect(new MobEffectInstance(ModEffects.PANIC, PanicNecklace.DURATION.get(), 0, false, false)); + } } } @@ -146,6 +164,22 @@ public class EntityEventHandler { if(player.getTicksFrozen() > 0 && AccessoryUtil.isFreezeImmune(player)) { player.setTicksFrozen(0); } + //岩浆免疫计时:岩浆中递减,离开后逐步恢复(每 tick +1) + LavaImmunity lavaImmunity = player.getData(ModAttachments.LAVA_IMMUNITY); + if(lavaImmunity.getMaxTicks() > 0) { + if(player.isInLava()) { + lavaImmunity.setCurrentTicks(Math.max(0, lavaImmunity.getCurrentTicks() - 1)); + }else { + lavaImmunity.setCurrentTicks(Math.min(lavaImmunity.getMaxTicks(), lavaImmunity.getCurrentTicks() + 1)); + } + } + //生命再生:每秒统计累加值并回复 + if(player.tickCount % 20 == 0) { + float regen = AccessoryUtil.getHealthPerSecond(player); + if(regen > 0.0F) { + player.heal(regen); + } + } //圣骑士护盾效果 if(player.tickCount % 30 == 0) { if(AccessoryUtil.canApplyGuardianShield(player)) { diff --git a/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java b/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java index 9b6825a..1cb0cf7 100644 --- a/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java @@ -4,6 +4,7 @@ import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.PlayerMana; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.weapon.MagicWeapon; import com.lzxnone.terraria.network.payload.ManaSyncPayload; import net.minecraft.server.level.ServerPlayer; @@ -41,16 +42,30 @@ public class PlayerManaSyncEventHandler { @SubscribeEvent public static void onPlayerTick(PlayerTickEvent.Post event) { if(!(event.getEntity() instanceof ServerPlayer player)) return; + + //刷新饰品最大魔力加成(基础/加成分离:水晶升级不受饰品影响) + if(player.tickCount % 20 == 0) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int bonus = AccessoryUtil.getMaxManaBonus(player); + if(mana.getBonusMaxMana() != bonus) { + mana.setBonusMaxMana(bonus); + player.setData(ModAttachments.PLAYER_MANA, mana); + sync(player); + } + } + if(isUsingMagicWeapon(player)) return; PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); - if(mana.tickRecoverDelay()) { + double delayMultiplier = AccessoryUtil.getManaRecoverDelayMultiplier(player); + if(mana.tickRecoverDelay(delayMultiplier)) { player.setData(ModAttachments.PLAYER_MANA, mana); return; } int oldMana = mana.getMana(); - if(!mana.recoverMana(PlayerMana.DEFAULT_RECOVER_RATE)) return; + double regenBonus = AccessoryUtil.getManaRegenBonus(player, mana.getMana(), mana.getMaxMana()); + if(!mana.recoverMana(PlayerMana.DEFAULT_RECOVER_RATE + regenBonus)) return; player.setData(ModAttachments.PLAYER_MANA, mana); if(mana.getMana() != oldMana) { diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index b19d566..366c109 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -161,6 +161,18 @@ public class ModItems { public static final DeferredItem FROZEN_SHIELD = ITEMS.register("frozen_shield", FrozenShield::new); public static final DeferredItem MAGMA_STONE = ITEMS.register("magma_stone", MagmaStone::new); public static final DeferredItem FIRE_GAUNTLET = ITEMS.register("fire_gauntlet", FireGauntlet::new); + public static final DeferredItem LAVA_CHARM = ITEMS.register("lava_charm", LavaCharm::new); + public static final DeferredItem OBSIDIAN_ROSE = ITEMS.register("obsidian_rose", ObsidianRose::new); + public static final DeferredItem MAGMA_SKULL = ITEMS.register("magma_skull", MagmaSkull::new); + public static final DeferredItem MOLTEN_CHARM = ITEMS.register("molten_charm", MoltenCharm::new); + public static final DeferredItem OBSIDIAN_SKULL_ROSE = ITEMS.register("obsidian_skull_rose", ObsidianSkullRose::new); + public static final DeferredItem MOLTEN_SKULL_ROSE = ITEMS.register("molten_skull_rose", MoltenSkullRose::new); + public static final DeferredItem PANIC_NECKLACE = ITEMS.register("panic_necklace", PanicNecklace::new); + public static final DeferredItem SWEETHEART_NECKLACE = ITEMS.register("sweetheart_necklace", SweetheartNecklace::new); + public static final DeferredItem ARCANE_FLOWER = ITEMS.register("arcane_flower", ArcaneFlower::new); + public static final DeferredItem REGENERATION_BAND = ITEMS.register("band_of_regeneration", RegenerationBand::new); + public static final DeferredItem BAND_OF_STARPOWER = ITEMS.register("band_of_starpower", BandOfStarpower::new); + public static final DeferredItem MANA_REGENERATION_BAND = ITEMS.register("mana_regeneration_band", ManaRegenerationBand::new); public static final DeferredItem EYE_OF_GOLEM = ITEMS.register("eye_of_the_golem", EyeOfGolem::new); public static final DeferredItem DESTROYER_EMBLEM = ITEMS.register("destroyer_emblem", DestroyerEmblem::new); public static final DeferredItem MOON_STONE = ITEMS.register("moon_stone", MoonStone::new); diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java index 508d416..38f7bcc 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java @@ -68,6 +68,83 @@ public class AccessoryUtil { }); } + //魔力恢复延迟倍率:取所有饰品中的最小值(减半优先) + public static double getManaRecoverDelayMultiplier(LivingEntity entity) { + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof ManaRegenerationModifier modifier) { + multiplier[0] = Math.min(multiplier[0], modifier.getManaRecoverDelayMultiplier(stack, entity)); + } + }); + return multiplier[0]; + } + + //额外魔力恢复速率:累加所有饰品 + public static double getManaRegenBonus(LivingEntity entity, int currentMana, int maxMana) { + double[] bonus = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof ManaRegenerationModifier modifier) { + bonus[0] += modifier.getManaRegenBonus(stack, entity, currentMana, maxMana); + } + }); + return bonus[0]; + } + + //最大魔力加成:累加所有饰品的加成 + public static int getMaxManaBonus(LivingEntity entity) { + int[] bonus = {0}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof MaxManaModifier modifier) { + bonus[0] += modifier.getMaxManaBonus(stack, entity); + } + }); + return bonus[0]; + } + + //每秒生命回复量:累加所有饰品的生命再生加成 + public static float getHealthPerSecond(LivingEntity entity) { + float[] amount = {0.0F}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof LifeRegenerationModifier modifier) { + amount[0] += modifier.getHealthPerSecond(stack, entity); + } + }); + return amount[0]; + } + + //岩浆免疫时长(刻):取所有饰品中的最大值 + public static int getLavaImmunityTicks(LivingEntity entity) { + int[] ticks = {0}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof LavaImmunityModifier modifier) { + ticks[0] = Math.max(ticks[0], modifier.getLavaImmunityTicks(stack, entity)); + } + }); + return ticks[0]; + } + + //是否佩戴恐慌类饰品(受到攻击后触发加速) + public static boolean canApplyPanic(LivingEntity entity) { + boolean[] result = {false}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof PanicModifier modifier && modifier.canApplyPanic(stack, entity)) { + result[0] = true; + } + }); + return result[0]; + } + + //岩浆伤害减免倍率:取所有饰品中的最大值 + public static double getLavaDamageReduction(LivingEntity entity) { + double[] reduction = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof LavaDamageReductionModifier modifier) { + reduction[0] = Math.max(reduction[0], modifier.getLavaDamageReduction(stack, entity)); + } + }); + return reduction[0]; + } + public static double applyDamageImmunity(LivingEntity entity) { double[] chance = {0.0D}; AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ArcaneFlower.java b/src/main/java/com/lzxnone/terraria/item/accessory/ArcaneFlower.java new file mode 100644 index 0000000..ffb0ebe --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ArcaneFlower.java @@ -0,0 +1,89 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.AutoManaPotionUser; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.ManaCostModifier; +import com.lzxnone.terraria.item.effect.VisibilityModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class ArcaneFlower extends AccessoryItem implements VisibilityModifier, ManaCostModifier, AutoManaPotionUser { + public static final ConfigDouble VISIBILITY_MULTIPLIER = new ConfigDouble( + "accessory.arcane_flower.visibility_multiplier", + "visibility_multiplier", + 0.5D, + 0.0D, + 10.0D + ); + public static final ConfigDouble MANA_COST_MULTIPLIER = new ConfigDouble( + "accessory.arcane_flower.mana_cost_multiplier", + "mana_cost_multiplier", + 0.92D, + 0.0D, + 1.0D + ); + + public ArcaneFlower() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getVisibilityMultiplier(ItemStack stack, LivingEntity entity) { + return VISIBILITY_MULTIPLIER.get(); + } + + @Override + public double getManaCostMultiplier(ItemStack stack, LivingEntity entity) { + return MANA_COST_MULTIPLIER.get(); + } + + @Override + public boolean canAutoUseManaPotion(ItemStack stack, LivingEntity entity) { + return true; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(VISIBILITY_MULTIPLIER, MANA_COST_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "arcane_flower", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/arcane_flower.png"), + Component.translatable("item.lzxnoneterraria.arcane_flower"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(VISIBILITY_MULTIPLIER.get() < 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.aggro_decrease" + ).withStyle(ChatFormatting.GRAY)); + } + if(MANA_COST_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mana_cost_decrease", + EffectTooltipUtil.formatPercent(MANA_COST_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.auto_mana_potion_use" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/BandOfStarpower.java b/src/main/java/com/lzxnone/terraria/item/accessory/BandOfStarpower.java new file mode 100644 index 0000000..7bed88e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/BandOfStarpower.java @@ -0,0 +1,63 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MaxManaModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class BandOfStarpower extends AccessoryItem implements MaxManaModifier { + //最大魔力加成 + public static final ConfigInt MAX_MANA_BONUS = new ConfigInt( + "accessory.band_of_starpower.max_mana_bonus", + "max_mana_bonus", + 20, + 0, + 400 + ); + + public BandOfStarpower() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public int getMaxManaBonus(ItemStack stack, LivingEntity entity) { + return MAX_MANA_BONUS.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MAX_MANA_BONUS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "band_of_starpower", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/band_of_starpower.png"), + Component.translatable("item.lzxnoneterraria.band_of_starpower"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MAX_MANA_BONUS.get() > 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.max_mana_bonus", + EffectTooltipUtil.formatNumber(MAX_MANA_BONUS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java index b038482..74bf9b5 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java @@ -7,6 +7,7 @@ import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; import com.lzxnone.terraria.item.effect.CriticalStrikeModifier; import com.lzxnone.terraria.item.effect.DamageModifier; import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.LifeRegenerationModifier; import com.lzxnone.terraria.item.effect.MeleeCritChanceModifier; import com.lzxnone.terraria.item.effect.MeleeDamageModifier; import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; @@ -30,7 +31,7 @@ import top.theillusivec4.curios.api.SlotContext; import java.util.List; -public class CelestialShell extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier, MeleeDamageModifier, MeleeCritChanceModifier, WaterBreathingModifier, ConditionalAttributeModifier { +public class CelestialShell extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier, MeleeDamageModifier, MeleeCritChanceModifier, LifeRegenerationModifier, WaterBreathingModifier, ConditionalAttributeModifier { //天界石(全天候) public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble( "accessory.celestial_shell.damage_multiplier", @@ -125,6 +126,22 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri 1.0D, 10.0D ); + //生命再生:天界石(全天候) + public static final ConfigDouble LIFE_REGEN = new ConfigDouble( + "accessory.celestial_shell.life_regen", + "health_per_second", + 0.2D, + 0.0D, + 1000.0D + ); + //生命再生:狼人(夜晚) + public static final ConfigDouble WOLF_LIFE_REGEN = new ConfigDouble( + "accessory.celestial_shell.wolf_life_regen", + "health_per_second", + 0.1D, + 0.0D, + 1000.0D + ); public CelestialShell() { super(new Item.Properties().stacksTo(1)); @@ -146,6 +163,15 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri return MINION_KNOCKBACK_MULTIPLIER.get(); } + @Override + public float getHealthPerSecond(ItemStack stack, LivingEntity entity) { + float regen = LIFE_REGEN.get().floatValue(); + if(entity.level().isNight()) { + regen += WOLF_LIFE_REGEN.get().floatValue(); + } + return regen; + } + //狼人(夜晚) @Override public double getMeleeDamageMultiplier(ItemStack stack, LivingEntity entity) { @@ -200,6 +226,8 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri ) ); } + //狼人(夜晚)/人鱼(水中)属性:穿戴瞬间按当前条件追加,切换由 syncConditionalModifiers 接管 + modifiers.putAll(getConditionalModifiers(stack, slotContext.entity())); return modifiers; } @@ -292,7 +320,7 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri public void onConfigLoad() { ConfigStruct.loadAll(DAMAGE_MULTIPLIER, CRIT_CHANCE, ATTACK_SPEED, DEFENSE, MINING_SPEED, MINION_KNOCKBACK_MULTIPLIER, MELEE_CRIT_CHANCE, MELEE_DAMAGE_MULTIPLIER, WOLF_ATTACK_SPEED, WOLF_DEFENSE, WOLF_MOVE_SPEED, JUMP_HEIGHT, - MOVE_SPEED); + MOVE_SPEED, LIFE_REGEN, WOLF_LIFE_REGEN); } }; @@ -343,10 +371,16 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get()) ).withStyle(ChatFormatting.GRAY)); } + if(LIFE_REGEN.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.life_regen", + EffectTooltipUtil.formatNumber(LIFE_REGEN.get()) + ).withStyle(ChatFormatting.GRAY)); + } //狼人(夜晚) tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.active_at_night" - ).withStyle(ChatFormatting.GRAY)); + ).withStyle(ChatFormatting.GREEN)); if(MELEE_CRIT_CHANCE.get() > 0.0D) { tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.melee_crit_chance_bonus", @@ -382,10 +416,16 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri "tooltip.lzxnoneterraria.jump_boost" ).withStyle(ChatFormatting.GRAY)); } + if(WOLF_LIFE_REGEN.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.life_regen", + EffectTooltipUtil.formatNumber(WOLF_LIFE_REGEN.get()) + ).withStyle(ChatFormatting.GRAY)); + } //人鱼(水中) tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.active_in_water" - ).withStyle(ChatFormatting.GRAY)); + ).withStyle(ChatFormatting.GREEN)); if(MOVE_SPEED.get() != 1.0D) { tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.move_speed_bonus", diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialStone.java index 9747db8..e0b3985 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialStone.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialStone.java @@ -6,6 +6,7 @@ import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.effect.CriticalStrikeModifier; import com.lzxnone.terraria.item.effect.DamageModifier; import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.LifeRegenerationModifier; import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; @@ -26,7 +27,7 @@ import top.theillusivec4.curios.api.SlotContext; import java.util.List; -public class CelestialStone extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier { +public class CelestialStone extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier, LifeRegenerationModifier { public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble( "accessory.celestial_stone.damage_multiplier", "damage_multiplier", @@ -69,6 +70,13 @@ public class CelestialStone extends AccessoryItem implements DamageModifier, Cri 1.0D, 10.0D ); + public static final ConfigDouble LIFE_REGEN = new ConfigDouble( + "accessory.celestial_stone.life_regen", + "health_per_second", + 0.2D, + 0.0D, + 1000.0D + ); public CelestialStone() { super(new Item.Properties().stacksTo(1)); @@ -89,6 +97,11 @@ public class CelestialStone extends AccessoryItem implements DamageModifier, Cri return MINION_KNOCKBACK_MULTIPLIER.get(); } + @Override + public float getHealthPerSecond(ItemStack stack, LivingEntity entity) { + return LIFE_REGEN.get().floatValue(); + } + @Override public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); @@ -131,7 +144,7 @@ public class CelestialStone extends AccessoryItem implements DamageModifier, Cri public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigStruct.loadAll(DAMAGE_MULTIPLIER, CRIT_CHANCE, ATTACK_SPEED, DEFENSE, MINING_SPEED, MINION_KNOCKBACK_MULTIPLIER); + ConfigStruct.loadAll(DAMAGE_MULTIPLIER, CRIT_CHANCE, ATTACK_SPEED, DEFENSE, MINING_SPEED, MINION_KNOCKBACK_MULTIPLIER, LIFE_REGEN); } }; @@ -181,5 +194,11 @@ public class CelestialStone extends AccessoryItem implements DamageModifier, Cri EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get()) ).withStyle(ChatFormatting.GRAY)); } + if(LIFE_REGEN.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.life_regen", + EffectTooltipUtil.formatNumber(LIFE_REGEN.get()) + ).withStyle(ChatFormatting.GRAY)); + } } } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/LavaCharm.java b/src/main/java/com/lzxnone/terraria/item/accessory/LavaCharm.java new file mode 100644 index 0000000..187a4cd --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/LavaCharm.java @@ -0,0 +1,62 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.LavaImmunityModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class LavaCharm extends AccessoryItem implements LavaImmunityModifier { + public static final ConfigInt IMMUNITY_TICKS = new ConfigInt( + "accessory.lava_charm.immunity_ticks", + "lava_immunity_ticks", + 140, + 0, + 1200 + ); + + public LavaCharm() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public int getLavaImmunityTicks(ItemStack stack, LivingEntity entity) { + return IMMUNITY_TICKS.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(IMMUNITY_TICKS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "lava_charm", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/lava_charm.png"), + Component.translatable("item.lzxnoneterraria.lava_charm"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(IMMUNITY_TICKS.get() > 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.lava_immunity", + EffectTooltipUtil.formatNumber(IMMUNITY_TICKS.get() / 20.0D) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MagmaSkull.java b/src/main/java/com/lzxnone/terraria/item/accessory/MagmaSkull.java new file mode 100644 index 0000000..c4cb5cd --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MagmaSkull.java @@ -0,0 +1,71 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.FireBlockImmunityModifier; +import com.lzxnone.terraria.item.effect.LavaImmunityModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class MagmaSkull extends AccessoryItem implements FireBlockImmunityModifier, LavaImmunityModifier { + public static final ConfigInt IMMUNITY_TICKS = new ConfigInt( + "accessory.magma_skull.immunity_ticks", + "lava_immunity_ticks", + 140, + 0, + 1200 + ); + + public MagmaSkull() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public int getLavaImmunityTicks(ItemStack stack, LivingEntity entity) { + return IMMUNITY_TICKS.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(IMMUNITY_TICKS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "magma_skull", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/magma_skull.png"), + Component.translatable("item.lzxnoneterraria.magma_skull"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.fire_block_immunity" + ).withStyle(ChatFormatting.GRAY)); + if(IMMUNITY_TICKS.get() > 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.lava_immunity", + EffectTooltipUtil.formatNumber(IMMUNITY_TICKS.get() / 20.0D) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ManaRegenerationBand.java b/src/main/java/com/lzxnone/terraria/item/accessory/ManaRegenerationBand.java new file mode 100644 index 0000000..32e56a4 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ManaRegenerationBand.java @@ -0,0 +1,108 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.ManaRegenerationModifier; +import com.lzxnone.terraria.item.effect.MaxManaModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class ManaRegenerationBand extends AccessoryItem implements ManaRegenerationModifier, MaxManaModifier { + //最大魔力加成 + public static final ConfigInt MAX_MANA_BONUS = new ConfigInt( + "accessory.mana_regeneration_band.max_mana_bonus", + "max_mana_bonus", + 20, + 0, + 400 + ); + public static final ConfigDouble RECOVER_DELAY_MULTIPLIER = new ConfigDouble( + "accessory.mana_regeneration_band.recover_delay_multiplier", + "mana_regen_delay_multiplier", + 0.5D, + 0.1D, + 1.0D + ); + public static final ConfigDouble REGEN_BONUS_SCALE = new ConfigDouble( + "accessory.mana_regeneration_band.regen_bonus_scale", + "mana_regen_bonus_scale", + 11.5D, + 0.0D, + 400.0D + ); + public static final ConfigDouble REGEN_BONUS_BASE = new ConfigDouble( + "accessory.mana_regeneration_band.regen_bonus_base", + "mana_regen_bonus_base", + 2.875D, + 0.0D, + 400.0D + ); + + public ManaRegenerationBand() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public int getMaxManaBonus(ItemStack stack, LivingEntity entity) { + return MAX_MANA_BONUS.get(); + } + + @Override + public double getManaRecoverDelayMultiplier(ItemStack stack, LivingEntity entity) { + return RECOVER_DELAY_MULTIPLIER.get(); + } + + @Override + public double getManaRegenBonus(ItemStack stack, LivingEntity entity, int currentMana, int maxMana) { + double ratio = maxMana > 0 ? (double) currentMana / maxMana : 0.0D; + return REGEN_BONUS_SCALE.get() * ratio + REGEN_BONUS_BASE.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MAX_MANA_BONUS, RECOVER_DELAY_MULTIPLIER, REGEN_BONUS_SCALE, REGEN_BONUS_BASE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "mana_regeneration_band", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/mana_regeneration_band.png"), + Component.translatable("item.lzxnoneterraria.mana_regeneration_band"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MAX_MANA_BONUS.get() > 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.max_mana_bonus", + EffectTooltipUtil.formatNumber(MAX_MANA_BONUS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(RECOVER_DELAY_MULTIPLIER.get() < 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mana_regen_delay", + EffectTooltipUtil.formatPercent(RECOVER_DELAY_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(REGEN_BONUS_SCALE.get() > 0.0D || REGEN_BONUS_BASE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mana_regen_boost" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoltenCharm.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoltenCharm.java new file mode 100644 index 0000000..e4616c3 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoltenCharm.java @@ -0,0 +1,71 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.FireBlockImmunityModifier; +import com.lzxnone.terraria.item.effect.LavaImmunityModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class MoltenCharm extends AccessoryItem implements FireBlockImmunityModifier, LavaImmunityModifier { + public static final ConfigInt IMMUNITY_TICKS = new ConfigInt( + "accessory.molten_charm.immunity_ticks", + "lava_immunity_ticks", + 140, + 0, + 1200 + ); + + public MoltenCharm() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public int getLavaImmunityTicks(ItemStack stack, LivingEntity entity) { + return IMMUNITY_TICKS.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(IMMUNITY_TICKS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "molten_charm", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/molten_charm.png"), + Component.translatable("item.lzxnoneterraria.molten_charm"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.fire_block_immunity" + ).withStyle(ChatFormatting.GRAY)); + if(IMMUNITY_TICKS.get() > 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.lava_immunity", + EffectTooltipUtil.formatNumber(IMMUNITY_TICKS.get() / 20.0D) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoltenSkullRose.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoltenSkullRose.java new file mode 100644 index 0000000..48b463d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoltenSkullRose.java @@ -0,0 +1,91 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.FireBlockImmunityModifier; +import com.lzxnone.terraria.item.effect.LavaDamageReductionModifier; +import com.lzxnone.terraria.item.effect.LavaImmunityModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class MoltenSkullRose extends AccessoryItem implements FireBlockImmunityModifier, LavaImmunityModifier, LavaDamageReductionModifier { + public static final ConfigInt IMMUNITY_TICKS = new ConfigInt( + "accessory.molten_skull_rose.immunity_ticks", + "lava_immunity_ticks", + 140, + 0, + 1200 + ); + public static final ConfigDouble DAMAGE_REDUCTION = new ConfigDouble( + "accessory.molten_skull_rose.damage_reduction", + "lava_damage_reduction", + 0.5D, + 0.0D, + 1.0D + ); + + public MoltenSkullRose() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public int getLavaImmunityTicks(ItemStack stack, LivingEntity entity) { + return IMMUNITY_TICKS.get(); + } + + @Override + public double getLavaDamageReduction(ItemStack stack, LivingEntity entity) { + return DAMAGE_REDUCTION.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(IMMUNITY_TICKS, DAMAGE_REDUCTION); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "molten_skull_rose", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/molten_skull_rose.png"), + Component.translatable("item.lzxnoneterraria.molten_skull_rose"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.fire_block_immunity" + ).withStyle(ChatFormatting.GRAY)); + if(IMMUNITY_TICKS.get() > 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.lava_immunity", + EffectTooltipUtil.formatNumber(IMMUNITY_TICKS.get() / 20.0D) + ).withStyle(ChatFormatting.GRAY)); + } + if(DAMAGE_REDUCTION.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.lava_damage_reduction", + EffectTooltipUtil.formatPercent(DAMAGE_REDUCTION.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java index 500548e..e37631c 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java @@ -5,6 +5,7 @@ import com.google.common.collect.MultimapBuilder; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.LifeRegenerationModifier; import com.lzxnone.terraria.item.effect.MeleeCritChanceModifier; import com.lzxnone.terraria.item.effect.MeleeDamageModifier; import com.lzxnone.terraria.ui.config.ConfigListItem; @@ -26,7 +27,7 @@ import top.theillusivec4.curios.api.SlotContext; import java.util.List; -public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, ConditionalAttributeModifier { +public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, LifeRegenerationModifier, ConditionalAttributeModifier { public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble( "accessory.moon_charm.melee_damage_multiplier", "melee_damage_multiplier", @@ -69,6 +70,13 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel 1.0D, 10.0D ); + public static final ConfigDouble LIFE_REGEN = new ConfigDouble( + "accessory.moon_charm.life_regen", + "health_per_second", + 0.1D, + 0.0D, + 1000.0D + ); public MoonCharm() { super(new Item.Properties().stacksTo(1)); @@ -84,10 +92,14 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel return entity.level().isNight() ? MELEE_CRIT_CHANCE.get() : 0.0D; } + @Override + public float getHealthPerSecond(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? LIFE_REGEN.get().floatValue() : 0.0F; + } + @Override public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { - //条件属性由 AccessoryUtil.syncConditionalModifiers 动态管理,不走 curios 自动应用 - return MultimapBuilder.hashKeys().arrayListValues().build(); + return getConditionalModifiers(stack, slotContext.entity()); } @Override @@ -154,7 +166,7 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER, MELEE_CRIT_CHANCE, ATTACK_SPEED, MOVE_SPEED, DEFENSE, JUMP_HEIGHT); + ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER, MELEE_CRIT_CHANCE, ATTACK_SPEED, MOVE_SPEED, DEFENSE, JUMP_HEIGHT, LIFE_REGEN); } }; @@ -170,7 +182,7 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.active_at_night" - ).withStyle(ChatFormatting.GRAY)); + ).withStyle(ChatFormatting.GREEN)); if(MELEE_CRIT_CHANCE.get() > 0.0D) { tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.melee_crit_chance_bonus", @@ -206,5 +218,11 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel "tooltip.lzxnoneterraria.jump_boost" ).withStyle(ChatFormatting.GRAY)); } + if(LIFE_REGEN.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.life_regen", + EffectTooltipUtil.formatNumber(LIFE_REGEN.get()) + ).withStyle(ChatFormatting.GRAY)); + } } } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java index 4df5692..78cfad6 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java @@ -5,6 +5,7 @@ import com.google.common.collect.MultimapBuilder; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.LifeRegenerationModifier; import com.lzxnone.terraria.item.effect.MeleeCritChanceModifier; import com.lzxnone.terraria.item.effect.MeleeDamageModifier; import com.lzxnone.terraria.item.effect.WaterBreathingModifier; @@ -27,7 +28,7 @@ import top.theillusivec4.curios.api.SlotContext; import java.util.List; -public class MoonShell extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, WaterBreathingModifier, ConditionalAttributeModifier { +public class MoonShell extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, LifeRegenerationModifier, WaterBreathingModifier, ConditionalAttributeModifier { public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble( "accessory.moon_shell.melee_damage_multiplier", "melee_damage_multiplier", @@ -70,6 +71,13 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel 1.0D, 10.0D ); + public static final ConfigDouble LIFE_REGEN = new ConfigDouble( + "accessory.moon_shell.life_regen", + "health_per_second", + 0.1D, + 0.0D, + 1000.0D + ); public static final ConfigDouble MOVE_SPEED = new ConfigDouble( "accessory.moon_shell.move_speed", "move_speed", @@ -92,6 +100,11 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel return entity.level().isNight() ? MELEE_CRIT_CHANCE.get() : 0.0D; } + @Override + public float getHealthPerSecond(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? LIFE_REGEN.get().floatValue() : 0.0F; + } + @Override public boolean canBreatheUnderwater(ItemStack stack, LivingEntity entity) { return true; @@ -99,7 +112,7 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel @Override public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { - return MultimapBuilder.hashKeys().arrayListValues().build(); + return getConditionalModifiers(stack, slotContext.entity()); } @Override @@ -188,7 +201,7 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER, MELEE_CRIT_CHANCE, ATTACK_SPEED, DEFENSE, JUMP_HEIGHT, WOLF_MOVE_SPEED, MOVE_SPEED); + ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER, MELEE_CRIT_CHANCE, ATTACK_SPEED, DEFENSE, JUMP_HEIGHT, WOLF_MOVE_SPEED, LIFE_REGEN, MOVE_SPEED); } }; @@ -205,7 +218,7 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel //狼人(夜晚) tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.active_at_night" - ).withStyle(ChatFormatting.GRAY)); + ).withStyle(ChatFormatting.GREEN)); if(MELEE_CRIT_CHANCE.get() > 0.0D) { tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.melee_crit_chance_bonus", @@ -235,6 +248,12 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel "tooltip.lzxnoneterraria.jump_boost" ).withStyle(ChatFormatting.GRAY)); } + if(LIFE_REGEN.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.life_regen", + EffectTooltipUtil.formatNumber(LIFE_REGEN.get()) + ).withStyle(ChatFormatting.GRAY)); + } if(WOLF_MOVE_SPEED.get() != 1.0D) { tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.move_speed_bonus", @@ -244,7 +263,7 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel //人鱼(水中) tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.active_in_water" - ).withStyle(ChatFormatting.GRAY)); + ).withStyle(ChatFormatting.GREEN)); if(MOVE_SPEED.get() != 1.0D) { tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.move_speed_bonus", diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java index e935af5..276b43d 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java @@ -92,7 +92,7 @@ public class MoonStone extends AccessoryItem implements DamageModifier, Critical @Override public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { - return MultimapBuilder.hashKeys().arrayListValues().build(); + return getConditionalModifiers(stack, slotContext.entity()); } @Override @@ -164,7 +164,7 @@ public class MoonStone extends AccessoryItem implements DamageModifier, Critical super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.active_at_night" - ).withStyle(ChatFormatting.GRAY)); + ).withStyle(ChatFormatting.GREEN)); if(DAMAGE_MULTIPLIER.get() != 1.0D) { tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.damage_increase", diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java index d04b625..1d56502 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java @@ -45,8 +45,7 @@ public class NeptunesShell extends AccessoryItem implements WaterBreathingModifi @Override public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { - //条件属性由 AccessoryUtil.syncConditionalModifiers 动态管理,不走 curios 自动应用 - return MultimapBuilder.hashKeys().arrayListValues().build(); + return getConditionalModifiers(stack, slotContext.entity()); } @Override @@ -96,7 +95,7 @@ public class NeptunesShell extends AccessoryItem implements WaterBreathingModifi super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.active_in_water" - ).withStyle(ChatFormatting.GRAY)); + ).withStyle(ChatFormatting.GREEN)); if(MOVE_SPEED.get() != 1.0D) { tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.move_speed_bonus", diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianRose.java b/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianRose.java new file mode 100644 index 0000000..d6cc143 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianRose.java @@ -0,0 +1,62 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.LavaDamageReductionModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class ObsidianRose extends AccessoryItem implements LavaDamageReductionModifier { + public static final ConfigDouble DAMAGE_REDUCTION = new ConfigDouble( + "accessory.obsidian_rose.damage_reduction", + "lava_damage_reduction", + 0.5D, + 0.0D, + 1.0D + ); + + public ObsidianRose() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getLavaDamageReduction(ItemStack stack, LivingEntity entity) { + return DAMAGE_REDUCTION.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_REDUCTION); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "obsidian_rose", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/obsidian_rose.png"), + Component.translatable("item.lzxnoneterraria.obsidian_rose"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(DAMAGE_REDUCTION.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.lava_damage_reduction", + EffectTooltipUtil.formatPercent(DAMAGE_REDUCTION.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianSkullRose.java b/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianSkullRose.java new file mode 100644 index 0000000..a417436 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianSkullRose.java @@ -0,0 +1,71 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.FireBlockImmunityModifier; +import com.lzxnone.terraria.item.effect.LavaDamageReductionModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class ObsidianSkullRose extends AccessoryItem implements FireBlockImmunityModifier, LavaDamageReductionModifier { + public static final ConfigDouble DAMAGE_REDUCTION = new ConfigDouble( + "accessory.obsidian_skull_rose.damage_reduction", + "lava_damage_reduction", + 0.5D, + 0.0D, + 1.0D + ); + + public ObsidianSkullRose() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public double getLavaDamageReduction(ItemStack stack, LivingEntity entity) { + return DAMAGE_REDUCTION.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_REDUCTION); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "obsidian_skull_rose", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/obsidian_skull_rose.png"), + Component.translatable("item.lzxnoneterraria.obsidian_skull_rose"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.fire_block_immunity" + ).withStyle(ChatFormatting.GRAY)); + if(DAMAGE_REDUCTION.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.lava_damage_reduction", + EffectTooltipUtil.formatPercent(DAMAGE_REDUCTION.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/PanicNecklace.java b/src/main/java/com/lzxnone/terraria/item/accessory/PanicNecklace.java new file mode 100644 index 0000000..efedb84 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/PanicNecklace.java @@ -0,0 +1,59 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.PanicModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class PanicNecklace extends AccessoryItem implements PanicModifier { + //恐慌持续时间(刻) + public static final ConfigInt DURATION = new ConfigInt( + "accessory.panic_necklace.duration", + "panic_duration", + 160, + 0, + 1200 + ); + + public PanicNecklace() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean canApplyPanic(ItemStack stack, LivingEntity entity) { + return true; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DURATION); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "panic_necklace", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/panic_necklace.png"), + Component.translatable("item.lzxnoneterraria.panic_necklace"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.panic" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/RegenerationBand.java b/src/main/java/com/lzxnone/terraria/item/accessory/RegenerationBand.java new file mode 100644 index 0000000..56bfbad --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/RegenerationBand.java @@ -0,0 +1,63 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.LifeRegenerationModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class RegenerationBand extends AccessoryItem implements LifeRegenerationModifier { + //每秒生命回复量 + public static final ConfigDouble HEALTH_PER_SECOND = new ConfigDouble( + "accessory.band_of_regeneration.health_per_second", + "health_per_second", + 0.2D, + 0.0D, + 1000.0D + ); + + public RegenerationBand() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public float getHealthPerSecond(ItemStack stack, LivingEntity entity) { + return HEALTH_PER_SECOND.get().floatValue(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(HEALTH_PER_SECOND); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "band_of_regeneration", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/band_of_regeneration.png"), + Component.translatable("item.lzxnoneterraria.band_of_regeneration"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(HEALTH_PER_SECOND.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.life_regen", + EffectTooltipUtil.formatNumber(HEALTH_PER_SECOND.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java index 91b5580..fe28bfd 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java @@ -92,8 +92,7 @@ public class SunStone extends AccessoryItem implements DamageModifier, CriticalS @Override public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { - //条件属性由 AccessoryUtil.syncConditionalModifiers 动态管理,不走 curios 自动应用 - return MultimapBuilder.hashKeys().arrayListValues().build(); + return getConditionalModifiers(stack, slotContext.entity()); } @Override @@ -165,7 +164,7 @@ public class SunStone extends AccessoryItem implements DamageModifier, CriticalS super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.active_at_day" - ).withStyle(ChatFormatting.GRAY)); + ).withStyle(ChatFormatting.GREEN)); if(DAMAGE_MULTIPLIER.get() != 1.0D) { tooltipComponents.add(Component.translatable( "tooltip.lzxnoneterraria.damage_increase", diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/SweetheartNecklace.java b/src/main/java/com/lzxnone/terraria/item/accessory/SweetheartNecklace.java new file mode 100644 index 0000000..721706a --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/SweetheartNecklace.java @@ -0,0 +1,91 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.BeeSummoner; +import com.lzxnone.terraria.item.effect.PanicModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class SweetheartNecklace extends AccessoryItem implements PanicModifier, BeeSummoner { + //恐慌持续时间(刻) + public static final ConfigInt DURATION = new ConfigInt( + "accessory.sweetheart_necklace.duration", + "panic_duration", + 160, + 0, + 1200 + ); + //受击释放的蜜蜂数量 + public static final ConfigInt BEE_SUMMON_MAX_COUNT = new ConfigInt( + "accessory.sweetheart_necklace.bee_summon_max_count", + "bee_summon_max_count", + 3, + 0, + 100 + ); + public static final ConfigDouble BEE_SUMMON_DAMAGE = new ConfigDouble( + "accessory.sweetheart_necklace.bee_summon_damage", + "bee_summon_damage", + 2.0D, + 0.0D, + 1000.0D + ); + + public SweetheartNecklace() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean canApplyPanic(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public int getBeeSummonMaxCount(ItemStack stack, LivingEntity entity) { + return BEE_SUMMON_MAX_COUNT.get(); + } + + @Override + public double getBeeSummonDamage(ItemStack stack, LivingEntity entity) { + return BEE_SUMMON_DAMAGE.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DURATION, BEE_SUMMON_MAX_COUNT, BEE_SUMMON_DAMAGE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "sweetheart_necklace", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/sweetheart_necklace.png"), + Component.translatable("item.lzxnoneterraria.sweetheart_necklace"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(BEE_SUMMON_MAX_COUNT.get() > 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.bee_summon" + ).withStyle(ChatFormatting.GRAY)); + } + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.panic" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/LavaDamageReductionModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/LavaDamageReductionModifier.java new file mode 100644 index 0000000..bc7a8bc --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/LavaDamageReductionModifier.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface LavaDamageReductionModifier { + //岩浆伤害减免倍率(0~1,如 0.5 = 减免 50%) + double getLavaDamageReduction(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/LavaImmunityModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/LavaImmunityModifier.java new file mode 100644 index 0000000..fcdf9f4 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/LavaImmunityModifier.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface LavaImmunityModifier { + //提供的岩浆免疫时长(刻) + int getLavaImmunityTicks(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/LifeRegenerationModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/LifeRegenerationModifier.java new file mode 100644 index 0000000..74b5b71 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/LifeRegenerationModifier.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface LifeRegenerationModifier { + //每秒生命回复量(HP/s) + float getHealthPerSecond(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/ManaRegenerationModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/ManaRegenerationModifier.java new file mode 100644 index 0000000..c598b71 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/ManaRegenerationModifier.java @@ -0,0 +1,11 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface ManaRegenerationModifier { + //魔力恢复延迟倍率(0.5 = 减半) + double getManaRecoverDelayMultiplier(ItemStack stack, LivingEntity entity); + //额外魔力恢复速率(点/秒),按当前魔力水平计算 + double getManaRegenBonus(ItemStack stack, LivingEntity entity, int currentMana, int maxMana); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MaxManaModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MaxManaModifier.java new file mode 100644 index 0000000..3d4e30e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/MaxManaModifier.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface MaxManaModifier { + //最大魔力加成 + int getMaxManaBonus(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/PanicModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/PanicModifier.java new file mode 100644 index 0000000..867aab2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/PanicModifier.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface PanicModifier { + //受到攻击后是否触发恐慌加速 + boolean canApplyPanic(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java b/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java index b613063..8765594 100644 --- a/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java +++ b/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java @@ -29,7 +29,8 @@ public class ManaCrystal extends Food { @Override protected boolean canEat(Level level, Player player, ItemStack stack) { - return player.getData(ModAttachments.PLAYER_MANA).getMaxMana() < MAX_MANA; + //只看基础最大魔力(水晶升级部分),饰品加成不会顶掉水晶使用次数 + return player.getData(ModAttachments.PLAYER_MANA).getBaseMaxMana() < MAX_MANA; } @Override diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java index acdb4a0..81f5a79 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -9,6 +9,7 @@ import com.lzxnone.terraria.effect.ManaSicknessEffect; import com.lzxnone.terraria.effect.MidasEffect; import com.lzxnone.terraria.effect.PaladinsShieldEffect; import com.lzxnone.terraria.effect.IceBarrierEffect; +import com.lzxnone.terraria.effect.PanicEffect; import com.lzxnone.terraria.effect.SummonEffect; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.client.config.RenderConfigs; @@ -49,6 +50,18 @@ import com.lzxnone.terraria.item.accessory.HeroShield; import com.lzxnone.terraria.item.accessory.FrozenTurtleShell; import com.lzxnone.terraria.item.accessory.FrozenShield; import com.lzxnone.terraria.item.accessory.FireGauntlet; +import com.lzxnone.terraria.item.accessory.LavaCharm; +import com.lzxnone.terraria.item.accessory.ObsidianRose; +import com.lzxnone.terraria.item.accessory.MagmaSkull; +import com.lzxnone.terraria.item.accessory.MoltenCharm; +import com.lzxnone.terraria.item.accessory.ObsidianSkullRose; +import com.lzxnone.terraria.item.accessory.MoltenSkullRose; +import com.lzxnone.terraria.item.accessory.PanicNecklace; +import com.lzxnone.terraria.item.accessory.SweetheartNecklace; +import com.lzxnone.terraria.item.accessory.ArcaneFlower; +import com.lzxnone.terraria.item.accessory.RegenerationBand; +import com.lzxnone.terraria.item.accessory.BandOfStarpower; +import com.lzxnone.terraria.item.accessory.ManaRegenerationBand; import com.lzxnone.terraria.item.accessory.EyeOfGolem; import com.lzxnone.terraria.item.accessory.DestroyerEmblem; import com.lzxnone.terraria.item.accessory.MoonStone; @@ -174,7 +187,8 @@ public class ConfigList { ManaSicknessEffect.CONFIG_LIST_ITEM, SummonEffect.CONFIG_LIST_ITEM, PaladinsShieldEffect.CONFIG_LIST_ITEM, - IceBarrierEffect.CONFIG_LIST_ITEM + IceBarrierEffect.CONFIG_LIST_ITEM, + PanicEffect.CONFIG_LIST_ITEM }); ITEMS.put(AMMO, new ConfigListItem[]{ MusketBall.CONFIG_LIST_ITEM, @@ -230,6 +244,18 @@ public class ConfigList { FrozenTurtleShell.CONFIG_LIST_ITEM, FrozenShield.CONFIG_LIST_ITEM, FireGauntlet.CONFIG_LIST_ITEM, + LavaCharm.CONFIG_LIST_ITEM, + ObsidianRose.CONFIG_LIST_ITEM, + MagmaSkull.CONFIG_LIST_ITEM, + MoltenCharm.CONFIG_LIST_ITEM, + ObsidianSkullRose.CONFIG_LIST_ITEM, + MoltenSkullRose.CONFIG_LIST_ITEM, + PanicNecklace.CONFIG_LIST_ITEM, + SweetheartNecklace.CONFIG_LIST_ITEM, + ArcaneFlower.CONFIG_LIST_ITEM, + RegenerationBand.CONFIG_LIST_ITEM, + BandOfStarpower.CONFIG_LIST_ITEM, + ManaRegenerationBand.CONFIG_LIST_ITEM, EyeOfGolem.CONFIG_LIST_ITEM, DestroyerEmblem.CONFIG_LIST_ITEM, MoonStone.CONFIG_LIST_ITEM, diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 5048503..38d50b3 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -137,6 +137,18 @@ "item.lzxnoneterraria.frozen_shield": "Frozen Shield", "item.lzxnoneterraria.magma_stone": "Magma Stone", "item.lzxnoneterraria.fire_gauntlet": "Fire Gauntlet", + "item.lzxnoneterraria.lava_charm": "Lava Charm", + "item.lzxnoneterraria.obsidian_rose": "Obsidian Rose", + "item.lzxnoneterraria.magma_skull": "Magma Skull", + "item.lzxnoneterraria.molten_charm": "Molten Charm", + "item.lzxnoneterraria.obsidian_skull_rose": "Obsidian Skull Rose", + "item.lzxnoneterraria.molten_skull_rose": "Molten Skull Rose", + "item.lzxnoneterraria.panic_necklace": "Panic Necklace", + "item.lzxnoneterraria.sweetheart_necklace": "Sweetheart Necklace", + "item.lzxnoneterraria.arcane_flower": "Arcane Flower", + "item.lzxnoneterraria.band_of_regeneration": "Band of Regeneration", + "item.lzxnoneterraria.band_of_starpower": "Band of Starpower", + "item.lzxnoneterraria.mana_regeneration_band": "Mana Regeneration Band", "item.lzxnoneterraria.eye_of_the_golem": "Eye of the Golem", "item.lzxnoneterraria.destroyer_emblem": "Destroyer Emblem", "item.lzxnoneterraria.moon_stone": "Moon Stone", @@ -213,8 +225,28 @@ "tooltip.lzxnoneterraria.fire_block_immunity": "Immune to Fire Blocks", "tooltip.lzxnoneterraria.freeze_immunity": "Immune to Freezing", "tooltip.lzxnoneterraria.damage_immunity": "%s%% chance to negate incoming damage", + "tooltip.lzxnoneterraria.lava_immunity": "Immune to lava for %s seconds", + "tooltip.lzxnoneterraria.lava_damage_reduction": "Lava damage -%s%%", + "tooltip.lzxnoneterraria.panic": "Increases movement speed after taking damage", + "tooltip.lzxnoneterraria.life_regen": "Life Regeneration +%s", "lzxnoneterraria.configuration.damage_immunity": "Damage Immunity", "lzxnoneterraria.configuration.damage_immunity.tooltip": "Chance to negate incoming damage", + "lzxnoneterraria.configuration.lava_immunity_ticks": "Lava Immunity Duration (ticks)", + "lzxnoneterraria.configuration.lava_immunity_ticks.tooltip": "Immunity duration gained when entering lava, gradually recovers after leaving", + "lzxnoneterraria.configuration.health_per_second": "Health Regeneration Per Second", + "lzxnoneterraria.configuration.health_per_second.tooltip": "Health regenerated per second while equipped", + "lzxnoneterraria.configuration.max_mana_bonus": "Max Mana Bonus", + "lzxnoneterraria.configuration.max_mana_bonus.tooltip": "Max mana gained while equipped", + "lzxnoneterraria.configuration.mana_regen_delay_multiplier": "Mana Regen Delay Multiplier", + "lzxnoneterraria.configuration.mana_regen_delay_multiplier.tooltip": "Multiplier for the mana recovery delay while equipped (0.5 = halved)", + "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_base": "Mana Regen Bonus Base", + "lzxnoneterraria.configuration.mana_regen_bonus_base.tooltip": "Bonus regen when current mana is 0 (points per second)", + "lzxnoneterraria.configuration.lava_damage_reduction": "Lava Damage Reduction", + "lzxnoneterraria.configuration.lava_damage_reduction.tooltip": "Reduces lava damage taken while equipped", + "lzxnoneterraria.configuration.panic_duration": "Panic Duration", + "lzxnoneterraria.configuration.panic_duration.tooltip": "Duration of the speed boost after taking damage while equipped, in ticks", "tooltip.lzxnoneterraria.damage_increase": "Damage +%s%%", "tooltip.lzxnoneterraria.crit_chance_bonus": "Critical Strike Chance +%s%%", @@ -294,6 +326,9 @@ "tooltip.lzxnoneterraria.magic_damage_decrease": "-%s%% magic damage", "tooltip.lzxnoneterraria.mana_cost_increase": "+%s%% mana cost", "tooltip.lzxnoneterraria.mana_cost_decrease": "-%s%% mana cost", + "tooltip.lzxnoneterraria.max_mana_bonus": "Mana +%s", + "tooltip.lzxnoneterraria.mana_regen_delay": "Mana regen delay -%s%%", + "tooltip.lzxnoneterraria.mana_regen_boost": "Increases mana regeneration rate", "tooltip.lzxnoneterraria.auto_mana_potion_use": "Automatically uses mana potions when mana runs out", "lzxnoneterraria.configuration.magic_damage_multiplier": "Magic Damage Multiplier", "lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "Magic damage is multiplied by this value while equipped", @@ -330,6 +365,7 @@ "effect.lzxnoneterraria.midas": "Midas", "effect.lzxnoneterraria.paladins_shield": "Paladin's Shield", "effect.lzxnoneterraria.ice_barrier": "Ice Barrier", + "effect.lzxnoneterraria.panic": "Panic", "effect.lzxnoneterraria.summon": "Summon", "effect.lzxnoneterraria.mana_sickness": "Mana Sickness", @@ -410,6 +446,8 @@ "lzxnoneterraria.configuration.paladins_shield_damage_absorption_ratio.tooltip": "Portion of shielded ally damage transferred to the guardian", "lzxnoneterraria.configuration.ice_barrier_damage_reduction_per_level": "Damage Reduction Per Level", "lzxnoneterraria.configuration.ice_barrier_damage_reduction_per_level.tooltip": "Damage reduction per level (level 0 = this value, level 1 = 1-(1-this)^2, and so on)", + "lzxnoneterraria.configuration.panic_speed_boost": "Panic Movement Speed Boost", + "lzxnoneterraria.configuration.panic_speed_boost.tooltip": "Movement speed boost multiplier triggered after taking damage", "lzxnoneterraria.configuration.enchanted_sword_damage": "Projectile Damage", "lzxnoneterraria.configuration.enchanted_sword_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.enchanted_sword_lifetime": "Projectile Lifetime", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 55c7d49..518d85d 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -137,6 +137,18 @@ "item.lzxnoneterraria.frozen_shield": "冰冻护盾", "item.lzxnoneterraria.magma_stone": "岩浆石", "item.lzxnoneterraria.fire_gauntlet": "烈火手套", + "item.lzxnoneterraria.lava_charm": "熔岩护身符", + "item.lzxnoneterraria.obsidian_rose": "黑曜石玫瑰", + "item.lzxnoneterraria.magma_skull": "岩浆骷髅头", + "item.lzxnoneterraria.molten_charm": "熔火护身符", + "item.lzxnoneterraria.obsidian_skull_rose": "黑曜石骷髅头玫瑰", + "item.lzxnoneterraria.molten_skull_rose": "熔火骷髅头玫瑰", + "item.lzxnoneterraria.panic_necklace": "恐慌项链", + "item.lzxnoneterraria.sweetheart_necklace": "甜心项链", + "item.lzxnoneterraria.arcane_flower": "奥术花", + "item.lzxnoneterraria.band_of_regeneration": "再生手环", + "item.lzxnoneterraria.band_of_starpower": "星力手环", + "item.lzxnoneterraria.mana_regeneration_band": "魔力再生手环", "item.lzxnoneterraria.eye_of_the_golem": "石巨人之眼", "item.lzxnoneterraria.destroyer_emblem": "毁灭者徽章", "item.lzxnoneterraria.moon_stone": "月亮石", @@ -213,8 +225,28 @@ "tooltip.lzxnoneterraria.fire_block_immunity": "对火块免疫", "tooltip.lzxnoneterraria.freeze_immunity": "免疫冰冻", "tooltip.lzxnoneterraria.damage_immunity": "有 %s%% 几率抵消承受的伤害", + "tooltip.lzxnoneterraria.lava_immunity": "%s秒内对岩浆免疫", + "tooltip.lzxnoneterraria.lava_damage_reduction": "岩浆伤害 -%s%%", + "tooltip.lzxnoneterraria.panic": "受到伤害后提高移动速度", + "tooltip.lzxnoneterraria.life_regen": "生命再生 +%s", "lzxnoneterraria.configuration.damage_immunity": "伤害免疫概率", "lzxnoneterraria.configuration.damage_immunity.tooltip": "抵消承受伤害的概率", + "lzxnoneterraria.configuration.lava_immunity_ticks": "岩浆免疫时长(刻)", + "lzxnoneterraria.configuration.lava_immunity_ticks.tooltip": "每次进入岩浆获得的免疫时长,离开后逐步恢复", + "lzxnoneterraria.configuration.health_per_second": "每秒生命回复", + "lzxnoneterraria.configuration.health_per_second.tooltip": "佩戴后每秒回复的生命值", + "lzxnoneterraria.configuration.max_mana_bonus": "最大魔力加成", + "lzxnoneterraria.configuration.max_mana_bonus.tooltip": "佩戴后增加的最大魔力", + "lzxnoneterraria.configuration.mana_regen_delay_multiplier": "魔力再生延迟倍率", + "lzxnoneterraria.configuration.mana_regen_delay_multiplier.tooltip": "佩戴后魔力恢复延迟的倍率(0.5 = 减半)", + "lzxnoneterraria.configuration.mana_regen_bonus_scale": "魔力再生加成系数", + "lzxnoneterraria.configuration.mana_regen_bonus_scale.tooltip": "额外再生 = 系数 × 当前魔力比例 + 基础值", + "lzxnoneterraria.configuration.mana_regen_bonus_base": "魔力再生加成基础值", + "lzxnoneterraria.configuration.mana_regen_bonus_base.tooltip": "当前魔力为 0 时的额外再生量(点/秒)", + "lzxnoneterraria.configuration.lava_damage_reduction": "岩浆伤害减免", + "lzxnoneterraria.configuration.lava_damage_reduction.tooltip": "佩戴后受到的岩浆伤害减免比例", + "lzxnoneterraria.configuration.panic_duration": "恐慌持续时间", + "lzxnoneterraria.configuration.panic_duration.tooltip": "佩戴后受到伤害时加速持续的时间(刻)", "tooltip.lzxnoneterraria.damage_increase": "伤害 +%s%%", "tooltip.lzxnoneterraria.crit_chance_bonus": "暴击率 +%s%%", @@ -294,6 +326,9 @@ "tooltip.lzxnoneterraria.magic_damage_decrease": "魔法伤害 -%s%%", "tooltip.lzxnoneterraria.mana_cost_increase": "魔力花费 +%s%%", "tooltip.lzxnoneterraria.mana_cost_decrease": "魔力花费 -%s%%", + "tooltip.lzxnoneterraria.max_mana_bonus": "魔力 +%s", + "tooltip.lzxnoneterraria.mana_regen_delay": "魔力再生延迟 -%s%%", + "tooltip.lzxnoneterraria.mana_regen_boost": "提升魔力再生速度", "tooltip.lzxnoneterraria.auto_mana_potion_use": "需要时自动使用魔力药水", "lzxnoneterraria.configuration.magic_damage_multiplier": "魔法伤害倍率", "lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "佩戴后魔法伤害乘以该倍率", @@ -330,6 +365,7 @@ "effect.lzxnoneterraria.midas": "迈达斯", "effect.lzxnoneterraria.paladins_shield": "圣骑士护盾", "effect.lzxnoneterraria.ice_barrier": "冰障", + "effect.lzxnoneterraria.panic": "恐慌", "effect.lzxnoneterraria.summon": "召唤", "effect.lzxnoneterraria.mana_sickness": "耐魔性", @@ -410,6 +446,8 @@ "lzxnoneterraria.configuration.paladins_shield_damage_absorption_ratio.tooltip": "被庇护的队友受到伤害时转移给庇护者的比例", "lzxnoneterraria.configuration.ice_barrier_damage_reduction_per_level": "每级伤害降低比例", "lzxnoneterraria.configuration.ice_barrier_damage_reduction_per_level.tooltip": "每级降低受到的伤害比例", + "lzxnoneterraria.configuration.panic_speed_boost": "恐慌移动速度加成", + "lzxnoneterraria.configuration.panic_speed_boost.tooltip": "受到伤害后触发的移动速度加成倍率", "lzxnoneterraria.configuration.enchanted_sword_damage": "弹射伤害", "lzxnoneterraria.configuration.enchanted_sword_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.enchanted_sword_lifetime": "弹射持续时间", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/arcane_flower.json b/src/main/resources/assets/lzxnoneterraria/models/item/arcane_flower.json new file mode 100644 index 0000000..3c499d2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/arcane_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/arcane_flower" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/band_of_regeneration.json b/src/main/resources/assets/lzxnoneterraria/models/item/band_of_regeneration.json new file mode 100644 index 0000000..a1ce454 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/band_of_regeneration.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/band_of_regeneration" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/band_of_starpower.json b/src/main/resources/assets/lzxnoneterraria/models/item/band_of_starpower.json new file mode 100644 index 0000000..74faf60 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/band_of_starpower.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/band_of_starpower" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/lava_charm.json b/src/main/resources/assets/lzxnoneterraria/models/item/lava_charm.json new file mode 100644 index 0000000..55b066b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/lava_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/lava_charm" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/magma_skull.json b/src/main/resources/assets/lzxnoneterraria/models/item/magma_skull.json new file mode 100644 index 0000000..d92f8fa --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/magma_skull.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/magma_skull" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/mana_regeneration_band.json b/src/main/resources/assets/lzxnoneterraria/models/item/mana_regeneration_band.json new file mode 100644 index 0000000..46e7d70 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/mana_regeneration_band.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/mana_regeneration_band" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/molten_charm.json b/src/main/resources/assets/lzxnoneterraria/models/item/molten_charm.json new file mode 100644 index 0000000..0be027f --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/molten_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/molten_charm" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/molten_skull_rose.json b/src/main/resources/assets/lzxnoneterraria/models/item/molten_skull_rose.json new file mode 100644 index 0000000..468d362 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/molten_skull_rose.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/molten_skull_rose" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_rose.json b/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_rose.json new file mode 100644 index 0000000..1d94d46 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_rose.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/obsidian_rose" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_skull_rose.json b/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_skull_rose.json new file mode 100644 index 0000000..5686ac9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_skull_rose.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/obsidian_skull_rose" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/panic_necklace.json b/src/main/resources/assets/lzxnoneterraria/models/item/panic_necklace.json new file mode 100644 index 0000000..a44ecaa --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/panic_necklace.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/panic_necklace" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/sweetheart_necklace.json b/src/main/resources/assets/lzxnoneterraria/models/item/sweetheart_necklace.json new file mode 100644 index 0000000..018c72d --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/sweetheart_necklace.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/sweetheart_necklace" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/arcane_flower.png b/src/main/resources/assets/lzxnoneterraria/textures/item/arcane_flower.png new file mode 100644 index 0000000..bb8591d Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/arcane_flower.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/band_of_regeneration.png b/src/main/resources/assets/lzxnoneterraria/textures/item/band_of_regeneration.png new file mode 100644 index 0000000..26d3a3b Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/band_of_regeneration.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/band_of_starpower.png b/src/main/resources/assets/lzxnoneterraria/textures/item/band_of_starpower.png new file mode 100644 index 0000000..eb469c4 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/band_of_starpower.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/lava_charm.png b/src/main/resources/assets/lzxnoneterraria/textures/item/lava_charm.png new file mode 100644 index 0000000..54bfc78 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/lava_charm.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/magma_skull.png b/src/main/resources/assets/lzxnoneterraria/textures/item/magma_skull.png new file mode 100644 index 0000000..8f7ea33 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/magma_skull.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/mana_regeneration_band.png b/src/main/resources/assets/lzxnoneterraria/textures/item/mana_regeneration_band.png new file mode 100644 index 0000000..b0d3cc9 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/mana_regeneration_band.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/molten_charm.png b/src/main/resources/assets/lzxnoneterraria/textures/item/molten_charm.png new file mode 100644 index 0000000..ee6d6e6 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/molten_charm.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/molten_skull_rose.png b/src/main/resources/assets/lzxnoneterraria/textures/item/molten_skull_rose.png new file mode 100644 index 0000000..3f4cbee Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/molten_skull_rose.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_rose.png b/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_rose.png new file mode 100644 index 0000000..4399870 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_rose.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_skull_rose.png b/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_skull_rose.png new file mode 100644 index 0000000..ccc8f5f Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_skull_rose.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/panic_necklace.png b/src/main/resources/assets/lzxnoneterraria/textures/item/panic_necklace.png new file mode 100644 index 0000000..38d6f94 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/panic_necklace.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/sweetheart_necklace.png b/src/main/resources/assets/lzxnoneterraria/textures/item/sweetheart_necklace.png new file mode 100644 index 0000000..e94fc5d Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/sweetheart_necklace.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/panic.png b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/panic.png new file mode 100644 index 0000000..bea198d Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/panic.png differ diff --git a/src/main/resources/data/lzxnoneterraria/recipe/arcane_flower.json b/src/main/resources/data/lzxnoneterraria/recipe/arcane_flower.json new file mode 100644 index 0000000..e22114e --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/arcane_flower.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:putrid_scent" + }, + { + "item": "lzxnoneterraria:mana_flower" + } + ], + "result": { + "id": "lzxnoneterraria:arcane_flower", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/band_of_starpower.json b/src/main/resources/data/lzxnoneterraria/recipe/band_of_starpower.json new file mode 100644 index 0000000..e342caf --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/band_of_starpower.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:panic_necklace" + }, + { + "item": "lzxnoneterraria:mana_crystal" + } + ], + "result": { + "id": "lzxnoneterraria:band_of_starpower", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/magma_skull.json b/src/main/resources/data/lzxnoneterraria/recipe/magma_skull.json new file mode 100644 index 0000000..1fffe42 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/magma_skull.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:obsidian_skull" + }, + { + "item": "lzxnoneterraria:lava_charm" + } + ], + "result": { + "id": "lzxnoneterraria:magma_skull", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/mana_regeneration_band.json b/src/main/resources/data/lzxnoneterraria/recipe/mana_regeneration_band.json new file mode 100644 index 0000000..9181d94 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/mana_regeneration_band.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:band_of_starpower" + }, + { + "item": "lzxnoneterraria:band_of_regeneration" + } + ], + "result": { + "id": "lzxnoneterraria:mana_regeneration_band", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/molten_charm.json b/src/main/resources/data/lzxnoneterraria/recipe/molten_charm.json new file mode 100644 index 0000000..9833766 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/molten_charm.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:obsidian_skull" + }, + { + "item": "lzxnoneterraria:lava_charm" + } + ], + "result": { + "id": "lzxnoneterraria:molten_charm", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/molten_skull_rose.json b/src/main/resources/data/lzxnoneterraria/recipe/molten_skull_rose.json new file mode 100644 index 0000000..b9a3759 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/molten_skull_rose.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:obsidian_skull_rose" + }, + { + "item": "lzxnoneterraria:lava_charm" + } + ], + "result": { + "id": "lzxnoneterraria:molten_skull_rose", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/obsidian_skull_rose.json b/src/main/resources/data/lzxnoneterraria/recipe/obsidian_skull_rose.json new file mode 100644 index 0000000..0d1cacb --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/obsidian_skull_rose.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:obsidian_skull" + }, + { + "item": "lzxnoneterraria:obsidian_rose" + } + ], + "result": { + "id": "lzxnoneterraria:obsidian_skull_rose", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/sweetheart_necklace.json b/src/main/resources/data/lzxnoneterraria/recipe/sweetheart_necklace.json new file mode 100644 index 0000000..546e5c3 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/sweetheart_necklace.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:panic_necklace" + }, + { + "item": "lzxnoneterraria:honey_comb" + } + ], + "result": { + "id": "lzxnoneterraria:sweetheart_necklace", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json index 51f99e1..d92aa24 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json @@ -66,6 +66,18 @@ "lzxnoneterraria:shackle", "lzxnoneterraria:rifle_scope", "lzxnoneterraria:sniper_scope", - "lzxnoneterraria:recon_scope" + "lzxnoneterraria:recon_scope", + "lzxnoneterraria:lava_charm", + "lzxnoneterraria:obsidian_rose", + "lzxnoneterraria:magma_skull", + "lzxnoneterraria:molten_charm", + "lzxnoneterraria:obsidian_skull_rose", + "lzxnoneterraria:molten_skull_rose", + "lzxnoneterraria:panic_necklace", + "lzxnoneterraria:sweetheart_necklace", + "lzxnoneterraria:arcane_flower", + "lzxnoneterraria:band_of_regeneration", + "lzxnoneterraria:band_of_starpower", + "lzxnoneterraria:mana_regeneration_band" ] }