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 1553773..2eb96e9 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 @@ -114,6 +114,17 @@ public class ModCreativeModeTabs { output.accept(ModItems.HERO_SHIELD.get()); output.accept(ModItems.FROZEN_SHIELD.get()); output.accept(ModItems.FROZEN_TURTLE_SHELL.get()); + output.accept(ModItems.MAGMA_STONE.get()); + output.accept(ModItems.FIRE_GAUNTLET.get()); + output.accept(ModItems.EYE_OF_GOLEM.get()); + output.accept(ModItems.DESTROYER_EMBLEM.get()); + output.accept(ModItems.MOON_STONE.get()); + output.accept(ModItems.SUN_STONE.get()); + output.accept(ModItems.CELESTIAL_STONE.get()); + output.accept(ModItems.MOON_CHARM.get()); + output.accept(ModItems.NEPTUNES_SHELL.get()); + output.accept(ModItems.MOON_SHELL.get()); + output.accept(ModItems.CELESTIAL_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/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index ad1c74a..b7365e4 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -20,10 +20,12 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.phys.Vec3; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.living.LivingDamageEvent; import net.neoforged.neoforge.event.entity.living.LivingDeathEvent; +import net.neoforged.neoforge.event.entity.living.LivingEvent; import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent; import net.neoforged.neoforge.event.tick.PlayerTickEvent; @@ -55,14 +57,29 @@ public class EntityEventHandler { if(!source.is(DamageTypeTags.BYPASSES_ARMOR)) { if(attacker instanceof LivingEntity livingEntity) AccessoryUtil.applyTargetArmorModifiers(livingEntity, entity); } + //近战攻击命中时点燃目标 + if(attacker instanceof LivingEntity livingAttacker && livingAttacker != entity) { + if(source.is(DamageTypes.PLAYER_ATTACK) || source.is(DamageTypes.MOB_ATTACK) || source.is(DamageTypes.MOB_ATTACK_NO_AGGRO)) { + if(AccessoryUtil.canApplyIgnite(livingAttacker)) entity.igniteForTicks(AccessoryUtil.getIgniteTicks(livingAttacker)); + } + } } @SubscribeEvent public static void onLivingDamagePre(LivingDamageEvent.Pre event) { LivingEntity target = event.getEntity(); if(!(target.level() instanceof ServerLevel serverLevel)) return; + DamageSource source = event.getSource(); + Entity attacker = source.getEntity(); //移除饰品加成护甲穿透 AccessoryUtil.removeTargetArmorModifiers(event.getEntity()); + //暴击 + if(attacker instanceof LivingEntity livingEntity && attacker != target) { + double critChance = AccessoryUtil.getCritChance(livingEntity); + if(critChance > 0.0D && attacker.getRandom().nextDouble() < critChance) { + event.setNewDamage(event.getNewDamage() * 1.5F); + } + } //冰障 if(target.hasEffect(ModEffects.ICE_BARRIER)) { MobEffectInstance instance = target.getEffect(ModEffects.ICE_BARRIER); @@ -85,6 +102,21 @@ public class EntityEventHandler { } } + @SubscribeEvent + public static void onLivingJump(LivingEvent.LivingJumpEvent event) { + LivingEntity entity = event.getEntity(); + if(entity.level().isClientSide()) return; + double heightMultiplier = AccessoryUtil.getJumpHeightMultiplier(entity); + double speedMultiplier = AccessoryUtil.getJumpSpeedMultiplier(entity); + if(heightMultiplier <= 1.0D && speedMultiplier <= 1.0D) return; + Vec3 motion = entity.getDeltaMovement(); + entity.setDeltaMovement( + motion.x * speedMultiplier, + motion.y * heightMultiplier, + motion.z * speedMultiplier + ); + } + @SubscribeEvent public static void onLivingDamagePost(LivingDamageEvent.Post event) { //支配之鞭 预兆标记 @@ -121,6 +153,12 @@ public class EntityEventHandler { public static void onPlayerTick(PlayerTickEvent.Post event) { Player player = event.getEntity(); if(player.level().isClientSide()) return; + //水下呼吸 + if(player.isInWater() && player.getAirSupply() < player.getMaxAirSupply() && AccessoryUtil.isWaterBreathing(player)) { + player.setAirSupply(player.getMaxAirSupply()); + } + //同步昼夜限定饰品的动态属性 + if(player.tickCount % 20 == 0) AccessoryUtil.syncConditionalModifiers(player); //免疫冰冻 if(player.getTicksFrozen() > 0 && AccessoryUtil.isFreezeImmune(player)) { player.setTicksFrozen(0); diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 0eeeefd..487a3a4 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -159,6 +159,17 @@ public class ModItems { 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 MAGMA_STONE = ITEMS.register("magma_stone", MagmaStone::new); + public static final DeferredItem FIRE_GAUNTLET = ITEMS.register("fire_gauntlet", FireGauntlet::new); + public static final DeferredItem EYE_OF_GOLEM = ITEMS.register("eye_of_the_golem", EyeOfGolem::new); + public static final DeferredItem DESTROYER_EMBLEM = ITEMS.register("destroyer_emblem", DestroyerEmblem::new); + public static final DeferredItem MOON_STONE = ITEMS.register("moon_stone", MoonStone::new); + public static final DeferredItem SUN_STONE = ITEMS.register("sun_stone", SunStone::new); + public static final DeferredItem CELESTIAL_STONE = ITEMS.register("celestial_stone", CelestialStone::new); + public static final DeferredItem MOON_CHARM = ITEMS.register("moon_charm", MoonCharm::new); + public static final DeferredItem NEPTUNES_SHELL = ITEMS.register("neptunes_shell", NeptunesShell::new); + public static final DeferredItem MOON_SHELL = ITEMS.register("moon_shell", MoonShell::new); + public static final DeferredItem CELESTIAL_SHELL = ITEMS.register("celestial_shell", CelestialShell::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 e0dcc4c..63da1d2 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.item.accessory; +import com.google.common.collect.Multimap; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.effect.ModEffects; @@ -17,6 +18,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeInstance; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; @@ -44,6 +46,28 @@ public class AccessoryUtil { }); } + //同步条件限定饰品的动态属性:按当前生效集合与全集 diff(状态切换/值变化才增删,平时只读零开销) + public static void syncConditionalModifiers(LivingEntity entity) { + forEachAccessory(entity, (accessory, stack) -> { + if(!(accessory instanceof ConditionalAttributeModifier modifier)) return; + Multimap, AttributeModifier> current = modifier.getConditionalModifiers(stack, entity); + modifier.getAllConditionalModifiers(stack, entity).forEach((attribute, attributeModifier) -> { + AttributeInstance instance = entity.getAttribute(attribute); + if(instance == null) return; + AttributeModifier existing = instance.getModifier(attributeModifier.id()); + if(current.containsEntry(attribute, attributeModifier)) { + if(existing == null) { + instance.addTransientModifier(attributeModifier); + }else if(existing.amount() != attributeModifier.amount() || existing.operation() != attributeModifier.operation()) { + instance.addOrUpdateTransientModifier(attributeModifier); + } + }else if(existing != null) { + instance.removeModifier(attributeModifier.id()); + } + }); + }); + } + public static double applyDamageImmunity(LivingEntity entity) { double[] chance = {0.0D}; AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { @@ -68,7 +92,7 @@ public class AccessoryUtil { 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]); + if(modifier.canApplyGuardianShield(stack, entity)) range[0] = Math.max(modifier.getGuardianRange(stack, entity), range[0]); } }); return range[0]; @@ -78,7 +102,7 @@ public class AccessoryUtil { 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]); + if(modifier.canApplyGuardianShield(stack, entity)) ratio[0] = Math.min(modifier.getMinHealthRatio(stack, entity), ratio[0]); } }); return ratio[0]; @@ -89,7 +113,7 @@ public class AccessoryUtil { AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { if(result[0]) return; if(accessory instanceof GuardianShieldModifier modifier) { - result[0] = modifier.applyGuardianShield(stack, entity); + result[0] = modifier.canApplyGuardianShield(stack, entity); } }); return result[0]; @@ -99,7 +123,7 @@ public class AccessoryUtil { 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]); + if(modifier.canApplyIceBarrier(stack, entity)) ratio[0] = Math.max(modifier.getMaxHealthRatio(stack, entity), ratio[0]); } }); return ratio[0]; @@ -110,7 +134,7 @@ public class AccessoryUtil { AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { if(result[0]) return; if(accessory instanceof IceBarrierModifier modifier) { - result[0] = modifier.applyIceBarrier(stack, entity); + result[0] = modifier.canApplyIceBarrier(stack, entity); } }); return result[0]; @@ -227,6 +251,86 @@ public class AccessoryUtil { private static final ResourceLocation TARGET_ARMOR_PIERCE_ID = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "target_armor_pierce"); private static final ResourceLocation TARGET_ARMOR_TOUGHNESS_PIERCE_ID = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "target_armor_toughness_pierce"); + //近战暴击率:累加所有饰品的近战暴击率加成 + public static double getMeleeCritChance(LivingEntity entity) { + double[] chance = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof MeleeCritChanceModifier modifier) { + chance[0] += modifier.getMeleeCritChance(stack, entity); + } + }); + return chance[0]; + } + + //水下呼吸:是否有饰品提供水下呼吸 + public static boolean isWaterBreathing(LivingEntity entity) { + boolean[] result = {false}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(result[0]) return; + if(accessory instanceof WaterBreathingModifier modifier) { + result[0] = modifier.canBreatheUnderwater(stack, entity); + } + }); + return result[0]; + } + + //跳跃高度倍率:取所有饰品中的最大值 + public static double getJumpHeightMultiplier(LivingEntity entity) { + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof JumpModifier modifier) { + multiplier[0] = Math.max(multiplier[0], modifier.getJumpHeightMultiplier(stack, entity)); + } + }); + return multiplier[0]; + } + + //跳跃速度倍率:取所有饰品中的最大值 + public static double getJumpSpeedMultiplier(LivingEntity entity) { + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof JumpModifier modifier) { + multiplier[0] = Math.max(multiplier[0], modifier.getJumpSpeedMultiplier(stack, entity)); + } + }); + return multiplier[0]; + } + + //暴击率:累加所有饰品的暴击率加成 + public static double getCritChance(LivingEntity entity) { + double[] chance = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof CriticalStrikeModifier modifier) { + chance[0] += modifier.getCritChance(stack, entity); + } + }); + return chance[0]; + } + + //岩浆石:能否对命中目标施加着火 + public static boolean canApplyIgnite(LivingEntity entity) { + boolean[] result = {false}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(result[0]) return; + if(accessory instanceof IgniteOnHitModifier modifier) { + result[0] = modifier.canApplyIgnite(stack, entity); + } + }); + return result[0]; + } + + //岩浆石:着火持续时间(刻) + public static int getIgniteTicks(LivingEntity entity) { + int[] ticks = {0}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(ticks[0] > 0) return; + if(accessory instanceof IgniteOnHitModifier modifier && modifier.canApplyIgnite(stack, entity)) { + ticks[0] = modifier.getIgniteTicks(stack, entity); + } + }); + return ticks[0]; + } + public static void applyInvulnerableTimeModifier(LivingEntity entity) { double finalTime = entity.invulnerableTime; double[] rate = {1.0D}; diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java new file mode 100644 index 0000000..5df7cf5 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java @@ -0,0 +1,240 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; +import com.lzxnone.terraria.item.effect.CriticalStrikeModifier; +import com.lzxnone.terraria.item.effect.DamageModifier; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; +import com.lzxnone.terraria.item.effect.WaterBreathingModifier; +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 CelestialShell extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier, WaterBreathingModifier, ConditionalAttributeModifier { + public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.celestial_shell.damage_multiplier", + "damage_multiplier", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble CRIT_CHANCE = new ConfigDouble( + "accessory.celestial_shell.crit_chance", + "crit_chance", + 0.02D, + 0.0D, + 1.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.celestial_shell.attack_speed", + "attack_speed", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.celestial_shell.defense", + "defense", + 4.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble MINING_SPEED = new ConfigDouble( + "accessory.celestial_shell.mining_speed", + "mining_speed", + 1.15D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble( + "accessory.celestial_shell.minion_knockback_multiplier", + "minion_knockback_multiplier", + 1.5D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MOVE_SPEED = new ConfigDouble( + "accessory.celestial_shell.move_speed", + "move_speed", + 1.5D, + 1.0D, + 10.0D + ); + + public CelestialShell() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getDamageMultiplier(ItemStack stack, LivingEntity entity) { + return DAMAGE_MULTIPLIER.get(); + } + + @Override + public double getCritChance(ItemStack stack, LivingEntity entity) { + return CRIT_CHANCE.get(); + } + + @Override + public double getMinionKnockbackMultiplier(ItemStack stack, LivingEntity entity) { + return MINION_KNOCKBACK_MULTIPLIER.get(); + } + + @Override + public boolean canBreatheUnderwater(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double attackSpeed = ATTACK_SPEED.get() - 1.0D; + if(attackSpeed != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "celestial_shell_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, "celestial_shell_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double miningSpeed = MINING_SPEED.get() - 1.0D; + if(miningSpeed != 0.0D) { + modifiers.put( + Attributes.BLOCK_BREAK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "celestial_shell_mining_speed"), + miningSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + return modifiers; + } + + //人鱼(水中):移动速度 + @Override + public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + if(entity.isInWater()) buildModifiers(modifiers); + return modifiers; + } + + @Override + public Multimap, AttributeModifier> getAllConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + buildModifiers(modifiers); + return modifiers; + } + + private void buildModifiers(Multimap, AttributeModifier> modifiers) { + double moveSpeed = MOVE_SPEED.get() - 1.0D; + if(moveSpeed != 0.0D) { + modifiers.put( + Attributes.MOVEMENT_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "celestial_shell_merfolk_move_speed"), + moveSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_MULTIPLIER, CRIT_CHANCE, ATTACK_SPEED, DEFENSE, MINING_SPEED, MINION_KNOCKBACK_MULTIPLIER, MOVE_SPEED); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "celestial_shell", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/celestial_shell.png"), + Component.translatable("item.lzxnoneterraria.celestial_shell"), + 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.active_in_water" + ).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)); + } + if(CRIT_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.crit_chance_bonus", + EffectTooltipUtil.formatNumber(CRIT_CHANCE.get() * 100.0D) + ).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(MINING_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mining_speed_bonus", + EffectTooltipUtil.formatPercent(MINING_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MINION_KNOCKBACK_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_knockback_increase", + EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MOVE_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.move_speed_bonus", + EffectTooltipUtil.formatPercent(MOVE_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.water_breathing" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialStone.java new file mode 100644 index 0000000..556f66d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialStone.java @@ -0,0 +1,185 @@ +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.CriticalStrikeModifier; +import com.lzxnone.terraria.item.effect.DamageModifier; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; +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 CelestialStone extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier { + public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.celestial_stone.damage_multiplier", + "damage_multiplier", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble CRIT_CHANCE = new ConfigDouble( + "accessory.celestial_stone.crit_chance", + "crit_chance", + 0.02D, + 0.0D, + 1.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.celestial_stone.attack_speed", + "attack_speed", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.celestial_stone.defense", + "defense", + 4.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble MINING_SPEED = new ConfigDouble( + "accessory.celestial_stone.mining_speed", + "mining_speed", + 1.15D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble( + "accessory.celestial_stone.minion_knockback_multiplier", + "minion_knockback_multiplier", + 1.5D, + 1.0D, + 10.0D + ); + + public CelestialStone() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getDamageMultiplier(ItemStack stack, LivingEntity entity) { + return DAMAGE_MULTIPLIER.get(); + } + + @Override + public double getCritChance(ItemStack stack, LivingEntity entity) { + return CRIT_CHANCE.get(); + } + + @Override + public double getMinionKnockbackMultiplier(ItemStack stack, LivingEntity entity) { + return MINION_KNOCKBACK_MULTIPLIER.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double attackSpeed = ATTACK_SPEED.get() - 1.0D; + if(attackSpeed != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "celestial_stone_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, "celestial_stone_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double miningSpeed = MINING_SPEED.get() - 1.0D; + if(miningSpeed != 0.0D) { + modifiers.put( + Attributes.BLOCK_BREAK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "celestial_stone_mining_speed"), + miningSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_MULTIPLIER, CRIT_CHANCE, ATTACK_SPEED, DEFENSE, MINING_SPEED, MINION_KNOCKBACK_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "celestial_stone", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/celestial_stone.png"), + Component.translatable("item.lzxnoneterraria.celestial_stone"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.damage_increase", + EffectTooltipUtil.formatPercent(DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(CRIT_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.crit_chance_bonus", + EffectTooltipUtil.formatNumber(CRIT_CHANCE.get() * 100.0D) + ).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(MINING_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mining_speed_bonus", + EffectTooltipUtil.formatPercent(MINING_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MINION_KNOCKBACK_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_knockback_increase", + EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/DestroyerEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/DestroyerEmblem.java new file mode 100644 index 0000000..68bc621 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/DestroyerEmblem.java @@ -0,0 +1,81 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.CriticalStrikeModifier; +import com.lzxnone.terraria.item.effect.DamageModifier; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.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 DestroyerEmblem extends AccessoryItem implements DamageModifier, CriticalStrikeModifier { + public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.destroyer_emblem.damage_multiplier", + "damage_multiplier", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble CRIT_CHANCE = new ConfigDouble( + "accessory.destroyer_emblem.crit_chance", + "crit_chance", + 0.08D, + 0.0D, + 1.0D + ); + + public DestroyerEmblem() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getDamageMultiplier(ItemStack stack, LivingEntity entity) { + return DAMAGE_MULTIPLIER.get(); + } + + @Override + public double getCritChance(ItemStack stack, LivingEntity entity) { + return CRIT_CHANCE.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_MULTIPLIER, CRIT_CHANCE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "destroyer_emblem", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/destroyer_emblem.png"), + Component.translatable("item.lzxnoneterraria.destroyer_emblem"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.damage_increase", + EffectTooltipUtil.formatPercent(DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(CRIT_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.crit_chance_bonus", + EffectTooltipUtil.formatNumber(CRIT_CHANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/EyeOfGolem.java b/src/main/java/com/lzxnone/terraria/item/accessory/EyeOfGolem.java new file mode 100644 index 0000000..fe3686e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/EyeOfGolem.java @@ -0,0 +1,62 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.CriticalStrikeModifier; +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 EyeOfGolem extends AccessoryItem implements CriticalStrikeModifier { + public static final ConfigDouble CRIT_CHANCE = new ConfigDouble( + "accessory.eye_of_the_golem.crit_chance", + "crit_chance", + 0.10D, + 0.0D, + 1.0D + ); + + public EyeOfGolem() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getCritChance(ItemStack stack, LivingEntity entity) { + return CRIT_CHANCE.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(CRIT_CHANCE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "eye_of_the_golem", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/eye_of_the_golem.png"), + Component.translatable("item.lzxnoneterraria.eye_of_the_golem"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(CRIT_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.crit_chance_bonus", + EffectTooltipUtil.formatNumber(CRIT_CHANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/FireGauntlet.java b/src/main/java/com/lzxnone/terraria/item/accessory/FireGauntlet.java new file mode 100644 index 0000000..2aa270e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/FireGauntlet.java @@ -0,0 +1,146 @@ +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.IgniteOnHitModifier; +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 FireGauntlet extends AccessoryItem implements MeleeDamageModifier, MeleeKnockbackModifier, IgniteOnHitModifier { + public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.fire_gauntlet.melee_damage_multiplier", + "melee_damage_multiplier", + 1.12D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MELEE_KNOCKBACK = new ConfigDouble( + "accessory.fire_gauntlet.melee_knockback", + "melee_knockback", + 0.4D, + 0.0D, + 100.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.fire_gauntlet.attack_speed", + "attack_speed", + 1.12D, + 1.0D, + 10.0D + ); + + public FireGauntlet() { + 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 boolean canApplyIgnite(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public int getIgniteTicks(ItemStack stack, LivingEntity entity) { + int roll = entity.getRandom().nextInt(8); + if(roll < 2) return 120; //6 秒 2/8 (25%) + if(roll < 5) return 80; //4 秒 3/8 (37.5%) + return 40; //2 秒 3/8 (37.5%) + } + + @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, "fire_gauntlet_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, "fire_gauntlet_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( + "fire_gauntlet", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/fire_gauntlet.png"), + Component.translatable("item.lzxnoneterraria.fire_gauntlet"), + 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)); + } + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.ignite_on_hit" + ).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 index 4c32e6c..7f7541f 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/FrozenShield.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/FrozenShield.java @@ -69,7 +69,7 @@ public class FrozenShield extends AccessoryItem implements GuardianShieldModifie } @Override - public boolean applyGuardianShield(ItemStack stack, LivingEntity entity) { + public boolean canApplyGuardianShield(ItemStack stack, LivingEntity entity) { return entity.getHealth() / entity.getMaxHealth() > MIN_HEALTH_RATIO.get(); } @@ -84,7 +84,7 @@ public class FrozenShield extends AccessoryItem implements GuardianShieldModifie } @Override - public boolean applyIceBarrier(ItemStack stack, LivingEntity entity) { + public boolean canApplyIceBarrier(ItemStack stack, LivingEntity entity) { return entity.getHealth() / entity.getMaxHealth() < MAX_HEALTH_RATIO.get(); } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/FrozenTurtleShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/FrozenTurtleShell.java index 8aba140..f180903 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/FrozenTurtleShell.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/FrozenTurtleShell.java @@ -32,7 +32,7 @@ public class FrozenTurtleShell extends AccessoryItem implements IceBarrierModifi } @Override - public boolean applyIceBarrier(ItemStack stack, LivingEntity entity) { + public boolean canApplyIceBarrier(ItemStack stack, LivingEntity entity) { return entity.getHealth() / entity.getMaxHealth() < MAX_HEALTH_RATIO.get(); } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/HeroShield.java b/src/main/java/com/lzxnone/terraria/item/accessory/HeroShield.java index 40eb3cf..ce25a3d 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/HeroShield.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/HeroShield.java @@ -68,7 +68,7 @@ public class HeroShield extends AccessoryItem implements GuardianShieldModifier, } @Override - public boolean applyGuardianShield(ItemStack stack, LivingEntity entity) { + public boolean canApplyGuardianShield(ItemStack stack, LivingEntity entity) { return entity.getHealth() / entity.getMaxHealth() > MIN_HEALTH_RATIO.get(); } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MagmaStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/MagmaStone.java new file mode 100644 index 0000000..21c3c7d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MagmaStone.java @@ -0,0 +1,38 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.IgniteOnHitModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +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 MagmaStone extends AccessoryItem implements IgniteOnHitModifier { + public MagmaStone() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean canApplyIgnite(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public int getIgniteTicks(ItemStack stack, LivingEntity entity) { + int roll = entity.getRandom().nextInt(8); + if(roll < 2) return 120; //6 秒 2/8 (25%) + if(roll < 5) return 80; //4 秒 3/8 (37.5%) + return 40; //2 秒 3/8 (37.5%) + } + + @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.ignite_on_hit" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java new file mode 100644 index 0000000..e4560b9 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java @@ -0,0 +1,217 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.JumpModifier; +import com.lzxnone.terraria.item.effect.MeleeCritChanceModifier; +import com.lzxnone.terraria.item.effect.MeleeDamageModifier; +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 MoonCharm extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, JumpModifier, ConditionalAttributeModifier { + public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.moon_charm.melee_damage_multiplier", + "melee_damage_multiplier", + 1.051D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MELEE_CRIT_CHANCE = new ConfigDouble( + "accessory.moon_charm.melee_crit_chance", + "melee_crit_chance", + 0.02D, + 0.0D, + 1.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.moon_charm.attack_speed", + "attack_speed", + 1.051D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MOVE_SPEED = new ConfigDouble( + "accessory.moon_charm.move_speed", + "move_speed", + 1.05D, + 1.0D, + 10.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.moon_charm.defense", + "defense", + 3.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble JUMP_HEIGHT = new ConfigDouble( + "accessory.moon_charm.jump_height", + "jump_height", + 1.05D, + 1.0D, + 10.0D + ); + public static final ConfigDouble JUMP_SPEED = new ConfigDouble( + "accessory.moon_charm.jump_speed", + "jump_speed", + 1.05D, + 1.0D, + 10.0D + ); + + public MoonCharm() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getMeleeDamageMultiplier(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? MELEE_DAMAGE_MULTIPLIER.get() : 1.0D; + } + + @Override + public double getMeleeCritChance(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? MELEE_CRIT_CHANCE.get() : 0.0D; + } + + @Override + public double getJumpHeightMultiplier(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? JUMP_HEIGHT.get() : 1.0D; + } + + @Override + public double getJumpSpeedMultiplier(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? JUMP_SPEED.get() : 1.0D; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + //条件属性由 AccessoryUtil.syncConditionalModifiers 动态管理,不走 curios 自动应用 + return MultimapBuilder.hashKeys().arrayListValues().build(); + } + + @Override + public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + if(entity.level().isNight()) buildModifiers(modifiers); + return modifiers; + } + + @Override + public Multimap, AttributeModifier> getAllConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + buildModifiers(modifiers); + return modifiers; + } + + private void buildModifiers(Multimap, AttributeModifier> modifiers) { + double attackSpeed = ATTACK_SPEED.get() - 1.0D; + if(attackSpeed != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_charm_attack_speed"), + attackSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + double moveSpeed = MOVE_SPEED.get() - 1.0D; + if(moveSpeed != 0.0D) { + modifiers.put( + Attributes.MOVEMENT_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_charm_move_speed"), + moveSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + double defense = DEFENSE.get(); + if(defense != 0.0D) { + modifiers.put( + Attributes.ARMOR, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_charm_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER, MELEE_CRIT_CHANCE, ATTACK_SPEED, MOVE_SPEED, DEFENSE, JUMP_HEIGHT, JUMP_SPEED); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "moon_charm", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/moon_charm.png"), + Component.translatable("item.lzxnoneterraria.moon_charm"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.active_at_night" + ).withStyle(ChatFormatting.GRAY)); + if(MELEE_CRIT_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.melee_crit_chance_bonus", + EffectTooltipUtil.formatNumber(MELEE_CRIT_CHANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + 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(ATTACK_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.attack_speed_bonus", + EffectTooltipUtil.formatPercent(ATTACK_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MOVE_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.move_speed_bonus", + EffectTooltipUtil.formatPercent(MOVE_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(JUMP_HEIGHT.get() > 1.0D || JUMP_SPEED.get() > 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.jump_boost" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java new file mode 100644 index 0000000..cdb4372 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java @@ -0,0 +1,239 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.JumpModifier; +import com.lzxnone.terraria.item.effect.MeleeCritChanceModifier; +import com.lzxnone.terraria.item.effect.MeleeDamageModifier; +import com.lzxnone.terraria.item.effect.WaterBreathingModifier; +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 MoonShell extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, JumpModifier, WaterBreathingModifier, ConditionalAttributeModifier { + public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.moon_shell.melee_damage_multiplier", + "melee_damage_multiplier", + 1.051D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MELEE_CRIT_CHANCE = new ConfigDouble( + "accessory.moon_shell.melee_crit_chance", + "melee_crit_chance", + 0.02D, + 0.0D, + 1.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.moon_shell.attack_speed", + "attack_speed", + 1.051D, + 1.0D, + 10.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.moon_shell.defense", + "defense", + 3.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble JUMP_HEIGHT = new ConfigDouble( + "accessory.moon_shell.jump_height", + "jump_height", + 1.05D, + 1.0D, + 10.0D + ); + public static final ConfigDouble JUMP_SPEED = new ConfigDouble( + "accessory.moon_shell.jump_speed", + "jump_speed", + 1.05D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MOVE_SPEED = new ConfigDouble( + "accessory.moon_shell.move_speed", + "move_speed", + 1.5D, + 1.0D, + 10.0D + ); + + public MoonShell() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getMeleeDamageMultiplier(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? MELEE_DAMAGE_MULTIPLIER.get() : 1.0D; + } + + @Override + public double getMeleeCritChance(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? MELEE_CRIT_CHANCE.get() : 0.0D; + } + + @Override + public double getJumpHeightMultiplier(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? JUMP_HEIGHT.get() : 1.0D; + } + + @Override + public double getJumpSpeedMultiplier(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? JUMP_SPEED.get() : 1.0D; + } + + @Override + public boolean canBreatheUnderwater(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + return MultimapBuilder.hashKeys().arrayListValues().build(); + } + + @Override + public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + if(entity.level().isNight()) { + buildWolfModifiers(modifiers); + } + if(entity.isInWater()) { + buildMerfolkModifiers(modifiers); + } + return modifiers; + } + + @Override + public Multimap, AttributeModifier> getAllConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + buildWolfModifiers(modifiers); + buildMerfolkModifiers(modifiers); + return modifiers; + } + + //狼人(夜晚):近战攻速、防御 + private void buildWolfModifiers(Multimap, AttributeModifier> modifiers) { + double attackSpeed = ATTACK_SPEED.get() - 1.0D; + if(attackSpeed != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_shell_wolf_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, "moon_shell_wolf_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + } + + //人鱼(水中):移动速度 + private void buildMerfolkModifiers(Multimap, AttributeModifier> modifiers) { + double moveSpeed = MOVE_SPEED.get() - 1.0D; + if(moveSpeed != 0.0D) { + modifiers.put( + Attributes.MOVEMENT_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_shell_merfolk_move_speed"), + moveSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER, MELEE_CRIT_CHANCE, ATTACK_SPEED, DEFENSE, JUMP_HEIGHT, JUMP_SPEED, MOVE_SPEED); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "moon_shell", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/moon_shell.png"), + Component.translatable("item.lzxnoneterraria.moon_shell"), + 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.active_at_night" + ).withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.active_in_water" + ).withStyle(ChatFormatting.GRAY)); + if(MELEE_CRIT_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.melee_crit_chance_bonus", + EffectTooltipUtil.formatNumber(MELEE_CRIT_CHANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + 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(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(JUMP_HEIGHT.get() > 1.0D || JUMP_SPEED.get() > 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.jump_boost" + ).withStyle(ChatFormatting.GRAY)); + } + if(MOVE_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.move_speed_bonus", + EffectTooltipUtil.formatPercent(MOVE_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.water_breathing" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java new file mode 100644 index 0000000..e603bb2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java @@ -0,0 +1,205 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; +import com.lzxnone.terraria.item.effect.CriticalStrikeModifier; +import com.lzxnone.terraria.item.effect.DamageModifier; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; +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 MoonStone extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier, ConditionalAttributeModifier { + public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.moon_stone.damage_multiplier", + "damage_multiplier", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble CRIT_CHANCE = new ConfigDouble( + "accessory.moon_stone.crit_chance", + "crit_chance", + 0.02D, + 0.0D, + 1.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.moon_stone.attack_speed", + "attack_speed", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.moon_stone.defense", + "defense", + 4.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble MINING_SPEED = new ConfigDouble( + "accessory.moon_stone.mining_speed", + "mining_speed", + 1.15D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble( + "accessory.moon_stone.minion_knockback_multiplier", + "minion_knockback_multiplier", + 1.5D, + 1.0D, + 10.0D + ); + + public MoonStone() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getDamageMultiplier(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? DAMAGE_MULTIPLIER.get() : 1.0D; + } + + @Override + public double getCritChance(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? CRIT_CHANCE.get() : 0.0D; + } + + @Override + public double getMinionKnockbackMultiplier(ItemStack stack, LivingEntity entity) { + return entity.level().isNight() ? MINION_KNOCKBACK_MULTIPLIER.get() : 1.0D; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + return MultimapBuilder.hashKeys().arrayListValues().build(); + } + + @Override + public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + if(entity.level().isNight()) buildModifiers(modifiers); + return modifiers; + } + + @Override + public Multimap, AttributeModifier> getAllConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + buildModifiers(modifiers); + return modifiers; + } + + private void buildModifiers(Multimap, AttributeModifier> modifiers) { + double attackSpeed = ATTACK_SPEED.get() - 1.0D; + if(attackSpeed != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_stone_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, "moon_stone_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double miningSpeed = MINING_SPEED.get() - 1.0D; + if(miningSpeed != 0.0D) { + modifiers.put( + Attributes.BLOCK_BREAK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_stone_mining_speed"), + miningSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_MULTIPLIER, CRIT_CHANCE, ATTACK_SPEED, DEFENSE, MINING_SPEED, MINION_KNOCKBACK_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "moon_stone", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/moon_stone.png"), + Component.translatable("item.lzxnoneterraria.moon_stone"), + 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.active_at_night" + ).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)); + } + if(CRIT_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.crit_chance_bonus", + EffectTooltipUtil.formatNumber(CRIT_CHANCE.get() * 100.0D) + ).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(MINING_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mining_speed_bonus", + EffectTooltipUtil.formatPercent(MINING_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MINION_KNOCKBACK_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_knockback_increase", + EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java new file mode 100644 index 0000000..d04b625 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java @@ -0,0 +1,110 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.WaterBreathingModifier; +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 NeptunesShell extends AccessoryItem implements WaterBreathingModifier, ConditionalAttributeModifier { + public static final ConfigDouble MOVE_SPEED = new ConfigDouble( + "accessory.neptunes_shell.move_speed", + "move_speed", + 1.5D, + 1.0D, + 10.0D + ); + + public NeptunesShell() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean canBreatheUnderwater(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + //条件属性由 AccessoryUtil.syncConditionalModifiers 动态管理,不走 curios 自动应用 + return MultimapBuilder.hashKeys().arrayListValues().build(); + } + + @Override + public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + if(entity.isInWater()) buildModifiers(modifiers); + return modifiers; + } + + @Override + public Multimap, AttributeModifier> getAllConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + buildModifiers(modifiers); + return modifiers; + } + + private void buildModifiers(Multimap, AttributeModifier> modifiers) { + double moveSpeed = MOVE_SPEED.get() - 1.0D; + if(moveSpeed != 0.0D) { + modifiers.put( + Attributes.MOVEMENT_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "neptunes_shell_move_speed"), + moveSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MOVE_SPEED); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "neptunes_shell", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/neptunes_shell.png"), + Component.translatable("item.lzxnoneterraria.neptunes_shell"), + 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.active_in_water" + ).withStyle(ChatFormatting.GRAY)); + if(MOVE_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.move_speed_bonus", + EffectTooltipUtil.formatPercent(MOVE_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.water_breathing" + ).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 index d5b7fe0..6501229 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/PaladinsShield.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/PaladinsShield.java @@ -60,7 +60,7 @@ public class PaladinsShield extends AccessoryItem implements GuardianShieldModif } @Override - public boolean applyGuardianShield(ItemStack stack, LivingEntity entity) { + public boolean canApplyGuardianShield(ItemStack stack, LivingEntity entity) { return entity.getHealth() / entity.getMaxHealth() > MIN_HEALTH_RATIO.get(); } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java new file mode 100644 index 0000000..12f877e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java @@ -0,0 +1,206 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier; +import com.lzxnone.terraria.item.effect.CriticalStrikeModifier; +import com.lzxnone.terraria.item.effect.DamageModifier; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; +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 SunStone extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier, ConditionalAttributeModifier { + public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.sun_stone.damage_multiplier", + "damage_multiplier", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble CRIT_CHANCE = new ConfigDouble( + "accessory.sun_stone.crit_chance", + "crit_chance", + 0.02D, + 0.0D, + 1.0D + ); + public static final ConfigDouble ATTACK_SPEED = new ConfigDouble( + "accessory.sun_stone.attack_speed", + "attack_speed", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.sun_stone.defense", + "defense", + 4.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble MINING_SPEED = new ConfigDouble( + "accessory.sun_stone.mining_speed", + "mining_speed", + 1.15D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble( + "accessory.sun_stone.minion_knockback_multiplier", + "minion_knockback_multiplier", + 1.5D, + 1.0D, + 10.0D + ); + + public SunStone() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getDamageMultiplier(ItemStack stack, LivingEntity entity) { + return !entity.level().isNight() ? DAMAGE_MULTIPLIER.get() : 1.0D; + } + + @Override + public double getCritChance(ItemStack stack, LivingEntity entity) { + return !entity.level().isNight() ? CRIT_CHANCE.get() : 0.0D; + } + + @Override + public double getMinionKnockbackMultiplier(ItemStack stack, LivingEntity entity) { + return !entity.level().isNight() ? MINION_KNOCKBACK_MULTIPLIER.get() : 1.0D; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + //条件属性由 AccessoryUtil.syncConditionalModifiers 动态管理,不走 curios 自动应用 + return MultimapBuilder.hashKeys().arrayListValues().build(); + } + + @Override + public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + if(!entity.level().isNight()) buildModifiers(modifiers); + return modifiers; + } + + @Override + public Multimap, AttributeModifier> getAllConditionalModifiers(ItemStack stack, LivingEntity entity) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + buildModifiers(modifiers); + return modifiers; + } + + private void buildModifiers(Multimap, AttributeModifier> modifiers) { + double attackSpeed = ATTACK_SPEED.get() - 1.0D; + if(attackSpeed != 0.0D) { + modifiers.put( + Attributes.ATTACK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "sun_stone_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, "sun_stone_armor"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double miningSpeed = MINING_SPEED.get() - 1.0D; + if(miningSpeed != 0.0D) { + modifiers.put( + Attributes.BLOCK_BREAK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "sun_stone_mining_speed"), + miningSpeed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE_MULTIPLIER, CRIT_CHANCE, ATTACK_SPEED, DEFENSE, MINING_SPEED, MINION_KNOCKBACK_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "sun_stone", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/sun_stone.png"), + Component.translatable("item.lzxnoneterraria.sun_stone"), + 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.active_at_day" + ).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)); + } + if(CRIT_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.crit_chance_bonus", + EffectTooltipUtil.formatNumber(CRIT_CHANCE.get() * 100.0D) + ).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(MINING_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mining_speed_bonus", + EffectTooltipUtil.formatPercent(MINING_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MINION_KNOCKBACK_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_knockback_increase", + EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/ConditionalAttributeModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/ConditionalAttributeModifier.java new file mode 100644 index 0000000..4a108f7 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/ConditionalAttributeModifier.java @@ -0,0 +1,16 @@ +package com.lzxnone.terraria.item.effect; + +import com.google.common.collect.Multimap; +import net.minecraft.core.Holder; +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.item.ItemStack; + +public interface ConditionalAttributeModifier { + Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity); + + default Multimap, AttributeModifier> getAllConditionalModifiers(ItemStack stack, LivingEntity entity) { + return getConditionalModifiers(stack, entity); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/CriticalStrikeModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/CriticalStrikeModifier.java new file mode 100644 index 0000000..cfcd724 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/CriticalStrikeModifier.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 CriticalStrikeModifier { + double getCritChance(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/GuardianShieldModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/GuardianShieldModifier.java index da5a590..7cf3c1c 100644 --- a/src/main/java/com/lzxnone/terraria/item/effect/GuardianShieldModifier.java +++ b/src/main/java/com/lzxnone/terraria/item/effect/GuardianShieldModifier.java @@ -4,7 +4,7 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; public interface GuardianShieldModifier { - boolean applyGuardianShield(ItemStack stack, LivingEntity entity); + boolean canApplyGuardianShield(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 index 4f066c7..c423a1c 100644 --- a/src/main/java/com/lzxnone/terraria/item/effect/IceBarrierModifier.java +++ b/src/main/java/com/lzxnone/terraria/item/effect/IceBarrierModifier.java @@ -4,6 +4,6 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; public interface IceBarrierModifier { - boolean applyIceBarrier(ItemStack stack, LivingEntity entity); + boolean canApplyIceBarrier(ItemStack stack, LivingEntity entity); double getMaxHealthRatio(ItemStack stack, LivingEntity entity); } diff --git a/src/main/java/com/lzxnone/terraria/item/effect/IgniteOnHitModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/IgniteOnHitModifier.java new file mode 100644 index 0000000..a998dfc --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/IgniteOnHitModifier.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 IgniteOnHitModifier { + boolean canApplyIgnite(ItemStack stack, LivingEntity entity); + int getIgniteTicks(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/JumpModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/JumpModifier.java new file mode 100644 index 0000000..677e6fe --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/JumpModifier.java @@ -0,0 +1,11 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface JumpModifier { + //跳跃高度倍率(垂直初速度) + double getJumpHeightMultiplier(ItemStack stack, LivingEntity entity); + //跳跃速度倍率(水平初速度) + double getJumpSpeedMultiplier(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MeleeCritChanceModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MeleeCritChanceModifier.java new file mode 100644 index 0000000..a7fadf1 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/MeleeCritChanceModifier.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 MeleeCritChanceModifier { + double getMeleeCritChance(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/WaterBreathingModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/WaterBreathingModifier.java new file mode 100644 index 0000000..c70f01c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/WaterBreathingModifier.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 WaterBreathingModifier { + boolean canBreatheUnderwater(ItemStack stack, LivingEntity entity); +} 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 24ccc07..6c106c0 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 @@ -160,7 +160,7 @@ public class StardustDragonStaff extends MinionWeapon { float damage = DAMAGE.get() + ADD_DAMAGE.get() * Math.max(0, stardustDragonSlotCount - 1); for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, damage, 1.0f)) target.invulnerableTime = 15; + if(DamageUtil.minionAttack(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 334c83d..61827ed 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 @@ -227,7 +227,7 @@ public class Terraprisma extends MinionWeapon { ); ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), 1.0f)) target.invulnerableTime = 15; + if(DamageUtil.minionAttack(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,7 +278,7 @@ public class Terraprisma extends MinionWeapon { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), 1.0f)) target.invulnerableTime = 15; + if(DamageUtil.minionAttack(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/ui/config/ConfigList.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java index f6b9c6f..918032b 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -48,6 +48,16 @@ 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.accessory.FireGauntlet; +import com.lzxnone.terraria.item.accessory.EyeOfGolem; +import com.lzxnone.terraria.item.accessory.DestroyerEmblem; +import com.lzxnone.terraria.item.accessory.MoonStone; +import com.lzxnone.terraria.item.accessory.SunStone; +import com.lzxnone.terraria.item.accessory.CelestialStone; +import com.lzxnone.terraria.item.accessory.MoonCharm; +import com.lzxnone.terraria.item.accessory.NeptunesShell; +import com.lzxnone.terraria.item.accessory.MoonShell; +import com.lzxnone.terraria.item.accessory.CelestialShell; import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.BeeKeeper; import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass; @@ -214,7 +224,17 @@ public class ConfigList { PaladinsShield.CONFIG_LIST_ITEM, HeroShield.CONFIG_LIST_ITEM, FrozenTurtleShell.CONFIG_LIST_ITEM, - FrozenShield.CONFIG_LIST_ITEM + FrozenShield.CONFIG_LIST_ITEM, + FireGauntlet.CONFIG_LIST_ITEM, + EyeOfGolem.CONFIG_LIST_ITEM, + DestroyerEmblem.CONFIG_LIST_ITEM, + MoonStone.CONFIG_LIST_ITEM, + SunStone.CONFIG_LIST_ITEM, + CelestialStone.CONFIG_LIST_ITEM, + MoonCharm.CONFIG_LIST_ITEM, + NeptunesShell.CONFIG_LIST_ITEM, + MoonShell.CONFIG_LIST_ITEM, + CelestialShell.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 8a3860c..ee81f42 100644 --- a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java @@ -7,6 +7,7 @@ import com.lzxnone.terraria.entity.beam.SwordBeam; 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.accessory.AccessoryUtil; import com.lzxnone.terraria.item.weapon.*; import com.lzxnone.terraria.item.weapon.summon.minion.MinionWeapon; import net.minecraft.resources.ResourceKey; @@ -31,6 +32,8 @@ public class DamageUtil { RANGED, SUMMON, MAGIC, + MINION, + SENTRY, REAL } @@ -50,6 +53,14 @@ public class DamageUtil { return entityAttack(attackEntity, target, sourceStack, damage, knockbackScale, ModDamageTypes.PLAYER_NORMAL_ATTACK, DamageCategory.SUMMON); } + public static boolean minionAttack(Entity attackEntity, Entity target, ItemStack sourceStack, float damage, float knockbackScale) { + return entityAttack(attackEntity, target, sourceStack, damage, knockbackScale, ModDamageTypes.PLAYER_NORMAL_ATTACK, DamageCategory.MINION); + } + + public static boolean sentryAttack(Entity attackEntity, Entity target, ItemStack sourceStack, float damage, float knockbackScale) { + return entityAttack(attackEntity, target, sourceStack, damage, knockbackScale, ModDamageTypes.PLAYER_NORMAL_ATTACK, DamageCategory.SENTRY); + } + public static boolean magicAttack(Entity attackEntity, Entity target, ItemStack sourceStack, float damage, float knockbackScale) { return entityAttack(attackEntity, target, sourceStack, damage, knockbackScale, ModDamageTypes.PLAYER_NORMAL_ATTACK, DamageCategory.MAGIC); } @@ -87,24 +98,40 @@ public class DamageUtil { 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()) { finalDamage = RangedWeapon.applyRangedDamageBonus(itemSource, player, finalDamage); + }else if(category == DamageCategory.MINION && !itemSource.isEmpty()) { + finalDamage = SummonWeapon.applySummonDamageBonus(itemSource, player, finalDamage); + knockbackLevel = MinionWeapon.applyMinionKnockback(player, knockbackLevel); + }else if(category == DamageCategory.SENTRY && !itemSource.isEmpty()) { + finalDamage = SummonWeapon.applySummonDamageBonus(itemSource, player, finalDamage); } if(category != DamageCategory.REAL) { finalDamage = applyTargetDamageEffects(target, finalDamage); } finalDamage = Math.max(0.0F, finalDamage); + //近战暴击(月光护身符等饰品的近战暴击率,触发后伤害提升 1.5 倍) + if(category == DamageCategory.MELEE) { + double meleeCritChance = AccessoryUtil.getMeleeCritChance(player); + if(meleeCritChance > 0.0D && player.getRandom().nextDouble() < meleeCritChance) { + finalDamage *= 1.5F; + } + } + Vec3 beforeHurtMovement = target instanceof LivingEntity livingTarget ? livingTarget.getDeltaMovement() : Vec3.ZERO; boolean hasHurt = target.hurt(source, finalDamage); if(hasHurt) { - if(category != DamageCategory.SUMMON && target instanceof LivingEntity livingTarget) { + if(category != DamageCategory.MINION && category != DamageCategory.SENTRY && target instanceof LivingEntity livingTarget) { player.setLastHurtMob(livingTarget); } + if(category == DamageCategory.MELEE) { + //近战着火 + if(AccessoryUtil.canApplyIgnite(player)) target.igniteForTicks(AccessoryUtil.getIgniteTicks(player)); + } if(target instanceof LivingEntity livingTarget) { Vec3 hurtKnockback = livingTarget.getDeltaMovement().subtract(beforeHurtMovement); Vec3 extraKnockback = Vec3.ZERO; diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 93f2dba..5df29bc 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -135,6 +135,17 @@ "item.lzxnoneterraria.hero_shield": "Hero Shield", "item.lzxnoneterraria.frozen_turtle_shell": "Frozen Turtle Shell", "item.lzxnoneterraria.frozen_shield": "Frozen Shield", + "item.lzxnoneterraria.magma_stone": "Magma Stone", + "item.lzxnoneterraria.fire_gauntlet": "Fire Gauntlet", + "item.lzxnoneterraria.eye_of_the_golem": "Eye of the Golem", + "item.lzxnoneterraria.destroyer_emblem": "Destroyer Emblem", + "item.lzxnoneterraria.moon_stone": "Moon Stone", + "item.lzxnoneterraria.sun_stone": "Sun Stone", + "item.lzxnoneterraria.celestial_stone": "Celestial Stone", + "item.lzxnoneterraria.moon_charm": "Moon Charm", + "item.lzxnoneterraria.neptunes_shell": "Neptune's Shell", + "item.lzxnoneterraria.moon_shell": "Moon Shell", + "item.lzxnoneterraria.celestial_shell": "Celestial Shell", "item.lzxnoneterraria.mana_crystal": "Mana Crystal", "item.lzxnoneterraria.summoning_potion": "Summoning Potion", "item.lzxnoneterraria.lesser_mana_potion": "Lesser Mana Potion", @@ -183,6 +194,9 @@ "curios.modifiers.terraria_accessory": "Accessory Attribute Bonus", "tooltip.lzxnoneterraria.poison_immunity": "Poison Immunity", + "tooltip.lzxnoneterraria.active_at_night": "At night:", + "tooltip.lzxnoneterraria.active_at_day": "During the day:", + "tooltip.lzxnoneterraria.active_in_water": "While in water:", "tooltip.lzxnoneterraria.darkness_immunity": "Darkness Immunity", "tooltip.lzxnoneterraria.slowness_immunity": "Slowness Immunity", "tooltip.lzxnoneterraria.weakness_immunity": "Weakness Immunity", @@ -198,6 +212,11 @@ "lzxnoneterraria.configuration.damage_immunity.tooltip": "Chance to negate incoming damage", "tooltip.lzxnoneterraria.damage_increase": "Damage +%s%%", + "tooltip.lzxnoneterraria.crit_chance_bonus": "Critical Strike Chance +%s%%", + "tooltip.lzxnoneterraria.mining_speed_bonus": "Mining Speed +%s%%", + "tooltip.lzxnoneterraria.move_speed_bonus": "Movement Speed +%s%%", + "tooltip.lzxnoneterraria.water_breathing": "Breathe underwater", + "tooltip.lzxnoneterraria.jump_boost": "Slightly increases jump height and speed", "tooltip.lzxnoneterraria.knockback_resistance_bonus": "Knockback Resistance +%s%%", "tooltip.lzxnoneterraria.defense_bonus": "Defense +%s", "tooltip.lzxnoneterraria.armor_toughness_bonus": "Armor Toughness +%s", @@ -212,6 +231,16 @@ "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", + "lzxnoneterraria.configuration.crit_chance": "Critical Strike Chance", + "lzxnoneterraria.configuration.crit_chance.tooltip": "Critical strike chance granted while equipped", + "lzxnoneterraria.configuration.mining_speed": "Mining Speed", + "lzxnoneterraria.configuration.mining_speed.tooltip": "Block breaking speed multiplier while equipped", + "lzxnoneterraria.configuration.move_speed": "Movement Speed", + "lzxnoneterraria.configuration.move_speed.tooltip": "Movement speed multiplier while equipped", + "lzxnoneterraria.configuration.jump_height": "Jump Height", + "lzxnoneterraria.configuration.jump_height.tooltip": "Vertical jump velocity multiplier while equipped", + "lzxnoneterraria.configuration.jump_speed": "Jump Speed", + "lzxnoneterraria.configuration.jump_speed.tooltip": "Horizontal jump velocity multiplier 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", @@ -237,13 +266,17 @@ "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_crit_chance_bonus": "Melee Critical Strike Chance +%s%%", "tooltip.lzxnoneterraria.melee_damage_decrease": "-%s%% melee damage", "tooltip.lzxnoneterraria.melee_knockback_bonus": "Melee Knockback +%s", "tooltip.lzxnoneterraria.attack_speed_bonus": "Attack Speed +%s%%", + "tooltip.lzxnoneterraria.ignite_on_hit": "Melee attacks inflict fire 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.melee_knockback": "Melee Knockback", "lzxnoneterraria.configuration.melee_knockback.tooltip": "Melee attacks gain this extra knockback while equipped", + "lzxnoneterraria.configuration.melee_crit_chance": "Melee Critical Strike Chance", + "lzxnoneterraria.configuration.melee_crit_chance.tooltip": "Critical strike chance granted to melee attacks 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%)", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 1890583..fb45090 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -135,6 +135,17 @@ "item.lzxnoneterraria.hero_shield": "英雄护盾", "item.lzxnoneterraria.frozen_turtle_shell": "冰冻海龟壳", "item.lzxnoneterraria.frozen_shield": "冰冻护盾", + "item.lzxnoneterraria.magma_stone": "岩浆石", + "item.lzxnoneterraria.fire_gauntlet": "烈火手套", + "item.lzxnoneterraria.eye_of_the_golem": "石巨人之眼", + "item.lzxnoneterraria.destroyer_emblem": "毁灭者徽章", + "item.lzxnoneterraria.moon_stone": "月亮石", + "item.lzxnoneterraria.sun_stone": "太阳石", + "item.lzxnoneterraria.celestial_stone": "天界石", + "item.lzxnoneterraria.moon_charm": "月光护身符", + "item.lzxnoneterraria.neptunes_shell": "海神贝壳", + "item.lzxnoneterraria.moon_shell": "月亮贝壳", + "item.lzxnoneterraria.celestial_shell": "天界贝壳", "item.lzxnoneterraria.mana_crystal": "魔力水晶", "item.lzxnoneterraria.summoning_potion": "召唤药水", "item.lzxnoneterraria.lesser_mana_potion": "弱效魔力药水", @@ -183,6 +194,9 @@ "curios.modifiers.terraria_accessory": "饰品属性加成", "tooltip.lzxnoneterraria.poison_immunity": "免疫中毒", + "tooltip.lzxnoneterraria.active_at_night": "在夜晚时:", + "tooltip.lzxnoneterraria.active_at_day": "在白天时:", + "tooltip.lzxnoneterraria.active_in_water": "在水中时:", "tooltip.lzxnoneterraria.darkness_immunity": "免疫黑暗", "tooltip.lzxnoneterraria.slowness_immunity": "免疫缓慢", "tooltip.lzxnoneterraria.weakness_immunity": "免疫虚弱", @@ -198,6 +212,11 @@ "lzxnoneterraria.configuration.damage_immunity.tooltip": "抵消承受伤害的概率", "tooltip.lzxnoneterraria.damage_increase": "伤害 +%s%%", + "tooltip.lzxnoneterraria.crit_chance_bonus": "暴击率 +%s%%", + "tooltip.lzxnoneterraria.mining_speed_bonus": "挖掘速度 +%s%%", + "tooltip.lzxnoneterraria.move_speed_bonus": "移动速度 +%s%%", + "tooltip.lzxnoneterraria.water_breathing": "水下呼吸", + "tooltip.lzxnoneterraria.jump_boost": "略微增加跳跃高度和跳跃速度", "tooltip.lzxnoneterraria.knockback_resistance_bonus": "抗性击退 +%s%%", "tooltip.lzxnoneterraria.defense_bonus": "护甲值 +%s", "tooltip.lzxnoneterraria.armor_toughness_bonus": "盔甲韧性 +%s", @@ -212,6 +231,16 @@ "lzxnoneterraria.configuration.armor_toughness.tooltip": "佩戴后获得该数值的盔甲韧性", "lzxnoneterraria.configuration.armor_pierce": "护甲穿透", "lzxnoneterraria.configuration.armor_pierce.tooltip": "佩戴后攻击无视目标该数值的护甲", + "lzxnoneterraria.configuration.crit_chance": "暴击率", + "lzxnoneterraria.configuration.crit_chance.tooltip": "佩戴后攻击时增加暴击率", + "lzxnoneterraria.configuration.mining_speed": "挖矿速度", + "lzxnoneterraria.configuration.mining_speed.tooltip": "佩戴后挖掘方块的速度倍率", + "lzxnoneterraria.configuration.move_speed": "移动速度", + "lzxnoneterraria.configuration.move_speed.tooltip": "佩戴后移动速度的倍率", + "lzxnoneterraria.configuration.jump_height": "跳跃高度", + "lzxnoneterraria.configuration.jump_height.tooltip": "佩戴后跳跃垂直初速度的倍率", + "lzxnoneterraria.configuration.jump_speed": "跳跃速度", + "lzxnoneterraria.configuration.jump_speed.tooltip": "佩戴后跳跃水平初速度的倍率", "tooltip.lzxnoneterraria.fallen_star_summon": "受到伤害后会使星星坠落", "tooltip.lzxnoneterraria.invulnerable_time_bonus": "延长受伤后的无敌状态时间 x%s", @@ -237,13 +266,17 @@ "lzxnoneterraria.configuration.min_health_ratio.tooltip": "生命高于该比例时触发(0 禁用)", "tooltip.lzxnoneterraria.melee_damage_increase": "近战伤害 +%s%%", + "tooltip.lzxnoneterraria.melee_crit_chance_bonus": "近战暴击率 +%s%%", "tooltip.lzxnoneterraria.melee_damage_decrease": "近战伤害 -%s%%", "tooltip.lzxnoneterraria.melee_knockback_bonus": "近战击退 +%s", "tooltip.lzxnoneterraria.attack_speed_bonus": "攻击速度 +%s%%", + "tooltip.lzxnoneterraria.ignite_on_hit": "近战攻击造成火焰伤害", "lzxnoneterraria.configuration.melee_damage_multiplier": "近战武器伤害倍率", "lzxnoneterraria.configuration.melee_damage_multiplier.tooltip": "佩戴后近战伤害乘以该倍率", "lzxnoneterraria.configuration.melee_knockback": "近战击退", "lzxnoneterraria.configuration.melee_knockback.tooltip": "佩戴后近战攻击额外增加该数值的击退", + "lzxnoneterraria.configuration.melee_crit_chance": "近战暴击率", + "lzxnoneterraria.configuration.melee_crit_chance.tooltip": "佩戴后近战攻击时增加暴击率", "lzxnoneterraria.configuration.attack_speed": "攻击速度", "lzxnoneterraria.configuration.attack_speed.tooltip": "佩戴后攻击速度乘以该倍率", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/celestial_shell.json b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_shell.json new file mode 100644 index 0000000..48018c2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_shell.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/celestial_shell" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/celestial_stone.json b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_stone.json new file mode 100644 index 0000000..424ca87 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/celestial_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/celestial_stone" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/destroyer_emblem.json b/src/main/resources/assets/lzxnoneterraria/models/item/destroyer_emblem.json new file mode 100644 index 0000000..68e9048 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/destroyer_emblem.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/destroyer_emblem" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/eye_of_the_golem.json b/src/main/resources/assets/lzxnoneterraria/models/item/eye_of_the_golem.json new file mode 100644 index 0000000..fae6e6f --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/eye_of_the_golem.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/eye_of_the_golem" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/fire_gauntlet.json b/src/main/resources/assets/lzxnoneterraria/models/item/fire_gauntlet.json new file mode 100644 index 0000000..87ec198 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/fire_gauntlet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/fire_gauntlet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/magma_stone.json b/src/main/resources/assets/lzxnoneterraria/models/item/magma_stone.json new file mode 100644 index 0000000..c9d18f0 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/magma_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/magma_stone" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/moon_charm.json b/src/main/resources/assets/lzxnoneterraria/models/item/moon_charm.json new file mode 100644 index 0000000..a4b436e --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/moon_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/moon_charm" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/moon_shell.json b/src/main/resources/assets/lzxnoneterraria/models/item/moon_shell.json new file mode 100644 index 0000000..8d5e746 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/moon_shell.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/moon_shell" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/moon_stone.json b/src/main/resources/assets/lzxnoneterraria/models/item/moon_stone.json new file mode 100644 index 0000000..60b6ab6 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/moon_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/moon_stone" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/neptunes_shell.json b/src/main/resources/assets/lzxnoneterraria/models/item/neptunes_shell.json new file mode 100644 index 0000000..87165c8 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/neptunes_shell.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/neptunes_shell" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/sun_stone.json b/src/main/resources/assets/lzxnoneterraria/models/item/sun_stone.json new file mode 100644 index 0000000..686ee8a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/sun_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/sun_stone" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_shell.png b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_shell.png new file mode 100644 index 0000000..7af2c60 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_shell.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_stone.png b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_stone.png new file mode 100644 index 0000000..774ae24 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/celestial_stone.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/destroyer_emblem.png b/src/main/resources/assets/lzxnoneterraria/textures/item/destroyer_emblem.png new file mode 100644 index 0000000..d38822a Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/destroyer_emblem.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/eye_of_the_golem.png b/src/main/resources/assets/lzxnoneterraria/textures/item/eye_of_the_golem.png new file mode 100644 index 0000000..f572ec0 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/eye_of_the_golem.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/fire_gauntlet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/fire_gauntlet.png new file mode 100644 index 0000000..eb381e6 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/fire_gauntlet.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/magma_stone.png b/src/main/resources/assets/lzxnoneterraria/textures/item/magma_stone.png new file mode 100644 index 0000000..abda91e Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/magma_stone.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/moon_charm.png b/src/main/resources/assets/lzxnoneterraria/textures/item/moon_charm.png new file mode 100644 index 0000000..bd255e7 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/moon_charm.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/moon_shell.png b/src/main/resources/assets/lzxnoneterraria/textures/item/moon_shell.png new file mode 100644 index 0000000..2c8659d Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/moon_shell.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/moon_stone.png b/src/main/resources/assets/lzxnoneterraria/textures/item/moon_stone.png new file mode 100644 index 0000000..0bddc96 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/moon_stone.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/neptunes_shell.png b/src/main/resources/assets/lzxnoneterraria/textures/item/neptunes_shell.png new file mode 100644 index 0000000..afa62c8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/neptunes_shell.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/sun_stone.png b/src/main/resources/assets/lzxnoneterraria/textures/item/sun_stone.png new file mode 100644 index 0000000..7a81860 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/sun_stone.png differ diff --git a/src/main/resources/data/lzxnoneterraria/recipe/celestial_shell.json b/src/main/resources/data/lzxnoneterraria/recipe/celestial_shell.json new file mode 100644 index 0000000..f4d6666 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/celestial_shell.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:celestial_stone" + }, + { + "item": "lzxnoneterraria:moon_shell" + } + ], + "result": { + "id": "lzxnoneterraria:celestial_shell", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/celestial_stone.json b/src/main/resources/data/lzxnoneterraria/recipe/celestial_stone.json new file mode 100644 index 0000000..117d3af --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/celestial_stone.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:moon_stone" + }, + { + "item": "lzxnoneterraria:sun_stone" + } + ], + "result": { + "id": "lzxnoneterraria:celestial_stone", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/destroyer_emblem.json b/src/main/resources/data/lzxnoneterraria/recipe/destroyer_emblem.json new file mode 100644 index 0000000..fee894c --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/destroyer_emblem.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:avenger_emblem" + }, + { + "item": "lzxnoneterraria:eye_of_the_golem" + } + ], + "result": { + "id": "lzxnoneterraria:destroyer_emblem", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/fire_gauntlet.json b/src/main/resources/data/lzxnoneterraria/recipe/fire_gauntlet.json new file mode 100644 index 0000000..52da0ba --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/fire_gauntlet.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:mechanical_glove" + }, + { + "item": "lzxnoneterraria:magma_stone" + } + ], + "result": { + "id": "lzxnoneterraria:fire_gauntlet", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/moon_shell.json b/src/main/resources/data/lzxnoneterraria/recipe/moon_shell.json new file mode 100644 index 0000000..e30a568 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/moon_shell.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:moon_charm" + }, + { + "item": "lzxnoneterraria:neptunes_shell" + } + ], + "result": { + "id": "lzxnoneterraria:moon_shell", + "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 2bd55b0..92c6691 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json @@ -50,6 +50,17 @@ "lzxnoneterraria:paladins_shield", "lzxnoneterraria:hero_shield", "lzxnoneterraria:frozen_turtle_shell", - "lzxnoneterraria:frozen_shield" + "lzxnoneterraria:frozen_shield", + "lzxnoneterraria:magma_stone", + "lzxnoneterraria:fire_gauntlet", + "lzxnoneterraria:eye_of_the_golem", + "lzxnoneterraria:destroyer_emblem", + "lzxnoneterraria:moon_stone", + "lzxnoneterraria:sun_stone", + "lzxnoneterraria:celestial_stone", + "lzxnoneterraria:moon_charm", + "lzxnoneterraria:neptunes_shell", + "lzxnoneterraria:moon_shell", + "lzxnoneterraria:celestial_shell" ] }