diff --git a/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java b/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java index 12e6c4c..751d819 100644 --- a/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java +++ b/src/main/java/com/lzxnone/terraria/attachment/ModAttachments.java @@ -39,4 +39,7 @@ public class ModAttachments { public static final Supplier> TARGET_MARKS = ATTACHMENT_TYPES.register("target_marks", () -> AttachmentType.builder((Supplier) TargetMarks::new).serialize(TargetMarks.CODEC).build()); + 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()); + } 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 c234fac..1553773 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 @@ -104,6 +104,16 @@ public class ModCreativeModeTabs { output.accept(ModItems.STINGER_NECKLACE.get()); output.accept(ModItems.BEE_CLOAK.get()); output.accept(ModItems.BLACK_BELT.get()); + output.accept(ModItems.TITAN_GLOVE.get()); + output.accept(ModItems.FERAL_CLAWS.get()); + output.accept(ModItems.POWER_GLOVE.get()); + output.accept(ModItems.MECHANICAL_GLOVE.get()); + output.accept(ModItems.FLESH_KNUCKLES.get()); + output.accept(ModItems.BERSERKERS_GLOVE.get()); + output.accept(ModItems.PALADINS_SHIELD.get()); + output.accept(ModItems.HERO_SHIELD.get()); + output.accept(ModItems.FROZEN_SHIELD.get()); + output.accept(ModItems.FROZEN_TURTLE_SHELL.get()); }).build()); public static final DeferredHolder BLOCK_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_block_0", () -> CreativeModeTab.builder() diff --git a/src/main/java/com/lzxnone/terraria/effect/IceBarrierEffect.java b/src/main/java/com/lzxnone/terraria/effect/IceBarrierEffect.java new file mode 100644 index 0000000..0d50ded --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/effect/IceBarrierEffect.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.ConfigFloat; +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; + +public class IceBarrierEffect extends MobEffect { + public static final ConfigFloat DAMAGE_REDUCTION = new ConfigFloat( + "effect.ice_barrier.damage_reduction", + "ice_barrier_damage_reduction_per_level", + 0.25f, + 0.0f, + 0.95f + ); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_REDUCTION); + } + }; + + public static float getDamageReduction() { + return DAMAGE_REDUCTION.get(); + } + + public static double getDamageMultiplier(int amplifier) { + return Math.pow(1.0D - DAMAGE_REDUCTION.get(), amplifier + 1); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "ice_barrier", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/ice_barrier.png"), + Component.translatable("effect.lzxnoneterraria.ice_barrier"), + CONFIG_DATA + ); + + public IceBarrierEffect() { + super(MobEffectCategory.BENEFICIAL, 0x87CEEB); + } +} diff --git a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java index 807420a..8cfab9b 100644 --- a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java +++ b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java @@ -32,4 +32,8 @@ public class ModEffects { MOB_EFFECTS.register("mana_sickness", ManaSicknessEffect::new); public static final DeferredHolder MIDAS = MOB_EFFECTS.register("midas", MidasEffect::new); + public static final DeferredHolder PALADINS_GUARDIAN = + MOB_EFFECTS.register("paladins_shield", PaladinsShieldEffect::new); + public static final DeferredHolder ICE_BARRIER = + MOB_EFFECTS.register("ice_barrier", IceBarrierEffect::new); } diff --git a/src/main/java/com/lzxnone/terraria/effect/PaladinsShieldEffect.java b/src/main/java/com/lzxnone/terraria/effect/PaladinsShieldEffect.java new file mode 100644 index 0000000..3818792 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/effect/PaladinsShieldEffect.java @@ -0,0 +1,43 @@ +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.ConfigFloat; +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; + +public class PaladinsShieldEffect extends MobEffect { + public static final ConfigFloat DAMAGE_ABSORPTION_RATIO = new ConfigFloat( + "effect.paladins_shield.damage_absorption_ratio", + "paladins_shield_damage_absorption_ratio", + 0.25f, + 0.0f, + 1.0f + ); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_ABSORPTION_RATIO); + } + }; + + public static float getDamageAbsorptionRatio() { + return DAMAGE_ABSORPTION_RATIO.get(); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "paladins_shield", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/paladins_shield.png"), + Component.translatable("effect.lzxnoneterraria.paladins_shield"), + CONFIG_DATA + ); + + public PaladinsShieldEffect() { + super(MobEffectCategory.BENEFICIAL, 0x4FC3F7); + } +} diff --git a/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java b/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java index f7d731f..904d879 100644 --- a/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java @@ -2,6 +2,7 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; @@ -40,7 +41,7 @@ public class EffectLogicHandler { if(instance != null) { currentEffect = instance.getEffect(); } - if(checkEffect(currentEffect)) { + if(shouldBroadcast(currentEffect)) { if(entity.level() instanceof ServerLevel serverLevel) { serverLevel.getChunkSource().broadcast(entity, new ClientboundUpdateMobEffectPacket(entity.getId(), instance, false)); @@ -56,20 +57,22 @@ public class EffectLogicHandler { if(instance != null) { currentEffect = instance.getEffect(); } - if(checkEffect(currentEffect)) { + if(shouldBroadcast(currentEffect)) { if(entity.level() instanceof ServerLevel serverLevel) { if(event.getEffectInstance() != null) { serverLevel.getChunkSource().broadcast(entity, new ClientboundRemoveMobEffectPacket(entity.getId(), currentEffect)); } - if(currentEffect == ModEffects.KILL_MODE) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.getKillModeCooldownTime(), 0); - entity.addEffect(effectInstance); - }else if(currentEffect == ModEffects.KILL_MODE_COOLDOWN) { - SoundUtil.playServerSound(entity, ModSounds.DEMON_SWORD_KILL_MODE_OFF_COOLDOWN.get(), 0.5f, 1.0f); - } } } + if(currentEffect == ModEffects.KILL_MODE) { + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.getKillModeCooldownTime(), 0); + entity.addEffect(effectInstance); + }else if(currentEffect == ModEffects.KILL_MODE_COOLDOWN) { + SoundUtil.playServerSound(entity, ModSounds.DEMON_SWORD_KILL_MODE_OFF_COOLDOWN.get(), 0.5f, 1.0f); + }else if(currentEffect == ModEffects.PALADINS_GUARDIAN) { + event.getEntity().removeData(ModAttachments.PALADIN_GUARDIAN_SOURCE); + } } @SubscribeEvent @@ -80,31 +83,29 @@ public class EffectLogicHandler { if(instance != null) { currentEffect = instance.getEffect(); } - if(checkEffect(currentEffect)) { + if(shouldBroadcast(currentEffect)) { if(entity.level() instanceof ServerLevel serverLevel) { if(event.getEffectInstance() != null) { serverLevel.getChunkSource().broadcast(entity, new ClientboundRemoveMobEffectPacket(entity.getId(), currentEffect)); } - if(currentEffect == ModEffects.KILL_MODE) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.getKillModeCooldownTime(), 0); - entity.addEffect(effectInstance); - }else if(currentEffect == ModEffects.KILL_MODE_COOLDOWN) { - SoundUtil.playServerSound(entity, ModSounds.DEMON_SWORD_KILL_MODE_OFF_COOLDOWN.get(), 0.5f, 1.0f); - } } } + if(currentEffect == ModEffects.KILL_MODE) { + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.getKillModeCooldownTime(), 0); + entity.addEffect(effectInstance); + }else if(currentEffect == ModEffects.KILL_MODE_COOLDOWN) { + SoundUtil.playServerSound(entity, ModSounds.DEMON_SWORD_KILL_MODE_OFF_COOLDOWN.get(), 0.5f, 1.0f); + }else if(currentEffect == ModEffects.PALADINS_GUARDIAN) { + event.getEntity().removeData(ModAttachments.PALADIN_GUARDIAN_SOURCE); + } } - public static boolean checkEffect(Holder effect) { + public static boolean shouldBroadcast(Holder effect) { if(effect == null) return false; return effect == ModEffects.CONFUSED || effect == ModEffects.KILL_MODE - || effect == ModEffects.KILL_MODE_COOLDOWN - || effect == ModEffects.MIDAS - || effect == ModEffects.CURSED_INFERNO - || effect == ModEffects.ICHOR - || effect == ModEffects.ACID_VENOM; + || effect == ModEffects.KILL_MODE_COOLDOWN; } } diff --git a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index 3789c5c..ad1c74a 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -4,6 +4,8 @@ import com.lzxnone.terraria.LzxnoneTerraria; 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.entity.summon.StaticSummon; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; @@ -12,6 +14,7 @@ import net.minecraft.server.level.ServerLevel; 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.LivingEntity; import net.minecraft.world.entity.player.Player; @@ -25,6 +28,7 @@ import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent; import net.neoforged.neoforge.event.tick.PlayerTickEvent; import java.util.List; +import java.util.Optional; import java.util.UUID; @EventBusSubscriber(modid = LzxnoneTerraria.MODID) @@ -42,22 +46,47 @@ public class EntityEventHandler { } //免疫火块 if(source.is(DamageTypes.IN_FIRE) || source.is(DamageTypes.HOT_FLOOR) || source.is(DamageTypes.CAMPFIRE)) { - if(AccessoryUtil.isFireBlockImmune(entity)) event.setCanceled(true); + if(AccessoryUtil.isFireBlockImmune(entity)) { + event.setCanceled(true); + return; + } } - //进行护甲修饰 + //进行护甲穿透 if(!source.is(DamageTypeTags.BYPASSES_ARMOR)) { if(attacker instanceof LivingEntity livingEntity) AccessoryUtil.applyTargetArmorModifiers(livingEntity, entity); } } @SubscribeEvent - public static void onArmorPierceRemove(LivingDamageEvent.Pre event) { - //移除护甲 + public static void onLivingDamagePre(LivingDamageEvent.Pre event) { + LivingEntity target = event.getEntity(); + if(!(target.level() instanceof ServerLevel serverLevel)) return; + //移除饰品加成护甲穿透 AccessoryUtil.removeTargetArmorModifiers(event.getEntity()); + //冰障 + if(target.hasEffect(ModEffects.ICE_BARRIER)) { + MobEffectInstance instance = target.getEffect(ModEffects.ICE_BARRIER); + if(instance != null) event.setNewDamage(event.getNewDamage() * (float) IceBarrierEffect.getDamageMultiplier(instance.getAmplifier())); + } + //圣骑士护盾伤害转移 + if(target.hasEffect(ModEffects.PALADINS_GUARDIAN)) { + UUID guardianId = target.getData(ModAttachments.PALADIN_GUARDIAN_SOURCE).orElse(null); + if(guardianId != null && !guardianId.equals(target.getUUID())) { + if(serverLevel.getEntity(guardianId) instanceof LivingEntity paladin + && paladin.isAlive() && paladin.getHealth() / paladin.getMaxHealth() > AccessoryUtil.getGuardianMinHealthRatio(paladin)) { + float ratio = PaladinsShieldEffect.getDamageAbsorptionRatio(); + if(ratio > 0.0F) { + float transferred = event.getNewDamage() * ratio; + event.setNewDamage(event.getNewDamage() - transferred); + paladin.hurt(event.getSource(), transferred); + } + } + } + } } @SubscribeEvent - public static void onLivingDamage(LivingDamageEvent.Post event) { + public static void onLivingDamagePost(LivingDamageEvent.Post event) { //支配之鞭 预兆标记 Possession.markEvent(event); @@ -92,9 +121,41 @@ public class EntityEventHandler { public static void onPlayerTick(PlayerTickEvent.Post event) { Player player = event.getEntity(); if(player.level().isClientSide()) return; + //免疫冰冻 if(player.getTicksFrozen() > 0 && AccessoryUtil.isFreezeImmune(player)) { player.setTicksFrozen(0); } + //圣骑士护盾效果 + if(player.tickCount % 30 == 0) { + if(AccessoryUtil.canApplyGuardianShield(player)) { + double range = AccessoryUtil.getGuardianRange(player); + player.addEffect(new MobEffectInstance(ModEffects.PALADINS_GUARDIAN, 40, 0, false, false)); + player.setData(ModAttachments.PALADIN_GUARDIAN_SOURCE, Optional.of(player.getUUID())); + if(range > 0) { + List allies = player.level().getEntitiesOfClass( + Player.class, player.getBoundingBox().inflate(range), + ally -> ally != player && ally.isAlive() && player.isAlliedTo(ally) + ); + for(Player ally : allies) { + UUID writeUuid; + if(AccessoryUtil.canApplyGuardianShield(ally)) { + writeUuid = ally.getUUID(); + }else { + UUID current = ally.getData(ModAttachments.PALADIN_GUARDIAN_SOURCE).orElse(null); + writeUuid = (current != null && (((ServerLevel) player.level()).getEntity(current) instanceof LivingEntity living && living.isAlive())) ? current : player.getUUID(); + } + ally.addEffect(new MobEffectInstance(ModEffects.PALADINS_GUARDIAN, 40, 0, false, false)); + ally.setData(ModAttachments.PALADIN_GUARDIAN_SOURCE, Optional.of(writeUuid)); + } + } + } + } + //冰障效果 + if(player.tickCount % 30 == 0 && AccessoryUtil.canApplyIceBarrier(player)) { + double threshold = AccessoryUtil.getIceBarrierMaxHealthRatio(player); + if(threshold > 0.0D && player.getHealth() / player.getMaxHealth() <= threshold) { + player.addEffect(new MobEffectInstance(ModEffects.ICE_BARRIER, 40, 0, false, false)); + } + } } - } diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index b8b7f6c..0eeeefd 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -149,6 +149,16 @@ public class ModItems { public static final DeferredItem STINGER_NECKLACE = ITEMS.register("stinger_necklace", StingerNecklace::new); public static final DeferredItem BEE_CLOAK = ITEMS.register("bee_cloak", BeeCloak::new); public static final DeferredItem BLACK_BELT = ITEMS.register("black_belt", BlackBelt::new); + public static final DeferredItem TITAN_GLOVE = ITEMS.register("titan_glove", TitanGlove::new); + public static final DeferredItem FERAL_CLAWS = ITEMS.register("feral_claws", FeralClaws::new); + public static final DeferredItem POWER_GLOVE = ITEMS.register("power_glove", PowerGlove::new); + public static final DeferredItem MECHANICAL_GLOVE = ITEMS.register("mechanical_glove", MechanicalGlove::new); + public static final DeferredItem FLESH_KNUCKLES = ITEMS.register("flesh_knuckles", FleshKnuckles::new); + public static final DeferredItem BERSERKERS_GLOVE = ITEMS.register("berserkers_glove", BerserkersGlove::new); + public static final DeferredItem PALADINS_SHIELD = ITEMS.register("paladins_shield", PaladinsShield::new); + public static final DeferredItem HERO_SHIELD = ITEMS.register("hero_shield", HeroShield::new); + public static final DeferredItem FROZEN_TURTLE_SHELL = ITEMS.register("frozen_turtle_shell", FrozenTurtleShell::new); + public static final DeferredItem FROZEN_SHIELD = ITEMS.register("frozen_shield", FrozenShield::new); //食物 public static final DeferredItem MANA_CRYSTAL = ITEMS.register("mana_crystal", ManaCrystal::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 9d8f374..e0dcc4c 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java @@ -54,6 +54,68 @@ public class AccessoryUtil { return chance[0]; } + public static double getVisibilityMultiplier(LivingEntity entity) { + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof VisibilityModifier modifier) { + multiplier[0] *= modifier.getVisibilityMultiplier(stack, entity); + } + }); + return multiplier[0]; + } + + public static double getGuardianRange(LivingEntity entity) { + double[] range = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof GuardianShieldModifier modifier) { + if(modifier.applyGuardianShield(stack, entity)) range[0] = Math.max(modifier.getGuardianRange(stack, entity), range[0]); + } + }); + return range[0]; + } + + public static double getGuardianMinHealthRatio(LivingEntity entity) { + double[] ratio = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof GuardianShieldModifier modifier) { + if(modifier.applyGuardianShield(stack, entity)) ratio[0] = Math.min(modifier.getMinHealthRatio(stack, entity), ratio[0]); + } + }); + return ratio[0]; + } + + public static boolean canApplyGuardianShield(LivingEntity entity) { + boolean[] result = {false}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(result[0]) return; + if(accessory instanceof GuardianShieldModifier modifier) { + result[0] = modifier.applyGuardianShield(stack, entity); + } + }); + return result[0]; + } + + public static double getIceBarrierMaxHealthRatio(LivingEntity entity) { + double[] ratio = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof IceBarrierModifier modifier) { + if(modifier.applyIceBarrier(stack, entity)) ratio[0] = Math.max(modifier.getMaxHealthRatio(stack, entity), ratio[0]); + } + }); + return ratio[0]; + } + + public static boolean canApplyIceBarrier(LivingEntity entity) { + boolean[] result = {false}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(result[0]) return; + if(accessory instanceof IceBarrierModifier modifier) { + result[0] = modifier.applyIceBarrier(stack, entity); + } + }); + return result[0]; + } + public static boolean isImmuneToEffect(LivingEntity entity, Holder effect) { boolean[] result = {false}; AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AnkhCharm.java b/src/main/java/com/lzxnone/terraria/item/accessory/AnkhCharm.java index 21178a9..f5d75c7 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/AnkhCharm.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AnkhCharm.java @@ -27,7 +27,7 @@ import java.util.List; public class AnkhCharm extends AccessoryItem implements MobEffectImmunityModifier { public static final ConfigDouble ARMOR_TOUGHNESS = new ConfigDouble( "accessory.ankh_charm.armor_toughness", - "ankh_charm_armor_toughness", + "armor_toughness", 2.0D, 0.0D, 100.0D diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AvengerEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/AvengerEmblem.java index 8bd346a..8ad3a6c 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/AvengerEmblem.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AvengerEmblem.java @@ -5,6 +5,10 @@ import com.google.common.collect.MultimapBuilder; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.effect.DamageModifier; import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +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; @@ -21,7 +25,13 @@ import top.theillusivec4.curios.api.SlotContext; import java.util.List; public class AvengerEmblem extends AccessoryItem implements DamageModifier { - public static final double DAMAGE_MULTIPLIER = 1.12D; + public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.avenger_emblem.damage_multiplier", + "damage_multiplier", + 1.12D, + 1.0D, + 10.0D + ); public AvengerEmblem() { super(new Item.Properties().stacksTo(1)); @@ -29,13 +39,13 @@ public class AvengerEmblem extends AccessoryItem implements DamageModifier { @Override public double getDamageMultiplier(ItemStack stack, LivingEntity entity) { - return DAMAGE_MULTIPLIER; + return DAMAGE_MULTIPLIER.get(); } @Override public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); - double bonus = DAMAGE_MULTIPLIER - 1.0D; + double bonus = DAMAGE_MULTIPLIER.get() - 1.0D; if(bonus != 0.0D) { modifiers.put( Attributes.ATTACK_DAMAGE, @@ -49,12 +59,28 @@ public class AvengerEmblem extends AccessoryItem implements DamageModifier { return modifiers; } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "avenger_emblem", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/avenger_emblem.png"), + Component.translatable("item.lzxnoneterraria.avenger_emblem"), + 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.damage_increase", - EffectTooltipUtil.formatPercent(DAMAGE_MULTIPLIER) - ).withStyle(ChatFormatting.GRAY)); + if(DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.damage_increase", + EffectTooltipUtil.formatPercent(DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } } } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/BerserkersGlove.java b/src/main/java/com/lzxnone/terraria/item/accessory/BerserkersGlove.java new file mode 100644 index 0000000..ad76c09 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/BerserkersGlove.java @@ -0,0 +1,152 @@ +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.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MeleeKnockbackModifier; +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.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 top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class BerserkersGlove extends AccessoryItem implements MeleeKnockbackModifier, VisibilityModifier { + public static final ConfigDouble MELEE_KNOCKBACK = new ConfigDouble( + "accessory.berserkers_glove.melee_knockback", + "melee_knockback", + 0.4D, + 0.0D, + 100.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.berserkers_glove.attack_speed", + "attack_speed", + 1.12D, + 1.0D, + 10.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.berserkers_glove.defense", + "defense", + 8.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble VISIBILITY_MULTIPLIER = new ConfigDouble( + "accessory.berserkers_glove.visibility_multiplier", + "visibility_multiplier", + 1.5D, + 0.1D, + 10.0D + ); + + public BerserkersGlove() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getMeleeKnockbackBonus(ItemStack stack, LivingEntity entity) { + return MELEE_KNOCKBACK.get(); + } + + @Override + public double getVisibilityMultiplier(ItemStack stack, LivingEntity entity) { + return VISIBILITY_MULTIPLIER.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double knockback = MELEE_KNOCKBACK.get(); + if(knockback != 0.0D) { + modifiers.put( + Attributes.ATTACK_KNOCKBACK, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "berserkers_glove_knockback"), + knockback, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double attackSpeed = ATTACK_SPEED.get() - 1.0D; + if(attackSpeed != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "berserkers_glove_attack_speed"), + attackSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + double defense = DEFENSE.get(); + if(defense != 0.0D) { + modifiers.put( + Attributes.ARMOR, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "berserkers_glove_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MELEE_KNOCKBACK, ATTACK_SPEED, DEFENSE, VISIBILITY_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "berserkers_glove", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/berserkers_glove.png"), + Component.translatable("item.lzxnoneterraria.berserkers_glove"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MELEE_KNOCKBACK.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.melee_knockback_bonus", + EffectTooltipUtil.formatNumber(MELEE_KNOCKBACK.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(ATTACK_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.attack_speed_bonus", + EffectTooltipUtil.formatPercent(ATTACK_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(DEFENSE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.defense_bonus", + EffectTooltipUtil.formatNumber(DEFENSE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(VISIBILITY_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.aggro_increase" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/BlackBelt.java b/src/main/java/com/lzxnone/terraria/item/accessory/BlackBelt.java index 960bf36..dc53adf 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/BlackBelt.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/BlackBelt.java @@ -19,8 +19,8 @@ import java.util.List; public class BlackBelt extends AccessoryItem implements DamageImmunityModifier { public static final ConfigDouble DAMAGE_IMMUNITY_CHANCE = new ConfigDouble( - "accessory.black_belt.damage_immunity_chance", - "damage_immunity_chance", + "accessory.black_belt.damage_immunity", + "damage_immunity", 0.1D, 0.0D, 1.0D @@ -54,8 +54,8 @@ public class BlackBelt extends AccessoryItem implements DamageImmunityModifier { super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); if(DAMAGE_IMMUNITY_CHANCE.get() > 0.0D) { tooltipComponents.add(Component.translatable( - "tooltip.lzxnoneterraria.damage_immunity_chance", - EffectTooltipUtil.formatPercent(DAMAGE_IMMUNITY_CHANCE.get()) + "tooltip.lzxnoneterraria.damage_immunity", + EffectTooltipUtil.formatNumber(DAMAGE_IMMUNITY_CHANCE.get() * 100.0D) ).withStyle(ChatFormatting.GRAY)); } } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/FeralClaws.java b/src/main/java/com/lzxnone/terraria/item/accessory/FeralClaws.java new file mode 100644 index 0000000..171e14b --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/FeralClaws.java @@ -0,0 +1,79 @@ +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.EffectTooltipUtil; +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.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 top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class FeralClaws extends AccessoryItem { + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.feral_claws.attack_speed", + "attack_speed", + 1.12D, + 1.0D, + 10.0D + ); + + public FeralClaws() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double bonus = ATTACK_SPEED.get() - 1.0D; + if(bonus != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "feral_claws_attack_speed"), + bonus, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(ATTACK_SPEED); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "feral_claws", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/feral_claws.png"), + Component.translatable("item.lzxnoneterraria.feral_claws"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(ATTACK_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.attack_speed_bonus", + EffectTooltipUtil.formatPercent(ATTACK_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/FleshKnuckles.java b/src/main/java/com/lzxnone/terraria/item/accessory/FleshKnuckles.java new file mode 100644 index 0000000..d488f9f --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/FleshKnuckles.java @@ -0,0 +1,98 @@ +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.EffectTooltipUtil; +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.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 top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class FleshKnuckles extends AccessoryItem implements VisibilityModifier { + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.flesh_knuckles.defense", + "defense", + 8.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble VISIBILITY_MULTIPLIER = new ConfigDouble( + "accessory.flesh_knuckles.visibility_multiplier", + "visibility_multiplier", + 1.5D, + 0.1D, + 10.0D + ); + + public FleshKnuckles() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getVisibilityMultiplier(ItemStack stack, LivingEntity entity) { + return VISIBILITY_MULTIPLIER.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double defense = DEFENSE.get(); + if(defense != 0.0D) { + modifiers.put( + Attributes.ARMOR, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "flesh_knuckles_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DEFENSE, VISIBILITY_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "flesh_knuckles", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/flesh_knuckles.png"), + Component.translatable("item.lzxnoneterraria.flesh_knuckles"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(DEFENSE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.defense_bonus", + EffectTooltipUtil.formatNumber(DEFENSE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(VISIBILITY_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.aggro_increase" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/FrozenShield.java b/src/main/java/com/lzxnone/terraria/item/accessory/FrozenShield.java new file mode 100644 index 0000000..4c32e6c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/FrozenShield.java @@ -0,0 +1,168 @@ +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.effect.IceBarrierEffect; +import com.lzxnone.terraria.effect.PaladinsShieldEffect; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.GuardianShieldModifier; +import com.lzxnone.terraria.item.effect.IceBarrierModifier; +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 top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class FrozenShield extends AccessoryItem implements GuardianShieldModifier, IceBarrierModifier { + public static final ConfigDouble MIN_HEALTH_RATIO = new ConfigDouble( + "accessory.frozen_shield.min_health_ratio", + "min_health_ratio", + 0.25D, + 0.0D, + 1.0D + ); + public static final ConfigDouble MAX_HEALTH_RATIO = new ConfigDouble( + "accessory.frozen_shield.max_health_ratio", + "max_health_ratio", + 0.5D, + 0.0D, + 1.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.frozen_shield.defense", + "defense", + 6.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble KNOCKBACK_RESISTANCE = new ConfigDouble( + "accessory.frozen_shield.knockback_resistance", + "knockback_resistance", + 1.0D, + 0.0D, + 1.0D + ); + public static final ConfigDouble GUARDIAN_RANGE = new ConfigDouble( + "accessory.frozen_shield.guardian_range", + "paladins_shield_range", + 32.0D, + 0.0D, + 128.0D + ); + + public FrozenShield() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean applyGuardianShield(ItemStack stack, LivingEntity entity) { + return entity.getHealth() / entity.getMaxHealth() > MIN_HEALTH_RATIO.get(); + } + + @Override + public double getGuardianRange(ItemStack stack, LivingEntity entity) { + return GUARDIAN_RANGE.get(); + } + + @Override + public double getMinHealthRatio(ItemStack stack, LivingEntity entity) { + return MIN_HEALTH_RATIO.get(); + } + + @Override + public boolean applyIceBarrier(ItemStack stack, LivingEntity entity) { + return entity.getHealth() / entity.getMaxHealth() < MAX_HEALTH_RATIO.get(); + } + + @Override + public double getMaxHealthRatio(ItemStack stack, LivingEntity entity) { + return MAX_HEALTH_RATIO.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double defense = DEFENSE.get(); + if(defense != 0.0D) { + modifiers.put( + Attributes.ARMOR, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "frozen_shield_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double knockbackResistance = KNOCKBACK_RESISTANCE.get(); + if(knockbackResistance != 0.0D) { + modifiers.put( + Attributes.KNOCKBACK_RESISTANCE, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "frozen_shield_knockback_resistance"), + knockbackResistance, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DEFENSE, KNOCKBACK_RESISTANCE, GUARDIAN_RANGE, MIN_HEALTH_RATIO, MAX_HEALTH_RATIO); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "frozen_shield", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/frozen_shield.png"), + Component.translatable("item.lzxnoneterraria.frozen_shield"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(DEFENSE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.defense_bonus", + EffectTooltipUtil.formatNumber(DEFENSE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(KNOCKBACK_RESISTANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.knockback_resistance_bonus", + EffectTooltipUtil.formatNumber(KNOCKBACK_RESISTANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + if(GUARDIAN_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.paladins_shield", + EffectTooltipUtil.formatNumber(MIN_HEALTH_RATIO.get() * 100.0D), + EffectTooltipUtil.formatNumber(PaladinsShieldEffect.getDamageAbsorptionRatio() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + if(MAX_HEALTH_RATIO.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.ice_barrier", + EffectTooltipUtil.formatNumber(MAX_HEALTH_RATIO.get() * 100.0D), + EffectTooltipUtil.formatNumber(IceBarrierEffect.getDamageReduction() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/FrozenTurtleShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/FrozenTurtleShell.java new file mode 100644 index 0000000..8aba140 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/FrozenTurtleShell.java @@ -0,0 +1,69 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.effect.IceBarrierEffect; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.IceBarrierModifier; +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 FrozenTurtleShell extends AccessoryItem implements IceBarrierModifier { + public static final ConfigDouble MAX_HEALTH_RATIO = new ConfigDouble( + "accessory.frozen_turtle_shell.max_health_ratio", + "max_health_ratio", + 0.5D, + 0.0D, + 1.0D + ); + + public FrozenTurtleShell() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean applyIceBarrier(ItemStack stack, LivingEntity entity) { + return entity.getHealth() / entity.getMaxHealth() < MAX_HEALTH_RATIO.get(); + } + + @Override + public double getMaxHealthRatio(ItemStack stack, LivingEntity entity) { + return MAX_HEALTH_RATIO.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MAX_HEALTH_RATIO); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "frozen_turtle_shell", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/frozen_turtle_shell.png"), + Component.translatable("item.lzxnoneterraria.frozen_turtle_shell"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MAX_HEALTH_RATIO.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.ice_barrier", + EffectTooltipUtil.formatNumber(MAX_HEALTH_RATIO.get() * 100.0D), + EffectTooltipUtil.formatNumber(IceBarrierEffect.getDamageReduction() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/HeroShield.java b/src/main/java/com/lzxnone/terraria/item/accessory/HeroShield.java new file mode 100644 index 0000000..40eb3cf --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/HeroShield.java @@ -0,0 +1,160 @@ +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.effect.PaladinsShieldEffect; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.GuardianShieldModifier; +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.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 top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class HeroShield extends AccessoryItem implements GuardianShieldModifier, VisibilityModifier { + public static final ConfigDouble MIN_HEALTH_RATIO = new ConfigDouble( + "accessory.hero_shield.min_health_ratio", + "min_health_ratio", + 0.25D, + 0.0D, + 1.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.hero_shield.defense", + "defense", + 10.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble KNOCKBACK_RESISTANCE = new ConfigDouble( + "accessory.hero_shield.knockback_resistance", + "knockback_resistance", + 1.0D, + 0.0D, + 1.0D + ); + public static final ConfigDouble VISIBILITY_MULTIPLIER = new ConfigDouble( + "accessory.hero_shield.visibility_multiplier", + "visibility_multiplier", + 1.5D, + 0.1D, + 10.0D + ); + public static final ConfigDouble GUARDIAN_RANGE = new ConfigDouble( + "accessory.hero_shield.guardian_range", + "paladins_shield_range", + 32.0D, + 0.0D, + 128.0D + ); + + public HeroShield() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean applyGuardianShield(ItemStack stack, LivingEntity entity) { + return entity.getHealth() / entity.getMaxHealth() > MIN_HEALTH_RATIO.get(); + } + + @Override + public double getGuardianRange(ItemStack stack, LivingEntity entity) { + return GUARDIAN_RANGE.get(); + } + + @Override + public double getMinHealthRatio(ItemStack stack, LivingEntity entity) { + return MIN_HEALTH_RATIO.get(); + } + + @Override + public double getVisibilityMultiplier(ItemStack stack, LivingEntity entity) { + return VISIBILITY_MULTIPLIER.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double defense = DEFENSE.get(); + if(defense != 0.0D) { + modifiers.put( + Attributes.ARMOR, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "hero_shield_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double knockbackResistance = KNOCKBACK_RESISTANCE.get(); + if(knockbackResistance != 0.0D) { + modifiers.put( + Attributes.KNOCKBACK_RESISTANCE, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "hero_shield_knockback_resistance"), + knockbackResistance, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DEFENSE, KNOCKBACK_RESISTANCE, VISIBILITY_MULTIPLIER, GUARDIAN_RANGE, MIN_HEALTH_RATIO); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "hero_shield", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/hero_shield.png"), + Component.translatable("item.lzxnoneterraria.hero_shield"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(DEFENSE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.defense_bonus", + EffectTooltipUtil.formatNumber(DEFENSE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(KNOCKBACK_RESISTANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.knockback_resistance_bonus", + EffectTooltipUtil.formatNumber(KNOCKBACK_RESISTANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + if(VISIBILITY_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.aggro_increase" + ).withStyle(ChatFormatting.GRAY)); + } + if(GUARDIAN_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.paladins_shield", + EffectTooltipUtil.formatNumber(MIN_HEALTH_RATIO.get() * 100.0D), + EffectTooltipUtil.formatNumber(PaladinsShieldEffect.getDamageAbsorptionRatio() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MechanicalGlove.java b/src/main/java/com/lzxnone/terraria/item/accessory/MechanicalGlove.java new file mode 100644 index 0000000..02f8a32 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MechanicalGlove.java @@ -0,0 +1,129 @@ +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.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MeleeDamageModifier; +import com.lzxnone.terraria.item.effect.MeleeKnockbackModifier; +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 top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class MechanicalGlove extends AccessoryItem implements MeleeDamageModifier, MeleeKnockbackModifier { + public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.mechanical_glove.melee_damage_multiplier", + "melee_damage_multiplier", + 1.12D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MELEE_KNOCKBACK = new ConfigDouble( + "accessory.mechanical_glove.melee_knockback", + "melee_knockback", + 0.4D, + 0.0D, + 100.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.mechanical_glove.attack_speed", + "attack_speed", + 1.12D, + 1.0D, + 10.0D + ); + + public MechanicalGlove() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getMeleeDamageMultiplier(ItemStack stack, LivingEntity entity) { + return MELEE_DAMAGE_MULTIPLIER.get(); + } + + @Override + public double getMeleeKnockbackBonus(ItemStack stack, LivingEntity entity) { + return MELEE_KNOCKBACK.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double knockback = MELEE_KNOCKBACK.get(); + if(knockback != 0.0D) { + modifiers.put( + Attributes.ATTACK_KNOCKBACK, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "mechanical_glove_knockback"), + knockback, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double attackSpeed = ATTACK_SPEED.get() - 1.0D; + if(attackSpeed != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "mechanical_glove_attack_speed"), + attackSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER, MELEE_KNOCKBACK, ATTACK_SPEED); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "mechanical_glove", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/mechanical_glove.png"), + Component.translatable("item.lzxnoneterraria.mechanical_glove"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MELEE_DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.melee_damage_increase", + EffectTooltipUtil.formatPercent(MELEE_DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MELEE_KNOCKBACK.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.melee_knockback_bonus", + EffectTooltipUtil.formatNumber(MELEE_KNOCKBACK.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(ATTACK_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.attack_speed_bonus", + EffectTooltipUtil.formatPercent(ATTACK_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/PaladinsShield.java b/src/main/java/com/lzxnone/terraria/item/accessory/PaladinsShield.java new file mode 100644 index 0000000..d5b7fe0 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/PaladinsShield.java @@ -0,0 +1,142 @@ +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.effect.PaladinsShieldEffect; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.GuardianShieldModifier; +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 top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class PaladinsShield extends AccessoryItem implements GuardianShieldModifier { + public static final ConfigDouble MIN_HEALTH_RATIO = new ConfigDouble( + "accessory.paladins_shield.min_health_ratio", + "min_health_ratio", + 0.25D, + 0.0D, + 1.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.paladins_shield.defense", + "defense", + 6.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble KNOCKBACK_RESISTANCE = new ConfigDouble( + "accessory.paladins_shield.knockback_resistance", + "knockback_resistance", + 1.0D, + 0.0D, + 1.0D + ); + public static final ConfigDouble GUARDIAN_RANGE = new ConfigDouble( + "accessory.paladins_shield.guardian_range", + "paladins_shield_range", + 32.0D, + 0.0D, + 128.0D + ); + + public PaladinsShield() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean applyGuardianShield(ItemStack stack, LivingEntity entity) { + return entity.getHealth() / entity.getMaxHealth() > MIN_HEALTH_RATIO.get(); + } + + @Override + public double getGuardianRange(ItemStack stack, LivingEntity entity) { + return GUARDIAN_RANGE.get(); + } + + @Override + public double getMinHealthRatio(ItemStack stack, LivingEntity entity) { + return MIN_HEALTH_RATIO.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double defense = DEFENSE.get(); + if(defense != 0.0D) { + modifiers.put( + Attributes.ARMOR, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "paladins_shield_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double knockbackResistance = KNOCKBACK_RESISTANCE.get(); + if(knockbackResistance != 0.0D) { + modifiers.put( + Attributes.KNOCKBACK_RESISTANCE, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "paladins_shield_knockback_resistance"), + knockbackResistance, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DEFENSE, KNOCKBACK_RESISTANCE, GUARDIAN_RANGE, MIN_HEALTH_RATIO); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "paladins_shield", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/paladins_shield.png"), + Component.translatable("item.lzxnoneterraria.paladins_shield"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(DEFENSE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.defense_bonus", + EffectTooltipUtil.formatNumber(DEFENSE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(KNOCKBACK_RESISTANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.knockback_resistance_bonus", + EffectTooltipUtil.formatNumber(KNOCKBACK_RESISTANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + if(GUARDIAN_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.paladins_shield", + EffectTooltipUtil.formatNumber(MIN_HEALTH_RATIO.get() * 100.0D), + EffectTooltipUtil.formatNumber(PaladinsShieldEffect.getDamageAbsorptionRatio() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/PowerGlove.java b/src/main/java/com/lzxnone/terraria/item/accessory/PowerGlove.java new file mode 100644 index 0000000..a708a28 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/PowerGlove.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.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MeleeKnockbackModifier; +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 top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class PowerGlove extends AccessoryItem implements MeleeKnockbackModifier { + public static final ConfigDouble MELEE_KNOCKBACK = new ConfigDouble( + "accessory.power_glove.melee_knockback", + "melee_knockback", + 0.4D, + 0.0D, + 100.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.power_glove.attack_speed", + "attack_speed", + 1.12D, + 1.0D, + 10.0D + ); + + public PowerGlove() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getMeleeKnockbackBonus(ItemStack stack, LivingEntity entity) { + return MELEE_KNOCKBACK.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double knockback = MELEE_KNOCKBACK.get(); + if(knockback != 0.0D) { + modifiers.put( + Attributes.ATTACK_KNOCKBACK, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "power_glove_knockback"), + knockback, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double attackSpeed = ATTACK_SPEED.get() - 1.0D; + if(attackSpeed != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "power_glove_attack_speed"), + attackSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MELEE_KNOCKBACK, ATTACK_SPEED); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "power_glove", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/power_glove.png"), + Component.translatable("item.lzxnoneterraria.power_glove"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MELEE_KNOCKBACK.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.melee_knockback_bonus", + EffectTooltipUtil.formatNumber(MELEE_KNOCKBACK.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(ATTACK_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.attack_speed_bonus", + EffectTooltipUtil.formatPercent(ATTACK_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/TitanGlove.java b/src/main/java/com/lzxnone/terraria/item/accessory/TitanGlove.java new file mode 100644 index 0000000..179d24d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/TitanGlove.java @@ -0,0 +1,86 @@ +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.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MeleeKnockbackModifier; +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 top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class TitanGlove extends AccessoryItem implements MeleeKnockbackModifier { + public static final ConfigDouble MELEE_KNOCKBACK = new ConfigDouble( + "accessory.titan_glove.melee_knockback", + "melee_knockback", + 0.4D, + 0.0D, + 100.0D + ); + + public TitanGlove() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getMeleeKnockbackBonus(ItemStack stack, LivingEntity entity) { + return MELEE_KNOCKBACK.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double bonus = MELEE_KNOCKBACK.get(); + if(bonus != 0.0D) { + modifiers.put( + Attributes.ATTACK_KNOCKBACK, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "titan_glove_knockback"), + bonus, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MELEE_KNOCKBACK); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "titan_glove", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/titan_glove.png"), + Component.translatable("item.lzxnoneterraria.titan_glove"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MELEE_KNOCKBACK.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.melee_knockback_bonus", + EffectTooltipUtil.formatNumber(MELEE_KNOCKBACK.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/GuardianShieldModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/GuardianShieldModifier.java new file mode 100644 index 0000000..da5a590 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/GuardianShieldModifier.java @@ -0,0 +1,10 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface GuardianShieldModifier { + boolean applyGuardianShield(ItemStack stack, LivingEntity entity); + double getGuardianRange(ItemStack stack, LivingEntity entity); + double getMinHealthRatio(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/IceBarrierModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/IceBarrierModifier.java new file mode 100644 index 0000000..4f066c7 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/IceBarrierModifier.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 IceBarrierModifier { + boolean applyIceBarrier(ItemStack stack, LivingEntity entity); + double getMaxHealthRatio(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MeleeKnockbackModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MeleeKnockbackModifier.java new file mode 100644 index 0000000..e1129c5 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/MeleeKnockbackModifier.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 MeleeKnockbackModifier { + //近战击退加值(正数 = 增加的击退强度) + double getMeleeKnockbackBonus(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/VisibilityModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/VisibilityModifier.java new file mode 100644 index 0000000..273520b --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/VisibilityModifier.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 VisibilityModifier { + //可见度倍率(>1 = 更容易被怪物发现,<1 = 更难被发现;1.0 = 无效果) + double getVisibilityMultiplier(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java index 0f09388..ff69484 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java @@ -2,6 +2,7 @@ package com.lzxnone.terraria.item.weapon; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.effect.MeleeDamageModifier; +import com.lzxnone.terraria.item.effect.MeleeKnockbackModifier; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; @@ -27,4 +28,15 @@ public class MeleeWeapon extends Weapon { finalDamage *= multiplier[0]; return (float)Math.max(0.0D, finalDamage); } + + public static float applyMeleeKnockbackBonus(ItemStack stack, LivingEntity entity, float knockback) { + //饰品 + double[] bonus = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { + if(accessory instanceof MeleeKnockbackModifier modifier) { + bonus[0] += modifier.getMeleeKnockbackBonus(accessoryStack, entity); + } + }); + return knockback + (float) bonus[0]; + } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java index 046ebb2..24ccc07 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java @@ -158,10 +158,9 @@ public class StardustDragonStaff extends MinionWeapon { } } float damage = DAMAGE.get() + ADD_DAMAGE.get() * Math.max(0, stardustDragonSlotCount - 1); - float knockback = summon.getOwner() instanceof Player p ? MinionWeapon.applyMinionKnockback(p, 1.0f) : 1.0f; for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, damage, knockback)) target.invulnerableTime = 15; + if(DamageUtil.summonAttack(summon, target, sourceStack, damage, 1.0f)) target.invulnerableTime = 15; } } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java index 38830a9..334c83d 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java @@ -226,9 +226,8 @@ public class Terraprisma extends MinionWeapon { FilterUtil.createTargetFilter(summon, player) ); ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); - float knockback = MinionWeapon.applyMinionKnockback(player, 1.0f); for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), knockback)) target.invulnerableTime = 15; + if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), 1.0f)) target.invulnerableTime = 15; } }else if(state == State.ROTATE.ordinal()) { int time = customData.contains("rotateTime") ? customData.getInt("rotateTime") : 0; @@ -278,9 +277,8 @@ public class Terraprisma extends MinionWeapon { ); ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); - float knockback = MinionWeapon.applyMinionKnockback(player, 1.0f); for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), knockback)) target.invulnerableTime = 15; + if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), 1.0f)) target.invulnerableTime = 15; } customData.putInt("rotateTime", time + 1); diff --git a/src/main/java/com/lzxnone/terraria/mixin/LivingEntityVisibilityMixin.java b/src/main/java/com/lzxnone/terraria/mixin/LivingEntityVisibilityMixin.java new file mode 100644 index 0000000..f3d0cb0 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/mixin/LivingEntityVisibilityMixin.java @@ -0,0 +1,24 @@ +package com.lzxnone.terraria.mixin; + +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(LivingEntity.class) +public abstract class LivingEntityVisibilityMixin { + @Inject(method = "getVisibilityPercent", at = @At("RETURN"), cancellable = true) + private void modifyVisibility(Entity lookingEntity, CallbackInfoReturnable cir) { + LivingEntity self = (LivingEntity)(Object)this; + if(!(self instanceof Player player)) return; + if(player.level().isClientSide()) return; + double multiplier = AccessoryUtil.getVisibilityMultiplier(player); + if(multiplier != 1.0D) { + cir.setReturnValue(cir.getReturnValue() * multiplier); + } + } +} 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 f349e94..f6b9c6f 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -7,6 +7,8 @@ import com.lzxnone.terraria.effect.DemonicFlamesEffect; import com.lzxnone.terraria.effect.IchorEffect; 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.SummonEffect; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.client.config.RenderConfigs; @@ -16,6 +18,7 @@ import com.lzxnone.terraria.item.accessory.NaturesGift; import com.lzxnone.terraria.item.accessory.ArmorPolish; import com.lzxnone.terraria.item.accessory.ArmorBracing; import com.lzxnone.terraria.item.accessory.AnkhCharm; +import com.lzxnone.terraria.item.accessory.AvengerEmblem; import com.lzxnone.terraria.item.accessory.CobaltShield; import com.lzxnone.terraria.item.accessory.ObsidianShield; import com.lzxnone.terraria.item.accessory.AnkhShield; @@ -35,6 +38,16 @@ import com.lzxnone.terraria.item.accessory.HoneyComb; import com.lzxnone.terraria.item.accessory.StingerNecklace; import com.lzxnone.terraria.item.accessory.BeeCloak; import com.lzxnone.terraria.item.accessory.BlackBelt; +import com.lzxnone.terraria.item.accessory.TitanGlove; +import com.lzxnone.terraria.item.accessory.FeralClaws; +import com.lzxnone.terraria.item.accessory.PowerGlove; +import com.lzxnone.terraria.item.accessory.MechanicalGlove; +import com.lzxnone.terraria.item.accessory.FleshKnuckles; +import com.lzxnone.terraria.item.accessory.BerserkersGlove; +import com.lzxnone.terraria.item.accessory.PaladinsShield; +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.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.BeeKeeper; import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass; @@ -145,7 +158,9 @@ public class ConfigList { AcidVenomEffect.CONFIG_LIST_ITEM, MidasEffect.CONFIG_LIST_ITEM, ManaSicknessEffect.CONFIG_LIST_ITEM, - SummonEffect.CONFIG_LIST_ITEM + SummonEffect.CONFIG_LIST_ITEM, + PaladinsShieldEffect.CONFIG_LIST_ITEM, + IceBarrierEffect.CONFIG_LIST_ITEM }); ITEMS.put(AMMO, new ConfigListItem[]{ MusketBall.CONFIG_LIST_ITEM, @@ -180,6 +195,7 @@ public class ConfigList { NecromanticScroll.CONFIG_LIST_ITEM, PapyrusScarab.CONFIG_LIST_ITEM, PygmyNecklace.CONFIG_LIST_ITEM, + AvengerEmblem.CONFIG_LIST_ITEM, WarriorEmblem.CONFIG_LIST_ITEM, SummonerEmblem.CONFIG_LIST_ITEM, RangerEmblem.CONFIG_LIST_ITEM, @@ -188,7 +204,17 @@ public class ConfigList { HoneyComb.CONFIG_LIST_ITEM, StingerNecklace.CONFIG_LIST_ITEM, BeeCloak.CONFIG_LIST_ITEM, - BlackBelt.CONFIG_LIST_ITEM + BlackBelt.CONFIG_LIST_ITEM, + TitanGlove.CONFIG_LIST_ITEM, + FeralClaws.CONFIG_LIST_ITEM, + PowerGlove.CONFIG_LIST_ITEM, + MechanicalGlove.CONFIG_LIST_ITEM, + FleshKnuckles.CONFIG_LIST_ITEM, + BerserkersGlove.CONFIG_LIST_ITEM, + PaladinsShield.CONFIG_LIST_ITEM, + HeroShield.CONFIG_LIST_ITEM, + FrozenTurtleShell.CONFIG_LIST_ITEM, + FrozenShield.CONFIG_LIST_ITEM }); ITEMS.put(ENCHANTMENT, new ConfigListItem[]{ ModEnchantmentConfigs.MANA_LEAK_CONFIG_LIST_ITEM, diff --git a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java index 4edfc9e..8a3860c 100644 --- a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java @@ -8,6 +8,7 @@ import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.weapon.*; +import com.lzxnone.terraria.item.weapon.summon.minion.MinionWeapon; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.damagesource.DamageSource; @@ -75,15 +76,18 @@ public class DamageUtil { //应用药水 float finalDamage = category == DamageCategory.REAL ? Math.max(0.0F, damage) : applyPlayerDamageEffects(player, damage); float knockbackLevel = (float) player.getAttributeValue(Attributes.ATTACK_KNOCKBACK); - // + knockbackLevel -= MeleeWeapon.applyMeleeKnockbackBonus(itemSource, player, 0.0F); + //应用 finalDamage = Weapon.applyDamageBonus(itemSource, player, finalDamage); if(category == DamageCategory.MELEE && !itemSource.isEmpty()) { finalDamage = EnchantmentHelper.modifyDamage(serverLevel, itemSource, target, source, finalDamage); finalDamage = MeleeWeapon.applyMeleeDamageBonus(itemSource, player, finalDamage); knockbackLevel = EnchantmentHelper.modifyKnockback(serverLevel, itemSource, target, source, knockbackLevel); + knockbackLevel = MeleeWeapon.applyMeleeKnockbackBonus(itemSource, player, knockbackLevel); }else if(category == DamageCategory.SUMMON && !itemSource.isEmpty()) { finalDamage = SummonWeapon.applySummonDamageBonus(itemSource, player, finalDamage); + if(itemSource.getItem() instanceof MinionWeapon) MinionWeapon.applyMinionKnockback(player, knockbackLevel); }else if(category == DamageCategory.MAGIC && !itemSource.isEmpty()) { finalDamage = MagicWeapon.applyMagicDamageBonus(itemSource, player, finalDamage); }else if(category == DamageCategory.RANGED && !itemSource.isEmpty()) { diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 20b5777..93f2dba 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -125,6 +125,16 @@ "item.lzxnoneterraria.stinger_necklace": "Stinger Necklace", "item.lzxnoneterraria.bee_cloak": "Bee Cloak", "item.lzxnoneterraria.black_belt": "Black Belt", + "item.lzxnoneterraria.titan_glove": "Titan Glove", + "item.lzxnoneterraria.feral_claws": "Feral Claws", + "item.lzxnoneterraria.power_glove": "Power Glove", + "item.lzxnoneterraria.mechanical_glove": "Mechanical Glove", + "item.lzxnoneterraria.flesh_knuckles": "Flesh Knuckles", + "item.lzxnoneterraria.berserkers_glove": "Berserker's Glove", + "item.lzxnoneterraria.paladins_shield": "Paladin's Shield", + "item.lzxnoneterraria.hero_shield": "Hero Shield", + "item.lzxnoneterraria.frozen_turtle_shell": "Frozen Turtle Shell", + "item.lzxnoneterraria.frozen_shield": "Frozen Shield", "item.lzxnoneterraria.mana_crystal": "Mana Crystal", "item.lzxnoneterraria.summoning_potion": "Summoning Potion", "item.lzxnoneterraria.lesser_mana_potion": "Lesser Mana Potion", @@ -162,6 +172,7 @@ "tooltip.lzxnoneterraria.ammo": "Ammo: %s", "tooltip.lzxnoneterraria.minion_weapon_minion_count": "Minion Count: %s", "tooltip.lzxnoneterraria.devils_devastation_kill_mode": "Kill Mode", + "tooltip.lzxnoneterraria.devils_devastation.0": "The perfect blade of the Underworld, wielding the power of Brimstone directly.", "tooltip.lzxnoneterraria.devils_devastation.1": "Humans understand this force as Havoc, the inevitable sundering of all order in fire.", "tooltip.lzxnoneterraria.devils_devastation.2": "Perhaps this is why the Brimstone Elemental had strength unrivaled by her sisters.", @@ -170,7 +181,7 @@ "tooltip.lzxnoneterraria.summoning_potion": "Increases minion capacity by %s for 8 minutes", "tooltip.lzxnoneterraria.mana_potion": "Restores %s mana", - "curios.modifiers.terraria_accessory" : "Accessory Attribute Bonus", + "curios.modifiers.terraria_accessory": "Accessory Attribute Bonus", "tooltip.lzxnoneterraria.poison_immunity": "Poison Immunity", "tooltip.lzxnoneterraria.darkness_immunity": "Darkness Immunity", "tooltip.lzxnoneterraria.slowness_immunity": "Slowness Immunity", @@ -180,42 +191,61 @@ "tooltip.lzxnoneterraria.wither_immunity": "Wither Immunity", "tooltip.lzxnoneterraria.levitation_immunity": "Levitation Immunity", "tooltip.lzxnoneterraria.mining_fatigue_immunity": "Mining Fatigue Immunity", - "tooltip.lzxnoneterraria.armor_toughness_bonus": "Armor Toughness +%s", - "tooltip.lzxnoneterraria.knockback_resistance_bonus": "Knockback Resistance +%s%%", - "tooltip.lzxnoneterraria.defense_bonus": "Defense +%s", "tooltip.lzxnoneterraria.fire_block_immunity": "Immune to Fire Blocks", "tooltip.lzxnoneterraria.freeze_immunity": "Immune to Freezing", - "tooltip.lzxnoneterraria.damage_increase": "Damage +%s%%", - "tooltip.lzxnoneterraria.fallen_star_summon": "Summons falling stars when damaged", - "tooltip.lzxnoneterraria.invulnerable_time_bonus": "Extends invulnerability time after being hit x%s", - "tooltip.lzxnoneterraria.armor_pierce_bonus": "Armor Pierce +%s", - "tooltip.lzxnoneterraria.bee_summon": "Releases bees when damaged", - "tooltip.lzxnoneterraria.damage_immunity_chance": "%s%% chance to negate incoming damage", + "tooltip.lzxnoneterraria.damage_immunity": "%s%% chance to negate incoming damage", + "lzxnoneterraria.configuration.damage_immunity": "Damage Immunity", + "lzxnoneterraria.configuration.damage_immunity.tooltip": "Chance to negate incoming damage", - "tooltip.lzxnoneterraria.melee_damage_increase": "+%s%% melee damage", - "tooltip.lzxnoneterraria.melee_damage_decrease": "-%s%% melee damage", - "lzxnoneterraria.configuration.melee_damage_multiplier": "Melee Damage Multiplier", - "lzxnoneterraria.configuration.melee_damage_multiplier.tooltip": "Melee damage is multiplied by this value while equipped", - "lzxnoneterraria.configuration.armor_toughness": "Armor Toughness", - "lzxnoneterraria.configuration.armor_toughness.tooltip": "Grants this amount of armor toughness while equipped", - "lzxnoneterraria.configuration.ankh_charm_armor_toughness": "Ankh Charm Armor Toughness", - "lzxnoneterraria.configuration.ankh_charm_armor_toughness.tooltip": "Grants this amount of armor toughness while equipped", + "tooltip.lzxnoneterraria.damage_increase": "Damage +%s%%", + "tooltip.lzxnoneterraria.knockback_resistance_bonus": "Knockback Resistance +%s%%", + "tooltip.lzxnoneterraria.defense_bonus": "Defense +%s", + "tooltip.lzxnoneterraria.armor_toughness_bonus": "Armor Toughness +%s", + "lzxnoneterraria.configuration.damage_multiplier": "Damage Multiplier", + "lzxnoneterraria.configuration.damage_multiplier.tooltip": "All damage is multiplied by this value while equipped", + "tooltip.lzxnoneterraria.armor_pierce_bonus": "Armor Pierce +%s", "lzxnoneterraria.configuration.knockback_resistance": "Knockback Resistance", "lzxnoneterraria.configuration.knockback_resistance.tooltip": "Grants this amount of knockback resistance while equipped", "lzxnoneterraria.configuration.defense": "Defense", "lzxnoneterraria.configuration.defense.tooltip": "Grants this amount of armor while equipped", - "lzxnoneterraria.configuration.fallen_star_damage": "Fallen Star Damage", - "lzxnoneterraria.configuration.fallen_star_damage.tooltip": "Damage dealt by falling stars", + "lzxnoneterraria.configuration.armor_toughness": "Armor Toughness", + "lzxnoneterraria.configuration.armor_toughness.tooltip": "Grants this amount of armor toughness while equipped", "lzxnoneterraria.configuration.armor_pierce": "Armor Pierce", "lzxnoneterraria.configuration.armor_pierce.tooltip": "Attacks ignore this much target armor while equipped", + + "tooltip.lzxnoneterraria.fallen_star_summon": "Summons falling stars when damaged", + "tooltip.lzxnoneterraria.invulnerable_time_bonus": "Extends invulnerability time after being hit x%s", + "tooltip.lzxnoneterraria.bee_summon": "Releases bees when damaged", + "tooltip.lzxnoneterraria.aggro_increase": "Increases enemy aggro", + "tooltip.lzxnoneterraria.paladins_shield": "When health is above %s%%, absorbs %s%% of damage taken by other players on the team", + "tooltip.lzxnoneterraria.ice_barrier": "Reduces damage taken by %s%% while health is below %s%%", + "lzxnoneterraria.configuration.fallen_star_damage": "Fallen Star Damage", + "lzxnoneterraria.configuration.fallen_star_damage.tooltip": "Damage dealt by falling stars", + "lzxnoneterraria.configuration.invulnerable_time_multiplier": "Invulnerable Time Multiplier", + "lzxnoneterraria.configuration.invulnerable_time_multiplier.tooltip": "Invulnerability time after being hit is multiplied by this value", "lzxnoneterraria.configuration.bee_summon_max_count": "Bee Summon Max Count", "lzxnoneterraria.configuration.bee_summon_max_count.tooltip": "Max bees released when damaged", "lzxnoneterraria.configuration.bee_summon_damage": "Bee Summon Damage", "lzxnoneterraria.configuration.bee_summon_damage.tooltip": "Damage dealt by each bee", - "lzxnoneterraria.configuration.damage_immunity_chance": "Damage Immunity Chance", - "lzxnoneterraria.configuration.damage_immunity_chance.tooltip": "Chance to negate incoming damage", - "lzxnoneterraria.configuration.invulnerable_time_multiplier": "Invulnerable Time Multiplier", - "lzxnoneterraria.configuration.invulnerable_time_multiplier.tooltip": "Invulnerability time after being hit is multiplied by this value", + "lzxnoneterraria.configuration.visibility_multiplier": "Aggro Multiplier", + "lzxnoneterraria.configuration.visibility_multiplier.tooltip": "Multiplies the distance at which monsters notice you while equipped (above 1 is easier to notice)", + "lzxnoneterraria.configuration.paladins_shield_range": "Guardian Range", + "lzxnoneterraria.configuration.paladins_shield_range.tooltip": "Absorbs part of damage for allied players within this range (0 disables)", + "lzxnoneterraria.configuration.max_health_ratio": "Max Health Threshold", + "lzxnoneterraria.configuration.max_health_ratio.tooltip": "Triggers while health is below this ratio (0 disables)", + "lzxnoneterraria.configuration.min_health_ratio": "Min Health Threshold", + "lzxnoneterraria.configuration.min_health_ratio.tooltip": "Triggers while health is above this ratio (0 disables)", + + "tooltip.lzxnoneterraria.melee_damage_increase": "+%s%% melee damage", + "tooltip.lzxnoneterraria.melee_damage_decrease": "-%s%% melee damage", + "tooltip.lzxnoneterraria.melee_knockback_bonus": "Melee Knockback +%s", + "tooltip.lzxnoneterraria.attack_speed_bonus": "Attack Speed +%s%%", + "lzxnoneterraria.configuration.melee_damage_multiplier": "Melee Damage Multiplier", + "lzxnoneterraria.configuration.melee_damage_multiplier.tooltip": "Melee damage is multiplied by this value while equipped", + "lzxnoneterraria.configuration.melee_knockback": "Melee Knockback", + "lzxnoneterraria.configuration.melee_knockback.tooltip": "Melee attacks gain this extra knockback while equipped", + "lzxnoneterraria.configuration.attack_speed": "Attack Speed", + "lzxnoneterraria.configuration.attack_speed.tooltip": "Attack speed is multiplied by this value while equipped (1.12 = +12%)", "tooltip.lzxnoneterraria.ranged_damage_increase": "+%s%% ranged damage", "tooltip.lzxnoneterraria.ranged_damage_decrease": "-%s%% ranged damage", @@ -224,11 +254,11 @@ "tooltip.lzxnoneterraria.magic_damage_increase": "+%s%% magic damage", "tooltip.lzxnoneterraria.magic_damage_decrease": "-%s%% magic damage", - "lzxnoneterraria.configuration.magic_damage_multiplier": "Magic Damage Multiplier", - "lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "Magic damage is multiplied by this value while equipped", "tooltip.lzxnoneterraria.mana_cost_increase": "+%s%% mana cost", "tooltip.lzxnoneterraria.mana_cost_decrease": "-%s%% mana cost", "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", "lzxnoneterraria.configuration.mana_cost_multiplier": "Mana Cost Multiplier", "lzxnoneterraria.configuration.mana_cost_multiplier.tooltip": "Mana cost is multiplied by this value while equipped", @@ -251,7 +281,6 @@ "entity.lzxnoneterraria.static_projectile": "Projectile", "entity.lzxnoneterraria.static_summon": "Summon", "entity.lzxnoneterraria.bee_summon": "Bee", - "effect.lzxnoneterraria.confused": "Confused", "effect.lzxnoneterraria.blood_butchered": "Blood Butchered", "effect.lzxnoneterraria.kill_mode": "Kill Mode", @@ -261,6 +290,8 @@ "effect.lzxnoneterraria.ichor": "Ichor", "effect.lzxnoneterraria.acid_venom": "Acid Venom", "effect.lzxnoneterraria.midas": "Midas", + "effect.lzxnoneterraria.paladins_shield": "Paladin's Shield", + "effect.lzxnoneterraria.ice_barrier": "Ice Barrier", "effect.lzxnoneterraria.summon": "Summon", "effect.lzxnoneterraria.mana_sickness": "Mana Sickness", @@ -337,6 +368,10 @@ "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction.tooltip": "Magic damage reduction at maximum duration, from 0 to 1", "lzxnoneterraria.configuration.summon_summon_count_per_level": "Minion Count Per Level", "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "Extra minion count granted by each level of the summon effect", + "lzxnoneterraria.configuration.paladins_shield_damage_absorption_ratio": "Damage Absorption Ratio", + "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.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 11b9b46..1890583 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -125,6 +125,16 @@ "item.lzxnoneterraria.stinger_necklace": "毒刺项链", "item.lzxnoneterraria.bee_cloak": "蜜蜂斗篷", "item.lzxnoneterraria.black_belt": "黑腰带", + "item.lzxnoneterraria.titan_glove": "泰坦手套", + "item.lzxnoneterraria.feral_claws": "猛爪手套", + "item.lzxnoneterraria.power_glove": "强力手套", + "item.lzxnoneterraria.mechanical_glove": "机械手套", + "item.lzxnoneterraria.flesh_knuckles": "血肉指虎", + "item.lzxnoneterraria.berserkers_glove": "狂战士手套", + "item.lzxnoneterraria.paladins_shield": "圣骑士护盾", + "item.lzxnoneterraria.hero_shield": "英雄护盾", + "item.lzxnoneterraria.frozen_turtle_shell": "冰冻海龟壳", + "item.lzxnoneterraria.frozen_shield": "冰冻护盾", "item.lzxnoneterraria.mana_crystal": "魔力水晶", "item.lzxnoneterraria.summoning_potion": "召唤药水", "item.lzxnoneterraria.lesser_mana_potion": "弱效魔力药水", @@ -171,7 +181,7 @@ "tooltip.lzxnoneterraria.summoning_potion": "增加 %s 个仆从栏位,持续 8 分钟", "tooltip.lzxnoneterraria.mana_potion": "恢复 %s 点魔力", - "curios.modifiers.terraria_accessory" : "饰品属性加成", + "curios.modifiers.terraria_accessory": "饰品属性加成", "tooltip.lzxnoneterraria.poison_immunity": "免疫中毒", "tooltip.lzxnoneterraria.darkness_immunity": "免疫黑暗", "tooltip.lzxnoneterraria.slowness_immunity": "免疫缓慢", @@ -181,42 +191,61 @@ "tooltip.lzxnoneterraria.wither_immunity": "免疫凋零", "tooltip.lzxnoneterraria.levitation_immunity": "免疫漂浮", "tooltip.lzxnoneterraria.mining_fatigue_immunity": "免疫挖掘疲劳", - "tooltip.lzxnoneterraria.armor_toughness_bonus": "盔甲韧性 +%s", - "tooltip.lzxnoneterraria.knockback_resistance_bonus": "抗性击退 +%s%%", - "tooltip.lzxnoneterraria.defense_bonus": "护甲值 +%s", "tooltip.lzxnoneterraria.fire_block_immunity": "对火块免疫", "tooltip.lzxnoneterraria.freeze_immunity": "免疫冰冻", - "tooltip.lzxnoneterraria.damage_increase": "伤害 +%s%%", - "tooltip.lzxnoneterraria.fallen_star_summon": "受到伤害后会使星星坠落", - "tooltip.lzxnoneterraria.invulnerable_time_bonus": "延长受伤后的无敌状态时间 x%s", - "tooltip.lzxnoneterraria.armor_pierce_bonus": "护甲穿透 +%s", - "tooltip.lzxnoneterraria.bee_summon": "受到伤害后释放蜜蜂", - "tooltip.lzxnoneterraria.damage_immunity_chance": "有 %s%% 几率抵消承受的伤害", + "tooltip.lzxnoneterraria.damage_immunity": "有 %s%% 几率抵消承受的伤害", + "lzxnoneterraria.configuration.damage_immunity": "伤害免疫概率", + "lzxnoneterraria.configuration.damage_immunity.tooltip": "抵消承受伤害的概率", - "tooltip.lzxnoneterraria.melee_damage_increase": "近战伤害 +%s%%", - "tooltip.lzxnoneterraria.melee_damage_decrease": "近战伤害 -%s%%", - "lzxnoneterraria.configuration.melee_damage_multiplier": "近战武器伤害倍率", - "lzxnoneterraria.configuration.melee_damage_multiplier.tooltip": "佩戴后近战伤害乘以该倍率", - "lzxnoneterraria.configuration.armor_toughness": "盔甲韧性", - "lzxnoneterraria.configuration.armor_toughness.tooltip": "佩戴后获得该数值的盔甲韧性", - "lzxnoneterraria.configuration.ankh_charm_armor_toughness": "十字章盔甲韧性", - "lzxnoneterraria.configuration.ankh_charm_armor_toughness.tooltip": "佩戴后获得该数值的盔甲韧性", + "tooltip.lzxnoneterraria.damage_increase": "伤害 +%s%%", + "tooltip.lzxnoneterraria.knockback_resistance_bonus": "抗性击退 +%s%%", + "tooltip.lzxnoneterraria.defense_bonus": "护甲值 +%s", + "tooltip.lzxnoneterraria.armor_toughness_bonus": "盔甲韧性 +%s", + "lzxnoneterraria.configuration.damage_multiplier": "伤害倍率", + "lzxnoneterraria.configuration.damage_multiplier.tooltip": "佩戴后所有伤害乘以该倍率", + "tooltip.lzxnoneterraria.armor_pierce_bonus": "护甲穿透 +%s", "lzxnoneterraria.configuration.knockback_resistance": "抗性击退", "lzxnoneterraria.configuration.knockback_resistance.tooltip": "佩戴后获得该数值的抗性击退", - "lzxnoneterraria.configuration.defense": "防御", - "lzxnoneterraria.configuration.defense.tooltip": "佩戴后获得该数值的防御", - "lzxnoneterraria.configuration.fallen_star_damage": "星星伤害", - "lzxnoneterraria.configuration.fallen_star_damage.tooltip": "星星坠落造成的伤害", + "lzxnoneterraria.configuration.defense": "护甲值", + "lzxnoneterraria.configuration.defense.tooltip": "佩戴后获得该数值的护甲值", + "lzxnoneterraria.configuration.armor_toughness": "盔甲韧性", + "lzxnoneterraria.configuration.armor_toughness.tooltip": "佩戴后获得该数值的盔甲韧性", "lzxnoneterraria.configuration.armor_pierce": "护甲穿透", "lzxnoneterraria.configuration.armor_pierce.tooltip": "佩戴后攻击无视目标该数值的护甲", + + "tooltip.lzxnoneterraria.fallen_star_summon": "受到伤害后会使星星坠落", + "tooltip.lzxnoneterraria.invulnerable_time_bonus": "延长受伤后的无敌状态时间 x%s", + "tooltip.lzxnoneterraria.bee_summon": "受到伤害后释放蜜蜂", + "tooltip.lzxnoneterraria.aggro_increase": "增加怪物仇恨", + "tooltip.lzxnoneterraria.paladins_shield": "当玩家生命高于 %s%% 时,吸收团队中其他玩家所受伤害的 %s%%", + "tooltip.lzxnoneterraria.ice_barrier": "当玩家生命低于 %s%% 时,降低 %s%% 伤害", + "lzxnoneterraria.configuration.fallen_star_damage": "星星伤害", + "lzxnoneterraria.configuration.fallen_star_damage.tooltip": "星星坠落造成的伤害", + "lzxnoneterraria.configuration.invulnerable_time_multiplier": "无敌时间倍率", + "lzxnoneterraria.configuration.invulnerable_time_multiplier.tooltip": "受伤后的无敌时间乘以该倍率", "lzxnoneterraria.configuration.bee_summon_max_count": "蜜蜂数量", "lzxnoneterraria.configuration.bee_summon_max_count.tooltip": "受到伤害后释放的最大蜜蜂数", "lzxnoneterraria.configuration.bee_summon_damage": "蜜蜂伤害", "lzxnoneterraria.configuration.bee_summon_damage.tooltip": "每只蜜蜂的攻击伤害", - "lzxnoneterraria.configuration.damage_immunity_chance": "伤害免疫概率", - "lzxnoneterraria.configuration.damage_immunity_chance.tooltip": "抵消承受伤害的概率", - "lzxnoneterraria.configuration.invulnerable_time_multiplier": "无敌时间倍率", - "lzxnoneterraria.configuration.invulnerable_time_multiplier.tooltip": "受伤后的无敌时间乘以该倍率", + "lzxnoneterraria.configuration.visibility_multiplier": "仇恨倍率", + "lzxnoneterraria.configuration.visibility_multiplier.tooltip": "佩戴后怪物发现你的距离乘以该倍率(大于1更容易被发现)", + "lzxnoneterraria.configuration.paladins_shield_range": "庇护范围", + "lzxnoneterraria.configuration.paladins_shield_range.tooltip": "为范围内同队伍玩家承担部分伤害(0 禁用)", + "lzxnoneterraria.configuration.max_health_ratio": "最高生命阈值", + "lzxnoneterraria.configuration.max_health_ratio.tooltip": "生命低于该比例时触发(0 禁用)", + "lzxnoneterraria.configuration.min_health_ratio": "最低生命阈值", + "lzxnoneterraria.configuration.min_health_ratio.tooltip": "生命高于该比例时触发(0 禁用)", + + "tooltip.lzxnoneterraria.melee_damage_increase": "近战伤害 +%s%%", + "tooltip.lzxnoneterraria.melee_damage_decrease": "近战伤害 -%s%%", + "tooltip.lzxnoneterraria.melee_knockback_bonus": "近战击退 +%s", + "tooltip.lzxnoneterraria.attack_speed_bonus": "攻击速度 +%s%%", + "lzxnoneterraria.configuration.melee_damage_multiplier": "近战武器伤害倍率", + "lzxnoneterraria.configuration.melee_damage_multiplier.tooltip": "佩戴后近战伤害乘以该倍率", + "lzxnoneterraria.configuration.melee_knockback": "近战击退", + "lzxnoneterraria.configuration.melee_knockback.tooltip": "佩戴后近战攻击额外增加该数值的击退", + "lzxnoneterraria.configuration.attack_speed": "攻击速度", + "lzxnoneterraria.configuration.attack_speed.tooltip": "佩戴后攻击速度乘以该倍率", "tooltip.lzxnoneterraria.ranged_damage_increase": "远程伤害 +%s%%", "tooltip.lzxnoneterraria.ranged_damage_decrease": "远程伤害 -%s%%", @@ -225,11 +254,11 @@ "tooltip.lzxnoneterraria.magic_damage_increase": "魔法伤害 +%s%%", "tooltip.lzxnoneterraria.magic_damage_decrease": "魔法伤害 -%s%%", - "lzxnoneterraria.configuration.magic_damage_multiplier": "魔法伤害倍率", - "lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "佩戴后魔法伤害乘以该倍率", "tooltip.lzxnoneterraria.mana_cost_increase": "魔力花费 +%s%%", "tooltip.lzxnoneterraria.mana_cost_decrease": "魔力花费 -%s%%", "tooltip.lzxnoneterraria.auto_mana_potion_use": "需要时自动使用魔力药水", + "lzxnoneterraria.configuration.magic_damage_multiplier": "魔法伤害倍率", + "lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "佩戴后魔法伤害乘以该倍率", "lzxnoneterraria.configuration.mana_cost_multiplier": "魔力消耗倍率", "lzxnoneterraria.configuration.mana_cost_multiplier.tooltip": "佩戴后魔力消耗乘以该倍率", @@ -261,6 +290,8 @@ "effect.lzxnoneterraria.ichor": "灵液", "effect.lzxnoneterraria.acid_venom": "酸性毒液", "effect.lzxnoneterraria.midas": "迈达斯", + "effect.lzxnoneterraria.paladins_shield": "圣骑士护盾", + "effect.lzxnoneterraria.ice_barrier": "冰障", "effect.lzxnoneterraria.summon": "召唤", "effect.lzxnoneterraria.mana_sickness": "耐魔性", @@ -337,6 +368,10 @@ "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction.tooltip": "达到最大持续时间时降低的魔法伤害比例,范围 0~1", "lzxnoneterraria.configuration.summon_summon_count_per_level": "每级仆从数量", "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "召唤效果每级额外增加的仆从数量", + "lzxnoneterraria.configuration.paladins_shield_damage_absorption_ratio": "伤害吸收比例", + "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.enchanted_sword_damage": "弹射伤害", "lzxnoneterraria.configuration.enchanted_sword_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.enchanted_sword_lifetime": "弹射持续时间", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/bee_cloak.json b/src/main/resources/assets/lzxnoneterraria/models/item/bee_cloak.json index 2937b82..a34a3e4 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/bee_cloak.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/bee_cloak.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "lzxnoneterraria:item/item", "textures": { "layer0": "lzxnoneterraria:item/bee_cloak" } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/berserkers_glove.json b/src/main/resources/assets/lzxnoneterraria/models/item/berserkers_glove.json new file mode 100644 index 0000000..126ae13 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/berserkers_glove.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item2", + "textures": { + "layer0": "lzxnoneterraria:item/berserkers_glove" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/black_belt.json b/src/main/resources/assets/lzxnoneterraria/models/item/black_belt.json index 7375128..9515a4b 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/black_belt.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/black_belt.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "lzxnoneterraria:item/item", "textures": { "layer0": "lzxnoneterraria:item/black_belt" } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/feral_claws.json b/src/main/resources/assets/lzxnoneterraria/models/item/feral_claws.json new file mode 100644 index 0000000..da2cb26 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/feral_claws.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/feral_claws" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/flesh_knuckles.json b/src/main/resources/assets/lzxnoneterraria/models/item/flesh_knuckles.json new file mode 100644 index 0000000..c2b1ff3 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/flesh_knuckles.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/flesh_knuckles" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/frozen_shield.json b/src/main/resources/assets/lzxnoneterraria/models/item/frozen_shield.json new file mode 100644 index 0000000..aaeae89 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/frozen_shield.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/frozen_shield" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/frozen_turtle_shell.json b/src/main/resources/assets/lzxnoneterraria/models/item/frozen_turtle_shell.json new file mode 100644 index 0000000..8b14514 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/frozen_turtle_shell.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/frozen_turtle_shell" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/hero_shield.json b/src/main/resources/assets/lzxnoneterraria/models/item/hero_shield.json new file mode 100644 index 0000000..68238ab --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/hero_shield.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/hero_shield" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/honey_comb.json b/src/main/resources/assets/lzxnoneterraria/models/item/honey_comb.json index 3b49f0d..428111d 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/honey_comb.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/honey_comb.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "lzxnoneterraria:item/item", "textures": { "layer0": "lzxnoneterraria:item/honey_comb" } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/mechanical_glove.json b/src/main/resources/assets/lzxnoneterraria/models/item/mechanical_glove.json new file mode 100644 index 0000000..0ec9498 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/mechanical_glove.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/mechanical_glove" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/paladins_shield.json b/src/main/resources/assets/lzxnoneterraria/models/item/paladins_shield.json new file mode 100644 index 0000000..653caf5 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/paladins_shield.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/paladins_shield" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/power_glove.json b/src/main/resources/assets/lzxnoneterraria/models/item/power_glove.json new file mode 100644 index 0000000..f216aed --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/power_glove.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/power_glove" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/shark_tooth_necklace.json b/src/main/resources/assets/lzxnoneterraria/models/item/shark_tooth_necklace.json index f8267a1..5965c6f 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/shark_tooth_necklace.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/shark_tooth_necklace.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "lzxnoneterraria:item/item", "textures": { "layer0": "lzxnoneterraria:item/shark_tooth_necklace" } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/stinger_necklace.json b/src/main/resources/assets/lzxnoneterraria/models/item/stinger_necklace.json index 636f250..2ab7ef6 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/stinger_necklace.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/stinger_necklace.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "lzxnoneterraria:item/item", "textures": { "layer0": "lzxnoneterraria:item/stinger_necklace" } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/titan_glove.json b/src/main/resources/assets/lzxnoneterraria/models/item/titan_glove.json new file mode 100644 index 0000000..1bf88fd --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/titan_glove.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/titan_glove" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/berserkers_glove.png b/src/main/resources/assets/lzxnoneterraria/textures/item/berserkers_glove.png new file mode 100644 index 0000000..89b45a8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/berserkers_glove.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/feral_claws.png b/src/main/resources/assets/lzxnoneterraria/textures/item/feral_claws.png new file mode 100644 index 0000000..5c094c4 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/feral_claws.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/flesh_knuckles.png b/src/main/resources/assets/lzxnoneterraria/textures/item/flesh_knuckles.png new file mode 100644 index 0000000..3fe81b9 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/flesh_knuckles.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/frozen_shield.png b/src/main/resources/assets/lzxnoneterraria/textures/item/frozen_shield.png new file mode 100644 index 0000000..b48b385 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/frozen_shield.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/frozen_turtle_shell.png b/src/main/resources/assets/lzxnoneterraria/textures/item/frozen_turtle_shell.png new file mode 100644 index 0000000..139f72e Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/frozen_turtle_shell.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/hero_shield.png b/src/main/resources/assets/lzxnoneterraria/textures/item/hero_shield.png new file mode 100644 index 0000000..d00f2ee Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/hero_shield.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/mechanical_glove.png b/src/main/resources/assets/lzxnoneterraria/textures/item/mechanical_glove.png new file mode 100644 index 0000000..05aed8e Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/mechanical_glove.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/paladins_shield.png b/src/main/resources/assets/lzxnoneterraria/textures/item/paladins_shield.png new file mode 100644 index 0000000..6573288 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/paladins_shield.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/power_glove.png b/src/main/resources/assets/lzxnoneterraria/textures/item/power_glove.png new file mode 100644 index 0000000..ef0edd8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/power_glove.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/titan_glove.png b/src/main/resources/assets/lzxnoneterraria/textures/item/titan_glove.png new file mode 100644 index 0000000..b5b40d6 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/titan_glove.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/ice_barrier.png b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/ice_barrier.png new file mode 100644 index 0000000..d1fa1c5 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/ice_barrier.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/paladins_shield.png b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/paladins_shield.png new file mode 100644 index 0000000..e4cbc05 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/paladins_shield.png differ diff --git a/src/main/resources/data/lzxnoneterraria/recipe/berserkers_glove.json b/src/main/resources/data/lzxnoneterraria/recipe/berserkers_glove.json new file mode 100644 index 0000000..cafafc4 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/berserkers_glove.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:power_glove" + }, + { + "item": "lzxnoneterraria:flesh_knuckles" + } + ], + "result": { + "id": "lzxnoneterraria:berserkers_glove", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/frozen_shield.json b/src/main/resources/data/lzxnoneterraria/recipe/frozen_shield.json new file mode 100644 index 0000000..2162615 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/frozen_shield.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:paladins_shield" + }, + { + "item": "lzxnoneterraria:frozen_turtle_shell" + } + ], + "result": { + "id": "lzxnoneterraria:frozen_shield", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/hero_shield.json b/src/main/resources/data/lzxnoneterraria/recipe/hero_shield.json new file mode 100644 index 0000000..aff2627 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/hero_shield.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:paladins_shield" + }, + { + "item": "lzxnoneterraria:flesh_knuckles" + } + ], + "result": { + "id": "lzxnoneterraria:hero_shield", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/mechanical_glove.json b/src/main/resources/data/lzxnoneterraria/recipe/mechanical_glove.json new file mode 100644 index 0000000..1d69709 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/mechanical_glove.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:power_glove" + }, + { + "item": "lzxnoneterraria:avenger_emblem" + } + ], + "result": { + "id": "lzxnoneterraria:mechanical_glove", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/power_glove.json b/src/main/resources/data/lzxnoneterraria/recipe/power_glove.json new file mode 100644 index 0000000..4cca1e7 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/power_glove.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:titan_glove" + }, + { + "item": "lzxnoneterraria:feral_claws" + } + ], + "result": { + "id": "lzxnoneterraria:power_glove", + "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 ddb3709..2bd55b0 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json @@ -40,6 +40,16 @@ "lzxnoneterraria:honey_comb", "lzxnoneterraria:stinger_necklace", "lzxnoneterraria:bee_cloak", - "lzxnoneterraria:black_belt" + "lzxnoneterraria:black_belt", + "lzxnoneterraria:titan_glove", + "lzxnoneterraria:feral_claws", + "lzxnoneterraria:power_glove", + "lzxnoneterraria:mechanical_glove", + "lzxnoneterraria:flesh_knuckles", + "lzxnoneterraria:berserkers_glove", + "lzxnoneterraria:paladins_shield", + "lzxnoneterraria:hero_shield", + "lzxnoneterraria:frozen_turtle_shell", + "lzxnoneterraria:frozen_shield" ] } diff --git a/src/main/resources/lzxnoneterraria.mixins.json b/src/main/resources/lzxnoneterraria.mixins.json index 1170416..2e470b5 100644 --- a/src/main/resources/lzxnoneterraria.mixins.json +++ b/src/main/resources/lzxnoneterraria.mixins.json @@ -3,7 +3,9 @@ "minVersion": "0.8", "package": "com.lzxnone.terraria.mixin", "compatibilityLevel": "JAVA_21", - "mixins": [], + "mixins": [ + "LivingEntityVisibilityMixin" + ], "client": [ "GuiGraphicsMixin", "GuiMixin",