diff --git a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java index 0077b9f..9e6824d 100644 --- a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java @@ -1,6 +1,7 @@ package com.lzxnone.terraria.client.entity.summon; -import com.lzxnone.terraria.client.item.ClientDropFallenStar; +import com.lzxnone.terraria.client.item.normal.ClientDropFallenStar; +import com.lzxnone.terraria.client.item.normal.ClientManaStar; import com.lzxnone.terraria.client.item.ranged.ClientBulletAmmo; import com.lzxnone.terraria.client.item.magic.ClientLastPrism; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; @@ -31,6 +32,7 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.DEFAULT, DEFAULT_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.DROP_FALLEN_STAR, ClientDropFallenStar.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.MANA_STAR, ClientManaStar.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.SEEDLER_NUT, DEFAULT_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.THE_HORSEMANS_BLADE_JACK, DEFAULT_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java b/src/main/java/com/lzxnone/terraria/client/item/normal/ClientDropFallenStar.java similarity index 99% rename from src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java rename to src/main/java/com/lzxnone/terraria/client/item/normal/ClientDropFallenStar.java index 093fc31..b4cb15e 100644 --- a/src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java +++ b/src/main/java/com/lzxnone/terraria/client/item/normal/ClientDropFallenStar.java @@ -1,6 +1,5 @@ -package com.lzxnone.terraria.client.item; +package com.lzxnone.terraria.client.item.normal; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; import com.lzxnone.terraria.entity.ModRenderTypes; import com.lzxnone.terraria.entity.TintedVertexConsumer; diff --git a/src/main/java/com/lzxnone/terraria/client/item/normal/ClientManaStar.java b/src/main/java/com/lzxnone/terraria/client/item/normal/ClientManaStar.java new file mode 100644 index 0000000..6a664cd --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/normal/ClientManaStar.java @@ -0,0 +1,48 @@ +package com.lzxnone.terraria.client.item.normal; + +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; + +public class ClientManaStar { + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + @Override + public void renderItem(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + ItemStack itemStack = summon.getEntityData().get(StaticSummon.ITEM); + if(itemStack == ItemStack.EMPTY) return; + + poseStack.pushPose(); + + poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot()))); + poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot()))); + + poseStack.mulPose(Axis.YP.rotationDegrees(9 * (summon.getEntityData().get(StaticSummon.AGE) + partialTick))); + + poseStack.translate(0, 0.5f, 0); + + poseStack.scale(0.75f, 0.75f, 0.75f); + + Minecraft.getInstance().getItemRenderer().renderStatic( + itemStack, + ItemDisplayContext.NONE, + summon.getEntityData().get(StaticSummon.GLOW) ? LightTexture.FULL_BRIGHT : packedLight, + OverlayTexture.NO_OVERLAY, + poseStack, + bufferSource, + entity.level(), + 0 + ); + poseStack.popPose(); + } + }; +} 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 0d26ff4..93ef4b4 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 @@ -128,6 +128,15 @@ public class ModCreativeModeTabs { output.accept(ModItems.REGENERATION_BAND.get()); output.accept(ModItems.BAND_OF_STARPOWER.get()); output.accept(ModItems.MANA_REGENERATION_BAND.get()); + output.accept(ModItems.MAGIC_CUFF.get()); + output.accept(ModItems.CELESTIAL_MAGNET.get()); + output.accept(ModItems.CELESTIAL_EMBLEM.get()); + output.accept(ModItems.CELESTIAL_CUFFS.get()); + output.accept(ModItems.MAGNET_FLOWER.get()); + output.accept(ModItems.PHILOSOPHERS_STONE.get()); + output.accept(ModItems.VALENTINE_RING.get()); + output.accept(ModItems.CHARM_OF_MYTHS.get()); + output.accept(ModItems.MANA_CLOAK.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/dynamic_lights/MEntityLuminance.java b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java index 7dd683c..6a386d4 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -66,7 +66,8 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.STARDUST_DRAGON_STAFF, StaticSummonBehaviors.FALLEN_STAR, StaticSummonBehaviors.FALLEN_STAR_SUPER, - StaticSummonBehaviors.DROP_FALLEN_STAR -> { + StaticSummonBehaviors.DROP_FALLEN_STAR, + StaticSummonBehaviors.MANA_STAR -> { return 15; } case StaticSummonBehaviors.CHLOROPHYTE_BULLET, diff --git a/src/main/java/com/lzxnone/terraria/effect/ManaSicknessEffect.java b/src/main/java/com/lzxnone/terraria/effect/ManaSicknessEffect.java index b094e25..df4d08d 100644 --- a/src/main/java/com/lzxnone/terraria/effect/ManaSicknessEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/ManaSicknessEffect.java @@ -1,6 +1,7 @@ package com.lzxnone.terraria.effect; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; @@ -38,8 +39,10 @@ public class ManaSicknessEffect extends MobEffect { public static void applyTo(LivingEntity entity) { int durationPerUse = DURATION_PER_USE.get(); - int maxDuration = MAX_DURATION.get(); - if(durationPerUse <= 0 || maxDuration <= 0) return; + if(durationPerUse <= 0 || MAX_DURATION.get() <= 0) return; + + int maxDuration = (int) Math.ceil(MAX_DURATION.get() * AccessoryUtil.getManaSicknessDurationMultiplier(entity)); + if(maxDuration <= 0) return; MobEffectInstance current = entity.getEffect(ModEffects.MANA_SICKNESS); int duration = Math.min(maxDuration, durationPerUse); diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java index 28c1f21..59ff893 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -1,6 +1,8 @@ package com.lzxnone.terraria.entity.summon; import com.lzxnone.terraria.item.ammo.*; +import com.lzxnone.terraria.item.normal.FallenStar; +import com.lzxnone.terraria.item.normal.ManaStar; import com.lzxnone.terraria.item.weapon.ranged.ElfMelter; import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.*; @@ -23,6 +25,7 @@ public class StaticSummonBehaviors { //掉落实体 public static final String DROP_FALLEN_STAR = "drop_fallen_star"; + public static final String MANA_STAR = "mana_star"; //弹射实体 public static final String SEEDLER_NUT = "seedler_nut"; @@ -76,6 +79,7 @@ public class StaticSummonBehaviors { BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {}); BEHAVIORS.put(DROP_FALLEN_STAR, FallenStar.SUMMON_BEHAVIOR); + BEHAVIORS.put(MANA_STAR, ManaStar.SUMMON_BEHAVIOR); BEHAVIORS.put(SEEDLER_NUT, Seedler.SUMMON_BEHAVIOR); BEHAVIORS.put(THE_HORSEMANS_BLADE_JACK, TheHorsemansBlade.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index 6b1f54b..5c08baa 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -3,21 +3,30 @@ 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.attachment.PlayerMana; +import com.lzxnone.terraria.entity.ModEntities; +import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; 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.ModItems; 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; import com.lzxnone.terraria.item.weapon.summon.whip.Possession; +import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.DamageTypeTags; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.monster.Monster; +import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -35,6 +44,9 @@ import java.util.UUID; @EventBusSubscriber(modid = LzxnoneTerraria.MODID) public class EntityEventHandler { + //魔力星掉落概率 + private static final double MANA_STAR_DROP_CHANCE = 1.0D / 9.0D; + @SubscribeEvent public static void onLivingIncomingDamage(LivingIncomingDamageEvent event) { LivingEntity entity = event.getEntity(); @@ -75,6 +87,20 @@ public class EntityEventHandler { if(AccessoryUtil.canApplyIgnite(livingAttacker)) entity.igniteForTicks(AccessoryUtil.getIgniteTicks(livingAttacker)); } } + //受到伤害时恢复魔力 + if(entity instanceof Player player) { + boolean isDebuffDamage = source.is(DamageTypes.DROWN) || source.is(DamageTypes.MAGIC) + || source.is(DamageTypes.ON_FIRE) || source.is(DamageTypes.IN_FIRE) || source.is(DamageTypes.WITHER); + double manaMultiplier = AccessoryUtil.getManaOnHurtMultiplier(player); + if(!isDebuffDamage && manaMultiplier > 0.0D) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int recover = (int) Math.round(event.getAmount() * manaMultiplier); + if(recover > 0 && mana.recoverManaImmediately(recover)) { + player.setData(ModAttachments.PLAYER_MANA, mana); + PlayerManaSyncEventHandler.sync((ServerPlayer) player); + } + } + } } @SubscribeEvent @@ -123,7 +149,7 @@ 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)); } @@ -133,6 +159,11 @@ public class EntityEventHandler { @SubscribeEvent public static void onEntityDeath(LivingDeathEvent event) { LivingEntity livingEntity = event.getEntity(); + Entity killer = event.getSource().getEntity(); + if(killer instanceof Projectile projectile) { + Entity owner = projectile.getOwner(); + if(owner instanceof Player) killer = owner; + } if(livingEntity.level() instanceof ServerLevel serverLevel) { //迈达斯生成绿宝石 if(livingEntity.hasEffect(ModEffects.MIDAS) && livingEntity.getRandom().nextFloat() < MidasEffect.getDropChance()) { @@ -147,6 +178,24 @@ public class EntityEventHandler { Entity stuck = serverLevel.getEntity(uuid); if(stuck instanceof StaticSummon stuckProjectile) DevilsDevastation.summonStuckProjectile(stuckProjectile); } + + //生成魔力星 + if(killer instanceof Player player + && livingEntity instanceof Monster + && player.getData(ModAttachments.PLAYER_MANA).getMana() < player.getData(ModAttachments.PLAYER_MANA).getMaxMana() + && livingEntity.getRandom().nextFloat() < MANA_STAR_DROP_CHANCE) { + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), livingEntity.level()); + summon.setPos(livingEntity.position()); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.MANA_STAR); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "item"); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.MANA_STAR.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 1200); + summon.getEntityData().set(StaticSummon.GLOW, true); + CompoundTag customData = new CompoundTag(); + customData.putInt("mana", 100); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + livingEntity.level().addFreshEntity(summon); + } } } diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 366c109..99ea72f 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -5,6 +5,7 @@ import com.lzxnone.terraria.block.ModBlocks; import com.lzxnone.terraria.item.accessory.*; import com.lzxnone.terraria.item.ammo.*; import com.lzxnone.terraria.item.food.ManaCrystal; +import com.lzxnone.terraria.item.normal.FallenStar; import com.lzxnone.terraria.item.potion.*; import com.lzxnone.terraria.item.weapon.ranged.ElfMelter; import com.lzxnone.terraria.item.weapon.magic.*; @@ -173,6 +174,15 @@ public class ModItems { 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 MAGIC_CUFF = ITEMS.register("magic_cuffs", MagicCuff::new); + public static final DeferredItem CELESTIAL_MAGNET = ITEMS.register("celestial_magnet", CelestialMagnet::new); + public static final DeferredItem CELESTIAL_EMBLEM = ITEMS.register("celestial_emblem", CelestialEmblem::new); + public static final DeferredItem CELESTIAL_CUFFS = ITEMS.register("celestial_cuffs", CelestialCuffs::new); + public static final DeferredItem MAGNET_FLOWER = ITEMS.register("magnet_flower", MagnetFlower::new); + public static final DeferredItem PHILOSOPHERS_STONE = ITEMS.register("philosophers_stone", PhilosophersStone::new); + public static final DeferredItem VALENTINE_RING = ITEMS.register("valentine_ring", ValentineRing::new); + public static final DeferredItem CHARM_OF_MYTHS = ITEMS.register("charm_of_myths", CharmOfMyths::new); + public static final DeferredItem MANA_CLOAK = ITEMS.register("mana_cloak", ManaCloak::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); @@ -222,6 +232,7 @@ public class ModItems { public static final DeferredItem GOLDEN_BULLET_PROJECTILE = ITEMS.register("golden_bullet_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem LUMINITE_BULLET_PROJECTILE = ITEMS.register("luminite_bullet_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem WHITE_STAR = ITEMS.register("white_star", () -> new Item(new Item.Properties())); + public static final DeferredItem MANA_STAR = ITEMS.register("mana_star", () -> new Item(new Item.Properties())); public static final DeferredItem ENCHANTED_SWORD_BEAM = ITEMS.register("enchanted_sword_beam", () -> new Item(new Item.Properties())); public static final DeferredItem STARFURY_STAR = ITEMS.register("starfury_star", () -> new Item(new Item.Properties())); 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 38f7bcc..ea67910 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,39 @@ public class AccessoryUtil { }); } + //耐魔性持续时间比例:取所有饰品中的最小值(降低优先) + public static double getManaSicknessDurationMultiplier(LivingEntity entity) { + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof ManaSicknessDurationModifier modifier) { + multiplier[0] = Math.min(multiplier[0], modifier.getManaSicknessDurationMultiplier(stack, entity)); + } + }); + return multiplier[0]; + } + + //星星拾取范围:取所有饰品中的最大值 + public static double getStarPickupRange(LivingEntity entity) { + double[] range = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof StarPickupRangeModifier modifier) { + range[0] = Math.max(range[0], modifier.getStarPickupRange(stack, entity)); + } + }); + return range[0]; + } + + //受击魔力恢复倍率:取所有饰品中的最大值(与天界手铐等效果不叠加) + public static double getManaOnHurtMultiplier(LivingEntity entity) { + double[] multiplier = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof ManaOnHurtModifier modifier) { + multiplier[0] = Math.max(multiplier[0], modifier.getManaOnHurtMultiplier(stack, entity)); + } + }); + return multiplier[0]; + } + //魔力恢复延迟倍率:取所有饰品中的最小值(减半优先) public static double getManaRecoverDelayMultiplier(LivingEntity entity) { double[] multiplier = {1.0D}; @@ -412,10 +445,12 @@ public class AccessoryUtil { public static void applyFallenStarSummoner(LivingEntity entity) { boolean[] result = {false}; + boolean[] summonManaStar = {false}; AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { if(result[0]) return; if(accessory instanceof FallenStarSummoner summoner) { result[0] = summoner.summonThreeFallenStar(stack, entity); + if(summoner.summonManaStarOnLanding(stack, entity)) summonManaStar[0] = true; } }); if(result[0]) { @@ -448,6 +483,7 @@ public class AccessoryUtil { CompoundTag customData = new CompoundTag(); customData.putInt("targetLifetime", (int) Math.floor(targetPos.distanceTo(spawnPos) / 2.0)); + if(summonManaStar[0] && i == 0) customData.putBoolean("summonManaStar", true); projectile.getEntityData().set(StaticProjectile.CUSTOM_DATA, customData); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialCuffs.java b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialCuffs.java new file mode 100644 index 0000000..ce239fb --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialCuffs.java @@ -0,0 +1,100 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.ManaOnHurtModifier; +import com.lzxnone.terraria.item.effect.MaxManaModifier; +import com.lzxnone.terraria.item.effect.StarPickupRangeModifier; +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 CelestialCuffs extends AccessoryItem implements StarPickupRangeModifier, MaxManaModifier, ManaOnHurtModifier { + public static final ConfigDouble PICKUP_RANGE = new ConfigDouble( + "accessory.celestial_cuffs.pickup_range", + "star_pickup_range", + 16.0D, + 0.0D, + 100.0D + ); + public static final ConfigInt MAX_MANA_BONUS = new ConfigInt( + "accessory.celestial_cuffs.max_mana_bonus", + "max_mana_bonus", + 20, + 0, + 400 + ); + public static final ConfigDouble MANA_ON_HURT_MULTIPLIER = new ConfigDouble( + "accessory.celestial_cuffs.mana_on_hurt_multiplier", + "mana_on_hurt_multiplier", + 5.0D, + 0.0D, + 1000.0D + ); + + public CelestialCuffs() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getStarPickupRange(ItemStack stack, LivingEntity entity) { + return PICKUP_RANGE.get(); + } + + @Override + public int getMaxManaBonus(ItemStack stack, LivingEntity entity) { + return MAX_MANA_BONUS.get(); + } + + @Override + public double getManaOnHurtMultiplier(ItemStack stack, LivingEntity entity) { + return MANA_ON_HURT_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(PICKUP_RANGE, MAX_MANA_BONUS, MANA_ON_HURT_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "celestial_cuffs", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/celestial_cuffs.png"), + Component.translatable("item.lzxnoneterraria.celestial_cuffs"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(PICKUP_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.star_pickup_range", + EffectTooltipUtil.formatNumber(PICKUP_RANGE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + 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(MANA_ON_HURT_MULTIPLIER.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mana_on_hurt" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialEmblem.java new file mode 100644 index 0000000..62507b3 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialEmblem.java @@ -0,0 +1,81 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MagicDamageModifier; +import com.lzxnone.terraria.item.effect.StarPickupRangeModifier; +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 CelestialEmblem extends AccessoryItem implements MagicDamageModifier, StarPickupRangeModifier { + public static final ConfigDouble MAGIC_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.celestial_emblem.magic_damage_multiplier", + "magic_damage_multiplier", + 1.15D, + 1.0D, + 10.0D + ); + public static final ConfigDouble PICKUP_RANGE = new ConfigDouble( + "accessory.celestial_emblem.pickup_range", + "star_pickup_range", + 16.0D, + 0.0D, + 100.0D + ); + + public CelestialEmblem() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getMagicDamageMultiplier(ItemStack stack, LivingEntity entity) { + return MAGIC_DAMAGE_MULTIPLIER.get(); + } + + @Override + public double getStarPickupRange(ItemStack stack, LivingEntity entity) { + return PICKUP_RANGE.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MAGIC_DAMAGE_MULTIPLIER, PICKUP_RANGE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "celestial_emblem", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/celestial_emblem.png"), + Component.translatable("item.lzxnoneterraria.celestial_emblem"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MAGIC_DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.magic_damage_increase", + EffectTooltipUtil.formatPercent(MAGIC_DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(PICKUP_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.star_pickup_range", + EffectTooltipUtil.formatNumber(PICKUP_RANGE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialMagnet.java b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialMagnet.java new file mode 100644 index 0000000..11af7c2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialMagnet.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.StarPickupRangeModifier; +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 CelestialMagnet extends AccessoryItem implements StarPickupRangeModifier { + public static final ConfigDouble PICKUP_RANGE = new ConfigDouble( + "accessory.celestial_magnet.pickup_range", + "star_pickup_range", + 16.0D, + 0.0D, + 16.0D + ); + + public CelestialMagnet() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getStarPickupRange(ItemStack stack, LivingEntity entity) { + return PICKUP_RANGE.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(PICKUP_RANGE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "celestial_magnet", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/celestial_magnet.png"), + Component.translatable("item.lzxnoneterraria.celestial_magnet"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(PICKUP_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.star_pickup_range", + EffectTooltipUtil.formatNumber(PICKUP_RANGE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CharmOfMyths.java b/src/main/java/com/lzxnone/terraria/item/accessory/CharmOfMyths.java new file mode 100644 index 0000000..ca85bd2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CharmOfMyths.java @@ -0,0 +1,83 @@ +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.item.effect.ManaSicknessDurationModifier; +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 CharmOfMyths extends AccessoryItem implements LifeRegenerationModifier, ManaSicknessDurationModifier { + //每秒生命回复量 + public static final ConfigDouble LIFE_REGEN = new ConfigDouble( + "accessory.charm_of_myths.life_regen", + "health_per_second", + 0.2D, + 0.0D, + 1000.0D + ); + //耐魔性持续时间比例(0.75 = 降低 25%) + public static final ConfigDouble DURATION_MULTIPLIER = new ConfigDouble( + "accessory.charm_of_myths.duration_multiplier", + "mana_sickness_duration_multiplier", + 0.75D, + 0.01D, + 1.0D + ); + + public CharmOfMyths() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public float getHealthPerSecond(ItemStack stack, LivingEntity entity) { + return LIFE_REGEN.get().floatValue(); + } + + @Override + public double getManaSicknessDurationMultiplier(ItemStack stack, LivingEntity entity) { + return DURATION_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(LIFE_REGEN, DURATION_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "charm_of_myths", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/charm_of_myths.png"), + Component.translatable("item.lzxnoneterraria.charm_of_myths"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(LIFE_REGEN.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.life_regen", + EffectTooltipUtil.formatNumber(LIFE_REGEN.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(DURATION_MULTIPLIER.get() < 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mana_sickness_duration", + EffectTooltipUtil.formatPercent(DURATION_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MagicCuff.java b/src/main/java/com/lzxnone/terraria/item/accessory/MagicCuff.java new file mode 100644 index 0000000..0a68a68 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MagicCuff.java @@ -0,0 +1,83 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.ManaOnHurtModifier; +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 MagicCuff extends AccessoryItem implements MaxManaModifier, ManaOnHurtModifier { + //最大魔力加成 + public static final ConfigInt MAX_MANA_BONUS = new ConfigInt( + "accessory.magic_cuffs.max_mana_bonus", + "max_mana_bonus", + 20, + 0, + 400 + ); + //受击魔力恢复倍率(受 1 点伤害恢复 multiplier 点魔力) + public static final ConfigDouble MANA_ON_HURT_MULTIPLIER = new ConfigDouble( + "accessory.magic_cuffs.mana_on_hurt_multiplier", + "mana_on_hurt_multiplier", + 5.0D, + 0.0D, + 1000.0D + ); + + public MagicCuff() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public int getMaxManaBonus(ItemStack stack, LivingEntity entity) { + return MAX_MANA_BONUS.get(); + } + + @Override + public double getManaOnHurtMultiplier(ItemStack stack, LivingEntity entity) { + return MANA_ON_HURT_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MAX_MANA_BONUS, MANA_ON_HURT_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "magic_cuffs", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/magic_cuffs.png"), + Component.translatable("item.lzxnoneterraria.magic_cuffs"), + 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(MANA_ON_HURT_MULTIPLIER.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mana_on_hurt" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MagnetFlower.java b/src/main/java/com/lzxnone/terraria/item/accessory/MagnetFlower.java new file mode 100644 index 0000000..bb585f9 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MagnetFlower.java @@ -0,0 +1,90 @@ +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.StarPickupRangeModifier; +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 MagnetFlower extends AccessoryItem implements StarPickupRangeModifier, ManaCostModifier, AutoManaPotionUser { + public static final ConfigDouble PICKUP_RANGE = new ConfigDouble( + "accessory.magnet_flower.pickup_range", + "star_pickup_range", + 16.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble MANA_COST_MULTIPLIER = new ConfigDouble( + "accessory.magnet_flower.mana_cost_multiplier", + "mana_cost_multiplier", + 0.92D, + 0.0D, + 1.0D + ); + + public MagnetFlower() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getStarPickupRange(ItemStack stack, LivingEntity entity) { + return PICKUP_RANGE.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(PICKUP_RANGE, MANA_COST_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "magnet_flower", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/magnet_flower.png"), + Component.translatable("item.lzxnoneterraria.magnet_flower"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(PICKUP_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.star_pickup_range", + EffectTooltipUtil.formatNumber(PICKUP_RANGE.get()) + ).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/ManaCloak.java b/src/main/java/com/lzxnone/terraria/item/accessory/ManaCloak.java new file mode 100644 index 0000000..2f67043 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ManaCloak.java @@ -0,0 +1,97 @@ +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.FallenStarSummoner; +import com.lzxnone.terraria.item.effect.ManaCostModifier; +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 ManaCloak extends AccessoryItem implements FallenStarSummoner, ManaCostModifier, AutoManaPotionUser { + public static final ConfigDouble FALLEN_STAR_DAMAGE = new ConfigDouble( + "accessory.mana_cloak.fallen_star_damage", + "fallen_star_damage", + 7.0D, + 0.0D, + 8388600.0D + ); + public static final ConfigDouble MANA_COST_MULTIPLIER = new ConfigDouble( + "accessory.mana_cloak.mana_cost_multiplier", + "mana_cost_multiplier", + 0.92D, + 0.0D, + 1.0D + ); + + public ManaCloak() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean summonThreeFallenStar(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public double getFallenStarDamage(ItemStack stack, LivingEntity entity) { + return FALLEN_STAR_DAMAGE.get(); + } + + @Override + public boolean summonManaStarOnLanding(ItemStack stack, LivingEntity entity) { + return true; + } + + @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(FALLEN_STAR_DAMAGE, MANA_COST_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "mana_cloak", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/mana_cloak.png"), + Component.translatable("item.lzxnoneterraria.mana_cloak"), + 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.fallen_star_summon" + ).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/PhilosophersStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/PhilosophersStone.java new file mode 100644 index 0000000..bd8966f --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/PhilosophersStone.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.ManaSicknessDurationModifier; +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 PhilosophersStone extends AccessoryItem implements ManaSicknessDurationModifier { + //耐魔性持续时间比例(0.75 = 降低 25%) + public static final ConfigDouble DURATION_MULTIPLIER = new ConfigDouble( + "accessory.philosophers_stone.duration_multiplier", + "mana_sickness_duration_multiplier", + 0.75D, + 0.01D, + 1.0D + ); + + public PhilosophersStone() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getManaSicknessDurationMultiplier(ItemStack stack, LivingEntity entity) { + return DURATION_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DURATION_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "philosophers_stone", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/philosophers_stone.png"), + Component.translatable("item.lzxnoneterraria.philosophers_stone"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(DURATION_MULTIPLIER.get() < 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mana_sickness_duration", + EffectTooltipUtil.formatPercent(DURATION_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ValentineRing.java b/src/main/java/com/lzxnone/terraria/item/accessory/ValentineRing.java new file mode 100644 index 0000000..36c11af --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ValentineRing.java @@ -0,0 +1,110 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +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.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.core.Holder; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class ValentineRing extends AccessoryItem implements LifeRegenerationModifier, ConditionalAttributeModifier { + //每秒生命回复量 + public static final ConfigDouble LIFE_REGEN = new ConfigDouble( + "accessory.valentine_ring.life_regen", + "health_per_second", + 0.25D, + 0.0D, + 1000.0D + ); + //跳跃高度倍率(同狼人效果,JUMP_STRENGTH 属性) + public static final ConfigDouble JUMP_HEIGHT = new ConfigDouble( + "accessory.valentine_ring.jump_height", + "jump_height", + 1.2D, + 1.0D, + 10.0D + ); + + public ValentineRing() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public float getHealthPerSecond(ItemStack stack, LivingEntity entity) { + return LIFE_REGEN.get().floatValue(); + } + + @Override + public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { + return buildModifiers(); + } + + @Override + public Multimap, AttributeModifier> getAllConditionalModifiers(ItemStack stack, LivingEntity entity) { + return buildModifiers(); + } + + //跳跃高度:全天候生效(无条件属性) + private Multimap, AttributeModifier> buildModifiers() { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double jumpStrength = JUMP_HEIGHT.get() - 1.0D; + if(jumpStrength != 0.0D) { + modifiers.put( + Attributes.JUMP_STRENGTH, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "valentine_ring_jump_height"), + jumpStrength, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(LIFE_REGEN, JUMP_HEIGHT); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "valentine_ring", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/valentine_ring.png"), + Component.translatable("item.lzxnoneterraria.valentine_ring"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(LIFE_REGEN.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.life_regen", + EffectTooltipUtil.formatNumber(LIFE_REGEN.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(JUMP_HEIGHT.get() > 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.jump_boost" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/FallenStarSummoner.java b/src/main/java/com/lzxnone/terraria/item/effect/FallenStarSummoner.java index eae3f69..134d491 100644 --- a/src/main/java/com/lzxnone/terraria/item/effect/FallenStarSummoner.java +++ b/src/main/java/com/lzxnone/terraria/item/effect/FallenStarSummoner.java @@ -1,8 +1,12 @@ package com.lzxnone.terraria.item.effect; import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.particle.ModParticles; import com.lzxnone.terraria.utils.*; @@ -20,6 +24,11 @@ public interface FallenStarSummoner { boolean summonThreeFallenStar(ItemStack stack, LivingEntity entity); double getFallenStarDamage(ItemStack stack, LivingEntity entity); + //星星落地时是否变为回复魔力的拾取物(魔力斗篷等) + default boolean summonManaStarOnLanding(ItemStack stack, LivingEntity entity) { + return false; + } + IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { @Override public void onMoving(StaticProjectile projectile) { @@ -72,6 +81,20 @@ public interface FallenStarSummoner { @Override public void onDied(StaticProjectile projectile) { if(!projectile.level().isClientSide()) { + CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA); + if(customData.contains("summonManaStar")) { + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), projectile.level()); + summon.setPos(projectile.position()); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.MANA_STAR); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "item"); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.MANA_STAR.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.GLOW, true); + CompoundTag summonCustomData = new CompoundTag(); + summonCustomData.putInt("mana", 50); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, summonCustomData); + projectile.level().addFreshEntity(summon); + } ParticleUtil.addParticles( (ServerLevel) projectile.level(), ModParticles.STAR_PARTICLE.get(), projectile.position(), new Vec3(0.5, 0.5, 0.5), diff --git a/src/main/java/com/lzxnone/terraria/item/effect/ManaOnHurtModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/ManaOnHurtModifier.java new file mode 100644 index 0000000..f5bcd19 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/ManaOnHurtModifier.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 ManaOnHurtModifier { + //受到伤害时恢复魔力倍率(受 1 点伤害恢复 multiplier 点魔力) + double getManaOnHurtMultiplier(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/ManaSicknessDurationModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/ManaSicknessDurationModifier.java new file mode 100644 index 0000000..e0248fb --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/ManaSicknessDurationModifier.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 ManaSicknessDurationModifier { + //耐魔性持续时间比例(0.75 = 降低 25%) + double getManaSicknessDurationMultiplier(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/StarPickupRangeModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/StarPickupRangeModifier.java new file mode 100644 index 0000000..5ad1ef2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/StarPickupRangeModifier.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 StarPickupRangeModifier { + //星星拾取范围(格),0 = 不扩展 + double getStarPickupRange(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java b/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java similarity index 78% rename from src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java rename to src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java index 13ebc09..0ff71f5 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java +++ b/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java @@ -1,9 +1,10 @@ -package com.lzxnone.terraria.item.ammo; +package com.lzxnone.terraria.item.normal; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.particle.ModParticles; import com.lzxnone.terraria.utils.ParticleUtil; import com.lzxnone.terraria.utils.SoundUtil; @@ -11,18 +12,26 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.Vec3; import java.util.List; -public class FallenStar extends BulletAmmo { +public class FallenStar extends Item { + public FallenStar() { + super(new Item.Properties()); + } + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { private static final double GRAVITY = 0.04D; private static final double AIR_FRICTION = 0.98D; private static final double GROUND_FRICTION = 0.6D; private static final double MAX_FALL_SPEED = -1.5D; + private static final double MIN_ATTRACT_RADIUS = 4.0D; private static final double PICKUP_RADIUS = 0.35D; + private static final double MAX_PICKUP_RADIUS = 16.0D; + private static final double ATTRACT_SPEED = 0.25D; @Override public void tick(StaticSummon summon) { @@ -67,15 +76,22 @@ public class FallenStar extends BulletAmmo { private boolean tryPickup(StaticSummon summon) { List players = summon.level().getEntitiesOfClass( ServerPlayer.class, - summon.getBoundingBox().inflate(PICKUP_RADIUS), + summon.getBoundingBox().inflate(MAX_PICKUP_RADIUS), player -> !player.isSpectator() ); if(players.isEmpty()) return false; - for(ServerPlayer player : players) { - ItemStack stack = new ItemStack(ModItems.FALLEN_STAR.get()); - if(!player.getInventory().add(stack)) continue; + ServerPlayer player = players.getFirst(); + double attractRange = Math.max(AccessoryUtil.getStarPickupRange(player), MIN_ATTRACT_RADIUS); + Vec3 dir = player.position().subtract(summon.position()); + double dist = dir.length(); + if(dist <= attractRange) { + summon.setDeltaMovement(dir.scale(ATTRACT_SPEED)); + } + if(dist <= PICKUP_RADIUS) { + ItemStack stack = new ItemStack(ModItems.FALLEN_STAR.get()); + if(!player.getInventory().add(stack)) return false; player.take(summon, 1); player.containerMenu.broadcastChanges(); player.playNotifySound( diff --git a/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java b/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java new file mode 100644 index 0000000..7a8f946 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java @@ -0,0 +1,87 @@ +package com.lzxnone.terraria.item.normal; + +import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.attachment.PlayerMana; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.item.Item; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + +public class ManaStar extends Item { + + public ManaStar() { + super(new Item.Properties()); + } + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + private static final double GRAVITY = 0.04D; + private static final double AIR_FRICTION = 0.98D; + private static final double GROUND_FRICTION = 0.6D; + private static final double MAX_FALL_SPEED = -1.5D; + private static final double MIN_ATTRACT_RADIUS = 4.0D; + private static final double PICKUP_RADIUS = 0.5D; + private static final double MAX_PICKUP_RADIUS = 16.0D; + private static final double ATTRACT_SPEED = 0.25D; + + @Override + public void tick(StaticSummon summon) { + Vec3 movement = summon.getDeltaMovement(); + if(summon.onGround()) { + movement = new Vec3(movement.x * GROUND_FRICTION, 0.0D, movement.z * GROUND_FRICTION); + }else { + movement = movement.add(0.0D, -GRAVITY, 0.0D); + movement = movement.multiply(AIR_FRICTION, AIR_FRICTION, AIR_FRICTION); + if(movement.y < MAX_FALL_SPEED) movement = new Vec3(movement.x, MAX_FALL_SPEED, movement.z); + } + summon.setDeltaMovement(movement); + + if(summon.level().isClientSide()) return; + + if(tryPickup(summon)) return; + + int lifetime = summon.getEntityData().get(StaticSummon.LIFETIME); + int age = summon.getEntityData().get(StaticSummon.AGE); + if(lifetime != StaticSummon.INFINITE_LIFETIME && age > lifetime) { + summon.discard(); + return; + } + summon.getEntityData().set(StaticSummon.AGE, age + 1); + } + + private boolean tryPickup(StaticSummon summon) { + List players = summon.level().getEntitiesOfClass( + ServerPlayer.class, + summon.getBoundingBox().inflate(MAX_PICKUP_RADIUS), + player -> !player.isSpectator() + ); + if(players.isEmpty()) return false; + + ServerPlayer player = players.getFirst(); + + double attractRange = Math.max(AccessoryUtil.getStarPickupRange(player), MIN_ATTRACT_RADIUS); + Vec3 dir = player.position().subtract(summon.position()); + double dist = dir.length(); + if(dist <= attractRange) { + summon.setDeltaMovement(dir.scale(ATTRACT_SPEED)); + } + if(dist <= PICKUP_RADIUS) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + int amount = customData.contains("mana") ? customData.getInt("mana") : 0; + if(mana.recoverManaImmediately(amount)) { + player.setData(ModAttachments.PLAYER_MANA, mana); + PlayerManaSyncEventHandler.sync(player); + } + onDied(summon); + return true; + } + return false; + } + }; +} 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 81f5a79..1a23833 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -62,6 +62,15 @@ 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.MagicCuff; +import com.lzxnone.terraria.item.accessory.CelestialMagnet; +import com.lzxnone.terraria.item.accessory.CelestialEmblem; +import com.lzxnone.terraria.item.accessory.CelestialCuffs; +import com.lzxnone.terraria.item.accessory.MagnetFlower; +import com.lzxnone.terraria.item.accessory.PhilosophersStone; +import com.lzxnone.terraria.item.accessory.ValentineRing; +import com.lzxnone.terraria.item.accessory.CharmOfMyths; +import com.lzxnone.terraria.item.accessory.ManaCloak; import com.lzxnone.terraria.item.accessory.EyeOfGolem; import com.lzxnone.terraria.item.accessory.DestroyerEmblem; import com.lzxnone.terraria.item.accessory.MoonStone; @@ -256,6 +265,15 @@ public class ConfigList { RegenerationBand.CONFIG_LIST_ITEM, BandOfStarpower.CONFIG_LIST_ITEM, ManaRegenerationBand.CONFIG_LIST_ITEM, + MagicCuff.CONFIG_LIST_ITEM, + CelestialMagnet.CONFIG_LIST_ITEM, + CelestialEmblem.CONFIG_LIST_ITEM, + CelestialCuffs.CONFIG_LIST_ITEM, + MagnetFlower.CONFIG_LIST_ITEM, + PhilosophersStone.CONFIG_LIST_ITEM, + ValentineRing.CONFIG_LIST_ITEM, + CharmOfMyths.CONFIG_LIST_ITEM, + ManaCloak.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 8b6fb8e..afd6ea6 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -149,6 +149,15 @@ "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.magic_cuffs": "Magic Cuffs", + "item.lzxnoneterraria.celestial_magnet": "Celestial Magnet", + "item.lzxnoneterraria.celestial_emblem": "Celestial Emblem", + "item.lzxnoneterraria.celestial_cuffs": "Celestial Cuffs", + "item.lzxnoneterraria.magnet_flower": "Magnet Flower", + "item.lzxnoneterraria.philosophers_stone": "Philosopher's Stone", + "item.lzxnoneterraria.valentine_ring": "Valentine Ring", + "item.lzxnoneterraria.charm_of_myths": "Charm of Myths", + "item.lzxnoneterraria.mana_cloak": "Mana Cloak", "item.lzxnoneterraria.eye_of_the_golem": "Eye of the Golem", "item.lzxnoneterraria.destroyer_emblem": "Destroyer Emblem", "item.lzxnoneterraria.moon_stone": "Moon Stone", @@ -243,6 +252,12 @@ "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 (per tick)", + "lzxnoneterraria.configuration.mana_on_hurt_multiplier": "Mana Recovery on Hit Multiplier", + "lzxnoneterraria.configuration.mana_on_hurt_multiplier.tooltip": "Mana recovered on hit based on pre-mitigation damage", + "lzxnoneterraria.configuration.mana_sickness_duration_multiplier": "Mana Sickness Duration Multiplier", + "lzxnoneterraria.configuration.mana_sickness_duration_multiplier.tooltip": "Multiplier for the max mana sickness duration while equipped (0.75 = 25% reduction)", + "lzxnoneterraria.configuration.star_pickup_range": "Star Pickup Range", + "lzxnoneterraria.configuration.star_pickup_range.tooltip": "Pickup range for mana stars and fallen stars while equipped, in blocks", "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", @@ -329,6 +344,9 @@ "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.mana_on_hurt": "Restores mana when taking damage", + "tooltip.lzxnoneterraria.mana_sickness_duration": "Mana sickness max duration -%s%%", + "tooltip.lzxnoneterraria.star_pickup_range": "Extends star pickup range to %s blocks", "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", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index be741d3..202885c 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -149,6 +149,15 @@ "item.lzxnoneterraria.band_of_regeneration": "再生手环", "item.lzxnoneterraria.band_of_starpower": "星力手环", "item.lzxnoneterraria.mana_regeneration_band": "魔力再生手环", + "item.lzxnoneterraria.magic_cuffs": "魔法手铐", + "item.lzxnoneterraria.celestial_magnet": "天界磁石", + "item.lzxnoneterraria.celestial_emblem": "天界徽章", + "item.lzxnoneterraria.celestial_cuffs": "天界手铐", + "item.lzxnoneterraria.magnet_flower": "磁花", + "item.lzxnoneterraria.philosophers_stone": "点金石", + "item.lzxnoneterraria.valentine_ring": "情人节戒指", + "item.lzxnoneterraria.charm_of_myths": "神话护身符", + "item.lzxnoneterraria.mana_cloak": "魔力斗篷", "item.lzxnoneterraria.eye_of_the_golem": "石巨人之眼", "item.lzxnoneterraria.destroyer_emblem": "毁灭者徽章", "item.lzxnoneterraria.moon_stone": "月亮石", @@ -243,6 +252,12 @@ "lzxnoneterraria.configuration.mana_regen_bonus_scale.tooltip": "额外再生 = 系数 × 当前魔力比例 + 基础值", "lzxnoneterraria.configuration.mana_regen_bonus_base": "魔力再生加成基础值", "lzxnoneterraria.configuration.mana_regen_bonus_base.tooltip": "当前魔力为 0 时的额外再生量(每 tick)", + "lzxnoneterraria.configuration.mana_on_hurt_multiplier": "受击魔力恢复倍率", + "lzxnoneterraria.configuration.mana_on_hurt_multiplier.tooltip": "受到伤害时按减免前的伤害值恢复魔力的倍率", + "lzxnoneterraria.configuration.mana_sickness_duration_multiplier": "耐药性持续时间比例", + "lzxnoneterraria.configuration.mana_sickness_duration_multiplier.tooltip": "佩戴后耐魔性最大持续时间的比例(0.75 = 降低 25%)", + "lzxnoneterraria.configuration.star_pickup_range": "星星拾取范围", + "lzxnoneterraria.configuration.star_pickup_range.tooltip": "佩戴后魔力星和坠落之星的拾取范围(格)", "lzxnoneterraria.configuration.lava_damage_reduction": "岩浆伤害减免", "lzxnoneterraria.configuration.lava_damage_reduction.tooltip": "佩戴后受到的岩浆伤害减免比例", "lzxnoneterraria.configuration.panic_duration": "恐慌持续时间", @@ -329,6 +344,9 @@ "tooltip.lzxnoneterraria.max_mana_bonus": "魔力 +%s", "tooltip.lzxnoneterraria.mana_regen_delay": "魔力再生延迟 -%s%%", "tooltip.lzxnoneterraria.mana_regen_boost": "提升魔力再生速度", + "tooltip.lzxnoneterraria.mana_on_hurt": "受到伤害时恢复魔力", + "tooltip.lzxnoneterraria.mana_sickness_duration": "耐药性最大时间 -%s%%", + "tooltip.lzxnoneterraria.star_pickup_range": "扩大星星拾取范围 %s 格", "tooltip.lzxnoneterraria.auto_mana_potion_use": "需要时自动使用魔力药水", "lzxnoneterraria.configuration.magic_damage_multiplier": "魔法伤害倍率", "lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "佩戴后魔法伤害乘以该倍率", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/celestial_cuffs.json b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_cuffs.json new file mode 100644 index 0000000..2a6c45a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_cuffs.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/celestial_cuffs" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/celestial_emblem.json b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_emblem.json new file mode 100644 index 0000000..0b37d27 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_emblem.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/celestial_emblem" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/celestial_magnet.json b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_magnet.json new file mode 100644 index 0000000..5790189 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_magnet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/celestial_magnet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/charm_of_myths.json b/src/main/resources/assets/lzxnoneterraria/models/item/charm_of_myths.json new file mode 100644 index 0000000..a0969f1 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/charm_of_myths.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/charm_of_myths" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/magic_cuffs.json b/src/main/resources/assets/lzxnoneterraria/models/item/magic_cuffs.json new file mode 100644 index 0000000..d9bca49 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/magic_cuffs.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/magic_cuffs" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/magnet_flower.json b/src/main/resources/assets/lzxnoneterraria/models/item/magnet_flower.json new file mode 100644 index 0000000..f44e678 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/magnet_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/magnet_flower" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/mana_cloak.json b/src/main/resources/assets/lzxnoneterraria/models/item/mana_cloak.json new file mode 100644 index 0000000..4372ed5 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/mana_cloak.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/mana_cloak" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/mana_star.json b/src/main/resources/assets/lzxnoneterraria/models/item/mana_star.json new file mode 100644 index 0000000..0586824 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/mana_star.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/mana_star" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/philosophers_stone.json b/src/main/resources/assets/lzxnoneterraria/models/item/philosophers_stone.json new file mode 100644 index 0000000..ad245a3 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/philosophers_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/philosophers_stone" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/valentine_ring.json b/src/main/resources/assets/lzxnoneterraria/models/item/valentine_ring.json new file mode 100644 index 0000000..b41bd9b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/valentine_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/valentine_ring" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_cuffs.png b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_cuffs.png new file mode 100644 index 0000000..4966186 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_cuffs.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_emblem.png b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_emblem.png new file mode 100644 index 0000000..6ffe4ae Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_emblem.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_magnet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_magnet.png new file mode 100644 index 0000000..ea9a3f7 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_magnet.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/charm_of_myths.png b/src/main/resources/assets/lzxnoneterraria/textures/item/charm_of_myths.png new file mode 100644 index 0000000..80ae76f Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/charm_of_myths.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/magic_cuffs.png b/src/main/resources/assets/lzxnoneterraria/textures/item/magic_cuffs.png new file mode 100644 index 0000000..93c5414 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/magic_cuffs.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/magnet_flower.png b/src/main/resources/assets/lzxnoneterraria/textures/item/magnet_flower.png new file mode 100644 index 0000000..f4d4f18 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/magnet_flower.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/mana_cloak.png b/src/main/resources/assets/lzxnoneterraria/textures/item/mana_cloak.png new file mode 100644 index 0000000..6e06e6f Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/mana_cloak.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/mana_star.png b/src/main/resources/assets/lzxnoneterraria/textures/item/mana_star.png new file mode 100644 index 0000000..8073283 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/mana_star.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/philosophers_stone.png b/src/main/resources/assets/lzxnoneterraria/textures/item/philosophers_stone.png new file mode 100644 index 0000000..d237100 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/philosophers_stone.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/valentine_ring.png b/src/main/resources/assets/lzxnoneterraria/textures/item/valentine_ring.png new file mode 100644 index 0000000..64edaa5 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/valentine_ring.png differ diff --git a/src/main/resources/data/lzxnoneterraria/recipe/celestial_cuffs.json b/src/main/resources/data/lzxnoneterraria/recipe/celestial_cuffs.json new file mode 100644 index 0000000..b1cd052 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/celestial_cuffs.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:celestial_magnet" + }, + { + "item": "lzxnoneterraria:magic_cuffs" + } + ], + "result": { + "id": "lzxnoneterraria:celestial_cuffs", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/celestial_emblem.json b/src/main/resources/data/lzxnoneterraria/recipe/celestial_emblem.json new file mode 100644 index 0000000..22b2da6 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/celestial_emblem.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:celestial_magnet" + }, + { + "item": "lzxnoneterraria:avenger_emblem" + } + ], + "result": { + "id": "lzxnoneterraria:celestial_emblem", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/charm_of_myths.json b/src/main/resources/data/lzxnoneterraria/recipe/charm_of_myths.json new file mode 100644 index 0000000..69e6293 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/charm_of_myths.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:band_of_regeneration" + }, + { + "item": "lzxnoneterraria:philosophers_stone" + } + ], + "result": { + "id": "lzxnoneterraria:charm_of_myths", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/magic_cuffs.json b/src/main/resources/data/lzxnoneterraria/recipe/magic_cuffs.json new file mode 100644 index 0000000..48c7a95 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/magic_cuffs.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:mana_regeneration_band" + }, + { + "item": "lzxnoneterraria:shackle" + } + ], + "result": { + "id": "lzxnoneterraria:magic_cuffs", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/magnet_flower.json b/src/main/resources/data/lzxnoneterraria/recipe/magnet_flower.json new file mode 100644 index 0000000..ca62fb3 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/magnet_flower.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:mana_flower" + }, + { + "item": "lzxnoneterraria:celestial_magnet" + } + ], + "result": { + "id": "lzxnoneterraria:magnet_flower", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/mana_cloak.json b/src/main/resources/data/lzxnoneterraria/recipe/mana_cloak.json new file mode 100644 index 0000000..63c1289 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/mana_cloak.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:mana_flower" + }, + { + "item": "lzxnoneterraria:star_cloak" + } + ], + "result": { + "id": "lzxnoneterraria:mana_cloak", + "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 d92aa24..a4a3bf4 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json @@ -78,6 +78,15 @@ "lzxnoneterraria:arcane_flower", "lzxnoneterraria:band_of_regeneration", "lzxnoneterraria:band_of_starpower", - "lzxnoneterraria:mana_regeneration_band" + "lzxnoneterraria:mana_regeneration_band", + "lzxnoneterraria:magic_cuffs", + "lzxnoneterraria:celestial_magnet", + "lzxnoneterraria:celestial_emblem", + "lzxnoneterraria:celestial_cuffs", + "lzxnoneterraria:magnet_flower", + "lzxnoneterraria:philosophers_stone", + "lzxnoneterraria:valentine_ring", + "lzxnoneterraria:charm_of_myths", + "lzxnoneterraria:mana_cloak" ] }