This commit is contained in:
LZX committed 2026-08-07 03:07:23 +08:00
1 parent f3dfab78d3
commit 2eef96b84f
37 files changed
+785 -120

No files matched your search

@@ -4,10 +4,12 @@ import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.ModKeyBindings;
import com.lzxnone.terraria.effect.ModEffects;
import com.lzxnone.terraria.item.ModItems;
import com.lzxnone.terraria.item.accessory.AccessoryUtil;
import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation;
import com.lzxnone.terraria.item.weapon.melee.FirstFractal;
import com.lzxnone.terraria.item.weapon.melee.TrueCopperShortsword;
import com.lzxnone.terraria.item.weapon.melee.Zenith;
import com.lzxnone.terraria.item.weapon.ranged.gun.Gun;
import com.lzxnone.terraria.item.weapon.ranged.gun.SniperRifle;
import com.lzxnone.terraria.item.weapon.summon.minion.MinionWeapon;
import com.lzxnone.terraria.network.payload.ClearSummonPayload;
@@ -73,8 +75,8 @@ public class InputHandler {
PacketDistributor.sendToServer(new ZenithScrollPayload(scrollDelta));
}
}
}else if(player.getUseItem().getItem() instanceof SniperRifle) {
if(player.isUsingItem()) {
}else if(player.getUseItem().getItem() instanceof Gun) {
if(player.isUsingItem() && (player.getUseItem().is(ModItems.SNIPER_RIFLE) || AccessoryUtil.hasScopeZoom(player))) {
double scrollDelta = event.getScrollDeltaY();
if(scrollDelta != 0) {
event.setCanceled(true);
@@ -2,6 +2,8 @@ package com.lzxnone.terraria.client.event;
import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.item.ModItems;
import com.lzxnone.terraria.item.accessory.AccessoryUtil;
import com.lzxnone.terraria.item.weapon.ranged.gun.Gun;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
@@ -49,6 +51,7 @@ public class SniperScopeHandler {
ItemStack stack = player.getUseItem();
if(stack.is(ModItems.SNIPER_RIFLE)) return stack;
if(stack.getItem() instanceof Gun && AccessoryUtil.hasScopeZoom(player)) return stack;
return ItemStack.EMPTY;
}
@@ -125,6 +125,11 @@ public class ModCreativeModeTabs {
output.accept(ModItems.NEPTUNES_SHELL.get());
output.accept(ModItems.MOON_SHELL.get());
output.accept(ModItems.CELESTIAL_SHELL.get());
output.accept(ModItems.PUTRID_SCENT.get());
output.accept(ModItems.SHACKLE.get());
output.accept(ModItems.RIFLE_SCOPE.get());
output.accept(ModItems.SNIPER_SCOPE.get());
output.accept(ModItems.RECON_SCOPE.get());
}).build());
public static final DeferredHolder<CreativeModeTab, CreativeModeTab> BLOCK_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_block_0", () -> CreativeModeTab.builder()
@@ -1,8 +1,12 @@
package com.lzxnone.terraria.event;
import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.item.accessory.AccessoryItem;
import com.lzxnone.terraria.item.accessory.AccessoryUtil;
import com.lzxnone.terraria.item.effect.ConditionalAttributeModifier;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.item.ItemStack;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import top.theillusivec4.curios.api.event.CurioChangeEvent;
@@ -14,5 +18,13 @@ public class AccessoryEventHandler {
LivingEntity entity = event.getEntity();
if(entity.level().isClientSide()) return;
AccessoryUtil.removeImmuneEffects(entity);
//脱下条件属性饰品时,移除其全部动态属性
ItemStack from = event.getFrom();
if(from.getItem() instanceof AccessoryItem accessory && accessory instanceof ConditionalAttributeModifier modifier) {
modifier.getAllConditionalModifiers(from, entity).forEach((attribute, attributeModifier) -> {
AttributeInstance instance = entity.getAttribute(attribute);
if(instance != null) instance.removeModifier(attributeModifier.id());
});
}
}
}
@@ -20,12 +20,10 @@ 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;
@@ -102,21 +100,6 @@ 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) {
//支配之鞭 预兆标记
@@ -170,6 +170,11 @@ public class ModItems {
public static final DeferredItem<Item> NEPTUNES_SHELL = ITEMS.register("neptunes_shell", NeptunesShell::new);
public static final DeferredItem<Item> MOON_SHELL = ITEMS.register("moon_shell", MoonShell::new);
public static final DeferredItem<Item> CELESTIAL_SHELL = ITEMS.register("celestial_shell", CelestialShell::new);
public static final DeferredItem<Item> PUTRID_SCENT = ITEMS.register("putrid_scent", PutridScent::new);
public static final DeferredItem<Item> SHACKLE = ITEMS.register("shackle", Shackle::new);
public static final DeferredItem<Item> RIFLE_SCOPE = ITEMS.register("rifle_scope", RifleScope::new);
public static final DeferredItem<Item> SNIPER_SCOPE = ITEMS.register("sniper_scope", SniperScope::new);
public static final DeferredItem<Item> RECON_SCOPE = ITEMS.register("recon_scope", ReconScope::new);
//食物
public static final DeferredItem<Item> MANA_CRYSTAL = ITEMS.register("mana_crystal", ManaCrystal::new);
@@ -262,6 +262,18 @@ public class AccessoryUtil {
return chance[0];
}
//瞄准放大:是否有饰品提供放大能力(如步枪瞄准镜)
public static boolean hasScopeZoom(LivingEntity entity) {
boolean[] result = {false};
AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> {
if(result[0]) return;
if(accessory instanceof ScopeZoomModifier modifier) {
result[0] = modifier.canZoom(stack, entity);
}
});
return result[0];
}
//水下呼吸:是否有饰品提供水下呼吸
public static boolean isWaterBreathing(LivingEntity entity) {
boolean[] result = {false};
@@ -274,28 +286,6 @@ public class AccessoryUtil {
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};
@@ -7,6 +7,8 @@ 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.MeleeCritChanceModifier;
import com.lzxnone.terraria.item.effect.MeleeDamageModifier;
import com.lzxnone.terraria.item.effect.MinionKnockbackModifier;
import com.lzxnone.terraria.item.effect.WaterBreathingModifier;
import com.lzxnone.terraria.ui.config.ConfigListItem;
@@ -28,7 +30,8 @@ import top.theillusivec4.curios.api.SlotContext;
import java.util.List;
public class CelestialShell extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier, WaterBreathingModifier, ConditionalAttributeModifier {
public class CelestialShell extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, MinionKnockbackModifier, MeleeDamageModifier, MeleeCritChanceModifier, WaterBreathingModifier, ConditionalAttributeModifier {
//天界石(全天候)
public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble(
"accessory.celestial_shell.damage_multiplier",
"damage_multiplier",
@@ -67,10 +70,54 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri
public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble(
"accessory.celestial_shell.minion_knockback_multiplier",
"minion_knockback_multiplier",
1.5D,
1.15D,
1.0D,
10.0D
);
//狼人(夜晚)
public static final ConfigDouble MELEE_CRIT_CHANCE = new ConfigDouble(
"accessory.celestial_shell.melee_crit_chance",
"melee_crit_chance",
0.02D,
0.0D,
1.0D
);
public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble(
"accessory.celestial_shell.melee_damage_multiplier",
"melee_damage_multiplier",
1.051D,
1.0D,
10.0D
);
public static final ConfigDouble WOLF_ATTACK_SPEED = new ConfigDouble(
"accessory.celestial_shell.wolf_attack_speed",
"attack_speed",
1.051D,
1.0D,
10.0D
);
public static final ConfigDouble WOLF_DEFENSE = new ConfigDouble(
"accessory.celestial_shell.wolf_defense",
"defense",
3.0D,
0.0D,
100.0D
);
public static final ConfigDouble WOLF_MOVE_SPEED = new ConfigDouble(
"accessory.celestial_shell.wolf_move_speed",
"move_speed",
1.05D,
1.0D,
10.0D
);
public static final ConfigDouble JUMP_HEIGHT = new ConfigDouble(
"accessory.celestial_shell.jump_height",
"jump_height",
1.2D,
1.0D,
10.0D
);
//人鱼(水中)
public static final ConfigDouble MOVE_SPEED = new ConfigDouble(
"accessory.celestial_shell.move_speed",
"move_speed",
@@ -83,6 +130,7 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri
super(new Item.Properties().stacksTo(1));
}
//天界石(全天候)
@Override
public double getDamageMultiplier(ItemStack stack, LivingEntity entity) {
return DAMAGE_MULTIPLIER.get();
@@ -98,6 +146,18 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri
return MINION_KNOCKBACK_MULTIPLIER.get();
}
//狼人(夜晚)
@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 boolean canBreatheUnderwater(ItemStack stack, LivingEntity entity) {
return true;
@@ -105,6 +165,7 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri
@Override
public Multimap<Holder<Attribute>, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) {
//天界石属性(全天候)走 curios 自动应用
Multimap<Holder<Attribute>, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build();
double attackSpeed = ATTACK_SPEED.get() - 1.0D;
if(attackSpeed != 0.0D) {
@@ -142,22 +203,77 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri
return modifiers;
}
//人鱼(水中):移动速度
//狼人(夜晚)属性 + 人鱼(水中)属性
@Override
public Multimap<Holder<Attribute>, AttributeModifier> getConditionalModifiers(ItemStack stack, LivingEntity entity) {
Multimap<Holder<Attribute>, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build();
if(entity.isInWater()) buildModifiers(modifiers);
if(entity.level().isNight()) {
buildWolfModifiers(modifiers);
}
if(entity.isInWater()) {
buildMerfolkModifiers(modifiers);
}
return modifiers;
}
@Override
public Multimap<Holder<Attribute>, AttributeModifier> getAllConditionalModifiers(ItemStack stack, LivingEntity entity) {
Multimap<Holder<Attribute>, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build();
buildModifiers(modifiers);
buildWolfModifiers(modifiers);
buildMerfolkModifiers(modifiers);
return modifiers;
}
private void buildModifiers(Multimap<Holder<Attribute>, AttributeModifier> modifiers) {
//狼人(夜晚):近战攻速、防御、移动速度
private void buildWolfModifiers(Multimap<Holder<Attribute>, AttributeModifier> modifiers) {
double attackSpeed = WOLF_ATTACK_SPEED.get() - 1.0D;
if(attackSpeed != 0.0D) {
modifiers.put(
Attributes.ATTACK_SPEED,
new AttributeModifier(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "celestial_shell_wolf_attack_speed"),
attackSpeed,
AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL
)
);
}
double defense = WOLF_DEFENSE.get();
if(defense != 0.0D) {
modifiers.put(
Attributes.ARMOR,
new AttributeModifier(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "celestial_shell_wolf_armor"),
defense,
AttributeModifier.Operation.ADD_VALUE
)
);
}
double wolfMoveSpeed = WOLF_MOVE_SPEED.get() - 1.0D;
if(wolfMoveSpeed != 0.0D) {
modifiers.put(
Attributes.MOVEMENT_SPEED,
new AttributeModifier(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "celestial_shell_wolf_move_speed"),
wolfMoveSpeed,
AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL
)
);
}
double jumpStrength = JUMP_HEIGHT.get() - 1.0D;
if(jumpStrength != 0.0D) {
modifiers.put(
Attributes.JUMP_STRENGTH,
new AttributeModifier(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "celestial_shell_wolf_jump_height"),
jumpStrength,
AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL
)
);
}
}
//人鱼(水中):移动速度
private void buildMerfolkModifiers(Multimap<Holder<Attribute>, AttributeModifier> modifiers) {
double moveSpeed = MOVE_SPEED.get() - 1.0D;
if(moveSpeed != 0.0D) {
modifiers.put(
@@ -174,7 +290,9 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri
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);
ConfigStruct.loadAll(DAMAGE_MULTIPLIER, CRIT_CHANCE, ATTACK_SPEED, DEFENSE, MINING_SPEED, MINION_KNOCKBACK_MULTIPLIER,
MELEE_CRIT_CHANCE, MELEE_DAMAGE_MULTIPLIER, WOLF_ATTACK_SPEED, WOLF_DEFENSE, WOLF_MOVE_SPEED, JUMP_HEIGHT,
MOVE_SPEED);
}
};
@@ -188,9 +306,13 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
//天界石(全天候)
if(ATTACK_SPEED.get() != 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.active_in_water"
"tooltip.lzxnoneterraria.attack_speed_bonus",
EffectTooltipUtil.formatPercent(ATTACK_SPEED.get())
).withStyle(ChatFormatting.GRAY));
}
if(DAMAGE_MULTIPLIER.get() != 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.damage_increase",
@@ -203,12 +325,6 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri
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",
@@ -227,6 +343,49 @@ public class CelestialShell extends AccessoryItem implements DamageModifier, Cri
EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get())
).withStyle(ChatFormatting.GRAY));
}
//狼人(夜晚)
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(WOLF_ATTACK_SPEED.get() != 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.attack_speed_bonus",
EffectTooltipUtil.formatPercent(WOLF_ATTACK_SPEED.get())
).withStyle(ChatFormatting.GRAY));
}
if(WOLF_MOVE_SPEED.get() != 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.move_speed_bonus",
EffectTooltipUtil.formatPercent(WOLF_MOVE_SPEED.get())
).withStyle(ChatFormatting.GRAY));
}
if(WOLF_DEFENSE.get() > 0.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.defense_bonus",
EffectTooltipUtil.formatNumber(WOLF_DEFENSE.get())
).withStyle(ChatFormatting.GRAY));
}
if(JUMP_HEIGHT.get() > 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.jump_boost"
).withStyle(ChatFormatting.GRAY));
}
//人鱼(水中)
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",
@@ -65,7 +65,7 @@ public class CelestialStone extends AccessoryItem implements DamageModifier, Cri
public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble(
"accessory.celestial_stone.minion_knockback_multiplier",
"minion_knockback_multiplier",
1.5D,
1.15D,
1.0D,
10.0D
);
@@ -5,7 +5,6 @@ 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;
@@ -27,7 +26,7 @@ import top.theillusivec4.curios.api.SlotContext;
import java.util.List;
public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, JumpModifier, ConditionalAttributeModifier {
public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, ConditionalAttributeModifier {
public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble(
"accessory.moon_charm.melee_damage_multiplier",
"melee_damage_multiplier",
@@ -66,14 +65,7 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel
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.2D,
1.0D,
10.0D
);
@@ -92,16 +84,6 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel
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<Holder<Attribute>, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) {
//条件属性由 AccessoryUtil.syncConditionalModifiers 动态管理,不走 curios 自动应用
@@ -156,12 +138,23 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel
)
);
}
double jumpStrength = JUMP_HEIGHT.get() - 1.0D;
if(jumpStrength != 0.0D) {
modifiers.put(
Attributes.JUMP_STRENGTH,
new AttributeModifier(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_charm_jump_height"),
jumpStrength,
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, MOVE_SPEED, DEFENSE, JUMP_HEIGHT, JUMP_SPEED);
ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER, MELEE_CRIT_CHANCE, ATTACK_SPEED, MOVE_SPEED, DEFENSE, JUMP_HEIGHT);
}
};
@@ -208,7 +201,7 @@ public class MoonCharm extends AccessoryItem implements MeleeDamageModifier, Mel
EffectTooltipUtil.formatNumber(DEFENSE.get())
).withStyle(ChatFormatting.GRAY));
}
if(JUMP_HEIGHT.get() > 1.0D || JUMP_SPEED.get() > 1.0D) {
if(JUMP_HEIGHT.get() > 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.jump_boost"
).withStyle(ChatFormatting.GRAY));
@@ -5,7 +5,6 @@ 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;
@@ -28,7 +27,7 @@ import top.theillusivec4.curios.api.SlotContext;
import java.util.List;
public class MoonShell extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, JumpModifier, WaterBreathingModifier, ConditionalAttributeModifier {
public class MoonShell extends AccessoryItem implements MeleeDamageModifier, MeleeCritChanceModifier, WaterBreathingModifier, ConditionalAttributeModifier {
public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble(
"accessory.moon_shell.melee_damage_multiplier",
"melee_damage_multiplier",
@@ -60,13 +59,13 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel
public static final ConfigDouble JUMP_HEIGHT = new ConfigDouble(
"accessory.moon_shell.jump_height",
"jump_height",
1.05D,
1.2D,
1.0D,
10.0D
);
public static final ConfigDouble JUMP_SPEED = new ConfigDouble(
"accessory.moon_shell.jump_speed",
"jump_speed",
public static final ConfigDouble WOLF_MOVE_SPEED = new ConfigDouble(
"accessory.moon_shell.wolf_move_speed",
"move_speed",
1.05D,
1.0D,
10.0D
@@ -93,16 +92,6 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel
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;
@@ -133,7 +122,7 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel
return modifiers;
}
//狼人(夜晚):近战攻速、防御
//狼人(夜晚):近战攻速、防御、移动速度
private void buildWolfModifiers(Multimap<Holder<Attribute>, AttributeModifier> modifiers) {
double attackSpeed = ATTACK_SPEED.get() - 1.0D;
if(attackSpeed != 0.0D) {
@@ -157,6 +146,28 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel
)
);
}
double wolfMoveSpeed = WOLF_MOVE_SPEED.get() - 1.0D;
if(wolfMoveSpeed != 0.0D) {
modifiers.put(
Attributes.MOVEMENT_SPEED,
new AttributeModifier(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_shell_wolf_move_speed"),
wolfMoveSpeed,
AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL
)
);
}
double jumpStrength = JUMP_HEIGHT.get() - 1.0D;
if(jumpStrength != 0.0D) {
modifiers.put(
Attributes.JUMP_STRENGTH,
new AttributeModifier(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "moon_shell_wolf_jump_height"),
jumpStrength,
AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL
)
);
}
}
//人鱼(水中):移动速度
@@ -177,7 +188,7 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel
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);
ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER, MELEE_CRIT_CHANCE, ATTACK_SPEED, DEFENSE, JUMP_HEIGHT, WOLF_MOVE_SPEED, MOVE_SPEED);
}
};
@@ -191,12 +202,10 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> 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",
@@ -221,11 +230,21 @@ public class MoonShell extends AccessoryItem implements MeleeDamageModifier, Mel
EffectTooltipUtil.formatNumber(DEFENSE.get())
).withStyle(ChatFormatting.GRAY));
}
if(JUMP_HEIGHT.get() > 1.0D || JUMP_SPEED.get() > 1.0D) {
if(JUMP_HEIGHT.get() > 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.jump_boost"
).withStyle(ChatFormatting.GRAY));
}
if(WOLF_MOVE_SPEED.get() != 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.move_speed_bonus",
EffectTooltipUtil.formatPercent(WOLF_MOVE_SPEED.get())
).withStyle(ChatFormatting.GRAY));
}
//人鱼(水中)
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",
@@ -66,7 +66,7 @@ public class MoonStone extends AccessoryItem implements DamageModifier, Critical
public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble(
"accessory.moon_stone.minion_knockback_multiplier",
"minion_knockback_multiplier",
1.5D,
1.15D,
1.0D,
10.0D
);
@@ -0,0 +1,99 @@
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.item.effect.VisibilityModifier;
import com.lzxnone.terraria.ui.config.ConfigListItem;
import com.lzxnone.terraria.ui.config.IConfigData;
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
import net.minecraft.ChatFormatting;
import net.minecraft.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 PutridScent extends AccessoryItem implements DamageModifier, CriticalStrikeModifier, VisibilityModifier {
public static final ConfigDouble VISIBILITY_MULTIPLIER = new ConfigDouble(
"accessory.putrid_scent.visibility_multiplier",
"visibility_multiplier",
0.5D,
0.0D,
10.0D
);
public static final ConfigDouble DAMAGE_MULTIPLIER = new ConfigDouble(
"accessory.putrid_scent.damage_multiplier",
"damage_multiplier",
1.05D,
1.0D,
10.0D
);
public static final ConfigDouble CRIT_CHANCE = new ConfigDouble(
"accessory.putrid_scent.crit_chance",
"crit_chance",
0.05D,
0.0D,
1.0D
);
public PutridScent() {
super(new Item.Properties().stacksTo(1));
}
@Override
public double getVisibilityMultiplier(ItemStack stack, LivingEntity entity) {
return VISIBILITY_MULTIPLIER.get();
}
@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(VISIBILITY_MULTIPLIER, DAMAGE_MULTIPLIER, CRIT_CHANCE);
}
};
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
"putrid_scent",
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/putrid_scent.png"),
Component.translatable("item.lzxnoneterraria.putrid_scent"),
CONFIG_DATA
);
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
if(VISIBILITY_MULTIPLIER.get() < 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.aggro_decrease"
).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));
}
}
}
@@ -0,0 +1,108 @@
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.item.effect.RangedDamageModifier;
import com.lzxnone.terraria.item.effect.ScopeZoomModifier;
import com.lzxnone.terraria.item.effect.VisibilityModifier;
import com.lzxnone.terraria.ui.config.ConfigListItem;
import com.lzxnone.terraria.ui.config.IConfigData;
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
import net.minecraft.ChatFormatting;
import net.minecraft.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 ReconScope extends AccessoryItem implements ScopeZoomModifier, RangedDamageModifier, CriticalStrikeModifier, VisibilityModifier {
public static final ConfigDouble VISIBILITY_MULTIPLIER = new ConfigDouble(
"accessory.recon_scope.visibility_multiplier",
"visibility_multiplier",
0.5D,
0.0D,
10.0D
);
public static final ConfigDouble RANGED_DAMAGE_MULTIPLIER = new ConfigDouble(
"accessory.recon_scope.ranged_damage_multiplier",
"ranged_damage_multiplier",
1.10D,
1.0D,
10.0D
);
public static final ConfigDouble CRIT_CHANCE = new ConfigDouble(
"accessory.recon_scope.crit_chance",
"crit_chance",
0.10D,
0.0D,
1.0D
);
public ReconScope() {
super(new Item.Properties().stacksTo(1));
}
@Override
public boolean canZoom(ItemStack stack, LivingEntity entity) {
return true;
}
@Override
public double getVisibilityMultiplier(ItemStack stack, LivingEntity entity) {
return VISIBILITY_MULTIPLIER.get();
}
@Override
public double getRangedDamageMultiplier(ItemStack stack, LivingEntity entity) {
return RANGED_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(VISIBILITY_MULTIPLIER, RANGED_DAMAGE_MULTIPLIER, CRIT_CHANCE);
}
};
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
"recon_scope",
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/recon_scope.png"),
Component.translatable("item.lzxnoneterraria.recon_scope"),
CONFIG_DATA
);
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.rifle_scope"
).withStyle(ChatFormatting.GRAY));
if(RANGED_DAMAGE_MULTIPLIER.get() != 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.ranged_damage_increase",
EffectTooltipUtil.formatPercent(RANGED_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(VISIBILITY_MULTIPLIER.get() < 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.aggro_decrease"
).withStyle(ChatFormatting.GRAY));
}
}
}
@@ -0,0 +1,28 @@
package com.lzxnone.terraria.item.accessory;
import com.lzxnone.terraria.item.effect.ScopeZoomModifier;
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 RifleScope extends AccessoryItem implements ScopeZoomModifier {
public RifleScope() {
super(new Item.Properties().stacksTo(1));
}
@Override
public boolean canZoom(ItemStack stack, LivingEntity entity) {
return true;
}
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<net.minecraft.network.chat.Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
tooltipComponents.add(net.minecraft.network.chat.Component.translatable(
"tooltip.lzxnoneterraria.rifle_scope"
).withStyle(net.minecraft.ChatFormatting.GRAY));
}
}
@@ -0,0 +1,79 @@
package com.lzxnone.terraria.item.accessory;
import com.google.common.collect.Multimap;
import com.google.common.collect.MultimapBuilder;
import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.item.effect.EffectTooltipUtil;
import com.lzxnone.terraria.ui.config.ConfigListItem;
import com.lzxnone.terraria.ui.config.IConfigData;
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
import com.lzxnone.terraria.ui.config.struct.ConfigStruct;
import net.minecraft.ChatFormatting;
import net.minecraft.core.Holder;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import top.theillusivec4.curios.api.SlotContext;
import java.util.List;
public class Shackle extends AccessoryItem {
public static final ConfigDouble DEFENSE = new ConfigDouble(
"accessory.shackle.defense",
"defense",
1.0D,
0.0D,
100.0D
);
public Shackle() {
super(new Item.Properties().stacksTo(1));
}
@Override
public Multimap<Holder<Attribute>, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) {
Multimap<Holder<Attribute>, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build();
double defense = DEFENSE.get();
if(defense != 0.0D) {
modifiers.put(
Attributes.ARMOR,
new AttributeModifier(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "shackle_armor"),
defense,
AttributeModifier.Operation.ADD_VALUE
)
);
}
return modifiers;
}
public static final IConfigData CONFIG_DATA = new IConfigData() {
@Override
public void onConfigLoad() {
ConfigStruct.loadAll(DEFENSE);
}
};
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
"shackle",
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/shackle.png"),
Component.translatable("item.lzxnoneterraria.shackle"),
CONFIG_DATA
);
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
if(DEFENSE.get() > 0.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.defense_bonus",
EffectTooltipUtil.formatNumber(DEFENSE.get())
).withStyle(ChatFormatting.GRAY));
}
}
}
@@ -0,0 +1,90 @@
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.item.effect.RangedDamageModifier;
import com.lzxnone.terraria.item.effect.ScopeZoomModifier;
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 SniperScope extends AccessoryItem implements ScopeZoomModifier, RangedDamageModifier, CriticalStrikeModifier {
public static final ConfigDouble RANGED_DAMAGE_MULTIPLIER = new ConfigDouble(
"accessory.sniper_scope.ranged_damage_multiplier",
"ranged_damage_multiplier",
1.10D,
1.0D,
10.0D
);
public static final ConfigDouble CRIT_CHANCE = new ConfigDouble(
"accessory.sniper_scope.crit_chance",
"crit_chance",
0.10D,
0.0D,
1.0D
);
public SniperScope() {
super(new Item.Properties().stacksTo(1));
}
@Override
public boolean canZoom(ItemStack stack, LivingEntity entity) {
return true;
}
@Override
public double getRangedDamageMultiplier(ItemStack stack, LivingEntity entity) {
return RANGED_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(RANGED_DAMAGE_MULTIPLIER, CRIT_CHANCE);
}
};
public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem(
"sniper_scope",
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/sniper_scope.png"),
Component.translatable("item.lzxnoneterraria.sniper_scope"),
CONFIG_DATA
);
@Override
public void appendHoverText(ItemStack stack, Item.TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.rifle_scope"
).withStyle(ChatFormatting.GRAY));
if(RANGED_DAMAGE_MULTIPLIER.get() != 1.0D) {
tooltipComponents.add(Component.translatable(
"tooltip.lzxnoneterraria.ranged_damage_increase",
EffectTooltipUtil.formatPercent(RANGED_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));
}
}
}
@@ -66,7 +66,7 @@ public class SunStone extends AccessoryItem implements DamageModifier, CriticalS
public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble(
"accessory.sun_stone.minion_knockback_multiplier",
"minion_knockback_multiplier",
1.5D,
1.15D,
1.0D,
10.0D
);
@@ -1,11 +0,0 @@
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);
}
@@ -0,0 +1,9 @@
package com.lzxnone.terraria.item.effect;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
public interface ScopeZoomModifier {
//是否提供瞄准放大能力
boolean canZoom(ItemStack stack, LivingEntity entity);
}
@@ -4,6 +4,7 @@ import com.lzxnone.terraria.ModSounds;
import com.lzxnone.terraria.entity.summon.StaticSummon;
import com.lzxnone.terraria.item.ModItems;
import com.lzxnone.terraria.item.weapon.RangedWeapon;
import com.lzxnone.terraria.item.effect.ScopeZoomModifier;
import com.lzxnone.terraria.ui.config.ConfigListItem;
import com.lzxnone.terraria.ui.config.IConfigData;
import com.lzxnone.terraria.ui.config.struct.ConfigDouble;
@@ -12,6 +13,7 @@ import com.lzxnone.terraria.utils.AmmoUtil;
import com.lzxnone.terraria.utils.SoundUtil;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
@@ -20,7 +22,7 @@ import net.minecraft.world.item.Tiers;
import net.minecraft.world.level.Level;
import org.joml.Vector3f;
public class SniperRifle extends Gun {
public class SniperRifle extends Gun implements ScopeZoomModifier {
public static final String ID = "sniper_rifle";
public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f);
public static final float DAMAGE_DEFAULT = 35.0f;
@@ -53,6 +55,11 @@ public class SniperRifle extends Gun {
return ZOOM_SCROLL_SPEED.get();
}
@Override
public boolean canZoom(ItemStack stack, LivingEntity entity) {
return true;
}
@Override
protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) {
SoundUtil.playClientSound(player, ModSounds.SHOT.get());
@@ -58,6 +58,10 @@ 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.accessory.PutridScent;
import com.lzxnone.terraria.item.accessory.Shackle;
import com.lzxnone.terraria.item.accessory.SniperScope;
import com.lzxnone.terraria.item.accessory.ReconScope;
import com.lzxnone.terraria.item.weapon.magic.LastPrism;
import com.lzxnone.terraria.item.weapon.melee.BeeKeeper;
import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass;
@@ -234,7 +238,11 @@ public class ConfigList {
MoonCharm.CONFIG_LIST_ITEM,
NeptunesShell.CONFIG_LIST_ITEM,
MoonShell.CONFIG_LIST_ITEM,
CelestialShell.CONFIG_LIST_ITEM
CelestialShell.CONFIG_LIST_ITEM,
PutridScent.CONFIG_LIST_ITEM,
Shackle.CONFIG_LIST_ITEM,
SniperScope.CONFIG_LIST_ITEM,
ReconScope.CONFIG_LIST_ITEM
});
ITEMS.put(ENCHANTMENT, new ConfigListItem[]{
ModEnchantmentConfigs.MANA_LEAK_CONFIG_LIST_ITEM,
@@ -146,6 +146,11 @@
"item.lzxnoneterraria.neptunes_shell": "Neptune's Shell",
"item.lzxnoneterraria.moon_shell": "Moon Shell",
"item.lzxnoneterraria.celestial_shell": "Celestial Shell",
"item.lzxnoneterraria.putrid_scent": "Putrid Scent",
"item.lzxnoneterraria.shackle": "Shackle",
"item.lzxnoneterraria.rifle_scope": "Rifle Scope",
"item.lzxnoneterraria.sniper_scope": "Sniper Scope",
"item.lzxnoneterraria.recon_scope": "Recon Scope",
"item.lzxnoneterraria.mana_crystal": "Mana Crystal",
"item.lzxnoneterraria.summoning_potion": "Summoning Potion",
"item.lzxnoneterraria.lesser_mana_potion": "Lesser Mana Potion",
@@ -216,6 +221,7 @@
"tooltip.lzxnoneterraria.mining_speed_bonus": "Mining Speed +%s%%",
"tooltip.lzxnoneterraria.move_speed_bonus": "Movement Speed +%s%%",
"tooltip.lzxnoneterraria.water_breathing": "Breathe underwater",
"tooltip.lzxnoneterraria.rifle_scope": "Scroll wheel adjusts zoom while using firearms",
"tooltip.lzxnoneterraria.jump_boost": "Slightly increases jump height and speed",
"tooltip.lzxnoneterraria.knockback_resistance_bonus": "Knockback Resistance +%s%%",
"tooltip.lzxnoneterraria.defense_bonus": "Defense +%s",
@@ -239,13 +245,12 @@
"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",
"tooltip.lzxnoneterraria.bee_summon": "Releases bees when damaged",
"tooltip.lzxnoneterraria.aggro_increase": "Increases enemy aggro",
"tooltip.lzxnoneterraria.aggro_decrease": "Decreases enemy aggro",
"tooltip.lzxnoneterraria.paladins_shield": "When health is above %s%%, absorbs %s%% of damage taken by other players on the team",
"tooltip.lzxnoneterraria.ice_barrier": "Reduces damage taken by %s%% while health is below %s%%",
"lzxnoneterraria.configuration.fallen_star_damage": "Fallen Star Damage",
@@ -146,6 +146,11 @@
"item.lzxnoneterraria.neptunes_shell": "海神贝壳",
"item.lzxnoneterraria.moon_shell": "月亮贝壳",
"item.lzxnoneterraria.celestial_shell": "天界贝壳",
"item.lzxnoneterraria.putrid_scent": "腐香囊",
"item.lzxnoneterraria.shackle": "镣铐",
"item.lzxnoneterraria.rifle_scope": "步枪瞄准镜",
"item.lzxnoneterraria.sniper_scope": "狙击镜",
"item.lzxnoneterraria.recon_scope": "侦察镜",
"item.lzxnoneterraria.mana_crystal": "魔力水晶",
"item.lzxnoneterraria.summoning_potion": "召唤药水",
"item.lzxnoneterraria.lesser_mana_potion": "弱效魔力药水",
@@ -216,6 +221,7 @@
"tooltip.lzxnoneterraria.mining_speed_bonus": "挖掘速度 +%s%%",
"tooltip.lzxnoneterraria.move_speed_bonus": "移动速度 +%s%%",
"tooltip.lzxnoneterraria.water_breathing": "水下呼吸",
"tooltip.lzxnoneterraria.rifle_scope": "使用枪械时,滚轮可以调节放大倍率",
"tooltip.lzxnoneterraria.jump_boost": "略微增加跳跃高度和跳跃速度",
"tooltip.lzxnoneterraria.knockback_resistance_bonus": "抗性击退 +%s%%",
"tooltip.lzxnoneterraria.defense_bonus": "护甲值 +%s",
@@ -239,13 +245,12 @@
"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",
"tooltip.lzxnoneterraria.bee_summon": "受到伤害后释放蜜蜂",
"tooltip.lzxnoneterraria.aggro_increase": "增加怪物仇恨",
"tooltip.lzxnoneterraria.aggro_decrease": "减少怪物仇恨",
"tooltip.lzxnoneterraria.paladins_shield": "当玩家生命高于 %s%% 时,吸收团队中其他玩家所受伤害的 %s%%",
"tooltip.lzxnoneterraria.ice_barrier": "当玩家生命低于 %s%% 时,降低 %s%% 伤害",
"lzxnoneterraria.configuration.fallen_star_damage": "星星伤害",
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/putrid_scent"
}
}
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/recon_scope"
}
}
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/rifle_scope"
}
}
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/shackle"
}
}
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/sniper_scope"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 B

@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "equipment",
"ingredients": [
{
"item": "lzxnoneterraria:sniper_scope"
},
{
"item": "lzxnoneterraria:putrid_scent"
}
],
"result": {
"id": "lzxnoneterraria:recon_scope",
"count": 1
}
}
@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shapeless",
"category": "equipment",
"ingredients": [
{
"item": "lzxnoneterraria:rifle_scope"
},
{
"item": "lzxnoneterraria:avenger_emblem"
}
],
"result": {
"id": "lzxnoneterraria:sniper_scope",
"count": 1
}
}
@@ -61,6 +61,11 @@
"lzxnoneterraria:moon_charm",
"lzxnoneterraria:neptunes_shell",
"lzxnoneterraria:moon_shell",
"lzxnoneterraria:celestial_shell"
"lzxnoneterraria:celestial_shell",
"lzxnoneterraria:putrid_scent",
"lzxnoneterraria:shackle",
"lzxnoneterraria:rifle_scope",
"lzxnoneterraria:sniper_scope",
"lzxnoneterraria:recon_scope"
]
}