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 acaa101..c234fac 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 @@ -103,6 +103,7 @@ public class ModCreativeModeTabs { output.accept(ModItems.HONEY_COMB.get()); output.accept(ModItems.STINGER_NECKLACE.get()); output.accept(ModItems.BEE_CLOAK.get()); + output.accept(ModItems.BLACK_BELT.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/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index 68c5b14..3789c5c 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -35,6 +35,11 @@ public class EntityEventHandler { if(entity.level().isClientSide()) return; DamageSource source = event.getSource(); Entity attacker = event.getSource().getEntity(); + //免疫伤害 + if(Math.random() <= AccessoryUtil.applyDamageImmunity(entity)) { + event.setCanceled(true); + return; + } //免疫火块 if(source.is(DamageTypes.IN_FIRE) || source.is(DamageTypes.HOT_FLOOR) || source.is(DamageTypes.CAMPFIRE)) { if(AccessoryUtil.isFireBlockImmune(entity)) event.setCanceled(true); diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 1b5d823..b8b7f6c 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -148,6 +148,7 @@ public class ModItems { public static final DeferredItem HONEY_COMB = ITEMS.register("honey_comb", HoneyComb::new); 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 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 41301d2..9d8f374 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java @@ -44,6 +44,16 @@ public class AccessoryUtil { }); } + public static double applyDamageImmunity(LivingEntity entity) { + double[] chance = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof DamageImmunityModifier modifier) { + chance[0] = Math.max(modifier.getDamageImmunityChance(stack, entity), chance[0]); + } + }); + return chance[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/BlackBelt.java b/src/main/java/com/lzxnone/terraria/item/accessory/BlackBelt.java new file mode 100644 index 0000000..960bf36 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/BlackBelt.java @@ -0,0 +1,62 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.DamageImmunityModifier; +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.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 BlackBelt extends AccessoryItem implements DamageImmunityModifier { + public static final ConfigDouble DAMAGE_IMMUNITY_CHANCE = new ConfigDouble( + "accessory.black_belt.damage_immunity_chance", + "damage_immunity_chance", + 0.1D, + 0.0D, + 1.0D + ); + + public BlackBelt() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getDamageImmunityChance(ItemStack stack, LivingEntity entity) { + return DAMAGE_IMMUNITY_CHANCE.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_IMMUNITY_CHANCE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "black_belt", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/black_belt.png"), + Component.translatable("item.lzxnoneterraria.black_belt"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + 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()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/DamageImmunityModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/DamageImmunityModifier.java new file mode 100644 index 0000000..63949f9 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/DamageImmunityModifier.java @@ -0,0 +1,8 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface DamageImmunityModifier { + double getDamageImmunityChance(ItemStack stack, LivingEntity entity); +} 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 b7ad1c6..f349e94 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -34,6 +34,7 @@ import com.lzxnone.terraria.item.accessory.SharkToothNecklace; 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.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.BeeKeeper; import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass; @@ -186,7 +187,8 @@ public class ConfigList { SharkToothNecklace.CONFIG_LIST_ITEM, HoneyComb.CONFIG_LIST_ITEM, StingerNecklace.CONFIG_LIST_ITEM, - BeeCloak.CONFIG_LIST_ITEM + BeeCloak.CONFIG_LIST_ITEM, + BlackBelt.CONFIG_LIST_ITEM }); ITEMS.put(ENCHANTMENT, new ConfigListItem[]{ ModEnchantmentConfigs.MANA_LEAK_CONFIG_LIST_ITEM, diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 1a86134..20b5777 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -124,6 +124,7 @@ "item.lzxnoneterraria.honey_comb": "Honey Comb", "item.lzxnoneterraria.stinger_necklace": "Stinger Necklace", "item.lzxnoneterraria.bee_cloak": "Bee Cloak", + "item.lzxnoneterraria.black_belt": "Black Belt", "item.lzxnoneterraria.mana_crystal": "Mana Crystal", "item.lzxnoneterraria.summoning_potion": "Summoning Potion", "item.lzxnoneterraria.lesser_mana_potion": "Lesser Mana Potion", @@ -189,6 +190,7 @@ "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.melee_damage_increase": "+%s%% melee damage", "tooltip.lzxnoneterraria.melee_damage_decrease": "-%s%% melee damage", @@ -210,6 +212,8 @@ "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", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 81a4805..11b9b46 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -124,6 +124,7 @@ "item.lzxnoneterraria.honey_comb": "蜂窝", "item.lzxnoneterraria.stinger_necklace": "毒刺项链", "item.lzxnoneterraria.bee_cloak": "蜜蜂斗篷", + "item.lzxnoneterraria.black_belt": "黑腰带", "item.lzxnoneterraria.mana_crystal": "魔力水晶", "item.lzxnoneterraria.summoning_potion": "召唤药水", "item.lzxnoneterraria.lesser_mana_potion": "弱效魔力药水", @@ -190,6 +191,7 @@ "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.melee_damage_increase": "近战伤害 +%s%%", "tooltip.lzxnoneterraria.melee_damage_decrease": "近战伤害 -%s%%", @@ -211,6 +213,8 @@ "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": "受伤后的无敌时间乘以该倍率", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/black_belt.json b/src/main/resources/assets/lzxnoneterraria/models/item/black_belt.json new file mode 100644 index 0000000..7375128 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/black_belt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/black_belt" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/black_belt.png b/src/main/resources/assets/lzxnoneterraria/textures/item/black_belt.png new file mode 100644 index 0000000..586ff4b Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/black_belt.png differ diff --git a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json index 6866c02..ddb3709 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json @@ -39,6 +39,7 @@ "lzxnoneterraria:shark_tooth_necklace", "lzxnoneterraria:honey_comb", "lzxnoneterraria:stinger_necklace", - "lzxnoneterraria:bee_cloak" + "lzxnoneterraria:bee_cloak", + "lzxnoneterraria:black_belt" ] }