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 93ef4b4..42a9304 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 @@ -137,6 +137,14 @@ public class ModCreativeModeTabs { output.accept(ModItems.VALENTINE_RING.get()); output.accept(ModItems.CHARM_OF_MYTHS.get()); output.accept(ModItems.MANA_CLOAK.get()); + output.accept(ModItems.LUCKY_COIN.get()); + output.accept(ModItems.GOLD_RING.get()); + output.accept(ModItems.COIN_RING.get()); + output.accept(ModItems.DISCOUNT_CARD.get()); + output.accept(ModItems.GREEDY_RING.get()); + output.accept(ModItems.TREASURE_MAGNET.get()); + output.accept(ModItems.TOOLBELT.get()); + output.accept(ModItems.ANCIENT_CHISEL.get()); output.accept(ModItems.EYE_OF_GOLEM.get()); output.accept(ModItems.DESTROYER_EMBLEM.get()); output.accept(ModItems.MOON_STONE.get()); diff --git a/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java b/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java index d6e6bf5..5a17b90 100644 --- a/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java @@ -18,6 +18,7 @@ public class AccessoryEventHandler { @SubscribeEvent public static void onCurioChange(CurioChangeEvent event) { LivingEntity entity = event.getEntity(); + //curios 在实体卸载/玩家登出时也会触发该事件,此时 entity 为 null if(entity.level().isClientSide()) return; AccessoryUtil.removeImmuneEffects(entity); //脱下条件属性饰品时,移除其全部动态属性 diff --git a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index 5c08baa..5549103 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -25,7 +25,10 @@ import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.monster.Enemy; import net.minecraft.world.entity.monster.Monster; +import net.minecraft.world.entity.boss.enderdragon.EnderDragon; +import net.minecraft.world.entity.boss.wither.WitherBoss; import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; @@ -117,6 +120,13 @@ public class EntityEventHandler { if(critChance > 0.0D && attacker.getRandom().nextDouble() < critChance) { event.setNewDamage(event.getNewDamage() * 1.5F); } + //击中敌人概率掉落绿宝石(敌对生物、末影龙或凋灵) + double emeraldDropChance = AccessoryUtil.getEmeraldDropChance(livingEntity); + if(emeraldDropChance > 0.0D + && (target instanceof Enemy || target instanceof EnderDragon || target instanceof WitherBoss) + && livingEntity.getRandom().nextDouble() < emeraldDropChance) { + target.spawnAtLocation(new ItemStack(Items.EMERALD)); + } } //冰障 if(target.hasEffect(ModEffects.ICE_BARRIER)) { diff --git a/src/main/java/com/lzxnone/terraria/integration/jei/LzxnoneTerrariaJeiPlugin.java b/src/main/java/com/lzxnone/terraria/integration/jei/LzxnoneTerrariaJeiPlugin.java index 9b1997c..86d119c 100644 --- a/src/main/java/com/lzxnone/terraria/integration/jei/LzxnoneTerrariaJeiPlugin.java +++ b/src/main/java/com/lzxnone/terraria/integration/jei/LzxnoneTerrariaJeiPlugin.java @@ -44,5 +44,21 @@ public class LzxnoneTerrariaJeiPlugin implements IModPlugin { new ItemStack(ModItems.NATURES_GIFT.get()), Component.translatable("jei.lzxnoneterraria.info.natures_gift") ); + registration.addItemStackInfo( + new ItemStack(ModItems.WARRIOR_EMBLEM.get()), + Component.translatable("jei.lzxnoneterraria.info.warrior_emblem") + ); + registration.addItemStackInfo( + new ItemStack(ModItems.SUMMONER_EMBLEM.get()), + Component.translatable("jei.lzxnoneterraria.info.summoner_emblem") + ); + registration.addItemStackInfo( + new ItemStack(ModItems.RANGER_EMBLEM.get()), + Component.translatable("jei.lzxnoneterraria.info.ranger_emblem") + ); + registration.addItemStackInfo( + new ItemStack(ModItems.SORCERER_EMBLEM.get()), + Component.translatable("jei.lzxnoneterraria.info.sorcerer_emblem") + ); } } diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 99ea72f..901b55e 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -183,6 +183,14 @@ public class ModItems { public static final DeferredItem VALENTINE_RING = ITEMS.register("valentine_ring", ValentineRing::new); public static final DeferredItem CHARM_OF_MYTHS = ITEMS.register("charm_of_myths", CharmOfMyths::new); public static final DeferredItem MANA_CLOAK = ITEMS.register("mana_cloak", ManaCloak::new); + public static final DeferredItem LUCKY_COIN = ITEMS.register("lucky_coin", LuckyCoin::new); + public static final DeferredItem GOLD_RING = ITEMS.register("gold_ring", GoldRing::new); + public static final DeferredItem COIN_RING = ITEMS.register("coin_ring", CoinRing::new); + public static final DeferredItem DISCOUNT_CARD = ITEMS.register("discount_card", DiscountCard::new); + public static final DeferredItem GREEDY_RING = ITEMS.register("greedy_ring", GreedyRing::new); + public static final DeferredItem TREASURE_MAGNET = ITEMS.register("treasure_magnet", TreasureMagnet::new); + public static final DeferredItem TOOLBELT = ITEMS.register("toolbelt", Toolbelt::new); + public static final DeferredItem ANCIENT_CHISEL = ITEMS.register("ancient_chisel", AncientChisel::new); public static final DeferredItem EYE_OF_GOLEM = ITEMS.register("eye_of_the_golem", EyeOfGolem::new); public static final DeferredItem DESTROYER_EMBLEM = ITEMS.register("destroyer_emblem", DestroyerEmblem::new); public static final DeferredItem MOON_STONE = ITEMS.register("moon_stone", MoonStone::new); diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java index ea67910..09616dd 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AccessoryUtil.java @@ -23,7 +23,9 @@ import net.minecraft.world.entity.ai.attributes.AttributeInstance; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; import top.theillusivec4.curios.api.CuriosApi; @@ -68,6 +70,62 @@ public class AccessoryUtil { }); } + //绿宝石掉落物吸附范围:取所有饰品中的最大值 + public static double getEmeraldPickupRange(LivingEntity entity) { + double[] range = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof EmeraldPickupRangeModifier modifier) { + range[0] = Math.max(range[0], modifier.getEmeraldPickupRange(stack, entity)); + } + }); + return range[0]; + } + + //所有掉落物吸附范围:取所有饰品中的最大值 + public static double getItemPickupRange(LivingEntity entity) { + double[] range = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof ItemPickupRangeModifier modifier) { + range[0] = Math.max(range[0], modifier.getItemPickupRange(stack, entity)); + } + }); + return range[0]; + } + + //该掉落物对该玩家的有效吸附范围:绿宝石取两接口最大值,其余仅全物品接口; + //返回 0 表示不吸附(未佩戴任何扩展吸附范围的饰品或配置为 0),封顶 16 格 + public static double getEffectivePickupRange(LivingEntity entity, Item item) { + double range; + if(item == Items.EMERALD) { + range = Math.max(getEmeraldPickupRange(entity), getItemPickupRange(entity)); + }else { + range = getItemPickupRange(entity); + } + return Math.min(range, 16.0D); + } + + //商人交易折扣比例:取所有饰品中的最大值 + public static double getMerchantDiscountRatio(LivingEntity entity) { + double[] ratio = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof MerchantDiscountModifier modifier) { + ratio[0] = Math.max(ratio[0], modifier.getMerchantDiscountRatio(stack, entity)); + } + }); + return ratio[0]; + } + + //击中敌人掉落绿宝石概率:取所有饰品中的最大值 + public static double getEmeraldDropChance(LivingEntity entity) { + double[] chance = {0.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(accessory instanceof EmeraldDropOnHitModifier modifier) { + chance[0] = Math.max(chance[0], modifier.getEmeraldDropChance(stack, entity)); + } + }); + return chance[0]; + } + //耐魔性持续时间比例:取所有饰品中的最小值(降低优先) public static double getManaSicknessDurationMultiplier(LivingEntity entity) { double[] multiplier = {1.0D}; diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AncientChisel.java b/src/main/java/com/lzxnone/terraria/item/accessory/AncientChisel.java new file mode 100644 index 0000000..9ae25c3 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AncientChisel.java @@ -0,0 +1,80 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.core.Holder; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class AncientChisel extends AccessoryItem { + //挖掘速度倍率(1.25 = +25%) + public static final ConfigDouble MINING_SPEED = new ConfigDouble( + "accessory.ancient_chisel.mining_speed", + "mining_speed", + 1.25D, + 0.0D, + 10.0D + ); + + public AncientChisel() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double speed = MINING_SPEED.get() - 1.0D; + if(speed != 0.0D) { + modifiers.put( + Attributes.BLOCK_BREAK_SPEED, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "ancient_chisel_mining_speed"), + speed, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MINING_SPEED); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "ancient_chisel", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/ancient_chisel.png"), + Component.translatable("item.lzxnoneterraria.ancient_chisel"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MINING_SPEED.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mining_speed_bonus", + EffectTooltipUtil.formatPercent(MINING_SPEED.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java index 74bf9b5..9203d8d 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CelestialShell.java @@ -235,6 +235,8 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri @Override public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + //tooltip 预览时 entity 为 null(curios 会对未佩戴物品查询属性修饰符) + if(entity == null) return modifiers; if(entity.level().isNight()) { buildWolfModifiers(modifiers); } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CoinRing.java b/src/main/java/com/lzxnone/terraria/item/accessory/CoinRing.java new file mode 100644 index 0000000..601604d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CoinRing.java @@ -0,0 +1,120 @@ +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.EmeraldDropOnHitModifier; +import com.lzxnone.terraria.item.effect.EmeraldPickupRangeModifier; +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 CoinRing extends AccessoryItem implements EmeraldPickupRangeModifier, EmeraldDropOnHitModifier { + //绿宝石吸附范围(金戒指效果) + public static final ConfigDouble PICKUP_RANGE = new ConfigDouble( + "accessory.coin_ring.pickup_range", + "emerald_pickup_range", + 16.0D, + 0.0D, + 16.0D + ); + //运气加成(幸运币效果) + public static final ConfigDouble LUCK_BONUS = new ConfigDouble( + "accessory.coin_ring.luck_bonus", + "luck_bonus", + 0.05D, + 0.0D, + 10.0D + ); + //击中敌人掉落绿宝石概率(幸运币效果) + public static final ConfigDouble DROP_CHANCE = new ConfigDouble( + "accessory.coin_ring.emerald_drop_chance", + "emerald_drop_chance", + 0.01D, + 0.0D, + 1.0D + ); + + public CoinRing() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getEmeraldPickupRange(ItemStack stack, LivingEntity entity) { + return PICKUP_RANGE.get(); + } + + @Override + public double getEmeraldDropChance(ItemStack stack, LivingEntity entity) { + return DROP_CHANCE.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double luck = LUCK_BONUS.get(); + if(luck != 0.0D) { + modifiers.put( + Attributes.LUCK, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "coin_ring_luck"), + luck, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(PICKUP_RANGE, LUCK_BONUS, DROP_CHANCE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "coin_ring", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/coin_ring.png"), + Component.translatable("item.lzxnoneterraria.coin_ring"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(PICKUP_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.emerald_pickup_range", + EffectTooltipUtil.formatNumber(PICKUP_RANGE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(LUCK_BONUS.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.luck_bonus", + EffectTooltipUtil.formatNumber(LUCK_BONUS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(DROP_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.emerald_drop" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/DiscountCard.java b/src/main/java/com/lzxnone/terraria/item/accessory/DiscountCard.java new file mode 100644 index 0000000..65e6201 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/DiscountCard.java @@ -0,0 +1,63 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MerchantDiscountModifier; +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 DiscountCard extends AccessoryItem implements MerchantDiscountModifier { + //商人交易折扣比例(0.2 = 价格减 20%) + public static final ConfigDouble DISCOUNT_RATIO = new ConfigDouble( + "accessory.discount_card.discount_ratio", + "merchant_discount_ratio", + 0.2D, + 0.0D, + 1.0D + ); + + public DiscountCard() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getMerchantDiscountRatio(ItemStack stack, LivingEntity entity) { + return DISCOUNT_RATIO.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DISCOUNT_RATIO); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "discount_card", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/discount_card.png"), + Component.translatable("item.lzxnoneterraria.discount_card"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(DISCOUNT_RATIO.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.merchant_discount", + EffectTooltipUtil.formatNumber(DISCOUNT_RATIO.get() * 100.0D) + "%" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/GoldRing.java b/src/main/java/com/lzxnone/terraria/item/accessory/GoldRing.java new file mode 100644 index 0000000..a20da69 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/GoldRing.java @@ -0,0 +1,62 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.EmeraldPickupRangeModifier; +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 GoldRing extends AccessoryItem implements EmeraldPickupRangeModifier { + public static final ConfigDouble PICKUP_RANGE = new ConfigDouble( + "accessory.gold_ring.pickup_range", + "emerald_pickup_range", + 16.0D, + 0.0D, + 16.0D + ); + + public GoldRing() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getEmeraldPickupRange(ItemStack stack, LivingEntity entity) { + return PICKUP_RANGE.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(PICKUP_RANGE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "gold_ring", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/gold_ring.png"), + Component.translatable("item.lzxnoneterraria.gold_ring"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(PICKUP_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.emerald_pickup_range", + EffectTooltipUtil.formatNumber(PICKUP_RANGE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/GreedyRing.java b/src/main/java/com/lzxnone/terraria/item/accessory/GreedyRing.java new file mode 100644 index 0000000..1ffb7fb --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/GreedyRing.java @@ -0,0 +1,140 @@ +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.EmeraldDropOnHitModifier; +import com.lzxnone.terraria.item.effect.EmeraldPickupRangeModifier; +import com.lzxnone.terraria.item.effect.MerchantDiscountModifier; +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 GreedyRing extends AccessoryItem implements EmeraldPickupRangeModifier, EmeraldDropOnHitModifier, MerchantDiscountModifier { + //绿宝石吸附范围(钱币戒指→金戒指效果) + public static final ConfigDouble PICKUP_RANGE = new ConfigDouble( + "accessory.greedy_ring.pickup_range", + "emerald_pickup_range", + 16.0D, + 0.0D, + 16.0D + ); + //运气加成(钱币戒指→幸运币效果) + public static final ConfigDouble LUCK_BONUS = new ConfigDouble( + "accessory.greedy_ring.luck_bonus", + "luck_bonus", + 0.05D, + 0.0D, + 10.0D + ); + //击中敌人掉落绿宝石概率(钱币戒指→幸运币效果) + public static final ConfigDouble DROP_CHANCE = new ConfigDouble( + "accessory.greedy_ring.emerald_drop_chance", + "emerald_drop_chance", + 0.01D, + 0.0D, + 1.0D + ); + //商人交易折扣比例(优惠卡效果) + public static final ConfigDouble DISCOUNT_RATIO = new ConfigDouble( + "accessory.greedy_ring.discount_ratio", + "merchant_discount_ratio", + 0.2D, + 0.0D, + 1.0D + ); + + public GreedyRing() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getEmeraldPickupRange(ItemStack stack, LivingEntity entity) { + return PICKUP_RANGE.get(); + } + + @Override + public double getEmeraldDropChance(ItemStack stack, LivingEntity entity) { + return DROP_CHANCE.get(); + } + + @Override + public double getMerchantDiscountRatio(ItemStack stack, LivingEntity entity) { + return DISCOUNT_RATIO.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double luck = LUCK_BONUS.get(); + if(luck != 0.0D) { + modifiers.put( + Attributes.LUCK, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "greedy_ring_luck"), + luck, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(PICKUP_RANGE, LUCK_BONUS, DROP_CHANCE, DISCOUNT_RATIO); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "greedy_ring", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/greedy_ring.png"), + Component.translatable("item.lzxnoneterraria.greedy_ring"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(PICKUP_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.emerald_pickup_range", + EffectTooltipUtil.formatNumber(PICKUP_RANGE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(LUCK_BONUS.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.luck_bonus", + EffectTooltipUtil.formatNumber(LUCK_BONUS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(DROP_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.emerald_drop" + ).withStyle(ChatFormatting.GRAY)); + } + if(DISCOUNT_RATIO.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.merchant_discount", + EffectTooltipUtil.formatNumber(DISCOUNT_RATIO.get() * 100.0D) + "%" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/LuckyCoin.java b/src/main/java/com/lzxnone/terraria/item/accessory/LuckyCoin.java new file mode 100644 index 0000000..b7b7cd8 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/LuckyCoin.java @@ -0,0 +1,100 @@ +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.EmeraldDropOnHitModifier; +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 LuckyCoin extends AccessoryItem implements EmeraldDropOnHitModifier { + //运气加成(属性修饰符) + public static final ConfigDouble LUCK_BONUS = new ConfigDouble( + "accessory.lucky_coin.luck_bonus", + "luck_bonus", + 0.05D, + 0.0D, + 10.0D + ); + //击中敌人掉落绿宝石概率 + public static final ConfigDouble DROP_CHANCE = new ConfigDouble( + "accessory.lucky_coin.emerald_drop_chance", + "emerald_drop_chance", + 0.01D, + 0.0D, + 1.0D + ); + + public LuckyCoin() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getEmeraldDropChance(ItemStack stack, LivingEntity entity) { + return DROP_CHANCE.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double luck = LUCK_BONUS.get(); + if(luck != 0.0D) { + modifiers.put( + Attributes.LUCK, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "lucky_coin_luck"), + luck, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(LUCK_BONUS, DROP_CHANCE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "lucky_coin", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/lucky_coin.png"), + Component.translatable("item.lzxnoneterraria.lucky_coin"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(LUCK_BONUS.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.luck_bonus", + EffectTooltipUtil.formatNumber(LUCK_BONUS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(DROP_CHANCE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.emerald_drop" + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java index e37631c..dca51e1 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoonCharm.java @@ -105,6 +105,8 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel @Override public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + //tooltip 预览时 entity 为 null(curios 会对未佩戴物品查询属性修饰符) + if(entity == null) return modifiers; if(entity.level().isNight()) buildModifiers(modifiers); return modifiers; } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java index 78cfad6..3a29a2c 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoonShell.java @@ -118,6 +118,8 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel @Override public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + //tooltip 预览时 entity 为 null(curios 会对未佩戴物品查询属性修饰符) + if(entity == null) return modifiers; if(entity.level().isNight()) { buildWolfModifiers(modifiers); } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java index 276b43d..7ea8d94 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MoonStone.java @@ -98,6 +98,8 @@ public class MoonStone extends AccessoryItem implements DamageModifier, Critical @Override public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + //tooltip 预览时 entity 为 null(curios 会对未佩戴物品查询属性修饰符) + if(entity == null) return modifiers; if(entity.level().isNight()) buildModifiers(modifiers); return modifiers; } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java b/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java index 1d56502..7c75302 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/NeptunesShell.java @@ -51,6 +51,8 @@ public class NeptunesShell extends AccessoryItem implements WaterBreathingModifi @Override public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + //tooltip 预览时 entity 为 null(curios 会对未佩戴物品查询属性修饰符) + if(entity == null) return modifiers; if(entity.isInWater()) buildModifiers(modifiers); return modifiers; } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java b/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java index fe28bfd..1c7ef0f 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/SunStone.java @@ -98,6 +98,8 @@ public class SunStone extends AccessoryItem implements DamageModifier, CriticalS @Override public Multimap, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) { Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + //tooltip 预览时 entity 为 null(curios 会对未佩戴物品查询属性修饰符) + if(entity == null) return modifiers; if(!entity.level().isNight()) buildModifiers(modifiers); return modifiers; } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/Toolbelt.java b/src/main/java/com/lzxnone/terraria/item/accessory/Toolbelt.java new file mode 100644 index 0000000..237e689 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/Toolbelt.java @@ -0,0 +1,80 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.ChatFormatting; +import net.minecraft.core.Holder; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.ai.attributes.Attribute; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import top.theillusivec4.curios.api.SlotContext; + +import java.util.List; + +public class Toolbelt extends AccessoryItem { + //方块交互距离加成(格) + public static final ConfigDouble REACH_BONUS = new ConfigDouble( + "accessory.toolbelt.reach_bonus", + "block_interaction_range", + 1.0D, + 0.0D, + 10.0D + ); + + public Toolbelt() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double reach = REACH_BONUS.get(); + if(reach != 0.0D) { + modifiers.put( + Attributes.BLOCK_INTERACTION_RANGE, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "toolbelt_reach"), + reach, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(REACH_BONUS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "toolbelt", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/toolbelt.png"), + Component.translatable("item.lzxnoneterraria.toolbelt"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(REACH_BONUS.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.block_interaction_range", + EffectTooltipUtil.formatNumber(REACH_BONUS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/TreasureMagnet.java b/src/main/java/com/lzxnone/terraria/item/accessory/TreasureMagnet.java new file mode 100644 index 0000000..bb3ef93 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/TreasureMagnet.java @@ -0,0 +1,63 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.ItemPickupRangeModifier; +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 TreasureMagnet extends AccessoryItem implements ItemPickupRangeModifier { + //所有掉落物的吸附范围 + public static final ConfigDouble PICKUP_RANGE = new ConfigDouble( + "accessory.treasure_magnet.pickup_range", + "item_pickup_range", + 16.0D, + 0.0D, + 16.0D + ); + + public TreasureMagnet() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public double getItemPickupRange(ItemStack stack, LivingEntity entity) { + return PICKUP_RANGE.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(PICKUP_RANGE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "treasure_magnet", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/treasure_magnet.png"), + Component.translatable("item.lzxnoneterraria.treasure_magnet"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(PICKUP_RANGE.get() > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.item_pickup_range", + EffectTooltipUtil.formatNumber(PICKUP_RANGE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/EmeraldDropOnHitModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/EmeraldDropOnHitModifier.java new file mode 100644 index 0000000..f461f6d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/EmeraldDropOnHitModifier.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 EmeraldDropOnHitModifier { + //击中敌人时掉落绿宝石的概率(0~1) + double getEmeraldDropChance(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/EmeraldPickupRangeModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/EmeraldPickupRangeModifier.java new file mode 100644 index 0000000..2080af1 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/EmeraldPickupRangeModifier.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 EmeraldPickupRangeModifier { + //绿宝石掉落物吸附范围(格),0 = 不扩展 + double getEmeraldPickupRange(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/ItemPickupRangeModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/ItemPickupRangeModifier.java new file mode 100644 index 0000000..4b5ed08 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/ItemPickupRangeModifier.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 ItemPickupRangeModifier { + //所有掉落物的吸附范围(格),0 = 不扩展 + double getItemPickupRange(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MerchantDiscountModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MerchantDiscountModifier.java new file mode 100644 index 0000000..0b4ecc9 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/MerchantDiscountModifier.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 MerchantDiscountModifier { + //商人交易折扣比例(0.2 = 打 8 折,即价格减 20%) + double getMerchantDiscountRatio(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java b/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java index 0ff71f5..866f713 100644 --- a/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java +++ b/src/main/java/com/lzxnone/terraria/item/normal/FallenStar.java @@ -28,7 +28,7 @@ public class FallenStar extends Item { private static final double AIR_FRICTION = 0.98D; private static final double GROUND_FRICTION = 0.6D; private static final double MAX_FALL_SPEED = -1.5D; - private static final double MIN_ATTRACT_RADIUS = 4.0D; + private static final double MIN_ATTRACT_RADIUS = 0D; private static final double PICKUP_RADIUS = 0.35D; private static final double MAX_PICKUP_RADIUS = 16.0D; private static final double ATTRACT_SPEED = 0.25D; diff --git a/src/main/java/com/lzxnone/terraria/mixin/ItemEntityMixin.java b/src/main/java/com/lzxnone/terraria/mixin/ItemEntityMixin.java new file mode 100644 index 0000000..74e6408 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/mixin/ItemEntityMixin.java @@ -0,0 +1,64 @@ +package com.lzxnone.terraria.mixin; + +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.phys.Vec3; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ItemEntity.class) +public class ItemEntityMixin { + @Unique + private static final double lzxnoneterraria$PICKUP_PROBE_RANGE = 16.0D; + + @Unique + private static final double lzxnoneterraria$ATTRACT_SPEED = 0.25D; + + @Unique + private boolean lzxnoneterraria$attracting = false; + + @Shadow + private int pickupDelay; + + @WrapOperation( + method = "tick", + at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/item/ItemEntity;applyGravity()V") + ) + private void lzxnoneterraria$wrapGravityWhileAttracted(ItemEntity self, Operation original) { + if(!lzxnoneterraria$attracting) { + original.call(self); + } + } + + @Inject(method = "tick", at = @At("TAIL")) + private void lzxnoneterraria$attractToPlayer(CallbackInfo ci) { + ItemEntity self = (ItemEntity)(Object) this; + boolean attracting = false; + if(this.pickupDelay == 0) { + Player player = self.level().getNearestPlayer( + self.getX(), self.getY(), self.getZ(), lzxnoneterraria$PICKUP_PROBE_RANGE, false + ); + if(player != null && self.getOwner() != player) { + Item item = self.getItem().getItem(); + double range = AccessoryUtil.getEffectivePickupRange(player, item); + if(range > 0.0D) { + double distanceSqr = self.distanceToSqr(player); + if(distanceSqr <= range * range) { + attracting = true; + Vec3 toPlayer = player.position().subtract(self.position()).normalize(); + self.setDeltaMovement(toPlayer.scale(lzxnoneterraria$ATTRACT_SPEED)); + } + } + } + } + lzxnoneterraria$attracting = attracting; + } +} diff --git a/src/main/java/com/lzxnone/terraria/mixin/VillagerMixin.java b/src/main/java/com/lzxnone/terraria/mixin/VillagerMixin.java new file mode 100644 index 0000000..a38c2df --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/mixin/VillagerMixin.java @@ -0,0 +1,26 @@ +package com.lzxnone.terraria.mixin; + +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.npc.Villager; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.trading.MerchantOffer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Villager.class) +public class VillagerMixin { + @Inject(method = "updateSpecialPrices", at = @At("TAIL")) + private void lzxnoneterraria$applyMerchantDiscount(Player player, CallbackInfo ci) { + if(player == null) return; + double ratio = AccessoryUtil.getMerchantDiscountRatio(player); + if(ratio <= 0.0D) return; + Villager self = (Villager)(Object) this; + for(MerchantOffer offer : self.getOffers()) { + int discount = Mth.floor(offer.getBaseCostA().getCount() * ratio); + if(discount > 0) offer.addToSpecialPriceDiff(-discount); + } + } +} 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 1a23833..08ff8a1 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -71,6 +71,14 @@ import com.lzxnone.terraria.item.accessory.PhilosophersStone; import com.lzxnone.terraria.item.accessory.ValentineRing; import com.lzxnone.terraria.item.accessory.CharmOfMyths; import com.lzxnone.terraria.item.accessory.ManaCloak; +import com.lzxnone.terraria.item.accessory.LuckyCoin; +import com.lzxnone.terraria.item.accessory.GoldRing; +import com.lzxnone.terraria.item.accessory.CoinRing; +import com.lzxnone.terraria.item.accessory.DiscountCard; +import com.lzxnone.terraria.item.accessory.GreedyRing; +import com.lzxnone.terraria.item.accessory.TreasureMagnet; +import com.lzxnone.terraria.item.accessory.Toolbelt; +import com.lzxnone.terraria.item.accessory.AncientChisel; import com.lzxnone.terraria.item.accessory.EyeOfGolem; import com.lzxnone.terraria.item.accessory.DestroyerEmblem; import com.lzxnone.terraria.item.accessory.MoonStone; @@ -274,6 +282,14 @@ public class ConfigList { ValentineRing.CONFIG_LIST_ITEM, CharmOfMyths.CONFIG_LIST_ITEM, ManaCloak.CONFIG_LIST_ITEM, + LuckyCoin.CONFIG_LIST_ITEM, + GoldRing.CONFIG_LIST_ITEM, + CoinRing.CONFIG_LIST_ITEM, + DiscountCard.CONFIG_LIST_ITEM, + GreedyRing.CONFIG_LIST_ITEM, + TreasureMagnet.CONFIG_LIST_ITEM, + Toolbelt.CONFIG_LIST_ITEM, + AncientChisel.CONFIG_LIST_ITEM, EyeOfGolem.CONFIG_LIST_ITEM, DestroyerEmblem.CONFIG_LIST_ITEM, MoonStone.CONFIG_LIST_ITEM, diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index afd6ea6..7b6cae6 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -158,6 +158,14 @@ "item.lzxnoneterraria.valentine_ring": "Valentine Ring", "item.lzxnoneterraria.charm_of_myths": "Charm of Myths", "item.lzxnoneterraria.mana_cloak": "Mana Cloak", + "item.lzxnoneterraria.lucky_coin": "Lucky Coin", + "item.lzxnoneterraria.gold_ring": "Gold Ring", + "item.lzxnoneterraria.coin_ring": "Coin Ring", + "item.lzxnoneterraria.discount_card": "Discount Card", + "item.lzxnoneterraria.greedy_ring": "Greedy Ring", + "item.lzxnoneterraria.treasure_magnet": "Treasure Magnet", + "item.lzxnoneterraria.toolbelt": "Toolbelt", + "item.lzxnoneterraria.ancient_chisel": "Ancient Chisel", "item.lzxnoneterraria.eye_of_the_golem": "Eye of the Golem", "item.lzxnoneterraria.destroyer_emblem": "Destroyer Emblem", "item.lzxnoneterraria.moon_stone": "Moon Stone", @@ -256,6 +264,20 @@ "lzxnoneterraria.configuration.mana_on_hurt_multiplier.tooltip": "Mana recovered on hit based on pre-mitigation damage", "lzxnoneterraria.configuration.mana_sickness_duration_multiplier": "Mana Sickness Duration Multiplier", "lzxnoneterraria.configuration.mana_sickness_duration_multiplier.tooltip": "Multiplier for the max mana sickness duration while equipped (0.75 = 25% reduction)", + "lzxnoneterraria.configuration.luck_bonus": "Luck Bonus", + "lzxnoneterraria.configuration.luck_bonus.tooltip": "Luck gained while equipped", + "lzxnoneterraria.configuration.merchant_discount_ratio": "Trade Discount Ratio", + "lzxnoneterraria.configuration.merchant_discount_ratio.tooltip": "Ratio of villager trade price reduction while equipped (0.2 = 20% off)", + "lzxnoneterraria.configuration.emerald_drop_chance": "Emerald Drop Chance", + "lzxnoneterraria.configuration.emerald_drop_chance.tooltip": "Chance to drop an emerald when hitting enemies while equipped", + "lzxnoneterraria.configuration.emerald_pickup_range": "Emerald Pickup Range", + "lzxnoneterraria.configuration.item_pickup_range": "Item Pickup Range", + "lzxnoneterraria.configuration.item_pickup_range.tooltip": "Pickup range of all dropped items while equipped", + "lzxnoneterraria.configuration.block_interaction_range": "Block Interaction Range", + "lzxnoneterraria.configuration.block_interaction_range.tooltip": "Extra block interaction range in blocks while equipped", + "lzxnoneterraria.configuration.mining_speed": "Mining Speed Multiplier", + "lzxnoneterraria.configuration.mining_speed.tooltip": "Mining speed is multiplied by this value while equipped (1.25 = +25%)", + "lzxnoneterraria.configuration.emerald_pickup_range.tooltip": "Pickup range for emerald item entities while equipped, in blocks", "lzxnoneterraria.configuration.star_pickup_range": "Star Pickup Range", "lzxnoneterraria.configuration.star_pickup_range.tooltip": "Pickup range for mana stars and fallen stars while equipped, in blocks", "lzxnoneterraria.configuration.lava_damage_reduction": "Lava Damage Reduction", @@ -346,6 +368,13 @@ "tooltip.lzxnoneterraria.mana_regen_boost": "Increases mana regeneration rate", "tooltip.lzxnoneterraria.mana_on_hurt": "Restores mana when taking damage", "tooltip.lzxnoneterraria.mana_sickness_duration": "Mana sickness max duration -%s%%", + "tooltip.lzxnoneterraria.luck_bonus": "Luck +%s", + "tooltip.lzxnoneterraria.emerald_drop": "Hitting enemies has a chance to drop emeralds", + "tooltip.lzxnoneterraria.emerald_pickup_range": "Extends emerald pickup range to %s blocks", + "tooltip.lzxnoneterraria.item_pickup_range": "Extends item pickup range to %s blocks", + "tooltip.lzxnoneterraria.block_interaction_range": "Block interaction range +%s", + "tooltip.lzxnoneterraria.mining_speed_bonus": "Mining speed +%s%%", + "tooltip.lzxnoneterraria.merchant_discount": "Provides %s trade discount", "tooltip.lzxnoneterraria.star_pickup_range": "Extends star pickup range to %s blocks", "tooltip.lzxnoneterraria.auto_mana_potion_use": "Automatically uses mana potions when mana runs out", "lzxnoneterraria.configuration.magic_damage_multiplier": "Magic Damage Multiplier", @@ -368,6 +397,10 @@ "jei.lzxnoneterraria.info.fallen_star": "Has a chance to fall from the sky at night. Fallen Stars spawn in open areas near players and can be picked up after landing.", "jei.lzxnoneterraria.info.natures_gift": "Can be found in ordinary loot chests from various structures.", + "jei.lzxnoneterraria.info.warrior_emblem": "Obtained by defeating the Wither.", + "jei.lzxnoneterraria.info.summoner_emblem": "Obtained by defeating the Wither.", + "jei.lzxnoneterraria.info.ranger_emblem": "Obtained by defeating the Wither.", + "jei.lzxnoneterraria.info.sorcerer_emblem": "Obtained by defeating the Wither.", "entity.lzxnoneterraria.static_projectile": "Projectile", "entity.lzxnoneterraria.static_summon": "Summon", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 202885c..4400c0a 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -158,6 +158,14 @@ "item.lzxnoneterraria.valentine_ring": "情人节戒指", "item.lzxnoneterraria.charm_of_myths": "神话护身符", "item.lzxnoneterraria.mana_cloak": "魔力斗篷", + "item.lzxnoneterraria.lucky_coin": "幸运币", + "item.lzxnoneterraria.gold_ring": "金戒指", + "item.lzxnoneterraria.coin_ring": "钱币戒指", + "item.lzxnoneterraria.discount_card": "优惠卡", + "item.lzxnoneterraria.greedy_ring": "贪婪戒指", + "item.lzxnoneterraria.treasure_magnet": "宝藏磁石", + "item.lzxnoneterraria.toolbelt": "工具腰带", + "item.lzxnoneterraria.ancient_chisel": "远古凿子", "item.lzxnoneterraria.eye_of_the_golem": "石巨人之眼", "item.lzxnoneterraria.destroyer_emblem": "毁灭者徽章", "item.lzxnoneterraria.moon_stone": "月亮石", @@ -256,6 +264,20 @@ "lzxnoneterraria.configuration.mana_on_hurt_multiplier.tooltip": "受到伤害时按减免前的伤害值恢复魔力的倍率", "lzxnoneterraria.configuration.mana_sickness_duration_multiplier": "耐药性持续时间比例", "lzxnoneterraria.configuration.mana_sickness_duration_multiplier.tooltip": "佩戴后耐魔性最大持续时间的比例(0.75 = 降低 25%)", + "lzxnoneterraria.configuration.luck_bonus": "幸运值加成", + "lzxnoneterraria.configuration.luck_bonus.tooltip": "佩戴后增加的幸运值", + "lzxnoneterraria.configuration.merchant_discount_ratio": "交易折扣比例", + "lzxnoneterraria.configuration.merchant_discount_ratio.tooltip": "佩戴后村民交易价格降低的比例(0.2 = 降低 20%)", + "lzxnoneterraria.configuration.emerald_drop_chance": "绿宝石掉落概率", + "lzxnoneterraria.configuration.emerald_drop_chance.tooltip": "佩戴后击中敌人时掉落绿宝石的概率", + "lzxnoneterraria.configuration.emerald_pickup_range": "绿宝石吸附范围", + "lzxnoneterraria.configuration.emerald_pickup_range.tooltip": "佩戴后绿宝石掉落物的吸附范围(格)", + "lzxnoneterraria.configuration.item_pickup_range": "物品吸附范围", + "lzxnoneterraria.configuration.item_pickup_range.tooltip": "佩戴后所有掉落物的吸附范围(格)", + "lzxnoneterraria.configuration.block_interaction_range": "方块交互距离", + "lzxnoneterraria.configuration.block_interaction_range.tooltip": "佩戴后方块交互距离的增加值(格)", + "lzxnoneterraria.configuration.mining_speed": "挖掘速度倍率", + "lzxnoneterraria.configuration.mining_speed.tooltip": "佩戴后挖掘速度乘以该倍率(1.25 = +25%)", "lzxnoneterraria.configuration.star_pickup_range": "星星拾取范围", "lzxnoneterraria.configuration.star_pickup_range.tooltip": "佩戴后魔力星和坠落之星的拾取范围(格)", "lzxnoneterraria.configuration.lava_damage_reduction": "岩浆伤害减免", @@ -346,6 +368,13 @@ "tooltip.lzxnoneterraria.mana_regen_boost": "提升魔力再生速度", "tooltip.lzxnoneterraria.mana_on_hurt": "受到伤害时恢复魔力", "tooltip.lzxnoneterraria.mana_sickness_duration": "耐药性最大时间 -%s%%", + "tooltip.lzxnoneterraria.luck_bonus": "幸运 +%s", + "tooltip.lzxnoneterraria.emerald_drop": "击中敌人有几率掉落绿宝石", + "tooltip.lzxnoneterraria.emerald_pickup_range": "扩大绿宝石吸附范围 %s 格", + "tooltip.lzxnoneterraria.item_pickup_range": "扩大物品吸附范围 %s 格", + "tooltip.lzxnoneterraria.block_interaction_range": "方块交互距离 +%s", + "tooltip.lzxnoneterraria.mining_speed_bonus": "挖掘速度 +%s%%", + "tooltip.lzxnoneterraria.merchant_discount": "提供 %s 交易折扣", "tooltip.lzxnoneterraria.star_pickup_range": "扩大星星拾取范围 %s 格", "tooltip.lzxnoneterraria.auto_mana_potion_use": "需要时自动使用魔力药水", "lzxnoneterraria.configuration.magic_damage_multiplier": "魔法伤害倍率", @@ -368,6 +397,10 @@ "jei.lzxnoneterraria.info.fallen_star": "夜晚时有概率从天空坠落。坠落之星会在玩家附近的露天区域生成,落地后可以拾取。", "jei.lzxnoneterraria.info.natures_gift": "可在各类普通结构战利品箱中找到。", + "jei.lzxnoneterraria.info.warrior_emblem": "通过击杀凋零获取。", + "jei.lzxnoneterraria.info.summoner_emblem": "通过击杀凋零获取。", + "jei.lzxnoneterraria.info.ranger_emblem": "通过击杀凋零获取。", + "jei.lzxnoneterraria.info.sorcerer_emblem": "通过击杀凋零获取。", "entity.lzxnoneterraria.static_projectile": "弹射物", "entity.lzxnoneterraria.static_summon": "召唤物", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/ancient_chisel.json b/src/main/resources/assets/lzxnoneterraria/models/item/ancient_chisel.json new file mode 100644 index 0000000..b998d40 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/ancient_chisel.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/ancient_chisel" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/coin_ring.json b/src/main/resources/assets/lzxnoneterraria/models/item/coin_ring.json new file mode 100644 index 0000000..466ea26 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/coin_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/coin_ring" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/discount_card.json b/src/main/resources/assets/lzxnoneterraria/models/item/discount_card.json new file mode 100644 index 0000000..ed7484a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/discount_card.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/discount_card" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/gold_ring.json b/src/main/resources/assets/lzxnoneterraria/models/item/gold_ring.json new file mode 100644 index 0000000..0138935 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/gold_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/gold_ring" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/greedy_ring.json b/src/main/resources/assets/lzxnoneterraria/models/item/greedy_ring.json new file mode 100644 index 0000000..53951a9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/greedy_ring.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/greedy_ring" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/lucky_coin.json b/src/main/resources/assets/lzxnoneterraria/models/item/lucky_coin.json new file mode 100644 index 0000000..8db664f --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/lucky_coin.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/lucky_coin" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/toolbelt.json b/src/main/resources/assets/lzxnoneterraria/models/item/toolbelt.json new file mode 100644 index 0000000..5444fd9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/toolbelt.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/toolbelt" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/treasure_magnet.json b/src/main/resources/assets/lzxnoneterraria/models/item/treasure_magnet.json new file mode 100644 index 0000000..47b0e73 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/treasure_magnet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/treasure_magnet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/ancient_chisel.png b/src/main/resources/assets/lzxnoneterraria/textures/item/ancient_chisel.png new file mode 100644 index 0000000..79b9b93 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/ancient_chisel.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/coin_ring.png b/src/main/resources/assets/lzxnoneterraria/textures/item/coin_ring.png new file mode 100644 index 0000000..064796b Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/coin_ring.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/discount_card.png b/src/main/resources/assets/lzxnoneterraria/textures/item/discount_card.png new file mode 100644 index 0000000..9778c46 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/discount_card.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/gold_ring.png b/src/main/resources/assets/lzxnoneterraria/textures/item/gold_ring.png new file mode 100644 index 0000000..4c0b1a2 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/gold_ring.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/greedy_ring.png b/src/main/resources/assets/lzxnoneterraria/textures/item/greedy_ring.png new file mode 100644 index 0000000..51cabef Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/greedy_ring.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/lucky_coin.png b/src/main/resources/assets/lzxnoneterraria/textures/item/lucky_coin.png new file mode 100644 index 0000000..a82b75f Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/lucky_coin.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/toolbelt.png b/src/main/resources/assets/lzxnoneterraria/textures/item/toolbelt.png new file mode 100644 index 0000000..551a6fd Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/toolbelt.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/treasure_magnet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/treasure_magnet.png new file mode 100644 index 0000000..5025452 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/treasure_magnet.png differ diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json deleted file mode 100644 index 42b612b..0000000 --- a/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "entries": [ - "lzxnoneterraria:common_structure_chests" - ] -} diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/wither.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/wither.json new file mode 100644 index 0000000..d347865 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/loot_modifiers/wither.json @@ -0,0 +1,10 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:entities/wither" + } + ], + "table": "lzxnoneterraria:entities/wither" +} diff --git a/src/main/resources/data/lzxnoneterraria/loot_table/entities/wither.json b/src/main/resources/data/lzxnoneterraria/loot_table/entities/wither.json new file mode 100644 index 0000000..007a66e --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/loot_table/entities/wither.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "lzxnoneterraria:warrior_emblem" + }, + { + "type": "minecraft:item", + "name": "lzxnoneterraria:summoner_emblem" + }, + { + "type": "minecraft:item", + "name": "lzxnoneterraria:ranger_emblem" + }, + { + "type": "minecraft:item", + "name": "lzxnoneterraria:sorcerer_emblem" + } + ] + } + ] +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/coin_ring.json b/src/main/resources/data/lzxnoneterraria/recipe/coin_ring.json new file mode 100644 index 0000000..c02f409 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/coin_ring.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:gold_ring" + }, + { + "item": "lzxnoneterraria:lucky_coin" + } + ], + "result": { + "id": "lzxnoneterraria:coin_ring", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/greedy_ring.json b/src/main/resources/data/lzxnoneterraria/recipe/greedy_ring.json new file mode 100644 index 0000000..332a0a8 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/greedy_ring.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:discount_card" + }, + { + "item": "lzxnoneterraria:coin_ring" + } + ], + "result": { + "id": "lzxnoneterraria:greedy_ring", + "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 a4a3bf4..d19c25c 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json @@ -87,6 +87,14 @@ "lzxnoneterraria:philosophers_stone", "lzxnoneterraria:valentine_ring", "lzxnoneterraria:charm_of_myths", - "lzxnoneterraria:mana_cloak" + "lzxnoneterraria:mana_cloak", + "lzxnoneterraria:lucky_coin", + "lzxnoneterraria:gold_ring", + "lzxnoneterraria:coin_ring", + "lzxnoneterraria:discount_card", + "lzxnoneterraria:greedy_ring", + "lzxnoneterraria:treasure_magnet", + "lzxnoneterraria:toolbelt", + "lzxnoneterraria:ancient_chisel" ] } diff --git a/src/main/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json new file mode 100644 index 0000000..0aae8d7 --- /dev/null +++ b/src/main/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "entries": [ + "lzxnoneterraria:common_structure_chests", + "lzxnoneterraria:wither" + ] +} diff --git a/src/main/resources/lzxnoneterraria.mixins.json b/src/main/resources/lzxnoneterraria.mixins.json index 2e470b5..59aebca 100644 --- a/src/main/resources/lzxnoneterraria.mixins.json +++ b/src/main/resources/lzxnoneterraria.mixins.json @@ -4,7 +4,9 @@ "package": "com.lzxnone.terraria.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ - "LivingEntityVisibilityMixin" + "LivingEntityVisibilityMixin", + "ItemEntityMixin", + "VillagerMixin" ], "client": [ "GuiGraphicsMixin",