diff --git a/gradle.properties b/gradle.properties index 80d35a4..b693bb9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ mod_name=Lzxnone Terraria # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=1.7.0 +mod_version=1.7.2 ## The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/lzxnone/terraria/effect/EffectIconRenderer.java b/src/main/java/com/lzxnone/terraria/client/event/EffectIconRenderer.java similarity index 91% rename from src/main/java/com/lzxnone/terraria/effect/EffectIconRenderer.java rename to src/main/java/com/lzxnone/terraria/client/event/EffectIconRenderer.java index 21cdfaa..f56b7fa 100644 --- a/src/main/java/com/lzxnone/terraria/effect/EffectIconRenderer.java +++ b/src/main/java/com/lzxnone/terraria/client/event/EffectIconRenderer.java @@ -1,6 +1,7 @@ -package com.lzxnone.terraria.effect; +package com.lzxnone.terraria.client.event; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.effect.ModEffects; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; @@ -8,10 +9,13 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.LivingEntity; +import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.RenderLivingEvent; import org.joml.Matrix4f; +@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) public class EffectIconRenderer { private static final ResourceLocation CONFUSED_ICON = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect_display/confused.png"); diff --git a/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java b/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java index bd2f758..e287d60 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/InputHandler.java @@ -18,6 +18,7 @@ import com.lzxnone.terraria.network.payload.ZenithScrollPayload; import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; +import net.minecraft.client.player.Input; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.component.DataComponents; @@ -33,6 +34,7 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.ClientTickEvent; import net.neoforged.neoforge.client.event.InputEvent; +import net.neoforged.neoforge.client.event.MovementInputUpdateEvent; import net.neoforged.neoforge.network.PacketDistributor; @EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) @@ -154,4 +156,21 @@ public class InputHandler { PacketDistributor.sendToServer(new ToggleSummonAttackModePayload()); } } + + @SubscribeEvent + public static void onMovementInput(MovementInputUpdateEvent event) { + Player player = event.getEntity(); + if(player.hasEffect(ModEffects.CONFUSED)) { + Input input = event.getInput(); + boolean tmp = input.left; + input.left = input.right; + input.right = tmp; + input.leftImpulse = -input.leftImpulse; + + tmp = input.up; + input.up = input.down; + input.down = tmp; + input.forwardImpulse = -input.forwardImpulse; + } + } } 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 3d0e7ab..411c787 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 @@ -64,8 +64,36 @@ public class ModCreativeModeTabs { .title(Component.translatable("itemGroup.lzxnoneterraria.accessory")) .icon(() -> ModItems.MANA_FLOWER.get().getDefaultInstance()) .displayItems((parameters, output) -> { + output.accept(ModItems.ARMOR_POLISH.get()); + output.accept(ModItems.MEGAPHONE.get()); + output.accept(ModItems.NAZAR.get()); + output.accept(ModItems.POCKET_MIRROR.get()); + output.accept(ModItems.REFLECTIVE_SHADES.get()); + output.accept(ModItems.ARMOR_BRACING.get()); + output.accept(ModItems.COUNTERCURSE_MANTRA.get()); + output.accept(ModItems.ANKH_CHARM.get()); + output.accept(ModItems.OBSIDIAN_SKULL.get()); + output.accept(ModItems.COBALT_SHIELD.get()); + output.accept(ModItems.OBSIDIAN_SHIELD.get()); + output.accept(ModItems.ANKH_SHIELD.get()); + output.accept(ModItems.BEZOAR.get()); + output.accept(ModItems.BLINDFOLD.get()); + output.accept(ModItems.FAST_CLOCK.get()); + output.accept(ModItems.VITAMINS.get()); + output.accept(ModItems.ADHESIVE_BANDAGE.get()); + output.accept(ModItems.MEDICATED_BANDAGE.get()); + output.accept(ModItems.TRIFOLD_MAP.get()); + output.accept(ModItems.THE_PLAN.get()); output.accept(ModItems.NATURES_GIFT.get()); output.accept(ModItems.MANA_FLOWER.get()); + output.accept(ModItems.HERCULES_BEETLE.get()); + output.accept(ModItems.NECROMANTIC_SCROLL.get()); + output.accept(ModItems.PAPYRUS_SCARAB.get()); + output.accept(ModItems.PYGMY_NECKLACE.get()); + output.accept(ModItems.WARRIOR_EMBLEM.get()); + output.accept(ModItems.SUMMONER_EMBLEM.get()); + output.accept(ModItems.RANGER_EMBLEM.get()); + output.accept(ModItems.SORCERER_EMBLEM.get()); }).build()); public static final DeferredHolder BLOCK_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_block_0", () -> CreativeModeTab.builder() diff --git a/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java b/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java new file mode 100644 index 0000000..137b7a7 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/event/AccessoryEventHandler.java @@ -0,0 +1,87 @@ +package com.lzxnone.terraria.event; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.effect.ModEffects; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import com.lzxnone.terraria.item.effect.FireBlockImmunityModifier; +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.core.Holder; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.entity.LivingEntity; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import top.theillusivec4.curios.api.event.CurioChangeEvent; + +@EventBusSubscriber(modid = LzxnoneTerraria.MODID) +public class AccessoryEventHandler { + + @SubscribeEvent + public static void onCurioChange(CurioChangeEvent event) { + LivingEntity entity = event.getEntity(); + if(entity.level().isClientSide()) return; + removeImmuneEffects(entity); + } + + public static boolean isImmuneToEffect(LivingEntity entity, Holder effect) { + boolean[] result = {false}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(result[0]) return; + if(accessory instanceof MobEffectImmunityModifier modifier) { + if(effect == MobEffects.POISON && modifier.isPoisonImmunity(stack, entity) + || effect == MobEffects.WITHER && modifier.isWitherImmunity(stack, entity) + || effect == MobEffects.DARKNESS && modifier.isDarknessImmunity(stack, entity) + || effect == MobEffects.MOVEMENT_SLOWDOWN && modifier.isSlownessImmunity(stack, entity) + || effect == MobEffects.WEAKNESS && modifier.isWeaknessImmunity(stack, entity) + || effect == ModEffects.BLOOD_BUTCHERED && modifier.isBleedImmunity(stack, entity) + || effect == ModEffects.CONFUSED && modifier.isConfusedImmunity(stack, entity) + || effect == MobEffects.LEVITATION && modifier.isLevitationImmunity(stack, entity) + || effect == MobEffects.DIG_SLOWDOWN && modifier.isMiningFatigueImmunity(stack, entity)) { + result[0] = true; + } + } + }); + return result[0]; + } + + public static void removeImmuneEffects(LivingEntity entity) { + if(entity.hasEffect(MobEffects.POISON) && isImmuneToEffect(entity, MobEffects.POISON)) { + entity.removeEffect(MobEffects.POISON); + } + if(entity.hasEffect(MobEffects.WITHER) && isImmuneToEffect(entity, MobEffects.WITHER)) { + entity.removeEffect(MobEffects.WITHER); + } + if(entity.hasEffect(MobEffects.DARKNESS) && isImmuneToEffect(entity, MobEffects.DARKNESS)) { + entity.removeEffect(MobEffects.DARKNESS); + } + if(entity.hasEffect(MobEffects.MOVEMENT_SLOWDOWN) && isImmuneToEffect(entity, MobEffects.MOVEMENT_SLOWDOWN)) { + entity.removeEffect(MobEffects.MOVEMENT_SLOWDOWN); + } + if(entity.hasEffect(MobEffects.WEAKNESS) && isImmuneToEffect(entity, MobEffects.WEAKNESS)) { + entity.removeEffect(MobEffects.WEAKNESS); + } + if(entity.hasEffect(ModEffects.BLOOD_BUTCHERED) && isImmuneToEffect(entity, ModEffects.BLOOD_BUTCHERED)) { + entity.removeEffect(ModEffects.BLOOD_BUTCHERED); + } + if(entity.hasEffect(ModEffects.CONFUSED) && isImmuneToEffect(entity, ModEffects.CONFUSED)) { + entity.removeEffect(ModEffects.CONFUSED); + } + if(entity.hasEffect(MobEffects.LEVITATION) && isImmuneToEffect(entity, MobEffects.LEVITATION)) { + entity.removeEffect(MobEffects.LEVITATION); + } + if(entity.hasEffect(MobEffects.DIG_SLOWDOWN) && isImmuneToEffect(entity, MobEffects.DIG_SLOWDOWN)) { + entity.removeEffect(MobEffects.DIG_SLOWDOWN); + } + } + + public static boolean isFireBlockImmune(LivingEntity entity) { + boolean[] result = {false}; + AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { + if(result[0]) return; + if(accessory instanceof FireBlockImmunityModifier modifier) { + result[0] = modifier.isFireBlockImmunity(stack, entity); + } + }); + return result[0]; + } +} diff --git a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java b/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java similarity index 85% rename from src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java rename to src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java index b62f141..7539007 100644 --- a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EffectLogicHandler.java @@ -1,6 +1,8 @@ -package com.lzxnone.terraria.effect; +package com.lzxnone.terraria.event; +import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.core.Holder; @@ -11,9 +13,23 @@ import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.LivingEntity; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.living.MobEffectEvent; + +@EventBusSubscriber(modid = LzxnoneTerraria.MODID) public class EffectLogicHandler { + @SubscribeEvent + public static void onEffectApplicable(MobEffectEvent.Applicable event) { + LivingEntity entity = event.getEntity(); + if(!entity.level().isClientSide()) { + MobEffectInstance instance = event.getEffectInstance(); + if(instance == null) return; + if(AccessoryEventHandler.isImmuneToEffect(entity, instance.getEffect())) { + event.setResult(MobEffectEvent.Applicable.Result.DO_NOT_APPLY); + } + } + } @SubscribeEvent public static void onEffectAdded(MobEffectEvent.Added event) { diff --git a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index 870cba4..aa99d5a 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -8,6 +8,8 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; import com.lzxnone.terraria.item.weapon.summon.whip.Possession; import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; @@ -16,12 +18,24 @@ 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.LivingIncomingDamageEvent; import java.util.List; import java.util.UUID; @EventBusSubscriber(modid = LzxnoneTerraria.MODID) public class EntityEventHandler { + @SubscribeEvent + public static void onLivingIncomingDamage(LivingIncomingDamageEvent event) { + LivingEntity entity = event.getEntity(); + if(entity.level().isClientSide()) return; + DamageSource source = event.getSource(); + if(!source.is(DamageTypes.IN_FIRE) && !source.is(DamageTypes.HOT_FLOOR) && !source.is(DamageTypes.CAMPFIRE)) return; + if(AccessoryEventHandler.isFireBlockImmune(entity)) { + event.setCanceled(true); + } + } + @SubscribeEvent public static void onLivingDamage(LivingDamageEvent.Post event) { //支配之鞭 预兆标记 diff --git a/src/main/java/com/lzxnone/terraria/goal/ConfusedEffectGoal.java b/src/main/java/com/lzxnone/terraria/goal/ConfusedEffectGoal.java index 33f32f6..7a4e59d 100644 --- a/src/main/java/com/lzxnone/terraria/goal/ConfusedEffectGoal.java +++ b/src/main/java/com/lzxnone/terraria/goal/ConfusedEffectGoal.java @@ -4,61 +4,81 @@ import com.lzxnone.terraria.effect.ModEffects; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.PathfinderMob; import net.minecraft.world.entity.ai.goal.Goal; +import net.minecraft.world.entity.ai.util.DefaultRandomPos; +import net.minecraft.world.level.pathfinder.Path; import net.minecraft.world.phys.Vec3; import java.util.EnumSet; public class ConfusedEffectGoal extends Goal { + private static final int FLEE_SEARCH_RADIUS = 16; + private static final int FLEE_SEARCH_HORIZONTAL_RADIUS = 7; + private static final double WALK_SPEED = 1.0D; + private static final double SPRINT_SPEED = 1.2D; + private static final double SPRINT_DISTANCE_SQ = 49.0D; + private final PathfinderMob mob; - private Vec3 fleePos; + private LivingEntity toAvoid; + private Path fleePath; public ConfusedEffectGoal(PathfinderMob mob) { this.mob = mob; - this.setFlags(EnumSet.of(Goal.Flag.MOVE, Goal.Flag.LOOK)); - } - @Override - public boolean canUse() { - return this.mob.hasEffect(ModEffects.CONFUSED) && this.mob.getTarget() != null; + this.setFlags(EnumSet.of(Goal.Flag.MOVE)); } @Override - public void start() { - this.updateFleePosition(); + public boolean canUse() { + LivingEntity target = this.mob.getTarget(); + if(!this.mob.hasEffect(ModEffects.CONFUSED) || target == null || !target.isAlive()) { + return false; + } + + Vec3 fleePos = DefaultRandomPos.getPosAway( + this.mob, + FLEE_SEARCH_RADIUS, + FLEE_SEARCH_HORIZONTAL_RADIUS, + target.position() + ); + if(fleePos == null) { + return false; + } + + if(target.distanceToSqr(fleePos) < target.distanceToSqr(this.mob)) { + return false; + } + + this.toAvoid = target; + this.fleePath = this.mob.getNavigation().createPath(fleePos.x, fleePos.y, fleePos.z, 0); + return this.fleePath != null; } @Override public boolean canContinueToUse() { - return this.canUse() && !this.mob.getNavigation().isDone(); + return this.mob.hasEffect(ModEffects.CONFUSED) + && this.toAvoid != null + && this.toAvoid.isAlive() + && !this.mob.getNavigation().isDone(); } @Override - public void tick() { - LivingEntity target = this.mob.getTarget(); - if(target == null) return; - - this.updateFleePosition(); - - if(this.fleePos != null) { - this.mob.getLookControl().setLookAt(this.fleePos.x, this.fleePos.y, this.fleePos.z); - } - } - - private void updateFleePosition() { - LivingEntity target = this.mob.getTarget(); - if(target == null) return; - - //Vec3 pos = DefaultRandomPos.getPosAway(this.mob, 16, 7, target.position()); - //if(pos == null) { - Vec3 revertDirection = this.mob.position().subtract(target.position()).normalize(); - Vec3 pos = this.mob.position().add(revertDirection.scale(5.0)); - //} - this.fleePos = pos; - this.mob.getNavigation().moveTo(this.fleePos.x, this.fleePos.y, this.fleePos.z, 1); + public void start() { + this.mob.getNavigation().moveTo(this.fleePath, WALK_SPEED); } @Override public void stop() { - this.fleePos = null; + this.toAvoid = null; + this.fleePath = null; this.mob.getNavigation().stop(); } + + @Override + public void tick() { + if(this.toAvoid != null && this.mob.distanceToSqr(this.toAvoid) < SPRINT_DISTANCE_SQ) { + this.mob.getNavigation().setSpeedModifier(SPRINT_SPEED); + }else { + this.mob.getNavigation().setSpeedModifier(WALK_SPEED); + } + } } + diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 8e551d6..1348814 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -2,9 +2,8 @@ package com.lzxnone.terraria.item; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.block.ModBlocks; +import com.lzxnone.terraria.item.accessory.*; import com.lzxnone.terraria.item.ammo.*; -import com.lzxnone.terraria.item.accessory.ManaFlower; -import com.lzxnone.terraria.item.accessory.NaturesGift; import com.lzxnone.terraria.item.food.ManaCrystal; import com.lzxnone.terraria.item.potion.*; import com.lzxnone.terraria.item.weapon.ranged.ElfMelter; @@ -110,8 +109,36 @@ public class ModItems { public static final DeferredItem FALLEN_STAR = ITEMS.register("fallen_star", FallenStar::new); //饰品 + public static final DeferredItem ARMOR_POLISH = ITEMS.register("armor_polish", ArmorPolish::new); + public static final DeferredItem MEGAPHONE = ITEMS.register("megaphone", Megaphone::new); + public static final DeferredItem NAZAR = ITEMS.register("nazar", Nazar::new); + public static final DeferredItem POCKET_MIRROR = ITEMS.register("pocket_mirror", PocketMirror::new); + public static final DeferredItem REFLECTIVE_SHADES = ITEMS.register("reflective_shades", ReflectiveShades::new); + public static final DeferredItem ARMOR_BRACING = ITEMS.register("armor_bracing", ArmorBracing::new); + public static final DeferredItem COUNTERCURSE_MANTRA = ITEMS.register("countercurse_mantra", CountercurseMantra::new); + public static final DeferredItem ANKH_CHARM = ITEMS.register("ankh_charm", AnkhCharm::new); + public static final DeferredItem OBSIDIAN_SKULL = ITEMS.register("obsidian_skull", ObsidianSkull::new); + public static final DeferredItem COBALT_SHIELD = ITEMS.register("cobalt_shield", CobaltShield::new); + public static final DeferredItem OBSIDIAN_SHIELD = ITEMS.register("obsidian_shield", ObsidianShield::new); + public static final DeferredItem ANKH_SHIELD = ITEMS.register("ankh_shield", AnkhShield::new); + public static final DeferredItem BEZOAR = ITEMS.register("bezoar", Bezoar::new); + public static final DeferredItem BLINDFOLD = ITEMS.register("blindfold", Blindfold::new); + public static final DeferredItem FAST_CLOCK = ITEMS.register("fast_clock", FastClock::new); + public static final DeferredItem VITAMINS = ITEMS.register("vitamins", Vitamins::new); + public static final DeferredItem ADHESIVE_BANDAGE = ITEMS.register("adhesive_bandage", AdhesiveBandage::new); + public static final DeferredItem MEDICATED_BANDAGE = ITEMS.register("medicated_bandage", MedicatedBandage::new); + public static final DeferredItem TRIFOLD_MAP = ITEMS.register("trifold_map", TrifoldMap::new); + public static final DeferredItem THE_PLAN = ITEMS.register("the_plan", ThePlan::new); public static final DeferredItem NATURES_GIFT = ITEMS.register("natures_gift", NaturesGift::new); public static final DeferredItem MANA_FLOWER = ITEMS.register("mana_flower", ManaFlower::new); + public static final DeferredItem HERCULES_BEETLE = ITEMS.register("hercules_beetle", HerculesBeetle::new); + public static final DeferredItem NECROMANTIC_SCROLL = ITEMS.register("necromantic_scroll", NecromanticScroll::new); + public static final DeferredItem PAPYRUS_SCARAB = ITEMS.register("papyrus_scarab", PapyrusScarab::new); + public static final DeferredItem PYGMY_NECKLACE = ITEMS.register("pygmy_necklace", PygmyNecklace::new); + public static final DeferredItem WARRIOR_EMBLEM = ITEMS.register("warrior_emblem", WarriorEmblem::new); + public static final DeferredItem SUMMONER_EMBLEM = ITEMS.register("summoner_emblem", SummonerEmblem::new); + public static final DeferredItem RANGER_EMBLEM = ITEMS.register("ranger_emblem", RangerEmblem::new); + public static final DeferredItem SORCERER_EMBLEM = ITEMS.register("sorcerer_emblem", SorcererEmblem::new); //食物 public static final DeferredItem MANA_CRYSTAL = ITEMS.register("mana_crystal", ManaCrystal::new); diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AdhesiveBandage.java b/src/main/java/com/lzxnone/terraria/item/accessory/AdhesiveBandage.java new file mode 100644 index 0000000..537103f --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AdhesiveBandage.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class AdhesiveBandage extends AccessoryItem implements MobEffectImmunityModifier { + public AdhesiveBandage() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isBleedImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.bleed_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AnkhCharm.java b/src/main/java/com/lzxnone/terraria/item/accessory/AnkhCharm.java new file mode 100644 index 0000000..21178a9 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AnkhCharm.java @@ -0,0 +1,131 @@ +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.MobEffectImmunityModifier; +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 AnkhCharm extends AccessoryItem implements MobEffectImmunityModifier { + public static final ConfigDouble ARMOR_TOUGHNESS = new ConfigDouble( + "accessory.ankh_charm.armor_toughness", + "ankh_charm_armor_toughness", + 2.0D, + 0.0D, + 100.0D + ); + + public AnkhCharm() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isPoisonImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isWitherImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isDarknessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isSlownessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isWeaknessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isBleedImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isConfusedImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isLevitationImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isMiningFatigueImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double toughness = ARMOR_TOUGHNESS.get(); + if(toughness != 0.0D) { + modifiers.put( + Attributes.ARMOR_TOUGHNESS, + new AttributeModifier(id, toughness, AttributeModifier.Operation.ADD_VALUE) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(ARMOR_TOUGHNESS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "ankh_charm", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/ankh_charm.png"), + Component.translatable("item.lzxnoneterraria.ankh_charm"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(ARMOR_TOUGHNESS.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.armor_toughness_bonus", + EffectTooltipUtil.formatNumber(ARMOR_TOUGHNESS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.poison_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.bleed_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.slowness_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.confused_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.wither_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.mining_fatigue_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.darkness_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.levitation_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.weakness_immunity").withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/AnkhShield.java b/src/main/java/com/lzxnone/terraria/item/accessory/AnkhShield.java new file mode 100644 index 0000000..aa8b0e1 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/AnkhShield.java @@ -0,0 +1,190 @@ +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.FireBlockImmunityModifier; +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +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 AnkhShield extends AccessoryItem implements FireBlockImmunityModifier, MobEffectImmunityModifier { + public static final ConfigDouble KNOCKBACK_RESISTANCE = new ConfigDouble( + "accessory.ankh_shield.knockback_resistance", + "knockback_resistance", + 1.0D, + 0.0D, + 1.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.ankh_shield.defense", + "defense", + 4.0D, + 0.0D, + 100.0D + ); + public static final ConfigDouble ARMOR_TOUGHNESS = new ConfigDouble( + "accessory.ankh_shield.armor_toughness", + "armor_toughness", + 2.0D, + 0.0D, + 100.0D + ); + + public AnkhShield() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isPoisonImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isWitherImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isDarknessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isSlownessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isWeaknessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isBleedImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isConfusedImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isLevitationImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isMiningFatigueImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double knockback = KNOCKBACK_RESISTANCE.get(); + if(knockback != 0.0D) { + modifiers.put( + Attributes.KNOCKBACK_RESISTANCE, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "ankh_shield_knockback_resistance"), + knockback, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double defense = DEFENSE.get(); + if(defense != 0.0D) { + modifiers.put( + Attributes.ARMOR, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "ankh_shield_defense"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double toughness = ARMOR_TOUGHNESS.get(); + if(toughness != 0.0D) { + modifiers.put( + Attributes.ARMOR_TOUGHNESS, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "ankh_shield_armor_toughness"), + toughness, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(KNOCKBACK_RESISTANCE, DEFENSE, ARMOR_TOUGHNESS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "ankh_shield", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/ankh_shield.png"), + Component.translatable("item.lzxnoneterraria.ankh_shield"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(KNOCKBACK_RESISTANCE.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.knockback_resistance_bonus", + EffectTooltipUtil.formatNumber(KNOCKBACK_RESISTANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + if(DEFENSE.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.defense_bonus", + EffectTooltipUtil.formatNumber(DEFENSE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(ARMOR_TOUGHNESS.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.armor_toughness_bonus", + EffectTooltipUtil.formatNumber(ARMOR_TOUGHNESS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.fire_block_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.poison_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.bleed_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.slowness_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.confused_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.wither_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.mining_fatigue_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.darkness_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.levitation_immunity").withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.weakness_immunity").withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ArmorBracing.java b/src/main/java/com/lzxnone/terraria/item/accessory/ArmorBracing.java new file mode 100644 index 0000000..d74ed8c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ArmorBracing.java @@ -0,0 +1,85 @@ +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.MobEffectImmunityModifier; +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 ArmorBracing extends AccessoryItem implements MobEffectImmunityModifier { + public static final ConfigDouble ARMOR_TOUGHNESS = new ConfigDouble( + "accessory.armor_bracing.armor_toughness", + "armor_toughness", + 2.0D, + 0.0D, + 100.0D + ); + + public ArmorBracing() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isWeaknessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double toughness = ARMOR_TOUGHNESS.get(); + if(toughness != 0.0D) { + modifiers.put( + Attributes.ARMOR_TOUGHNESS, + new AttributeModifier(id, toughness, AttributeModifier.Operation.ADD_VALUE) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(ARMOR_TOUGHNESS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "armor_bracing", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/armor_bracing.png"), + Component.translatable("item.lzxnoneterraria.armor_bracing"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.weakness_immunity" + ).withStyle(ChatFormatting.GRAY)); + if(ARMOR_TOUGHNESS.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.armor_toughness_bonus", + EffectTooltipUtil.formatNumber(ARMOR_TOUGHNESS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ArmorPolish.java b/src/main/java/com/lzxnone/terraria/item/accessory/ArmorPolish.java new file mode 100644 index 0000000..9af91f4 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ArmorPolish.java @@ -0,0 +1,76 @@ +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 ArmorPolish extends AccessoryItem { + public static final ConfigDouble ARMOR_TOUGHNESS = new ConfigDouble( + "accessory.armor_polish.armor_toughness", + "armor_toughness", + 2.0D, + 0.0D, + 100.0D + ); + + public ArmorPolish() { + 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 toughness = ARMOR_TOUGHNESS.get(); + if(toughness != 0.0D) { + modifiers.put( + Attributes.ARMOR_TOUGHNESS, + new AttributeModifier(id, toughness, AttributeModifier.Operation.ADD_VALUE) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(ARMOR_TOUGHNESS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "armor_polish", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/armor_polish.png"), + Component.translatable("item.lzxnoneterraria.armor_polish"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(ARMOR_TOUGHNESS.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.armor_toughness_bonus", + EffectTooltipUtil.formatNumber(ARMOR_TOUGHNESS.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } + +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/Bezoar.java b/src/main/java/com/lzxnone/terraria/item/accessory/Bezoar.java new file mode 100644 index 0000000..8c36a3e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/Bezoar.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class Bezoar extends AccessoryItem implements MobEffectImmunityModifier { + public Bezoar() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isPoisonImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.poison_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/Blindfold.java b/src/main/java/com/lzxnone/terraria/item/accessory/Blindfold.java new file mode 100644 index 0000000..f884aae --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/Blindfold.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class Blindfold extends AccessoryItem implements MobEffectImmunityModifier { + public Blindfold() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isDarknessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.darkness_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CobaltShield.java b/src/main/java/com/lzxnone/terraria/item/accessory/CobaltShield.java new file mode 100644 index 0000000..1ff5b5c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CobaltShield.java @@ -0,0 +1,103 @@ +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 CobaltShield extends AccessoryItem { + public static final ConfigDouble KNOCKBACK_RESISTANCE = new ConfigDouble( + "accessory.cobalt_shield.knockback_resistance", + "knockback_resistance", + 1.0D, + 0.0D, + 1.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.cobalt_shield.defense", + "defense", + 1.0D, + 0.0D, + 100.0D + ); + + public CobaltShield() { + 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 knockback = KNOCKBACK_RESISTANCE.get(); + if(knockback != 0.0D) { + modifiers.put( + Attributes.KNOCKBACK_RESISTANCE, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "cobalt_shield_knockback_resistance"), + knockback, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double defense = DEFENSE.get(); + if(defense != 0.0D) { + modifiers.put( + Attributes.ARMOR, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "cobalt_shield_defense"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(KNOCKBACK_RESISTANCE, DEFENSE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "cobalt_shield", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/cobalt_shield.png"), + Component.translatable("item.lzxnoneterraria.cobalt_shield"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(KNOCKBACK_RESISTANCE.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.knockback_resistance_bonus", + EffectTooltipUtil.formatNumber(KNOCKBACK_RESISTANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + if(DEFENSE.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.defense_bonus", + EffectTooltipUtil.formatNumber(DEFENSE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/CountercurseMantra.java b/src/main/java/com/lzxnone/terraria/item/accessory/CountercurseMantra.java new file mode 100644 index 0000000..3e4a187 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/CountercurseMantra.java @@ -0,0 +1,38 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class CountercurseMantra extends AccessoryItem implements MobEffectImmunityModifier { + public CountercurseMantra() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isWitherImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isMiningFatigueImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.wither_immunity" + ).withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mining_fatigue_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/FastClock.java b/src/main/java/com/lzxnone/terraria/item/accessory/FastClock.java new file mode 100644 index 0000000..66e3042 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/FastClock.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class FastClock extends AccessoryItem implements MobEffectImmunityModifier { + public FastClock() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isSlownessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.slowness_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/HerculesBeetle.java b/src/main/java/com/lzxnone/terraria/item/accessory/HerculesBeetle.java new file mode 100644 index 0000000..5517813 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/HerculesBeetle.java @@ -0,0 +1,83 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; +import com.lzxnone.terraria.item.effect.SummonDamageModifier; +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.Rarity; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; +import java.util.Locale; + +public class HerculesBeetle extends AccessoryItem implements SummonDamageModifier, MinionKnockbackModifier { + public static final ConfigDouble SUMMON_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.hercules_beetle.summon_damage_multiplier", + "summon_damage_multiplier", + 1.15D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble( + "accessory.hercules_beetle.minion_knockback_multiplier", + "minion_knockback_multiplier", + 1.25D, + 1.0D, + 10.0D + ); + + public HerculesBeetle() { + super(new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); + } + + @Override + public double getSummonDamageMultiplier(ItemStack stack, LivingEntity entity) { + return SUMMON_DAMAGE_MULTIPLIER.get(); + } + + @Override + public double getMinionKnockbackMultiplier(ItemStack stack, LivingEntity entity) { + return MINION_KNOCKBACK_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(SUMMON_DAMAGE_MULTIPLIER, MINION_KNOCKBACK_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "hercules_beetle", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/hercules_beetle.png"), + Component.translatable("item.lzxnoneterraria.hercules_beetle"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(SUMMON_DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.summon_damage_increase", + EffectTooltipUtil.formatPercent(SUMMON_DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MINION_KNOCKBACK_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_knockback_increase", + EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java b/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java index a6dad4c..67b00e7 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java @@ -1,8 +1,9 @@ package com.lzxnone.terraria.item.accessory; import com.lzxnone.terraria.LzxnoneTerraria; -import com.lzxnone.terraria.item.accessory.effect.AutoManaPotionUser; -import com.lzxnone.terraria.item.accessory.effect.ManaCostModifier; +import com.lzxnone.terraria.item.effect.AutoManaPotionUser; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.ManaCostModifier; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.ui.config.struct.ConfigDouble; @@ -22,7 +23,7 @@ import java.util.Locale; public class ManaFlower extends AccessoryItem implements ManaCostModifier, AutoManaPotionUser { public static final ConfigDouble MANA_COST_MULTIPLIER = new ConfigDouble( "accessory.mana_flower.mana_cost_multiplier", - "mana_flower_mana_cost_multiplier", + "mana_cost_multiplier", 0.92D, 0.0D, 1.0D @@ -37,6 +38,11 @@ public class ManaFlower extends AccessoryItem implements ManaCostModifier, AutoM return MANA_COST_MULTIPLIER.get(); } + @Override + public boolean canAutoUseManaPotion(ItemStack stack, LivingEntity entity) { + return true; + } + public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { @@ -51,27 +57,15 @@ public class ManaFlower extends AccessoryItem implements ManaCostModifier, AutoM CONFIG_DATA ); - @Override - public boolean canAutoUseManaPotion(ItemStack stack, LivingEntity entity) { - return true; - } - @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); - tooltipComponents.add(Component.translatable( - "tooltip.lzxnoneterraria.mana_flower.0", - formatManaCostReductionPercent(MANA_COST_MULTIPLIER.get()) - ).withStyle(ChatFormatting.GRAY)); - tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.mana_flower.1").withStyle(ChatFormatting.GRAY)); - } - - private static String formatManaCostReductionPercent(double multiplier) { - double reduction = Math.max(0.0D, (1.0D - multiplier) * 100.0D); - if(Math.abs(reduction - Math.rint(reduction)) < 1.0E-6D) return Integer.toString((int)Math.rint(reduction)); - String formatted = String.format(Locale.ROOT, "%.2f", reduction); - while(formatted.endsWith("0")) formatted = formatted.substring(0, formatted.length() - 1); - if(formatted.endsWith(".")) formatted = formatted.substring(0, formatted.length() - 1); - return formatted; + if(MANA_COST_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mana_cost_decrease", + EffectTooltipUtil.formatPercent(MANA_COST_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + tooltipComponents.add(Component.translatable("tooltip.lzxnoneterraria.auto_mana_potion_use").withStyle(ChatFormatting.GRAY)); } } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/MedicatedBandage.java b/src/main/java/com/lzxnone/terraria/item/accessory/MedicatedBandage.java new file mode 100644 index 0000000..20b9232 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/MedicatedBandage.java @@ -0,0 +1,38 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class MedicatedBandage extends AccessoryItem implements MobEffectImmunityModifier { + public MedicatedBandage() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isPoisonImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isBleedImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.poison_immunity" + ).withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.bleed_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/Megaphone.java b/src/main/java/com/lzxnone/terraria/item/accessory/Megaphone.java new file mode 100644 index 0000000..e452a71 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/Megaphone.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class Megaphone extends AccessoryItem implements MobEffectImmunityModifier { + public Megaphone() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isMiningFatigueImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mining_fatigue_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java b/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java index 2a81181..82fefd7 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java @@ -1,7 +1,8 @@ package com.lzxnone.terraria.item.accessory; import com.lzxnone.terraria.LzxnoneTerraria; -import com.lzxnone.terraria.item.accessory.effect.ManaCostModifier; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.ManaCostModifier; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.ui.config.struct.ConfigDouble; @@ -12,7 +13,6 @@ 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.Rarity; import net.minecraft.world.item.TooltipFlag; import java.util.List; @@ -21,7 +21,7 @@ import java.util.Locale; public class NaturesGift extends AccessoryItem implements ManaCostModifier { public static final ConfigDouble MANA_COST_MULTIPLIER = new ConfigDouble( "accessory.natures_gift.mana_cost_multiplier", - "natures_gift_mana_cost_multiplier", + "mana_cost_multiplier", 0.94D, 0.0D, 1.0D @@ -53,18 +53,11 @@ public class NaturesGift extends AccessoryItem implements ManaCostModifier { @Override public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); - tooltipComponents.add(Component.translatable( - "tooltip.lzxnoneterraria.natures_gift.0", - formatManaCostReductionPercent(MANA_COST_MULTIPLIER.get()) - ).withStyle(ChatFormatting.GRAY)); - } - - private static String formatManaCostReductionPercent(double multiplier) { - double reduction = Math.max(0.0D, (1.0D - multiplier) * 100.0D); - if(Math.abs(reduction - Math.rint(reduction)) < 1.0E-6D) return Integer.toString((int)Math.rint(reduction)); - String formatted = String.format(Locale.ROOT, "%.2f", reduction); - while(formatted.endsWith("0")) formatted = formatted.substring(0, formatted.length() - 1); - if(formatted.endsWith(".")) formatted = formatted.substring(0, formatted.length() - 1); - return formatted; + if(MANA_COST_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.mana_cost_decrease", + EffectTooltipUtil.formatPercent(MANA_COST_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } } } diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/Nazar.java b/src/main/java/com/lzxnone/terraria/item/accessory/Nazar.java new file mode 100644 index 0000000..5d53484 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/Nazar.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class Nazar extends AccessoryItem implements MobEffectImmunityModifier { + public Nazar() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isWitherImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.wither_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/NecromanticScroll.java b/src/main/java/com/lzxnone/terraria/item/accessory/NecromanticScroll.java new file mode 100644 index 0000000..b07bc15 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/NecromanticScroll.java @@ -0,0 +1,103 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MinionCountModifier; +import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; +import com.lzxnone.terraria.item.effect.SummonDamageModifier; +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.ConfigInt; +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.Rarity; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; +import java.util.Locale; + +public class NecromanticScroll extends AccessoryItem implements MinionCountModifier, SummonDamageModifier, MinionKnockbackModifier { + public static final ConfigInt MINION_COUNT_BONUS = new ConfigInt( + "accessory.necromantic_scroll.minion_count_bonus", + "minion_count_bonus", + 1, + 0, + 100 + ); + public static final ConfigDouble SUMMON_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.necromantic_scroll.summon_damage_multiplier", + "summon_damage_multiplier", + 1.10D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble( + "accessory.necromantic_scroll.minion_knockback_multiplier", + "minion_knockback_multiplier", + 1.25D, + 1.0D, + 10.0D + ); + + public NecromanticScroll() { + super(new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); + } + + @Override + public int getMinionCountBonus(ItemStack stack, LivingEntity entity) { + return MINION_COUNT_BONUS.get(); + } + + @Override + public double getSummonDamageMultiplier(ItemStack stack, LivingEntity entity) { + return SUMMON_DAMAGE_MULTIPLIER.get(); + } + + @Override + public double getMinionKnockbackMultiplier(ItemStack stack, LivingEntity entity) { + return MINION_KNOCKBACK_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MINION_COUNT_BONUS, SUMMON_DAMAGE_MULTIPLIER, MINION_KNOCKBACK_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "necromantic_scroll", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/necromantic_scroll.png"), + Component.translatable("item.lzxnoneterraria.necromantic_scroll"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MINION_COUNT_BONUS.get() != 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_slot_add", + MINION_COUNT_BONUS.get() + ).withStyle(ChatFormatting.GRAY)); + } + if(SUMMON_DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.summon_damage_increase", + EffectTooltipUtil.formatPercent(SUMMON_DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MINION_KNOCKBACK_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_knockback_increase", + EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianShield.java b/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianShield.java new file mode 100644 index 0000000..953c56e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianShield.java @@ -0,0 +1,113 @@ +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.FireBlockImmunityModifier; +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 ObsidianShield extends AccessoryItem implements FireBlockImmunityModifier { + public static final ConfigDouble KNOCKBACK_RESISTANCE = new ConfigDouble( + "accessory.obsidian_shield.knockback_resistance", + "knockback_resistance", + 1.0D, + 0.0D, + 10.0D + ); + public static final ConfigDouble DEFENSE = new ConfigDouble( + "accessory.obsidian_shield.defense", + "defense", + 2.0D, + 0.0D, + 100.0D + ); + + public ObsidianShield() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double knockback = KNOCKBACK_RESISTANCE.get(); + if(knockback != 0.0D) { + modifiers.put( + Attributes.KNOCKBACK_RESISTANCE, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "obsidian_shield_knockback_resistance"), + knockback, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + double defense = DEFENSE.get(); + if(defense != 0.0D) { + modifiers.put( + Attributes.ARMOR, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "obsidian_shield_defense"), + defense, + AttributeModifier.Operation.ADD_VALUE + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(KNOCKBACK_RESISTANCE, DEFENSE); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "obsidian_shield", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/obsidian_shield.png"), + Component.translatable("item.lzxnoneterraria.obsidian_shield"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(KNOCKBACK_RESISTANCE.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.knockback_resistance_bonus", + EffectTooltipUtil.formatNumber(KNOCKBACK_RESISTANCE.get() * 100.0D) + ).withStyle(ChatFormatting.GRAY)); + } + if(DEFENSE.get() != 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.defense_bonus", + EffectTooltipUtil.formatNumber(DEFENSE.get()) + ).withStyle(ChatFormatting.GRAY)); + } + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.fire_block_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianSkull.java b/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianSkull.java new file mode 100644 index 0000000..ce6b7c3 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ObsidianSkull.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.FireBlockImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class ObsidianSkull extends AccessoryItem implements FireBlockImmunityModifier { + public ObsidianSkull() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.fire_block_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/PapyrusScarab.java b/src/main/java/com/lzxnone/terraria/item/accessory/PapyrusScarab.java new file mode 100644 index 0000000..348e3fe --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/PapyrusScarab.java @@ -0,0 +1,112 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MinionCountModifier; +import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; +import com.lzxnone.terraria.item.effect.SummonDamageModifier; +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.ConfigInt; +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.Rarity; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; +import java.util.Locale; + +public class PapyrusScarab extends AccessoryItem implements MinionCountModifier, SummonDamageModifier, MinionKnockbackModifier { + public static final ConfigInt MINION_COUNT_BONUS = new ConfigInt( + "accessory.papyrus_scarab.minion_count_bonus", + "minion_count_bonus", + 1, + 0, + 100 + ); + public static final ConfigDouble SUMMON_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.papyrus_scarab.summon_damage_multiplier", + "summon_damage_multiplier", + 1.15D, + 1.0D, + 10.0D + ); + public static final ConfigDouble MINION_KNOCKBACK_MULTIPLIER = new ConfigDouble( + "accessory.papyrus_scarab.minion_knockback_multiplier", + "minion_knockback_multiplier", + 1.25D, + 1.0D, + 10.0D + ); + + public PapyrusScarab() { + super(new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + } + + @Override + public int getMinionCountBonus(ItemStack stack, LivingEntity entity) { + return MINION_COUNT_BONUS.get(); + } + + @Override + public double getSummonDamageMultiplier(ItemStack stack, LivingEntity entity) { + return SUMMON_DAMAGE_MULTIPLIER.get(); + } + + @Override + public double getMinionKnockbackMultiplier(ItemStack stack, LivingEntity entity) { + return MINION_KNOCKBACK_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MINION_COUNT_BONUS, SUMMON_DAMAGE_MULTIPLIER, MINION_KNOCKBACK_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "papyrus_scarab", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/papyrus_scarab.png"), + Component.translatable("item.lzxnoneterraria.papyrus_scarab"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MINION_COUNT_BONUS.get() != 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_slot_add", + MINION_COUNT_BONUS.get() + ).withStyle(ChatFormatting.GRAY)); + } + if(SUMMON_DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.summon_damage_increase", + EffectTooltipUtil.formatPercent(SUMMON_DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + if(MINION_KNOCKBACK_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_knockback_increase", + EffectTooltipUtil.formatPercent(MINION_KNOCKBACK_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } + + private static String formatPercentBonus(double multiplier) { + double bonus = Math.max(0.0D, (multiplier - 1.0D) * 100.0D); + if(Math.abs(bonus - Math.rint(bonus)) < 1.0E-6D) return Integer.toString((int)Math.rint(bonus)); + String formatted = String.format(Locale.ROOT, "%.2f", bonus); + while(formatted.endsWith("0")) formatted = formatted.substring(0, formatted.length() - 1); + if(formatted.endsWith(".")) formatted = formatted.substring(0, formatted.length() - 1); + return formatted; + } +} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/PocketMirror.java b/src/main/java/com/lzxnone/terraria/item/accessory/PocketMirror.java new file mode 100644 index 0000000..d73052b --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/PocketMirror.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class PocketMirror extends AccessoryItem implements MobEffectImmunityModifier { + public PocketMirror() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isLevitationImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.levitation_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/PygmyNecklace.java b/src/main/java/com/lzxnone/terraria/item/accessory/PygmyNecklace.java new file mode 100644 index 0000000..db2bd53 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/PygmyNecklace.java @@ -0,0 +1,62 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.MinionCountModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +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.Rarity; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class PygmyNecklace extends AccessoryItem implements MinionCountModifier { + public static final ConfigInt MINION_COUNT_BONUS = new ConfigInt( + "accessory.pygmy_necklace.minion_count_bonus", + "minion_count_bonus", + 1, + 0, + 100 + ); + + public PygmyNecklace() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public int getMinionCountBonus(ItemStack stack, LivingEntity entity) { + return MINION_COUNT_BONUS.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MINION_COUNT_BONUS); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "pygmy_necklace", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/pygmy_necklace.png"), + Component.translatable("item.lzxnoneterraria.pygmy_necklace"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MINION_COUNT_BONUS.get() != 0) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.minion_slot_add", + MINION_COUNT_BONUS.get() + ).withStyle(ChatFormatting.GRAY)); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/RangerEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/RangerEmblem.java new file mode 100644 index 0000000..22f2447 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/RangerEmblem.java @@ -0,0 +1,61 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.RangedDamageModifier; +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 RangerEmblem extends AccessoryItem implements RangedDamageModifier { + public static final ConfigDouble RANGED_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.ranger_emblem.ranged_damage_multiplier", + "ranged_damage_multiplier", + 1.15D, + 1.0D, + 10.0D + ); + + public RangerEmblem() { + super(new Item.Properties().stacksTo(1)); + } + + public double getRangedDamageModifier(ItemStack stack, LivingEntity entity) { + return RANGED_DAMAGE_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(RANGED_DAMAGE_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "ranger_emblem", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/ranger_emblem.png"), + Component.translatable("item.lzxnoneterraria.ranger_emblem"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + 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)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ReflectiveShades.java b/src/main/java/com/lzxnone/terraria/item/accessory/ReflectiveShades.java new file mode 100644 index 0000000..15306ea --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ReflectiveShades.java @@ -0,0 +1,38 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class ReflectiveShades extends AccessoryItem implements MobEffectImmunityModifier { + public ReflectiveShades() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isDarknessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isLevitationImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.darkness_immunity" + ).withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.levitation_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/SorcererEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/SorcererEmblem.java new file mode 100644 index 0000000..cf8461d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/SorcererEmblem.java @@ -0,0 +1,61 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MagicDamageModifier; +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 SorcererEmblem extends AccessoryItem implements MagicDamageModifier { + public static final ConfigDouble MAGIC_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.sorcerer_emblem.magic_damage_multiplier", + "magic_damage_multiplier", + 1.15D, + 1.0D, + 10.0D + ); + + public SorcererEmblem() { + super(new Item.Properties().stacksTo(1)); + } + + public double getMagicDamageModifier(ItemStack stack, LivingEntity entity) { + return MAGIC_DAMAGE_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MAGIC_DAMAGE_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "sorcerer_emblem", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/sorcerer_emblem.png"), + Component.translatable("item.lzxnoneterraria.sorcerer_emblem"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MAGIC_DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.magic_damage_increase", + EffectTooltipUtil.formatPercent(MAGIC_DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/SummonerEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/SummonerEmblem.java new file mode 100644 index 0000000..29fd001 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/SummonerEmblem.java @@ -0,0 +1,61 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.SummonDamageModifier; +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 SummonerEmblem extends AccessoryItem implements SummonDamageModifier { + public static final ConfigDouble SUMMON_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.summoner_emblem.summon_damage_multiplier", + "summon_damage_multiplier", + 1.15D, + 1.0D, + 10.0D + ); + + public SummonerEmblem() { + super(new Item.Properties().stacksTo(1)); + } + + public double getSummonDamageMultiplier(ItemStack stack, LivingEntity entity) { + return SUMMON_DAMAGE_MULTIPLIER.get(); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(SUMMON_DAMAGE_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "summoner_emblem", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/summoner_emblem.png"), + Component.translatable("item.lzxnoneterraria.summoner_emblem"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(SUMMON_DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.summon_damage_increase", + EffectTooltipUtil.formatPercent(SUMMON_DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ThePlan.java b/src/main/java/com/lzxnone/terraria/item/accessory/ThePlan.java new file mode 100644 index 0000000..e43a434 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ThePlan.java @@ -0,0 +1,38 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class ThePlan extends AccessoryItem implements MobEffectImmunityModifier { + public ThePlan() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isSlownessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public boolean isConfusedImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.slowness_immunity" + ).withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.confused_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/TrifoldMap.java b/src/main/java/com/lzxnone/terraria/item/accessory/TrifoldMap.java new file mode 100644 index 0000000..89797ae --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/TrifoldMap.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class TrifoldMap extends AccessoryItem implements MobEffectImmunityModifier { + public TrifoldMap() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isConfusedImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.confused_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/Vitamins.java b/src/main/java/com/lzxnone/terraria/item/accessory/Vitamins.java new file mode 100644 index 0000000..aaacd21 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/Vitamins.java @@ -0,0 +1,30 @@ +package com.lzxnone.terraria.item.accessory; + +import com.lzxnone.terraria.item.effect.MobEffectImmunityModifier; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; + +import java.util.List; + +public class Vitamins extends AccessoryItem implements MobEffectImmunityModifier { + public Vitamins() { + super(new Item.Properties().stacksTo(1)); + } + + @Override + public boolean isWeaknessImmunity(ItemStack stack, LivingEntity entity) { + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.weakness_immunity" + ).withStyle(ChatFormatting.GRAY)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/WarriorEmblem.java b/src/main/java/com/lzxnone/terraria/item/accessory/WarriorEmblem.java new file mode 100644 index 0000000..d584c3e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/accessory/WarriorEmblem.java @@ -0,0 +1,85 @@ +package com.lzxnone.terraria.item.accessory; + +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.effect.EffectTooltipUtil; +import com.lzxnone.terraria.item.effect.MeleeDamageModifier; +import com.lzxnone.terraria.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 WarriorEmblem extends AccessoryItem implements MeleeDamageModifier { + public static final ConfigDouble MELEE_DAMAGE_MULTIPLIER = new ConfigDouble( + "accessory.warrior_emblem.melee_damage_multiplier", + "melee_damage_multiplier", + 1.15D, + 1.0D, + 10.0D + ); + + public WarriorEmblem() { + super(new Item.Properties().stacksTo(1)); + } + + public double getMeleeDamageModifier(ItemStack stack, LivingEntity entity) { + return MELEE_DAMAGE_MULTIPLIER.get(); + } + + @Override + public Multimap, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) { + Multimap, AttributeModifier> modifiers = MultimapBuilder.hashKeys().arrayListValues().build(); + double bonus = MELEE_DAMAGE_MULTIPLIER.get() - 1.0D; + if(bonus != 0.0D) { + modifiers.put( + Attributes.ATTACK_DAMAGE, + new AttributeModifier( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "warrior_emblem_attack_bonus"), + bonus, + AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL + ) + ); + } + return modifiers; + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(MELEE_DAMAGE_MULTIPLIER); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "warrior_emblem", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/warrior_emblem.png"), + Component.translatable("item.lzxnoneterraria.warrior_emblem"), + CONFIG_DATA + ); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + if(MELEE_DAMAGE_MULTIPLIER.get() != 1.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.melee_damage_increase", + EffectTooltipUtil.formatPercent(MELEE_DAMAGE_MULTIPLIER.get()) + ).withStyle(ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/effect/AutoManaPotionUser.java b/src/main/java/com/lzxnone/terraria/item/effect/AutoManaPotionUser.java similarity index 79% rename from src/main/java/com/lzxnone/terraria/item/accessory/effect/AutoManaPotionUser.java rename to src/main/java/com/lzxnone/terraria/item/effect/AutoManaPotionUser.java index aeac9f3..a43193c 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/effect/AutoManaPotionUser.java +++ b/src/main/java/com/lzxnone/terraria/item/effect/AutoManaPotionUser.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.accessory.effect; +package com.lzxnone.terraria.item.effect; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/lzxnone/terraria/item/effect/EffectTooltipUtil.java b/src/main/java/com/lzxnone/terraria/item/effect/EffectTooltipUtil.java new file mode 100644 index 0000000..ee05ca7 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/EffectTooltipUtil.java @@ -0,0 +1,29 @@ +package com.lzxnone.terraria.item.effect; + +import java.util.Locale; + +public class EffectTooltipUtil { + //获取增加/减少百分比 + public static String formatPercent(double multiplier) { + double percent; + if(multiplier > 1.0) { + percent = Math.max(0.0D, (multiplier - 1.0D) * 100.0D); + }else { + percent = Math.max(0.0D, (1.0D - multiplier) * 100.0D); + } + if(Math.abs(percent - Math.rint(percent)) < 1.0E-6D) return Integer.toString((int)Math.rint(percent)); + String formatted = String.format(Locale.ROOT, "%.2f", percent); + while(formatted.endsWith("0")) formatted = formatted.substring(0, formatted.length() - 1); + if(formatted.endsWith(".")) formatted = formatted.substring(0, formatted.length() - 1); + return formatted; + } + + //获取数值显示(整数不带小数,小数去尾零) + public static String formatNumber(double value) { + if(Math.abs(value - Math.rint(value)) < 1.0E-6D) return Integer.toString((int)Math.rint(value)); + String formatted = String.format(Locale.ROOT, "%.2f", value); + while(formatted.endsWith("0")) formatted = formatted.substring(0, formatted.length() - 1); + if(formatted.endsWith(".")) formatted = formatted.substring(0, formatted.length() - 1); + return formatted; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/FireBlockImmunityModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/FireBlockImmunityModifier.java new file mode 100644 index 0000000..226b165 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/FireBlockImmunityModifier.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 FireBlockImmunityModifier { + //火块(火/灵魂火/岩浆块)免疫 + default boolean isFireBlockImmunity(ItemStack stack, LivingEntity entity) { return false; } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MagicDamageModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MagicDamageModifier.java new file mode 100644 index 0000000..b3af684 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/MagicDamageModifier.java @@ -0,0 +1,8 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface MagicDamageModifier { + double getMagicDamageModifier(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/effect/ManaCostModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/ManaCostModifier.java similarity index 79% rename from src/main/java/com/lzxnone/terraria/item/accessory/effect/ManaCostModifier.java rename to src/main/java/com/lzxnone/terraria/item/effect/ManaCostModifier.java index 5b6f4ca..e824420 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/effect/ManaCostModifier.java +++ b/src/main/java/com/lzxnone/terraria/item/effect/ManaCostModifier.java @@ -1,4 +1,4 @@ -package com.lzxnone.terraria.item.accessory.effect; +package com.lzxnone.terraria.item.effect; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MeleeDamageModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MeleeDamageModifier.java new file mode 100644 index 0000000..f65a1c1 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/MeleeDamageModifier.java @@ -0,0 +1,8 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface MeleeDamageModifier { + double getMeleeDamageModifier(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MinionCountModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MinionCountModifier.java new file mode 100644 index 0000000..cdc22d0 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/MinionCountModifier.java @@ -0,0 +1,8 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface MinionCountModifier { + int getMinionCountBonus(ItemStack stack, LivingEntity entity); +} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MinionKnockbackModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MinionKnockbackModifier.java new file mode 100644 index 0000000..aea3aec --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/MinionKnockbackModifier.java @@ -0,0 +1,8 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface MinionKnockbackModifier { + double getMinionKnockbackMultiplier(ItemStack stack, LivingEntity entity); +} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/item/effect/MobEffectImmunityModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/MobEffectImmunityModifier.java new file mode 100644 index 0000000..e3093e3 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/MobEffectImmunityModifier.java @@ -0,0 +1,33 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface MobEffectImmunityModifier { + //中毒 + default boolean isPoisonImmunity(ItemStack stack, LivingEntity entity) { return false; } + + //凋零 + default boolean isWitherImmunity(ItemStack stack, LivingEntity entity) { return false; } + + //黑暗 + default boolean isDarknessImmunity(ItemStack stack, LivingEntity entity) { return false; } + + //缓慢 + default boolean isSlownessImmunity(ItemStack stack, LivingEntity entity) { return false; } + + //缓慢 + default boolean isWeaknessImmunity(ItemStack stack, LivingEntity entity) { return false; } + + //流血 + default boolean isBleedImmunity(ItemStack stack, LivingEntity entity) { return false; } + + //困惑 + default boolean isConfusedImmunity(ItemStack stack, LivingEntity entity) { return false; } + + //漂浮 + default boolean isLevitationImmunity(ItemStack stack, LivingEntity entity) { return false; } + + //挖掘疲劳 + default boolean isMiningFatigueImmunity(ItemStack stack, LivingEntity entity) { return false; } +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/RangedDamageModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/RangedDamageModifier.java new file mode 100644 index 0000000..7006cad --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/RangedDamageModifier.java @@ -0,0 +1,8 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface RangedDamageModifier { + double getRangedDamageModifier(ItemStack stack, LivingEntity entity); +} diff --git a/src/main/java/com/lzxnone/terraria/item/effect/SummonDamageModifier.java b/src/main/java/com/lzxnone/terraria/item/effect/SummonDamageModifier.java new file mode 100644 index 0000000..8c4d34e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/effect/SummonDamageModifier.java @@ -0,0 +1,8 @@ +package com.lzxnone.terraria.item.effect; + +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public interface SummonDamageModifier { + double getSummonDamageMultiplier(ItemStack stack, LivingEntity entity); +} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java index ff7b1a8..105a909 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon; -import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.enchantment.ModEnchantments; @@ -8,18 +7,16 @@ import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; import com.lzxnone.terraria.effect.ManaSicknessEffect; import com.lzxnone.terraria.item.accessory.AccessoryUtil; -import com.lzxnone.terraria.item.accessory.effect.AutoManaPotionUser; -import com.lzxnone.terraria.item.accessory.effect.ManaCostModifier; -import com.lzxnone.terraria.utils.ManaPotionUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; +import com.lzxnone.terraria.item.effect.AutoManaPotionUser; +import com.lzxnone.terraria.item.effect.MagicDamageModifier; +import com.lzxnone.terraria.item.effect.ManaCostModifier; +import com.lzxnone.terraria.item.effect.SummonDamageModifier; +import com.lzxnone.terraria.item.potion.AbstractManaPotion; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; -import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.level.Level; public class MagicWeapon extends Weapon { @@ -44,47 +41,60 @@ public class MagicWeapon extends Weapon { onMagicUseTick(level, entity, stack, count); } - protected void onMagicUseTick(Level level, LivingEntity entity, ItemStack stack, int count) { - } + //使用魔法武器时 + protected void onMagicUseTick(Level level, LivingEntity entity, ItemStack stack, int count) {} - protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { - return 0.0D; - } + //提供基础魔力消耗 + protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { return 0.0D; } + //获取最终魔力消耗 protected double getFinalManaConsumeRate(ItemStack stack, LivingEntity entity) { double rate = getManaConsumeRate(stack, entity); + //魔力泄漏 int leakLevel = getEnchantmentLevel(entity, stack, ModEnchantments.MANA_LEAK); - int efficiencyLevel = getEnchantmentLevel(entity, stack, ModEnchantments.MANA_EFFICIENCY); - rate *= Math.pow(ModEnchantmentConfigs.getManaLeakConsumeMultiplier(), leakLevel); + //魔力效率 + int efficiencyLevel = getEnchantmentLevel(entity, stack, ModEnchantments.MANA_EFFICIENCY); rate *= Math.pow(ModEnchantmentConfigs.getManaEfficiencyConsumeMultiplier(), efficiencyLevel); - rate *= getAccessoryManaCostMultiplier(entity); + //饰品 + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, itemStack) -> { + if(accessory instanceof ManaCostModifier modifier) { + multiplier[0] *= modifier.getManaCostMultiplier(itemStack, entity); + } + }); + rate *= multiplier[0]; return Math.max(0.0D, rate); } + //获取最终造成的伤害 public static float applyMagicDamageBonus(ItemStack stack, LivingEntity entity, float damage) { double finalDamage = damage; + //奥术增幅 int amplificationLevel = getEnchantmentLevel(entity, stack, ModEnchantments.ARCANE_AMPLIFICATION); - finalDamage *= Math.pow(ModEnchantmentConfigs.getArcaneAmplificationDamageMultiplier(), amplificationLevel); + //耐魔性 finalDamage *= ManaSicknessEffect.getMagicDamageMultiplier(entity); + //饰品 + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { + if(accessory instanceof MagicDamageModifier modifier) { + multiplier[0] *= modifier.getMagicDamageModifier(accessoryStack, entity); + } + }); + finalDamage *= multiplier[0]; return (float) Math.max(0.0D, finalDamage); } + //是否可以继续使用魔法武器 protected boolean canUseMagic(ItemStack stack, LivingEntity entity) { if(entity.hasInfiniteMaterials()) return true; - if(!isManaEmpty(entity)) return true; - if(entity instanceof ServerPlayer player) { - return tryAutoUseManaPotion(player); - } - return entity instanceof Player player && canAutoUseManaPotion(player) && ManaPotionUtil.hasManaPotion(player); - } - - protected boolean isManaEmpty(LivingEntity entity) { - if(!(entity instanceof Player player)) return false; - return !player.getData(ModAttachments.PLAYER_MANA).hasMana(); + if(entity instanceof ServerPlayer player && player.getData(ModAttachments.PLAYER_MANA).hasMana()) return true; + if(entity instanceof ServerPlayer player) return tryAutoUseManaPotion(player); + return entity instanceof Player player && canAutoUseManaPotion(player) && findManaPotionSlot(player) >= 0; } + //进行魔力消耗 protected boolean tryConsumeMana(Level level, LivingEntity entity, ItemStack stack, double amount) { if(amount <= 0.0D || entity.hasInfiniteMaterials()) return true; if(!(entity instanceof ServerPlayer player)) return true; @@ -101,14 +111,14 @@ public class MagicWeapon extends Weapon { return tryAutoUseManaPotion(player); } - private static double getAccessoryManaCostMultiplier(LivingEntity entity) { - double[] multiplier = {1.0D}; - AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { - if(accessory instanceof ManaCostModifier modifier) { - multiplier[0] *= modifier.getManaCostMultiplier(stack, entity); + private static int findManaPotionSlot(Player player) { + for(int i = 0; i < player.getInventory().getContainerSize(); i++) { + ItemStack stack = player.getInventory().getItem(i); + if(stack.getItem() instanceof AbstractManaPotion potion) { + if(potion.getRecoverAmount() > 0) return i; } - }); - return multiplier[0]; + } + return -1; } private static boolean canAutoUseManaPotion(LivingEntity entity) { @@ -123,11 +133,11 @@ public class MagicWeapon extends Weapon { private static boolean tryAutoUseManaPotion(ServerPlayer player) { if(!canAutoUseManaPotion(player)) return false; - boolean res = ManaPotionUtil.tryUseManaPotion(player); - if(res) { - SoundUtil.playServerSound(player, ModSounds.DRINK.get(), 0.5f, 1.0f); - } - return res; + int slot = findManaPotionSlot(player); + if(slot < 0) return false; + ItemStack stack = player.getInventory().getItem(slot); + if(!(stack.getItem() instanceof AbstractManaPotion potion)) return false; + return potion.tryDrink(player, stack); } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java index 02cf75b..2a0c7fa 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java @@ -1,5 +1,9 @@ package com.lzxnone.terraria.item.weapon; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import com.lzxnone.terraria.item.effect.MeleeDamageModifier; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; public class MeleeWeapon extends Weapon { @@ -10,4 +14,17 @@ public class MeleeWeapon extends Weapon { public MeleeWeapon(Properties properties) { super(properties); } + + public static float applyMeleeDamageBonus(ItemStack stack, LivingEntity entity, float damage) { + double finalDamage = damage; + //饰品 + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { + if(accessory instanceof MeleeDamageModifier modifier) { + multiplier[0] *= modifier.getMeleeDamageModifier(accessoryStack, entity); + } + }); + finalDamage *= multiplier[0]; + return (float)Math.max(0.0D, finalDamage); + } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java index c01afa4..7e327a0 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java @@ -3,6 +3,9 @@ package com.lzxnone.terraria.item.weapon; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import com.lzxnone.terraria.item.effect.RangedDamageModifier; +import com.lzxnone.terraria.item.effect.SummonDamageModifier; import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; @@ -50,6 +53,22 @@ public class RangedWeapon extends Weapon { return null; } + public static float applyRangedDamageBonus(ItemStack stack, LivingEntity entity, float damage) { + double finalDamage = damage; + //火药 + int gunpowderLevel = getEnchantmentLevel(entity, stack, ModEnchantments.GUNPOWDER); + finalDamage *= Math.pow(ModEnchantmentConfigs.getGunpowderDamageMultiplier(), gunpowderLevel); + //饰品 + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { + if(accessory instanceof RangedDamageModifier modifier) { + multiplier[0] *= modifier.getRangedDamageModifier(accessoryStack, entity); + } + }); + finalDamage *= multiplier[0]; + return (float)Math.max(0.0D, finalDamage); + } + public int getFinalAmmoConsumeAmount(ItemStack weaponStack, LivingEntity entity, int amount) { if(amount <= 0) return 0; int exhaustionLevel = getEnchantmentLevel(entity, weaponStack, ModEnchantments.AMMO_EXHAUSTION); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java index 9e9cb2e..196aa94 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java @@ -2,12 +2,11 @@ package com.lzxnone.terraria.item.weapon; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.enchantment.ModEnchantments; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import com.lzxnone.terraria.item.effect.SummonDamageModifier; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; -import net.minecraft.world.item.enchantment.Enchantment; public class SummonWeapon extends Weapon { public SummonWeapon(Tier tier, Properties properties) { @@ -16,9 +15,17 @@ public class SummonWeapon extends Weapon { public static float applySummonDamageBonus(ItemStack stack, LivingEntity entity, float damage) { double finalDamage = damage; + //召唤增幅 int amplificationLevel = getEnchantmentLevel(entity, stack, ModEnchantments.SUMMON_AMPLIFICATION); - finalDamage *= Math.pow(ModEnchantmentConfigs.getSummonAmplificationDamageMultiplier(), amplificationLevel); + //饰品 + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { + if(accessory instanceof SummonDamageModifier modifier) { + multiplier[0] *= modifier.getSummonDamageMultiplier(accessoryStack, entity); + } + }); + finalDamage *= multiplier[0]; return (float)Math.max(0.0D, finalDamage); } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java index 9619658..4f2b725 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java @@ -87,7 +87,7 @@ public class ElfMelter extends RangedWeapon { for(Entity target : targets) { if(target.getBoundingBox().inflate(1.0).clip(collisionStart, end).isEmpty()) continue; ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); - if(DamageUtil.rangedAttack(summon, target, sourceStack, DAMAGE.get(), 0.25f)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, DAMAGE.get(), -0.25f)) { target.invulnerableTime = 12; if(target instanceof LivingEntity livingTarget) { livingTarget.setTicksFrozen(Math.max(livingTarget.getTicksFrozen(), FREEZE_TICKS.get())); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java index 5b281ec..8472374 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java @@ -113,7 +113,7 @@ public class Flamethrower extends RangedWeapon { for(Entity target : targets) { if(target.getBoundingBox().inflate(1.0).clip(collisionStart, end).isEmpty()) continue; ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); - if(DamageUtil.rangedAttack(summon, target, sourceStack, DAMAGE.get(), 0.25f)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, DAMAGE.get(), -0.25f)) { target.invulnerableTime = 12; if(target instanceof LivingEntity livingTarget) { livingTarget.igniteForTicks(IGNITE_TICKS.get()); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/MinionWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/MinionWeapon.java index 3fdff7d..f501929 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/MinionWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/MinionWeapon.java @@ -7,11 +7,12 @@ import com.lzxnone.terraria.effect.SummonEffect; import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.network.PlayerSummonSync; +import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import com.lzxnone.terraria.item.effect.MinionCountModifier; +import com.lzxnone.terraria.item.effect.MinionKnockbackModifier; import com.lzxnone.terraria.item.weapon.SummonWeapon; import com.lzxnone.terraria.utils.CollisionUtil; import com.lzxnone.terraria.utils.FilterUtil; -import net.minecraft.ChatFormatting; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -22,10 +23,8 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.boss.EnderDragonPart; import net.minecraft.world.entity.boss.enderdragon.EnderDragon; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; -import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.ClipContext; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; @@ -46,7 +45,24 @@ public class MinionWeapon extends SummonWeapon { public static int getMaxSummonCount(Player player) { MobEffectInstance instance = player.getEffect(ModEffects.SUMMON); - return 1 + (instance == null ? 0 : (instance.getAmplifier() + 1) * SummonEffect.getSummonCountPerLevel()); + int summonCount = 1 + (instance == null ? 0 : (instance.getAmplifier() + 1) * SummonEffect.getSummonCountPerLevel()); + int[] accessoryBonus = {0}; + AccessoryUtil.forEachAccessory(player, (accessory, stack) -> { + if(accessory instanceof MinionCountModifier modifier) { + accessoryBonus[0] += modifier.getMinionCountBonus(stack, player); + } + }); + return summonCount + accessoryBonus[0]; + } + + public static float applyMinionKnockback(Player player, float knockbackScale) { + double[] multiplier = {1.0D}; + AccessoryUtil.forEachAccessory(player, (accessory, stack) -> { + if(accessory instanceof MinionKnockbackModifier modifier) { + multiplier[0] *= modifier.getMinionKnockbackMultiplier(stack, player); + } + }); + return knockbackScale * (float) multiplier[0]; } public static int getSummonCount(Player player, String id) { diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java index 24ccc07..046ebb2 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java @@ -158,9 +158,10 @@ public class StardustDragonStaff extends MinionWeapon { } } float damage = DAMAGE.get() + ADD_DAMAGE.get() * Math.max(0, stardustDragonSlotCount - 1); + float knockback = summon.getOwner() instanceof Player p ? MinionWeapon.applyMinionKnockback(p, 1.0f) : 1.0f; for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, damage, 1.0f)) target.invulnerableTime = 15; + if(DamageUtil.summonAttack(summon, target, sourceStack, damage, knockback)) target.invulnerableTime = 15; } } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java index 334c83d..38830a9 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java @@ -226,8 +226,9 @@ public class Terraprisma extends MinionWeapon { FilterUtil.createTargetFilter(summon, player) ); ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + float knockback = MinionWeapon.applyMinionKnockback(player, 1.0f); for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), 1.0f)) target.invulnerableTime = 15; + if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), knockback)) target.invulnerableTime = 15; } }else if(state == State.ROTATE.ordinal()) { int time = customData.contains("rotateTime") ? customData.getInt("rotateTime") : 0; @@ -277,8 +278,9 @@ public class Terraprisma extends MinionWeapon { ); ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + float knockback = MinionWeapon.applyMinionKnockback(player, 1.0f); for(Entity target : targets) { - if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), 1.0f)) target.invulnerableTime = 15; + if(DamageUtil.summonAttack(summon, target, sourceStack, customData.contains("damage") ? customData.getFloat("damage") : DAMAGE.get(), knockback)) target.invulnerableTime = 15; } customData.putInt("rotateTime", time + 1); diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java index f50df05..b24c384 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -13,6 +13,20 @@ import com.lzxnone.terraria.client.config.RenderConfigs; import com.lzxnone.terraria.item.ammo.*; import com.lzxnone.terraria.item.accessory.ManaFlower; import com.lzxnone.terraria.item.accessory.NaturesGift; +import com.lzxnone.terraria.item.accessory.ArmorPolish; +import com.lzxnone.terraria.item.accessory.ArmorBracing; +import com.lzxnone.terraria.item.accessory.AnkhCharm; +import com.lzxnone.terraria.item.accessory.CobaltShield; +import com.lzxnone.terraria.item.accessory.ObsidianShield; +import com.lzxnone.terraria.item.accessory.AnkhShield; +import com.lzxnone.terraria.item.accessory.HerculesBeetle; +import com.lzxnone.terraria.item.accessory.NecromanticScroll; +import com.lzxnone.terraria.item.accessory.PapyrusScarab; +import com.lzxnone.terraria.item.accessory.PygmyNecklace; +import com.lzxnone.terraria.item.accessory.WarriorEmblem; +import com.lzxnone.terraria.item.accessory.SummonerEmblem; +import com.lzxnone.terraria.item.accessory.RangerEmblem; +import com.lzxnone.terraria.item.accessory.SorcererEmblem; import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.BeeKeeper; import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass; @@ -144,7 +158,21 @@ public class ConfigList { }); ITEMS.put(ACCESSORY, new ConfigListItem[]{ NaturesGift.CONFIG_LIST_ITEM, - ManaFlower.CONFIG_LIST_ITEM + ArmorPolish.CONFIG_LIST_ITEM, + ArmorBracing.CONFIG_LIST_ITEM, + AnkhCharm.CONFIG_LIST_ITEM, + CobaltShield.CONFIG_LIST_ITEM, + ObsidianShield.CONFIG_LIST_ITEM, + AnkhShield.CONFIG_LIST_ITEM, + ManaFlower.CONFIG_LIST_ITEM, + HerculesBeetle.CONFIG_LIST_ITEM, + NecromanticScroll.CONFIG_LIST_ITEM, + PapyrusScarab.CONFIG_LIST_ITEM, + PygmyNecklace.CONFIG_LIST_ITEM, + WarriorEmblem.CONFIG_LIST_ITEM, + SummonerEmblem.CONFIG_LIST_ITEM, + RangerEmblem.CONFIG_LIST_ITEM, + SorcererEmblem.CONFIG_LIST_ITEM }); ITEMS.put(ENCHANTMENT, new ConfigListItem[]{ ModEnchantmentConfigs.MANA_LEAK_CONFIG_LIST_ITEM, diff --git a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java index 5d48d34..afac42f 100644 --- a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java @@ -10,6 +10,8 @@ import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.weapon.MagicWeapon; +import com.lzxnone.terraria.item.weapon.MeleeWeapon; +import com.lzxnone.terraria.item.weapon.RangedWeapon; import com.lzxnone.terraria.item.weapon.SummonWeapon; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; @@ -78,13 +80,14 @@ public class DamageUtil { //应用附魔 if(category == DamageCategory.MELEE && !itemSource.isEmpty()) { finalDamage = EnchantmentHelper.modifyDamage(serverLevel, itemSource, target, source, finalDamage); + finalDamage = MeleeWeapon.applyMeleeDamageBonus(itemSource, player, finalDamage); knockbackLevel = EnchantmentHelper.modifyKnockback(serverLevel, itemSource, target, source, knockbackLevel); }else if(category == DamageCategory.SUMMON && !itemSource.isEmpty()) { finalDamage = SummonWeapon.applySummonDamageBonus(itemSource, player, finalDamage); }else if(category == DamageCategory.MAGIC && !itemSource.isEmpty()) { finalDamage = MagicWeapon.applyMagicDamageBonus(itemSource, player, finalDamage); }else if(category == DamageCategory.RANGED && !itemSource.isEmpty()) { - finalDamage = applyRangedDamageBonus(itemSource, player, finalDamage); + finalDamage = RangedWeapon.applyRangedDamageBonus(itemSource, player, finalDamage); } if(category != DamageCategory.REAL) { finalDamage = applyTargetDamageEffects(target, finalDamage); @@ -135,14 +138,6 @@ public class DamageUtil { return Math.max(0.0F, finalDamage); } - private static float applyRangedDamageBonus(ItemStack stack, LivingEntity entity, float damage) { - double finalDamage = damage; - int gunpowderLevel = getEnchantmentLevel(entity, stack, ModEnchantments.GUNPOWDER); - - finalDamage *= Math.pow(ModEnchantmentConfigs.getGunpowderDamageMultiplier(), gunpowderLevel); - return (float)Math.max(0.0D, finalDamage); - } - private static float applyTargetDamageEffects(Entity target, float damage) { if(!(target instanceof LivingEntity livingTarget)) return damage; @@ -154,14 +149,6 @@ public class DamageUtil { return Math.max(0.0F, finalDamage); } - private static int getEnchantmentLevel(LivingEntity entity, ItemStack stack, ResourceKey enchantment) { - return entity.registryAccess() - .lookupOrThrow(Registries.ENCHANTMENT) - .get(enchantment) - .map(stack::getEnchantmentLevel) - .orElse(0); - } - private static Player getAttackOwner(Entity attackEntity) { if(attackEntity instanceof Player player) return player; if(attackEntity instanceof StaticProjectile projectile) return getAttackOwner(projectile.getOwner()); diff --git a/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java b/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java deleted file mode 100644 index a39707f..0000000 --- a/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.lzxnone.terraria.utils; - -import com.lzxnone.terraria.item.potion.AbstractManaPotion; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; - -public class ManaPotionUtil { - public static boolean hasManaPotion(Player player) { - return findManaPotionSlot(player) >= 0; - } - - public static boolean tryUseManaPotion(ServerPlayer player) { - int slot = findManaPotionSlot(player); - if(slot < 0) return false; - - ItemStack stack = player.getInventory().getItem(slot); - if(!(stack.getItem() instanceof AbstractManaPotion potion)) return false; - return potion.tryDrink(player, stack); - } - - private static int findManaPotionSlot(Player player) { - for(int i = 0; i < player.getInventory().getContainerSize(); i++) { - ItemStack stack = player.getInventory().getItem(i); - if(getManaRecoverAmount(stack) > 0) { - return i; - } - } - return -1; - } - - private static int getManaRecoverAmount(ItemStack stack) { - if(stack.getItem() instanceof AbstractManaPotion potion) return potion.getRecoverAmount(); - return 0; - } -} diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 073eb1d..25de151 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -87,6 +87,34 @@ "item.lzxnoneterraria.fallen_star": "Fallen Star", "item.lzxnoneterraria.natures_gift": "Nature's Gift", "item.lzxnoneterraria.mana_flower": "Mana Flower", + "item.lzxnoneterraria.armor_polish": "Armor Polish", + "item.lzxnoneterraria.megaphone": "Megaphone", + "item.lzxnoneterraria.nazar": "Nazar", + "item.lzxnoneterraria.pocket_mirror": "Pocket Mirror", + "item.lzxnoneterraria.reflective_shades": "Reflective Shades", + "item.lzxnoneterraria.armor_bracing": "Armor Bracing", + "item.lzxnoneterraria.countercurse_mantra": "Countercurse Mantra", + "item.lzxnoneterraria.ankh_charm": "Ankh Charm", + "item.lzxnoneterraria.obsidian_skull": "Obsidian Skull", + "item.lzxnoneterraria.cobalt_shield": "Cobalt Shield", + "item.lzxnoneterraria.obsidian_shield": "Obsidian Shield", + "item.lzxnoneterraria.ankh_shield": "Ankh Shield", + "item.lzxnoneterraria.bezoar": "Bezoar", + "item.lzxnoneterraria.blindfold": "Blindfold", + "item.lzxnoneterraria.fast_clock": "Fast Clock", + "item.lzxnoneterraria.vitamins": "Vitamins", + "item.lzxnoneterraria.adhesive_bandage": "Adhesive Bandage", + "item.lzxnoneterraria.medicated_bandage": "Medicated Bandage", + "item.lzxnoneterraria.trifold_map": "Trifold Map", + "item.lzxnoneterraria.the_plan": "The Plan", + "item.lzxnoneterraria.hercules_beetle": "Hercules Beetle", + "item.lzxnoneterraria.necromantic_scroll": "Necromantic Scroll", + "item.lzxnoneterraria.papyrus_scarab": "Papyrus Scarab", + "item.lzxnoneterraria.pygmy_necklace": "Pygmy Necklace", + "item.lzxnoneterraria.warrior_emblem": "Warrior Emblem", + "item.lzxnoneterraria.summoner_emblem": "Summoner Emblem", + "item.lzxnoneterraria.ranger_emblem": "Ranger Emblem", + "item.lzxnoneterraria.sorcerer_emblem": "Sorcerer Emblem", "item.lzxnoneterraria.mana_crystal": "Mana Crystal", "item.lzxnoneterraria.summoning_potion": "Summoning Potion", "item.lzxnoneterraria.lesser_mana_potion": "Lesser Mana Potion", @@ -122,17 +150,71 @@ "tooltip.lzxnoneterraria.absolute_distance": "Absolute Distance", "tooltip.lzxnoneterraria.zoom": "Zoom", "tooltip.lzxnoneterraria.ammo": "Ammo: %s", + "tooltip.lzxnoneterraria.minion_weapon_minion_count": "Minion Count: %s", "tooltip.lzxnoneterraria.devils_devastation_kill_mode": "Kill Mode", "tooltip.lzxnoneterraria.devils_devastation.0": "The perfect blade of the Underworld, wielding the power of Brimstone directly.", "tooltip.lzxnoneterraria.devils_devastation.1": "Humans understand this force as Havoc, the inevitable sundering of all order in fire.", "tooltip.lzxnoneterraria.devils_devastation.2": "Perhaps this is why the Brimstone Elemental had strength unrivaled by her sisters.", - "tooltip.lzxnoneterraria.natures_gift.0": "%s%% reduced mana cost", - "tooltip.lzxnoneterraria.mana_flower.0": "%s%% reduced mana cost", - "tooltip.lzxnoneterraria.mana_flower.1": "Automatically uses mana potions when mana runs out", "tooltip.lzxnoneterraria.mana_crystal": "Permanently increases maximum mana by 20, up to 200", + "tooltip.lzxnoneterraria.summoning_potion": "Increases minion capacity by %s for 8 minutes", "tooltip.lzxnoneterraria.mana_potion": "Restores %s mana", - "tooltip.lzxnoneterraria.minion_weapon_minion_count": "Minion Count: %s", + + "curios.modifiers.terraria_accessory" : "Accessory Attribute Bonus", + "tooltip.lzxnoneterraria.poison_immunity": "Poison Immunity", + "tooltip.lzxnoneterraria.darkness_immunity": "Darkness Immunity", + "tooltip.lzxnoneterraria.slowness_immunity": "Slowness Immunity", + "tooltip.lzxnoneterraria.weakness_immunity": "Weakness Immunity", + "tooltip.lzxnoneterraria.bleed_immunity": "Bleed Immunity", + "tooltip.lzxnoneterraria.confused_immunity": "Confused Immunity", + "tooltip.lzxnoneterraria.wither_immunity": "Wither Immunity", + "tooltip.lzxnoneterraria.levitation_immunity": "Levitation Immunity", + "tooltip.lzxnoneterraria.mining_fatigue_immunity": "Mining Fatigue Immunity", + "tooltip.lzxnoneterraria.armor_toughness_bonus": "Armor Toughness +%s", + "tooltip.lzxnoneterraria.knockback_resistance_bonus": "Knockback Resistance +%s%%", + "tooltip.lzxnoneterraria.defense_bonus": "Defense +%s", + "tooltip.lzxnoneterraria.fire_block_immunity": "Immune to Fire Blocks", + + "tooltip.lzxnoneterraria.melee_damage_increase": "+%s%% melee damage", + "tooltip.lzxnoneterraria.melee_damage_decrease": "-%s%% melee damage", + "lzxnoneterraria.configuration.melee_damage_multiplier": "Melee Damage Multiplier", + "lzxnoneterraria.configuration.melee_damage_multiplier.tooltip": "Melee damage is multiplied by this value while equipped", + "lzxnoneterraria.configuration.armor_toughness": "Armor Toughness", + "lzxnoneterraria.configuration.armor_toughness.tooltip": "Grants this amount of armor toughness while equipped", + "lzxnoneterraria.configuration.ankh_charm_armor_toughness": "Ankh Charm Armor Toughness", + "lzxnoneterraria.configuration.ankh_charm_armor_toughness.tooltip": "Grants this amount of armor toughness while equipped", + "lzxnoneterraria.configuration.knockback_resistance": "Knockback Resistance", + "lzxnoneterraria.configuration.knockback_resistance.tooltip": "Grants this amount of knockback resistance while equipped", + "lzxnoneterraria.configuration.defense": "Defense", + "lzxnoneterraria.configuration.defense.tooltip": "Grants this amount of armor while equipped", + + "tooltip.lzxnoneterraria.ranged_damage_increase": "+%s%% ranged damage", + "tooltip.lzxnoneterraria.ranged_damage_decrease": "-%s%% ranged damage", + "lzxnoneterraria.configuration.ranged_damage_multiplier": "Ranged Damage Multiplier", + "lzxnoneterraria.configuration.ranged_damage_multiplier.tooltip": "Ranged damage is multiplied by this value while equipped", + + "tooltip.lzxnoneterraria.magic_damage_increase": "+%s%% magic damage", + "tooltip.lzxnoneterraria.magic_damage_decrease": "-%s%% magic damage", + "lzxnoneterraria.configuration.magic_damage_multiplier": "Magic Damage Multiplier", + "lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "Magic damage is multiplied by this value while equipped", + "tooltip.lzxnoneterraria.mana_cost_increase": "+%s%% mana cost", + "tooltip.lzxnoneterraria.mana_cost_decrease": "-%s%% mana cost", + "tooltip.lzxnoneterraria.auto_mana_potion_use": "Automatically uses mana potions when mana runs out", + "lzxnoneterraria.configuration.mana_cost_multiplier": "Mana Cost Multiplier", + "lzxnoneterraria.configuration.mana_cost_multiplier.tooltip": "Mana cost is multiplied by this value while equipped", + + "tooltip.lzxnoneterraria.summon_damage_increase": "+%s%% summon damage", + "tooltip.lzxnoneterraria.summon_damage_decrease": "-%s%% summon damage", + "tooltip.lzxnoneterraria.minion_knockback_increase": "+%s%% minion knockback", + "tooltip.lzxnoneterraria.minion_knockback_decrease": "-%s%% minion knockback", + "tooltip.lzxnoneterraria.minion_slot_add": "+%s minion capacity", + "tooltip.lzxnoneterraria.minion_slot_remove": "-%s minion capacity", + "lzxnoneterraria.configuration.summon_damage_multiplier": "Summon Damage Multiplier", + "lzxnoneterraria.configuration.summon_damage_multiplier.tooltip": "Summon damage is multiplied by this value while equipped", + "lzxnoneterraria.configuration.minion_knockback_multiplier": "Minion Knockback Multiplier", + "lzxnoneterraria.configuration.minion_knockback_multiplier.tooltip": "Minion knockback is multiplied by this value while equipped", + "lzxnoneterraria.configuration.minion_count_bonus": "Minion Count Bonus", + "lzxnoneterraria.configuration.minion_count_bonus.tooltip": "Extra minion capacity granted while equipped", "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.", @@ -193,12 +275,6 @@ "lzxnoneterraria.configuration.gunpowder_damage_multiplier.tooltip": "Ranged weapon damage multiplier per Gunpowder level", "lzxnoneterraria.configuration.steady_breath_spread_multiplier": "Spread Multiplier", "lzxnoneterraria.configuration.steady_breath_spread_multiplier.tooltip": "Ranged weapon spread multiplier per Steady Breath level", - "lzxnoneterraria.configuration.natures_gift_settings": "Nature's Gift Settings", - "lzxnoneterraria.configuration.natures_gift_mana_cost_multiplier": "Mana Cost Multiplier", - "lzxnoneterraria.configuration.natures_gift_mana_cost_multiplier.tooltip": "Mana cost is multiplied by this value while equipped", - "lzxnoneterraria.configuration.mana_flower_settings": "Mana Flower Settings", - "lzxnoneterraria.configuration.mana_flower_mana_cost_multiplier": "Mana Cost Multiplier", - "lzxnoneterraria.configuration.mana_flower_mana_cost_multiplier.tooltip": "Mana cost is multiplied by this value while equipped", "lzxnoneterraria.configuration.render_settings": "Render Settings", "lzxnoneterraria.configuration.render_mixin_render_hand": "Enable renderHand", "lzxnoneterraria.configuration.render_mixin_render_hand.tooltip": "Enables the first-person hand rendering mixin", @@ -212,55 +288,44 @@ "lzxnoneterraria.configuration.render_mana_bar_x.tooltip": "Screen X coordinate of the mana bar's top-left corner", "lzxnoneterraria.configuration.render_mana_bar_y": "Mana Bar Y", "lzxnoneterraria.configuration.render_mana_bar_y.tooltip": "Screen Y coordinate of the mana bar's top-left corner", - "lzxnoneterraria.configuration.effect_settings": "Effect Settings", "lzxnoneterraria.configuration.blood_butcherer_damage_per_level": "Blood Butcherer Effect Damage Per Level", "lzxnoneterraria.configuration.blood_butcherer_damage_per_level.tooltip": "Damage dealt per effect level", "lzxnoneterraria.configuration.demonic_flames_damage_per_level": "Demonic Flames Damage Per Level", "lzxnoneterraria.configuration.demonic_flames_damage_per_level.tooltip": "Damage dealt per effect level", - "lzxnoneterraria.configuration.cursed_inferno_settings": "Cursed Inferno Settings", "lzxnoneterraria.configuration.cursed_inferno_damage_per_level": "Damage Per Level", "lzxnoneterraria.configuration.cursed_inferno_damage_per_level.tooltip": "Cursed Inferno checks damage once per second; damage dealt per effect level", - "lzxnoneterraria.configuration.ichor_settings": "Ichor Settings", "lzxnoneterraria.configuration.ichor_damage_bonus_per_level": "Damage Bonus Per Level", "lzxnoneterraria.configuration.ichor_damage_bonus_per_level.tooltip": "Extra damage taken per Ichor level on the target; default 0.15 means 15%", - "lzxnoneterraria.configuration.acid_venom_settings": "Acid Venom Settings", "lzxnoneterraria.configuration.acid_venom_damage_per_level": "Damage Per Level", "lzxnoneterraria.configuration.acid_venom_damage_per_level.tooltip": "Acid Venom checks damage once per second; damage dealt per effect level", - "lzxnoneterraria.configuration.midas_settings": "Midas Settings", "lzxnoneterraria.configuration.midas_drop_chance": "Emerald Drop Chance", "lzxnoneterraria.configuration.midas_drop_chance.tooltip": "Chance for an entity with Midas to drop one emerald on death, from 0 to 1", - "lzxnoneterraria.configuration.mana_sickness_settings": "Mana Sickness Settings", "lzxnoneterraria.configuration.mana_sickness_duration_per_use": "Duration Added Per Use", "lzxnoneterraria.configuration.mana_sickness_duration_per_use.tooltip": "Mana Sickness duration added by each mana potion use, in ticks", "lzxnoneterraria.configuration.mana_sickness_max_duration": "Max Duration", "lzxnoneterraria.configuration.mana_sickness_max_duration.tooltip": "Maximum Mana Sickness duration that can be stacked, in ticks", "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction": "Max Magic Damage Reduction", "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction.tooltip": "Magic damage reduction at maximum duration, from 0 to 1", - "lzxnoneterraria.configuration.summon_settings": "Summon Settings", "lzxnoneterraria.configuration.summon_summon_count_per_level": "Minion Count Per Level", "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "Extra minion count granted by each level of the summon effect", - "lzxnoneterraria.configuration.enchanted_sword_settings": "Enchanted Sword Settings", "lzxnoneterraria.configuration.enchanted_sword_damage": "Projectile Damage", "lzxnoneterraria.configuration.enchanted_sword_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.enchanted_sword_lifetime": "Projectile Lifetime", "lzxnoneterraria.configuration.enchanted_sword_lifetime.tooltip": "Projectile duration in ticks", "lzxnoneterraria.configuration.enchanted_sword_speed": "Projectile Speed", "lzxnoneterraria.configuration.enchanted_sword_speed.tooltip": "Projectile movement speed", - "lzxnoneterraria.configuration.bee_keeper_settings": "Bee Keeper Settings", "lzxnoneterraria.configuration.bee_keeper_max_bees": "Max Bees", "lzxnoneterraria.configuration.bee_keeper_max_bees.tooltip": "Maximum number of bees spawned per hit", "lzxnoneterraria.configuration.bee_keeper_confusion_duration": "Confusion Duration", "lzxnoneterraria.configuration.bee_keeper_confusion_duration.tooltip": "Confusion effect duration in ticks (0 = disabled)", "lzxnoneterraria.configuration.bee_keeper_bee_damage": "Bee Damage", "lzxnoneterraria.configuration.bee_keeper_bee_damage.tooltip": "Damage dealt by each bee", - "lzxnoneterraria.configuration.starfury_settings": "Starfury Settings", "lzxnoneterraria.configuration.starfury_damage": "Projectile Damage", "lzxnoneterraria.configuration.starfury_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.starfury_max_range": "Max Range", "lzxnoneterraria.configuration.starfury_max_range.tooltip": "Maximum projectile travel range", "lzxnoneterraria.configuration.starfury_speed": "Projectile Speed", "lzxnoneterraria.configuration.starfury_speed.tooltip": "Projectile movement speed", - "lzxnoneterraria.configuration.seedler_settings": "Seedler Settings", "lzxnoneterraria.configuration.seedler_nut_gravity": "Nut Gravity", "lzxnoneterraria.configuration.seedler_nut_gravity.tooltip": "Gravity applied to nuts", "lzxnoneterraria.configuration.seedler_nut_bounce": "Nut Bounce", @@ -273,7 +338,6 @@ "lzxnoneterraria.configuration.seedler_thorn_lifetime.tooltip": "Thorn duration in ticks", "lzxnoneterraria.configuration.seedler_thorn_speed": "Thorn Speed", "lzxnoneterraria.configuration.seedler_thorn_speed.tooltip": "Thorn movement speed", - "lzxnoneterraria.configuration.horsemans_blade_settings": "Horseman's Blade Settings", "lzxnoneterraria.configuration.horsemans_blade_rotate_range": "Blade Rotate Range", "lzxnoneterraria.configuration.horsemans_blade_rotate_range.tooltip": "Blade rotation angle range", "lzxnoneterraria.configuration.horsemans_blade_max_hit_count": "Blade Max Hit Count", @@ -288,7 +352,6 @@ "lzxnoneterraria.configuration.horsemans_pumpkin_damage.tooltip": "Damage dealt by pumpkin", "lzxnoneterraria.configuration.horsemans_pumpkin_max_target_range": "Pumpkin Max Target Range", "lzxnoneterraria.configuration.horsemans_pumpkin_max_target_range.tooltip": "Maximum target acquisition range for pumpkins", - "lzxnoneterraria.configuration.influx_waver_settings": "Influx Waver Settings", "lzxnoneterraria.configuration.influx_waver_damage": "Projectile Damage", "lzxnoneterraria.configuration.influx_waver_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.influx_waver_max_count": "Max Projectile Count", @@ -299,14 +362,12 @@ "lzxnoneterraria.configuration.influx_waver_spawn_range.tooltip": "Projectile spawn radius", "lzxnoneterraria.configuration.influx_waver_target_range": "Target Range", "lzxnoneterraria.configuration.influx_waver_target_range.tooltip": "Projectile target acquisition range", - "lzxnoneterraria.configuration.star_wrath_settings": "Star Wrath Settings", "lzxnoneterraria.configuration.star_wrath_damage": "Projectile Damage", "lzxnoneterraria.configuration.star_wrath_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.star_wrath_speed": "Projectile Speed", "lzxnoneterraria.configuration.star_wrath_speed.tooltip": "Projectile movement speed", "lzxnoneterraria.configuration.star_wrath_max_range": "Max Range", "lzxnoneterraria.configuration.star_wrath_max_range.tooltip": "Maximum projectile travel range", - "lzxnoneterraria.configuration.meowmere_settings": "Meowmere Settings", "lzxnoneterraria.configuration.meowmere_damage": "Projectile Damage", "lzxnoneterraria.configuration.meowmere_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.meowmere_gravity": "Projectile Gravity", @@ -331,7 +392,6 @@ "lzxnoneterraria.configuration.terra_projectile_lifetime.tooltip": "Projectile duration in ticks", "lzxnoneterraria.configuration.terra_projectile_damage_decay": "Damage Decay", "lzxnoneterraria.configuration.terra_projectile_damage_decay.tooltip": "Damage decay multiplier per entity hit", - "lzxnoneterraria.configuration.zenith_settings": "Zenith Settings", "lzxnoneterraria.configuration.zenith_damage": "Projectile Damage", "lzxnoneterraria.configuration.zenith_damage.tooltip": "Damage per hit (applied as x~2x this value)", "lzxnoneterraria.configuration.zenith_distance_mode": "Enable Relative Distance Mode", @@ -356,14 +416,12 @@ "lzxnoneterraria.configuration.zenith_trail_alpha.tooltip": "Trail rendering opacity", "lzxnoneterraria.configuration.zenith_trail_max_length": "Trail Length", "lzxnoneterraria.configuration.zenith_trail_max_length.tooltip": "Maximum number of trail segments", - "lzxnoneterraria.configuration.excalibur_settings": "Excalibur Settings", "lzxnoneterraria.configuration.excalibur_rotate_range": "Blade Rotate Range", "lzxnoneterraria.configuration.excalibur_rotate_range.tooltip": "Blade rotation angle range", "lzxnoneterraria.configuration.excalibur_max_hit_count": "Blade Max Hit Count", "lzxnoneterraria.configuration.excalibur_max_hit_count.tooltip": "Maximum entities hit per blade swing", "lzxnoneterraria.configuration.excalibur_damage": "Blade Damage", "lzxnoneterraria.configuration.excalibur_damage.tooltip": "Damage dealt by blade", - "lzxnoneterraria.configuration.nights_edge_settings": "Night's Edge Settings", "lzxnoneterraria.configuration.nights_edge_projectile_align_to_blade": "Projectile Align To Blade", "lzxnoneterraria.configuration.nights_edge_projectile_align_to_blade.tooltip": "Whether projectile direction follows blade direction", "lzxnoneterraria.configuration.nights_edge_rotate_range": "Blade Rotate Range", @@ -384,14 +442,12 @@ "lzxnoneterraria.configuration.nights_edge_projectile_lifetime.tooltip": "Projectile duration in ticks", "lzxnoneterraria.configuration.nights_edge_projectile_rotation_speed": "Projectile Rotation Speed", "lzxnoneterraria.configuration.nights_edge_projectile_rotation_speed.tooltip": "Projectile rotation speed", - "lzxnoneterraria.configuration.true_excalibur_settings": "True Excalibur Settings", "lzxnoneterraria.configuration.true_excalibur_rotate_range": "Blade Rotate Range", "lzxnoneterraria.configuration.true_excalibur_rotate_range.tooltip": "Blade rotation angle range", "lzxnoneterraria.configuration.true_excalibur_max_hit_count": "Blade Max Hit Count", "lzxnoneterraria.configuration.true_excalibur_max_hit_count.tooltip": "Maximum entities hit per blade swing", "lzxnoneterraria.configuration.true_excalibur_damage": "Blade Damage", "lzxnoneterraria.configuration.true_excalibur_damage.tooltip": "Damage dealt by blade", - "lzxnoneterraria.configuration.true_nights_edge_settings": "True Night's Edge Settings", "lzxnoneterraria.configuration.true_nights_edge_projectile_align_to_blade": "Projectile Align To Blade", "lzxnoneterraria.configuration.true_nights_edge_projectile_align_to_blade.tooltip": "Whether projectile direction follows blade direction", "lzxnoneterraria.configuration.true_nights_edge_rotate_range": "Blade Rotate Range", @@ -414,22 +470,18 @@ "lzxnoneterraria.configuration.true_nights_edge_projectile_lifetime.tooltip": "Projectile duration in ticks", "lzxnoneterraria.configuration.true_nights_edge_projectile_rotation_speed": "Projectile Rotation Speed", "lzxnoneterraria.configuration.true_nights_edge_projectile_rotation_speed.tooltip": "Projectile rotation speed", - "lzxnoneterraria.configuration.lights_bane_settings": "Lights Bane Settings", "lzxnoneterraria.configuration.lights_bane_big_damage": "Big Slash Damage", "lzxnoneterraria.configuration.lights_bane_big_damage.tooltip": "Damage dealt by big slash", "lzxnoneterraria.configuration.lights_bane_small_damage": "Small Slash Damage", "lzxnoneterraria.configuration.lights_bane_small_damage.tooltip": "Damage dealt by small slash", "lzxnoneterraria.configuration.lights_bane_target_range": "Target Acquisition Range", "lzxnoneterraria.configuration.lights_bane_target_range.tooltip": "Range to search for nearby enemies", - "lzxnoneterraria.configuration.blood_butcherer_settings": "Blood Butcherer Settings", "lzxnoneterraria.configuration.blood_butcherer_effect_duration": "Butchery Effect Duration", "lzxnoneterraria.configuration.blood_butcherer_effect_duration.tooltip": "Duration of the butchery effect in ticks", "lzxnoneterraria.configuration.blood_butcherer_max_level": "Max Butchery Level", "lzxnoneterraria.configuration.blood_butcherer_max_level.tooltip": "Maximum stackable level of the butchery effect", - "lzxnoneterraria.configuration.muramasa_settings": "Muramasa Settings", "lzxnoneterraria.configuration.muramasa_beam_damage": "Beam Damage", "lzxnoneterraria.configuration.muramasa_beam_damage.tooltip": "Damage dealt by the blue beam", - "lzxnoneterraria.configuration.blade_of_grass_settings": "Blade of Grass Settings", "lzxnoneterraria.configuration.blade_of_grass_projectile_damage": "Projectile Damage", "lzxnoneterraria.configuration.blade_of_grass_projectile_damage.tooltip": "Damage per projectile hit", "lzxnoneterraria.configuration.blade_of_grass_effect_duration": "Effect Duration", @@ -444,7 +496,6 @@ "lzxnoneterraria.configuration.blade_of_grass_radius_growth.tooltip": "Projectile orbit radius growth per tick", "lzxnoneterraria.configuration.blade_of_grass_rotation_speed": "Rotation Speed", "lzxnoneterraria.configuration.blade_of_grass_rotation_speed.tooltip": "Projectile orbit rotation speed per tick", - "lzxnoneterraria.configuration.volcano_settings": "Volcano Settings", "lzxnoneterraria.configuration.volcano_explosion_range": "Explosion Range", "lzxnoneterraria.configuration.volcano_explosion_range.tooltip": "Explosion radius", "lzxnoneterraria.configuration.volcano_explosion_damage": "Explosion Damage", @@ -453,14 +504,12 @@ "lzxnoneterraria.configuration.volcano_explosion_max_hit_count.tooltip": "Maximum entities hit per explosion", "lzxnoneterraria.configuration.volcano_ignite_seconds": "Ignite Duration", "lzxnoneterraria.configuration.volcano_ignite_seconds.tooltip": "Duration of the fire effect in seconds", - "lzxnoneterraria.configuration.terragrim_settings": "Terragrim Settings", "lzxnoneterraria.configuration.terragrim_hit_range": "Hit Range", "lzxnoneterraria.configuration.terragrim_hit_range.tooltip": "AABB collision box range", "lzxnoneterraria.configuration.terragrim_damage": "Damage", "lzxnoneterraria.configuration.terragrim_damage.tooltip": "Damage per tick", "lzxnoneterraria.configuration.terragrim_rotate_range": "Blade Rotate Range", "lzxnoneterraria.configuration.terragrim_rotate_range.tooltip": "Blade rotation angle range", - "lzxnoneterraria.configuration.first_fractal_settings": "First Fractal Settings", "lzxnoneterraria.configuration.first_fractal_projectile_damage": "Projectile Damage", "lzxnoneterraria.configuration.first_fractal_projectile_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.first_fractal_bounding_box_size": "Bounding Box Size", @@ -477,7 +526,6 @@ "lzxnoneterraria.configuration.first_fractal_max_range.tooltip": "Maximum projectile travel range", "lzxnoneterraria.configuration.first_fractal_spawn_range": "Spawn Range", "lzxnoneterraria.configuration.first_fractal_spawn_range.tooltip": "Projectile spawn radius around target", - "lzxnoneterraria.configuration.mace_settings": "Mace Settings", "lzxnoneterraria.configuration.mace_projectile_speed": "Projectile Speed", "lzxnoneterraria.configuration.mace_projectile_speed.tooltip": "Projectile movement speed", "lzxnoneterraria.configuration.mace_gravity": "Gravity", @@ -488,7 +536,6 @@ "lzxnoneterraria.configuration.mace_fly_time.tooltip": "Maximum projectile fly time in ticks", "lzxnoneterraria.configuration.mace_max_range": "Max Range", "lzxnoneterraria.configuration.mace_max_range.tooltip": "Maximum projectile travel range", - "lzxnoneterraria.configuration.terraprisma_settings": "Terraprisma Settings", "lzxnoneterraria.configuration.terraprisma_target_range": "Target Acquisition Range", "lzxnoneterraria.configuration.terraprisma_target_range.tooltip": "Maximum range for summons to search for and keep targets", "lzxnoneterraria.configuration.terraprisma_follow_speed": "Follow Speed", @@ -505,7 +552,6 @@ "lzxnoneterraria.configuration.terraprisma_rotate_speed.tooltip": "Approximate linear speed along the ellipse during rotate attacks", "lzxnoneterraria.configuration.terraprisma_damage": "Damage", "lzxnoneterraria.configuration.terraprisma_damage.tooltip": "Base damage dealt per summon hit", - "lzxnoneterraria.configuration.stardust_dragon_staff_settings": "Stardust Dragon Staff Settings", "lzxnoneterraria.configuration.stardust_dragon_staff_damage": "Base Damage", "lzxnoneterraria.configuration.stardust_dragon_staff_damage.tooltip": "Default base damage dealt by the Stardust Dragon", "lzxnoneterraria.configuration.stardust_dragon_staff_add_damage": "Slot Damage Bonus", @@ -522,7 +568,6 @@ "lzxnoneterraria.configuration.stardust_dragon_staff_wander_fri.tooltip": "Velocity retention per tick while slowing down from wander", "lzxnoneterraria.configuration.stardust_dragon_staff_dash_fri": "Dash Friction", "lzxnoneterraria.configuration.stardust_dragon_staff_dash_fri.tooltip": "Velocity retention per tick while slowing down from dash", - "lzxnoneterraria.configuration.possession_settings": "Possession Settings", "lzxnoneterraria.configuration.possession_range": "Range", "lzxnoneterraria.configuration.possession_range.tooltip": "Maximum whip strike distance", "lzxnoneterraria.configuration.possession_damage": "Damage", @@ -537,7 +582,6 @@ "lzxnoneterraria.configuration.possession_prophetic_mark_duration.tooltip": "Duration of the prophetic mark applied by Possession, in ticks", "lzxnoneterraria.configuration.possession_max_prophetic_mark_stacks": "Max Prophetic Stacks", "lzxnoneterraria.configuration.possession_max_prophetic_mark_stacks.tooltip": "Maximum number of vision triggers from one prophetic mark", - "lzxnoneterraria.configuration.last_prism_settings": "Last Prism Settings", "lzxnoneterraria.configuration.last_prism_damage": "Damage", "lzxnoneterraria.configuration.last_prism_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.last_prism_charge_time": "Charge Time", @@ -548,19 +592,16 @@ "lzxnoneterraria.configuration.last_prism_max_range.tooltip": "Maximum beam range", "lzxnoneterraria.configuration.last_prism_mana_consume_rate": "Mana Consume Rate", "lzxnoneterraria.configuration.last_prism_mana_consume_rate.tooltip": "Mana consumed per tick while using", - "lzxnoneterraria.configuration.musket_ball_settings": "Musket Ball Settings", "lzxnoneterraria.configuration.musket_ball_base_damage": "Base Damage", "lzxnoneterraria.configuration.musket_ball_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.musket_ball_speed": "Speed", "lzxnoneterraria.configuration.musket_ball_speed.tooltip": "Ammo movement speed per tick", - "lzxnoneterraria.configuration.meteor_shot_settings": "Meteor Shot Settings", "lzxnoneterraria.configuration.meteor_shot_base_damage": "Base Damage", "lzxnoneterraria.configuration.meteor_shot_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.meteor_shot_speed": "Speed", "lzxnoneterraria.configuration.meteor_shot_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.meteor_shot_max_hit": "Max Hit Count", "lzxnoneterraria.configuration.meteor_shot_max_hit.tooltip": "Block collisions and entity hits both count toward this limit", - "lzxnoneterraria.configuration.crystal_bullet_settings": "Crystal Bullet Settings", "lzxnoneterraria.configuration.crystal_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.crystal_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.crystal_bullet_speed": "Speed", @@ -575,21 +616,18 @@ "lzxnoneterraria.configuration.crystal_bullet_fragment_count.tooltip": "Number of crystal fragments spawned after a hit or collision", "lzxnoneterraria.configuration.crystal_bullet_particle_count": "Particle Count", "lzxnoneterraria.configuration.crystal_bullet_particle_count.tooltip": "Number of crystal particles spawned after a hit or collision", - "lzxnoneterraria.configuration.cursed_bullet_settings": "Cursed Bullet Settings", "lzxnoneterraria.configuration.cursed_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.cursed_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.cursed_bullet_speed": "Speed", "lzxnoneterraria.configuration.cursed_bullet_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.cursed_bullet_effect_time": "Effect Duration", "lzxnoneterraria.configuration.cursed_bullet_effect_time.tooltip": "Duration of the effect applied on hit, in ticks", - "lzxnoneterraria.configuration.chlorophyte_bullet_settings": "Chlorophyte Bullet Settings", "lzxnoneterraria.configuration.chlorophyte_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.chlorophyte_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.chlorophyte_bullet_speed": "Speed", "lzxnoneterraria.configuration.chlorophyte_bullet_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.chlorophyte_bullet_target_range": "Target Range", "lzxnoneterraria.configuration.chlorophyte_bullet_target_range.tooltip": "Maximum range for automatic target seeking", - "lzxnoneterraria.configuration.high_velocity_bullet_settings": "High Velocity Bullet Settings", "lzxnoneterraria.configuration.high_velocity_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.high_velocity_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.high_velocity_bullet_speed": "Speed", @@ -598,26 +636,22 @@ "lzxnoneterraria.configuration.high_velocity_bullet_damage_decay.tooltip": "Damage multiplier after each extra hit", "lzxnoneterraria.configuration.high_velocity_bullet_max_hit": "Max Hit Count", "lzxnoneterraria.configuration.high_velocity_bullet_max_hit.tooltip": "Maximum number of entity hits or collisions", - "lzxnoneterraria.configuration.ichor_bullet_settings": "Ichor Bullet Settings", "lzxnoneterraria.configuration.ichor_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.ichor_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.ichor_bullet_speed": "Speed", "lzxnoneterraria.configuration.ichor_bullet_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.ichor_bullet_effect_time": "Effect Duration", "lzxnoneterraria.configuration.ichor_bullet_effect_time.tooltip": "Duration of the effect applied on hit, in ticks", - "lzxnoneterraria.configuration.venom_bullet_settings": "Venom Bullet Settings", "lzxnoneterraria.configuration.venom_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.venom_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.venom_bullet_speed": "Speed", "lzxnoneterraria.configuration.venom_bullet_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.venom_bullet_effect_time": "Effect Duration", "lzxnoneterraria.configuration.venom_bullet_effect_time.tooltip": "Duration of the effect applied on hit, in ticks", - "lzxnoneterraria.configuration.party_bullet_settings": "Party Bullet Settings", "lzxnoneterraria.configuration.party_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.party_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.party_bullet_speed": "Speed", "lzxnoneterraria.configuration.party_bullet_speed.tooltip": "Ammo movement speed per tick", - "lzxnoneterraria.configuration.nano_bullet_settings": "Nano Bullet Settings", "lzxnoneterraria.configuration.nano_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.nano_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.nano_bullet_speed": "Speed", @@ -628,7 +662,6 @@ "lzxnoneterraria.configuration.nano_bullet_max_hit.tooltip": "Maximum number of entity hits or collisions", "lzxnoneterraria.configuration.nano_bullet_effect_time": "Effect Duration", "lzxnoneterraria.configuration.nano_bullet_effect_time.tooltip": "Duration of the effect applied on hit, in ticks", - "lzxnoneterraria.configuration.exploding_bullet_settings": "Exploding Bullet Settings", "lzxnoneterraria.configuration.exploding_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.exploding_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.exploding_bullet_speed": "Speed", @@ -637,113 +670,86 @@ "lzxnoneterraria.configuration.exploding_bullet_knockback_multiplier.tooltip": "Multiplier applied to knockback strength on hit", "lzxnoneterraria.configuration.exploding_bullet_dust_count": "Explosion Dust Count", "lzxnoneterraria.configuration.exploding_bullet_dust_count.tooltip": "Number of dust particles spawned by the explosion", - "lzxnoneterraria.configuration.silver_bullet_settings": "Silver Bullet Settings", "lzxnoneterraria.configuration.silver_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.silver_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.silver_bullet_speed": "Speed", "lzxnoneterraria.configuration.silver_bullet_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.silver_bullet_piglin_damage_multiplier": "Piglin Damage Multiplier", "lzxnoneterraria.configuration.silver_bullet_piglin_damage_multiplier.tooltip": "Damage multiplier against piglins, piglin brutes, zombified piglins, and similar piglin entities", - "lzxnoneterraria.configuration.golden_bullet_settings": "Golden Bullet Settings", "lzxnoneterraria.configuration.golden_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.golden_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.golden_bullet_speed": "Speed", "lzxnoneterraria.configuration.golden_bullet_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.golden_bullet_effect_time": "Midas Duration", "lzxnoneterraria.configuration.golden_bullet_effect_time.tooltip": "Duration of the Midas effect applied by Golden Bullet in ticks", - "lzxnoneterraria.configuration.tungsten_bullet_settings": "Tungsten Bullet Settings", "lzxnoneterraria.configuration.tungsten_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.tungsten_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.tungsten_bullet_speed": "Speed", "lzxnoneterraria.configuration.tungsten_bullet_speed.tooltip": "Ammo movement speed per tick", - "lzxnoneterraria.configuration.luminite_bullet_settings": "Luminite Bullet Settings", "lzxnoneterraria.configuration.luminite_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.luminite_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.luminite_bullet_speed": "Speed", "lzxnoneterraria.configuration.luminite_bullet_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.luminite_bullet_damage_decay": "Damage Decay Multiplier", "lzxnoneterraria.configuration.luminite_bullet_damage_decay.tooltip": "Damage multiplier after each extra hit", - "lzxnoneterraria.configuration.musket_settings": "Musket Settings", "lzxnoneterraria.configuration.musket_damage": "Damage", "lzxnoneterraria.configuration.musket_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.flintlock_pistol_settings": "Flintlock Pistol Settings", "lzxnoneterraria.configuration.flintlock_pistol_damage": "Damage", "lzxnoneterraria.configuration.flintlock_pistol_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.boomstick_settings": "Boomstick Settings", "lzxnoneterraria.configuration.boomstick_damage": "Damage", "lzxnoneterraria.configuration.boomstick_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.revolver_settings": "Revolver Settings", "lzxnoneterraria.configuration.revolver_damage": "Damage", "lzxnoneterraria.configuration.revolver_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.red_ryder_settings": "Red Ryder Settings", "lzxnoneterraria.configuration.red_ryder_damage": "Damage", "lzxnoneterraria.configuration.red_ryder_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.the_undertaker_settings": "The Undertaker Settings", "lzxnoneterraria.configuration.the_undertaker_damage": "Damage", "lzxnoneterraria.configuration.the_undertaker_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.quad_barrel_shotgun_settings": "Quad-Barrel Shotgun Settings", "lzxnoneterraria.configuration.quad_barrel_shotgun_damage": "Damage", "lzxnoneterraria.configuration.quad_barrel_shotgun_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.handgun_settings": "Handgun Settings", "lzxnoneterraria.configuration.handgun_damage": "Damage", "lzxnoneterraria.configuration.handgun_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.phoenix_blaster_settings": "Phoenix Blaster Settings", "lzxnoneterraria.configuration.phoenix_blaster_damage": "Damage", "lzxnoneterraria.configuration.phoenix_blaster_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.minishark_settings": "Minishark Settings", "lzxnoneterraria.configuration.minishark_ammo_not_consume_chance": "Ammo Not Consume Chance", "lzxnoneterraria.configuration.minishark_ammo_not_consume_chance.tooltip": "Chance for each shot to avoid consuming ammo, from 0 to 1", "lzxnoneterraria.configuration.minishark_damage": "Damage", "lzxnoneterraria.configuration.minishark_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.megashark_settings": "Megashark Settings", "lzxnoneterraria.configuration.megashark_ammo_not_consume_chance": "Ammo Not Consume Chance", "lzxnoneterraria.configuration.megashark_ammo_not_consume_chance.tooltip": "Chance for each shot to avoid consuming ammo, from 0 to 1", "lzxnoneterraria.configuration.megashark_damage": "Damage", "lzxnoneterraria.configuration.megashark_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.clockwork_assault_rifle_settings": "Clockwork Assault Rifle Settings", "lzxnoneterraria.configuration.clockwork_assault_rifle_damage": "Damage", "lzxnoneterraria.configuration.clockwork_assault_rifle_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.gatligator_settings": "Gatligator Settings", "lzxnoneterraria.configuration.gatligator_damage": "Damage", "lzxnoneterraria.configuration.gatligator_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.shotgun_settings": "Shotgun Settings", "lzxnoneterraria.configuration.shotgun_damage": "Damage", "lzxnoneterraria.configuration.shotgun_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.uzi_settings": "Uzi Settings", "lzxnoneterraria.configuration.uzi_damage": "Damage", "lzxnoneterraria.configuration.uzi_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.venus_magnum_settings": "Venus Magnum Settings", "lzxnoneterraria.configuration.venus_magnum_damage": "Damage", "lzxnoneterraria.configuration.venus_magnum_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.tactical_shotgun_settings": "Tactical Shotgun Settings", "lzxnoneterraria.configuration.tactical_shotgun_damage": "Damage", "lzxnoneterraria.configuration.tactical_shotgun_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.sniper_rifle_settings": "Sniper Rifle Settings", "lzxnoneterraria.configuration.sniper_rifle_damage": "Damage", "lzxnoneterraria.configuration.sniper_rifle_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.sniper_rifle_zoom_scroll_speed": "Zoom Scroll Speed", "lzxnoneterraria.configuration.sniper_rifle_zoom_scroll_speed.tooltip": "Mouse wheel speed for adjusting sniper scope zoom", - "lzxnoneterraria.configuration.chain_gun_settings": "Chain Gun Settings", "lzxnoneterraria.configuration.chain_gun_damage": "Damage", "lzxnoneterraria.configuration.chain_gun_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.sdmg_settings": "S.D.M.G. Settings", "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance": "Ammo Not Consume Chance", "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance.tooltip": "Chance for each shot to avoid consuming ammo, from 0 to 1", "lzxnoneterraria.configuration.sdmg_damage": "Damage", "lzxnoneterraria.configuration.sdmg_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.snowball_cannon_settings": "Snowball Cannon Settings", "lzxnoneterraria.configuration.snowball_cannon_speed": "Speed", "lzxnoneterraria.configuration.snowball_cannon_speed.tooltip": "Snowball projectile speed", "lzxnoneterraria.configuration.snowball_cannon_gravity": "Gravity", "lzxnoneterraria.configuration.snowball_cannon_gravity.tooltip": "Downward acceleration applied each tick", "lzxnoneterraria.configuration.snowball_cannon_damage": "Damage", "lzxnoneterraria.configuration.snowball_cannon_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.star_cannon_settings": "Star Cannon Settings", "lzxnoneterraria.configuration.star_cannon_damage": "Damage", "lzxnoneterraria.configuration.star_cannon_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.star_cannon_speed": "Speed", "lzxnoneterraria.configuration.star_cannon_speed.tooltip": "Fallen star projectile speed", - "lzxnoneterraria.configuration.super_star_shooter_settings": "Super Star Shooter Settings", "lzxnoneterraria.configuration.super_star_shooter_damage": "Damage", "lzxnoneterraria.configuration.super_star_shooter_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.super_star_shooter_speed": "Speed", @@ -752,7 +758,6 @@ "lzxnoneterraria.configuration.super_star_shooter_bolt_damage.tooltip": "Prismatic bolt damage per hit", "lzxnoneterraria.configuration.super_star_shooter_bolt_speed": "Bolt Speed", "lzxnoneterraria.configuration.super_star_shooter_bolt_speed.tooltip": "Prismatic bolt projectile speed", - "lzxnoneterraria.configuration.flamethrower_settings": "Flamethrower Settings", "lzxnoneterraria.configuration.flamethrower_damage": "Damage", "lzxnoneterraria.configuration.flamethrower_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.flamethrower_ignite_ticks": "Ignite Duration", @@ -761,7 +766,6 @@ "lzxnoneterraria.configuration.flamethrower_speed.tooltip": "Flame stream initial speed", "lzxnoneterraria.configuration.flamethrower_range": "Range", "lzxnoneterraria.configuration.flamethrower_range.tooltip": "Flame stream travel range", - "lzxnoneterraria.configuration.elf_melter_settings": "Elf Melter Settings", "lzxnoneterraria.configuration.elf_melter_damage": "Damage", "lzxnoneterraria.configuration.elf_melter_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.elf_melter_speed": "Speed", @@ -770,7 +774,6 @@ "lzxnoneterraria.configuration.elf_melter_range.tooltip": "Frost stream travel range", "lzxnoneterraria.configuration.elf_melter_freeze_ticks": "Freeze Duration", "lzxnoneterraria.configuration.elf_melter_freeze_ticks.tooltip": "Frozen time applied on hit, in ticks", - "lzxnoneterraria.configuration.devils_devastation_settings": "Devil's Devastation Settings", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "Kill Mode Duration", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "Kill Mode duration in ticks", "lzxnoneterraria.configuration.devils_devastation_kill_mode_cooldown_time": "Kill Mode Cooldown", @@ -799,8 +802,6 @@ "lzxnoneterraria.configuration.devils_devastation_max_stuck_count.tooltip": "Maximum number of stuck projectiles", "lzxnoneterraria.configuration.devils_devastation_mark_lightning_damage": "Mark Lightning Damage", "lzxnoneterraria.configuration.devils_devastation_mark_lightning_damage.tooltip": "Mark lightning strike damage", - "lzxnoneterraria.configuration.devils_devastation_mark_lightning_lifetime": "Mark Lightning Lifetime", - "lzxnoneterraria.configuration.devils_devastation_mark_lightning_lifetime.tooltip": "Mark lightning duration in ticks", "lzxnoneterraria.configuration.devils_devastation_projectile_effect_duration": "Projectile Effect Duration", "lzxnoneterraria.configuration.devils_devastation_projectile_effect_duration.tooltip": "Effect duration applied by right-click projectile in ticks", "lzxnoneterraria.configuration.devils_devastation_stuck_projectile_effect_duration": "Stuck Projectile Effect Duration", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 0c7a6e2..3db4084 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -87,6 +87,34 @@ "item.lzxnoneterraria.fallen_star": "坠落之星", "item.lzxnoneterraria.natures_gift": "大自然的恩赐", "item.lzxnoneterraria.mana_flower": "魔力花", + "item.lzxnoneterraria.armor_polish": "盔甲抛光剂", + "item.lzxnoneterraria.megaphone": "扩音器", + "item.lzxnoneterraria.nazar": "邪眼", + "item.lzxnoneterraria.pocket_mirror": "袖珍镜", + "item.lzxnoneterraria.reflective_shades": "反光墨镜", + "item.lzxnoneterraria.armor_bracing": "盔甲背带", + "item.lzxnoneterraria.countercurse_mantra": "反诅咒咒语", + "item.lzxnoneterraria.ankh_charm": "十字章护身符", + "item.lzxnoneterraria.obsidian_skull": "黑曜石骷髅头", + "item.lzxnoneterraria.cobalt_shield": "钴护盾", + "item.lzxnoneterraria.obsidian_shield": "黑曜石护盾", + "item.lzxnoneterraria.ankh_shield": "十字章护盾", + "item.lzxnoneterraria.bezoar": "牛黄", + "item.lzxnoneterraria.blindfold": "蒙眼布", + "item.lzxnoneterraria.fast_clock": "快走闹钟", + "item.lzxnoneterraria.vitamins": "维生素", + "item.lzxnoneterraria.adhesive_bandage": "粘性绷带", + "item.lzxnoneterraria.medicated_bandage": "药用绷带", + "item.lzxnoneterraria.trifold_map": "三折地图", + "item.lzxnoneterraria.the_plan": "计划书", + "item.lzxnoneterraria.hercules_beetle": "大力士甲虫", + "item.lzxnoneterraria.necromantic_scroll": "死灵卷轴", + "item.lzxnoneterraria.papyrus_scarab": "甲虫莎草纸", + "item.lzxnoneterraria.pygmy_necklace": "矮人项链", + "item.lzxnoneterraria.warrior_emblem": "战士徽章", + "item.lzxnoneterraria.summoner_emblem": "召唤师徽章", + "item.lzxnoneterraria.ranger_emblem": "游侠徽章", + "item.lzxnoneterraria.sorcerer_emblem": "巫师徽章", "item.lzxnoneterraria.mana_crystal": "魔力水晶", "item.lzxnoneterraria.summoning_potion": "召唤药水", "item.lzxnoneterraria.lesser_mana_potion": "弱效魔力药水", @@ -122,17 +150,72 @@ "tooltip.lzxnoneterraria.absolute_distance": "绝对距离", "tooltip.lzxnoneterraria.zoom": "倍率", "tooltip.lzxnoneterraria.ammo": "弹药: %s", + "tooltip.lzxnoneterraria.minion_weapon_minion_count": "仆从数量: %s", "tooltip.lzxnoneterraria.devils_devastation_kill_mode": "杀戮模式", + "tooltip.lzxnoneterraria.devils_devastation.0": "完美的地狱之剑,直接掌握着硫磺火之力。", "tooltip.lzxnoneterraria.devils_devastation.1": "人类将这种力量理解为浩劫,即一切秩序在火焰之中的必然毁灭。", "tooltip.lzxnoneterraria.devils_devastation.2": "或许这就是硫磺火元素掌握着她的姐妹所不能匹敌之力量的原因。", - "tooltip.lzxnoneterraria.natures_gift.0": "魔力花费降低 %s%%", - "tooltip.lzxnoneterraria.mana_flower.0": "魔力花费降低 %s%%", - "tooltip.lzxnoneterraria.mana_flower.1": "魔力枯竭时自动使用魔力药水", "tooltip.lzxnoneterraria.mana_crystal": "永久提升 20 点最大魔力,最高提升到 200", + "tooltip.lzxnoneterraria.summoning_potion": "增加 %s 个仆从栏位,持续 8 分钟", "tooltip.lzxnoneterraria.mana_potion": "恢复 %s 点魔力", - "tooltip.lzxnoneterraria.minion_weapon_minion_count": "仆从数量: %s", + + "curios.modifiers.terraria_accessory" : "饰品属性加成", + "tooltip.lzxnoneterraria.poison_immunity": "免疫中毒", + "tooltip.lzxnoneterraria.darkness_immunity": "免疫黑暗", + "tooltip.lzxnoneterraria.slowness_immunity": "免疫缓慢", + "tooltip.lzxnoneterraria.weakness_immunity": "免疫虚弱", + "tooltip.lzxnoneterraria.bleed_immunity": "免疫流血", + "tooltip.lzxnoneterraria.confused_immunity": "免疫困惑", + "tooltip.lzxnoneterraria.wither_immunity": "免疫凋零", + "tooltip.lzxnoneterraria.levitation_immunity": "免疫漂浮", + "tooltip.lzxnoneterraria.mining_fatigue_immunity": "免疫挖掘疲劳", + "tooltip.lzxnoneterraria.armor_toughness_bonus": "盔甲韧性 +%s", + "tooltip.lzxnoneterraria.knockback_resistance_bonus": "抗性击退 +%s%%", + "tooltip.lzxnoneterraria.defense_bonus": "护甲值 +%s", + "tooltip.lzxnoneterraria.fire_block_immunity": "对火块免疫", + + "tooltip.lzxnoneterraria.melee_damage_increase": "近战伤害 +%s%%", + "tooltip.lzxnoneterraria.melee_damage_decrease": "近战伤害 -%s%%", + "lzxnoneterraria.configuration.melee_damage_multiplier": "近战武器伤害倍率", + "lzxnoneterraria.configuration.melee_damage_multiplier.tooltip": "佩戴后近战伤害乘以该倍率", + "lzxnoneterraria.configuration.armor_toughness": "盔甲韧性", + "lzxnoneterraria.configuration.armor_toughness.tooltip": "佩戴后获得该数值的盔甲韧性", + "lzxnoneterraria.configuration.ankh_charm_armor_toughness": "十字章盔甲韧性", + "lzxnoneterraria.configuration.ankh_charm_armor_toughness.tooltip": "佩戴后获得该数值的盔甲韧性", + "lzxnoneterraria.configuration.knockback_resistance": "抗性击退", + "lzxnoneterraria.configuration.knockback_resistance.tooltip": "佩戴后获得该数值的抗性击退", + "lzxnoneterraria.configuration.defense": "防御", + "lzxnoneterraria.configuration.defense.tooltip": "佩戴后获得该数值的防御", + + "tooltip.lzxnoneterraria.ranged_damage_increase": "远程伤害 +%s%%", + "tooltip.lzxnoneterraria.ranged_damage_decrease": "远程伤害 -%s%%", + "lzxnoneterraria.configuration.ranged_damage_multiplier": "远程伤害倍率", + "lzxnoneterraria.configuration.ranged_damage_multiplier.tooltip": "佩戴后远程伤害乘以该倍率", + + "tooltip.lzxnoneterraria.magic_damage_increase": "魔法伤害 +%s%%", + "tooltip.lzxnoneterraria.magic_damage_decrease": "魔法伤害 -%s%%", + "lzxnoneterraria.configuration.magic_damage_multiplier": "魔法伤害倍率", + "lzxnoneterraria.configuration.magic_damage_multiplier.tooltip": "佩戴后魔法伤害乘以该倍率", + "tooltip.lzxnoneterraria.mana_cost_increase": "魔力花费 +%s%%", + "tooltip.lzxnoneterraria.mana_cost_decrease": "魔力花费 -%s%%", + "tooltip.lzxnoneterraria.auto_mana_potion_use": "魔力枯竭时自动使用魔力药水", + "lzxnoneterraria.configuration.mana_cost_multiplier": "魔力消耗倍率", + "lzxnoneterraria.configuration.mana_cost_multiplier.tooltip": "佩戴后魔力消耗乘以该倍率", + + "tooltip.lzxnoneterraria.summon_damage_increase": "召唤伤害 +%s%%", + "tooltip.lzxnoneterraria.summon_damage_decrease": "召唤伤害 -%s%%", + "tooltip.lzxnoneterraria.minion_knockback_increase": "仆从击退 +%s%%", + "tooltip.lzxnoneterraria.minion_knockback_decrease": "仆从击退 -%s%%", + "tooltip.lzxnoneterraria.minion_slot_add": "仆从数量上限 +%s", + "tooltip.lzxnoneterraria.minion_slot_remove": "仆从数量上限 -%s", + "lzxnoneterraria.configuration.summon_damage_multiplier": "召唤伤害倍率", + "lzxnoneterraria.configuration.summon_damage_multiplier.tooltip": "佩戴后召唤伤害乘以该倍率", + "lzxnoneterraria.configuration.minion_knockback_multiplier": "仆从击退倍率", + "lzxnoneterraria.configuration.minion_knockback_multiplier.tooltip": "佩戴后仆从击退乘以该倍率", + "lzxnoneterraria.configuration.minion_count_bonus": "仆从数量加成", + "lzxnoneterraria.configuration.minion_count_bonus.tooltip": "佩戴后额外增加的仆从数量", "jei.lzxnoneterraria.info.fallen_star": "夜晚时有概率从天空坠落。坠落之星会在玩家附近的露天区域生成,落地后可以拾取。", "jei.lzxnoneterraria.info.natures_gift": "可在各类普通结构战利品箱中找到。", @@ -192,12 +275,6 @@ "lzxnoneterraria.configuration.gunpowder_damage_multiplier.tooltip": "每级火药对远程武器伤害的倍率", "lzxnoneterraria.configuration.steady_breath_spread_multiplier": "散射倍率", "lzxnoneterraria.configuration.steady_breath_spread_multiplier.tooltip": "每级屏息对远程武器散射幅度的倍率", - "lzxnoneterraria.configuration.natures_gift_settings": "大自然的恩赐 设置", - "lzxnoneterraria.configuration.natures_gift_mana_cost_multiplier": "魔力消耗倍率", - "lzxnoneterraria.configuration.natures_gift_mana_cost_multiplier.tooltip": "佩戴后魔力消耗乘以该倍率", - "lzxnoneterraria.configuration.mana_flower_settings": "魔力花 设置", - "lzxnoneterraria.configuration.mana_flower_mana_cost_multiplier": "魔力消耗倍率", - "lzxnoneterraria.configuration.mana_flower_mana_cost_multiplier.tooltip": "佩戴后魔力消耗乘以该倍率", "lzxnoneterraria.configuration.render_settings": "渲染 设置", "lzxnoneterraria.configuration.render_mixin_render_hand": "启用 renderHand", "lzxnoneterraria.configuration.render_mixin_render_hand.tooltip": "启用第一人称手部渲染相关 mixin", @@ -211,55 +288,44 @@ "lzxnoneterraria.configuration.render_mana_bar_x.tooltip": "魔力条左上角的屏幕 X 坐标", "lzxnoneterraria.configuration.render_mana_bar_y": "魔力条 Y 坐标", "lzxnoneterraria.configuration.render_mana_bar_y.tooltip": "魔力条左上角的屏幕 Y 坐标", - "lzxnoneterraria.configuration.effect_settings": "药水效果 设置", "lzxnoneterraria.configuration.blood_butcherer_damage_per_level": "血腥屠宰效果每级伤害", "lzxnoneterraria.configuration.blood_butcherer_damage_per_level.tooltip": "每级造成的伤害", "lzxnoneterraria.configuration.demonic_flames_damage_per_level": "恶魔之焰效果每级伤害", "lzxnoneterraria.configuration.demonic_flames_damage_per_level.tooltip": "每级造成的伤害", - "lzxnoneterraria.configuration.cursed_inferno_settings": "诅咒狱火 设置", "lzxnoneterraria.configuration.cursed_inferno_damage_per_level": "每级伤害", "lzxnoneterraria.configuration.cursed_inferno_damage_per_level.tooltip": "诅咒狱火每秒进行一次伤害判定,每级造成的伤害", - "lzxnoneterraria.configuration.ichor_settings": "灵液 设置", "lzxnoneterraria.configuration.ichor_damage_bonus_per_level": "每级增伤", "lzxnoneterraria.configuration.ichor_damage_bonus_per_level.tooltip": "目标拥有灵液效果时,每级额外受到的伤害比例,默认 0.15 表示 15%", - "lzxnoneterraria.configuration.acid_venom_settings": "酸性毒液 设置", "lzxnoneterraria.configuration.acid_venom_damage_per_level": "每级伤害", "lzxnoneterraria.configuration.acid_venom_damage_per_level.tooltip": "酸性毒液每秒进行一次伤害判定,每级造成的伤害", - "lzxnoneterraria.configuration.midas_settings": "迈达斯 设置", "lzxnoneterraria.configuration.midas_drop_chance": "绿宝石掉落概率", "lzxnoneterraria.configuration.midas_drop_chance.tooltip": "拥有迈达斯效果的生物死亡时掉落一颗绿宝石的概率,范围 0~1", - "lzxnoneterraria.configuration.mana_sickness_settings": "耐魔性 设置", "lzxnoneterraria.configuration.mana_sickness_duration_per_use": "每次增加时间", "lzxnoneterraria.configuration.mana_sickness_duration_per_use.tooltip": "每次使用魔力药水增加的耐魔性持续时间(刻)", "lzxnoneterraria.configuration.mana_sickness_max_duration": "最大持续时间", "lzxnoneterraria.configuration.mana_sickness_max_duration.tooltip": "耐魔性可以叠加到的最大持续时间(刻)", "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction": "最大魔法伤害降低", "lzxnoneterraria.configuration.mana_sickness_max_damage_reduction.tooltip": "达到最大持续时间时降低的魔法伤害比例,范围 0~1", - "lzxnoneterraria.configuration.summon_settings": "召唤 设置", "lzxnoneterraria.configuration.summon_summon_count_per_level": "每级仆从数量", "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "召唤效果每级额外增加的仆从数量", - "lzxnoneterraria.configuration.enchanted_sword_settings": "附魔剑 设置", "lzxnoneterraria.configuration.enchanted_sword_damage": "弹射伤害", "lzxnoneterraria.configuration.enchanted_sword_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.enchanted_sword_lifetime": "弹射持续时间", "lzxnoneterraria.configuration.enchanted_sword_lifetime.tooltip": "弹射物持续时间(刻)", "lzxnoneterraria.configuration.enchanted_sword_speed": "弹射速度", "lzxnoneterraria.configuration.enchanted_sword_speed.tooltip": "弹射物移动速度", - "lzxnoneterraria.configuration.bee_keeper_settings": "养蜂人 设置", "lzxnoneterraria.configuration.bee_keeper_max_bees": "最大蜜蜂数量", "lzxnoneterraria.configuration.bee_keeper_max_bees.tooltip": "每次命中生成的最大蜜蜂数", "lzxnoneterraria.configuration.bee_keeper_confusion_duration": "困惑持续时间", "lzxnoneterraria.configuration.bee_keeper_confusion_duration.tooltip": "困惑效果持续时间(刻),设为 0 禁用", "lzxnoneterraria.configuration.bee_keeper_bee_damage": "蜜蜂伤害", "lzxnoneterraria.configuration.bee_keeper_bee_damage.tooltip": "每只蜜蜂的攻击伤害", - "lzxnoneterraria.configuration.starfury_settings": "星怒 设置", "lzxnoneterraria.configuration.starfury_damage": "弹射伤害", "lzxnoneterraria.configuration.starfury_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.starfury_max_range": "最大范围", "lzxnoneterraria.configuration.starfury_max_range.tooltip": "弹射物最大飞行距离", "lzxnoneterraria.configuration.starfury_speed": "弹射速度", "lzxnoneterraria.configuration.starfury_speed.tooltip": "弹射物移动速度", - "lzxnoneterraria.configuration.seedler_settings": "种子弯刀 设置", "lzxnoneterraria.configuration.seedler_nut_gravity": "坚果重力", "lzxnoneterraria.configuration.seedler_nut_gravity.tooltip": "坚果受到的重力", "lzxnoneterraria.configuration.seedler_nut_bounce": "坚果弹力", @@ -272,7 +338,6 @@ "lzxnoneterraria.configuration.seedler_thorn_lifetime.tooltip": "荆棘持续时间(刻)", "lzxnoneterraria.configuration.seedler_thorn_speed": "荆棘速度", "lzxnoneterraria.configuration.seedler_thorn_speed.tooltip": "荆棘移动速度", - "lzxnoneterraria.configuration.horsemans_blade_settings": "无头骑士剑 设置", "lzxnoneterraria.configuration.horsemans_blade_rotate_range": "刀光偏转角范围", "lzxnoneterraria.configuration.horsemans_blade_rotate_range.tooltip": "刀光旋转角度范围", "lzxnoneterraria.configuration.horsemans_blade_max_hit_count": "刀光最大击中数", @@ -287,7 +352,6 @@ "lzxnoneterraria.configuration.horsemans_pumpkin_damage.tooltip": "南瓜造成的伤害", "lzxnoneterraria.configuration.horsemans_pumpkin_max_target_range": "南瓜最大寻敌范围", "lzxnoneterraria.configuration.horsemans_pumpkin_max_target_range.tooltip": "南瓜最大追踪敌人的距离", - "lzxnoneterraria.configuration.influx_waver_settings": "波涌之刃 设置", "lzxnoneterraria.configuration.influx_waver_damage": "弹射伤害", "lzxnoneterraria.configuration.influx_waver_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.influx_waver_max_count": "弹射最大生成数量", @@ -298,14 +362,12 @@ "lzxnoneterraria.configuration.influx_waver_spawn_range.tooltip": "弹射物生成半径", "lzxnoneterraria.configuration.influx_waver_target_range": "弹射寻敌范围", "lzxnoneterraria.configuration.influx_waver_target_range.tooltip": "弹射物追踪敌人的最大距离", - "lzxnoneterraria.configuration.star_wrath_settings": "狂星之怒 设置", "lzxnoneterraria.configuration.star_wrath_damage": "弹射伤害", "lzxnoneterraria.configuration.star_wrath_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.star_wrath_speed": "弹射速度", "lzxnoneterraria.configuration.star_wrath_speed.tooltip": "弹射物移动速度", "lzxnoneterraria.configuration.star_wrath_max_range": "最大范围", "lzxnoneterraria.configuration.star_wrath_max_range.tooltip": "弹射物最大飞行距离", - "lzxnoneterraria.configuration.meowmere_settings": "彩虹喵之刃 设置", "lzxnoneterraria.configuration.meowmere_damage": "弹射伤害", "lzxnoneterraria.configuration.meowmere_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.meowmere_gravity": "弹射重力", @@ -330,7 +392,6 @@ "lzxnoneterraria.configuration.terra_projectile_lifetime.tooltip": "弹射物持续时间(刻)", "lzxnoneterraria.configuration.terra_projectile_damage_decay": "弹射伤害递减系数", "lzxnoneterraria.configuration.terra_projectile_damage_decay.tooltip": "每击中一个生物的伤害衰减倍数", - "lzxnoneterraria.configuration.zenith_settings": "天顶剑 设置", "lzxnoneterraria.configuration.zenith_damage": "弹射伤害", "lzxnoneterraria.configuration.zenith_damage.tooltip": "每次命中伤害(实际为 x~2x 此值)", "lzxnoneterraria.configuration.zenith_distance_mode": "使用相对距离模式", @@ -355,14 +416,12 @@ "lzxnoneterraria.configuration.zenith_trail_alpha.tooltip": "尾迹渲染透明度", "lzxnoneterraria.configuration.zenith_trail_max_length": "尾迹长度", "lzxnoneterraria.configuration.zenith_trail_max_length.tooltip": "尾迹最大段数", - "lzxnoneterraria.configuration.excalibur_settings": "断钢剑 设置", "lzxnoneterraria.configuration.excalibur_rotate_range": "刀光偏转角范围", "lzxnoneterraria.configuration.excalibur_rotate_range.tooltip": "刀光旋转角度范围", "lzxnoneterraria.configuration.excalibur_max_hit_count": "刀光最大击中数", "lzxnoneterraria.configuration.excalibur_max_hit_count.tooltip": "刀光单次最大击中生物数量", "lzxnoneterraria.configuration.excalibur_damage": "刀光伤害", "lzxnoneterraria.configuration.excalibur_damage.tooltip": "刀光造成的伤害", - "lzxnoneterraria.configuration.nights_edge_settings": "永夜刃 设置", "lzxnoneterraria.configuration.nights_edge_projectile_align_to_blade": "弹射匹配刀光方向", "lzxnoneterraria.configuration.nights_edge_projectile_align_to_blade.tooltip": "弹射方向是否跟随刀光方向", "lzxnoneterraria.configuration.nights_edge_rotate_range": "刀光偏转角范围", @@ -383,14 +442,12 @@ "lzxnoneterraria.configuration.nights_edge_projectile_lifetime.tooltip": "弹射物持续时间(刻)", "lzxnoneterraria.configuration.nights_edge_projectile_rotation_speed": "弹射旋转速度", "lzxnoneterraria.configuration.nights_edge_projectile_rotation_speed.tooltip": "弹射物旋转速度", - "lzxnoneterraria.configuration.true_excalibur_settings": "真断钢剑 设置", "lzxnoneterraria.configuration.true_excalibur_rotate_range": "刀光偏转角范围", "lzxnoneterraria.configuration.true_excalibur_rotate_range.tooltip": "刀光旋转角度范围", "lzxnoneterraria.configuration.true_excalibur_max_hit_count": "刀光最大击中数", "lzxnoneterraria.configuration.true_excalibur_max_hit_count.tooltip": "刀光单次最大击中生物数量", "lzxnoneterraria.configuration.true_excalibur_damage": "刀光伤害", "lzxnoneterraria.configuration.true_excalibur_damage.tooltip": "刀光造成的伤害", - "lzxnoneterraria.configuration.true_nights_edge_settings": "真永夜刃 设置", "lzxnoneterraria.configuration.true_nights_edge_projectile_align_to_blade": "弹射匹配刀光方向", "lzxnoneterraria.configuration.true_nights_edge_projectile_align_to_blade.tooltip": "弹射方向是否跟随刀光方向", "lzxnoneterraria.configuration.true_nights_edge_rotate_range": "刀光偏转角范围", @@ -413,22 +470,18 @@ "lzxnoneterraria.configuration.true_nights_edge_projectile_lifetime.tooltip": "弹射物持续时间(刻)", "lzxnoneterraria.configuration.true_nights_edge_projectile_rotation_speed": "弹射旋转速度", "lzxnoneterraria.configuration.true_nights_edge_projectile_rotation_speed.tooltip": "弹射物旋转速度", - "lzxnoneterraria.configuration.lights_bane_settings": "魔光剑 设置", "lzxnoneterraria.configuration.lights_bane_big_damage": "大斩击伤害", "lzxnoneterraria.configuration.lights_bane_big_damage.tooltip": "大斩击造成的伤害", "lzxnoneterraria.configuration.lights_bane_small_damage": "小斩击伤害", "lzxnoneterraria.configuration.lights_bane_small_damage.tooltip": "小斩击造成的伤害", "lzxnoneterraria.configuration.lights_bane_target_range": "寻敌范围", "lzxnoneterraria.configuration.lights_bane_target_range.tooltip": "搜索附近敌人的距离", - "lzxnoneterraria.configuration.blood_butcherer_settings": "血腥屠刀 设置", "lzxnoneterraria.configuration.blood_butcherer_effect_duration": "屠宰效果持续时间", "lzxnoneterraria.configuration.blood_butcherer_effect_duration.tooltip": "血腥屠宰效果的持续时间(刻)", "lzxnoneterraria.configuration.blood_butcherer_max_level": "屠宰效果最大等级", "lzxnoneterraria.configuration.blood_butcherer_max_level.tooltip": "血腥屠宰效果的可叠加最大等级", - "lzxnoneterraria.configuration.muramasa_settings": "村正 设置", "lzxnoneterraria.configuration.muramasa_beam_damage": "光线伤害", "lzxnoneterraria.configuration.muramasa_beam_damage.tooltip": "蓝色光线造成的伤害", - "lzxnoneterraria.configuration.blade_of_grass_settings": "草剑 设置", "lzxnoneterraria.configuration.blade_of_grass_projectile_damage": "弹射伤害", "lzxnoneterraria.configuration.blade_of_grass_projectile_damage.tooltip": "每次弹射命中伤害", "lzxnoneterraria.configuration.blade_of_grass_effect_duration": "效果持续时间", @@ -443,7 +496,6 @@ "lzxnoneterraria.configuration.blade_of_grass_radius_growth.tooltip": "弹射轨道半径每刻增大值", "lzxnoneterraria.configuration.blade_of_grass_rotation_speed": "旋转速度", "lzxnoneterraria.configuration.blade_of_grass_rotation_speed.tooltip": "弹射轨道每刻旋转角度", - "lzxnoneterraria.configuration.volcano_settings": "火山 设置", "lzxnoneterraria.configuration.volcano_explosion_range": "爆炸范围", "lzxnoneterraria.configuration.volcano_explosion_range.tooltip": "爆炸半径", "lzxnoneterraria.configuration.volcano_explosion_damage": "爆炸伤害", @@ -452,14 +504,12 @@ "lzxnoneterraria.configuration.volcano_explosion_max_hit_count.tooltip": "单次爆炸最大击中生物数量", "lzxnoneterraria.configuration.volcano_ignite_seconds": "着火时间", "lzxnoneterraria.configuration.volcano_ignite_seconds.tooltip": "着火效果持续时间(秒)", - "lzxnoneterraria.configuration.terragrim_settings": "泰拉魔刃 设置", "lzxnoneterraria.configuration.terragrim_hit_range": "碰撞箱范围", "lzxnoneterraria.configuration.terragrim_hit_range.tooltip": "AABB 碰撞箱半边长", "lzxnoneterraria.configuration.terragrim_damage": "伤害", "lzxnoneterraria.configuration.terragrim_damage.tooltip": "每刻造成的伤害", "lzxnoneterraria.configuration.terragrim_rotate_range": "刀光偏转角范围", "lzxnoneterraria.configuration.terragrim_rotate_range.tooltip": "刀光旋转角度范围", - "lzxnoneterraria.configuration.first_fractal_settings": "第一分形 设置", "lzxnoneterraria.configuration.first_fractal_projectile_damage": "弹射伤害", "lzxnoneterraria.configuration.first_fractal_projectile_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.first_fractal_bounding_box_size": "碰撞箱大小", @@ -476,7 +526,6 @@ "lzxnoneterraria.configuration.first_fractal_max_range.tooltip": "弹射物最大飞行距离", "lzxnoneterraria.configuration.first_fractal_spawn_range": "生成范围", "lzxnoneterraria.configuration.first_fractal_spawn_range.tooltip": "弹射物在目标周围生成半径", - "lzxnoneterraria.configuration.mace_settings": "链球 设置", "lzxnoneterraria.configuration.mace_projectile_speed": "弹射速度", "lzxnoneterraria.configuration.mace_projectile_speed.tooltip": "弹射物移动速度", "lzxnoneterraria.configuration.mace_gravity": "重力", @@ -487,7 +536,6 @@ "lzxnoneterraria.configuration.mace_fly_time.tooltip": "弹射物最大飞行时间(刻)", "lzxnoneterraria.configuration.mace_max_range": "最大范围", "lzxnoneterraria.configuration.mace_max_range.tooltip": "弹射物最大飞行距离", - "lzxnoneterraria.configuration.terraprisma_settings": "泰拉棱镜 设置", "lzxnoneterraria.configuration.terraprisma_target_range": "寻敌范围", "lzxnoneterraria.configuration.terraprisma_target_range.tooltip": "召唤物搜索和维持目标的最大距离", "lzxnoneterraria.configuration.terraprisma_follow_speed": "跟随速度", @@ -504,7 +552,6 @@ "lzxnoneterraria.configuration.terraprisma_rotate_speed.tooltip": "旋转攻击沿椭圆轨迹移动的近似线速度", "lzxnoneterraria.configuration.terraprisma_damage": "伤害", "lzxnoneterraria.configuration.terraprisma_damage.tooltip": "召唤物每次命中造成的基础伤害", - "lzxnoneterraria.configuration.stardust_dragon_staff_settings": "星尘之龙法杖 设置", "lzxnoneterraria.configuration.stardust_dragon_staff_damage": "基础伤害", "lzxnoneterraria.configuration.stardust_dragon_staff_damage.tooltip": "星尘龙默认基础伤害", "lzxnoneterraria.configuration.stardust_dragon_staff_add_damage": "槽位增伤", @@ -521,7 +568,6 @@ "lzxnoneterraria.configuration.stardust_dragon_staff_wander_fri.tooltip": "游荡减速时每刻速度保留比例", "lzxnoneterraria.configuration.stardust_dragon_staff_dash_fri": "冲刺阻力", "lzxnoneterraria.configuration.stardust_dragon_staff_dash_fri.tooltip": "冲刺减速时每刻速度保留比例", - "lzxnoneterraria.configuration.possession_settings": "支配之鞭 设置", "lzxnoneterraria.configuration.possession_range": "射程", "lzxnoneterraria.configuration.possession_range.tooltip": "鞭子最大抽打距离", "lzxnoneterraria.configuration.possession_damage": "伤害", @@ -536,7 +582,6 @@ "lzxnoneterraria.configuration.possession_prophetic_mark_duration.tooltip": "支配之鞭施加的预兆标记持续时间(刻)", "lzxnoneterraria.configuration.possession_max_prophetic_mark_stacks": "最大预兆层数", "lzxnoneterraria.configuration.possession_max_prophetic_mark_stacks.tooltip": "同一个预兆标记最多触发幻象的次数", - "lzxnoneterraria.configuration.last_prism_settings": "终极棱镜 设置", "lzxnoneterraria.configuration.last_prism_damage": "伤害", "lzxnoneterraria.configuration.last_prism_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.last_prism_charge_time": "蓄力时间", @@ -547,19 +592,16 @@ "lzxnoneterraria.configuration.last_prism_max_range.tooltip": "激光最大射程", "lzxnoneterraria.configuration.last_prism_mana_consume_rate": "魔力消耗速率", "lzxnoneterraria.configuration.last_prism_mana_consume_rate.tooltip": "使用时每刻消耗的魔力值", - "lzxnoneterraria.configuration.musket_ball_settings": "火枪子弹 设置", "lzxnoneterraria.configuration.musket_ball_base_damage": "基础伤害", "lzxnoneterraria.configuration.musket_ball_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.musket_ball_speed": "速度", "lzxnoneterraria.configuration.musket_ball_speed.tooltip": "子弹每刻移动速度", - "lzxnoneterraria.configuration.meteor_shot_settings": "流星弹 设置", "lzxnoneterraria.configuration.meteor_shot_base_damage": "基础伤害", "lzxnoneterraria.configuration.meteor_shot_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.meteor_shot_speed": "速度", "lzxnoneterraria.configuration.meteor_shot_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.meteor_shot_max_hit": "最大命中数", "lzxnoneterraria.configuration.meteor_shot_max_hit.tooltip": "碰撞方块和击中生物都会计入命中次数", - "lzxnoneterraria.configuration.crystal_bullet_settings": "水晶子弹 设置", "lzxnoneterraria.configuration.crystal_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.crystal_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.crystal_bullet_speed": "速度", @@ -574,21 +616,18 @@ "lzxnoneterraria.configuration.crystal_bullet_fragment_count.tooltip": "命中或碰撞后生成的水晶碎片数量", "lzxnoneterraria.configuration.crystal_bullet_particle_count": "粒子数量", "lzxnoneterraria.configuration.crystal_bullet_particle_count.tooltip": "命中或碰撞后生成的水晶碎片粒子数量", - "lzxnoneterraria.configuration.cursed_bullet_settings": "诅咒弹 设置", "lzxnoneterraria.configuration.cursed_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.cursed_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.cursed_bullet_speed": "速度", "lzxnoneterraria.configuration.cursed_bullet_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.cursed_bullet_effect_time": "效果持续时间", "lzxnoneterraria.configuration.cursed_bullet_effect_time.tooltip": "命中后施加效果的持续时间(刻)", - "lzxnoneterraria.configuration.chlorophyte_bullet_settings": "叶绿弹 设置", "lzxnoneterraria.configuration.chlorophyte_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.chlorophyte_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.chlorophyte_bullet_speed": "速度", "lzxnoneterraria.configuration.chlorophyte_bullet_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.chlorophyte_bullet_target_range": "寻敌范围", "lzxnoneterraria.configuration.chlorophyte_bullet_target_range.tooltip": "自动寻敌的最大范围", - "lzxnoneterraria.configuration.high_velocity_bullet_settings": "高速子弹 设置", "lzxnoneterraria.configuration.high_velocity_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.high_velocity_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.high_velocity_bullet_speed": "速度", @@ -597,26 +636,22 @@ "lzxnoneterraria.configuration.high_velocity_bullet_damage_decay.tooltip": "每次额外命中后的伤害倍率", "lzxnoneterraria.configuration.high_velocity_bullet_max_hit": "最大命中数", "lzxnoneterraria.configuration.high_velocity_bullet_max_hit.tooltip": "最多命中的生物或碰撞次数", - "lzxnoneterraria.configuration.ichor_bullet_settings": "灵液弹 设置", "lzxnoneterraria.configuration.ichor_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.ichor_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.ichor_bullet_speed": "速度", "lzxnoneterraria.configuration.ichor_bullet_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.ichor_bullet_effect_time": "效果持续时间", "lzxnoneterraria.configuration.ichor_bullet_effect_time.tooltip": "命中后施加效果的持续时间(刻)", - "lzxnoneterraria.configuration.venom_bullet_settings": "毒液弹 设置", "lzxnoneterraria.configuration.venom_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.venom_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.venom_bullet_speed": "速度", "lzxnoneterraria.configuration.venom_bullet_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.venom_bullet_effect_time": "效果持续时间", "lzxnoneterraria.configuration.venom_bullet_effect_time.tooltip": "命中后施加效果的持续时间(刻)", - "lzxnoneterraria.configuration.party_bullet_settings": "派对弹 设置", "lzxnoneterraria.configuration.party_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.party_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.party_bullet_speed": "速度", "lzxnoneterraria.configuration.party_bullet_speed.tooltip": "子弹每刻移动速度", - "lzxnoneterraria.configuration.nano_bullet_settings": "纳米弹 设置", "lzxnoneterraria.configuration.nano_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.nano_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.nano_bullet_speed": "速度", @@ -627,7 +662,6 @@ "lzxnoneterraria.configuration.nano_bullet_max_hit.tooltip": "最多命中的生物或碰撞次数", "lzxnoneterraria.configuration.nano_bullet_effect_time": "效果持续时间", "lzxnoneterraria.configuration.nano_bullet_effect_time.tooltip": "命中后施加效果的持续时间(刻)", - "lzxnoneterraria.configuration.exploding_bullet_settings": "爆破弹 设置", "lzxnoneterraria.configuration.exploding_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.exploding_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.exploding_bullet_speed": "速度", @@ -636,113 +670,86 @@ "lzxnoneterraria.configuration.exploding_bullet_knockback_multiplier.tooltip": "爆破弹命中时对击退强度的倍率", "lzxnoneterraria.configuration.exploding_bullet_dust_count": "爆炸尘埃数量", "lzxnoneterraria.configuration.exploding_bullet_dust_count.tooltip": "爆炸时生成的尘埃粒子数量", - "lzxnoneterraria.configuration.silver_bullet_settings": "银子弹 设置", "lzxnoneterraria.configuration.silver_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.silver_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.silver_bullet_speed": "速度", "lzxnoneterraria.configuration.silver_bullet_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.silver_bullet_piglin_damage_multiplier": "猪人伤害倍率", "lzxnoneterraria.configuration.silver_bullet_piglin_damage_multiplier.tooltip": "命中猪灵、猪灵蛮兵、僵尸猪灵等猪人生物时的伤害倍率", - "lzxnoneterraria.configuration.golden_bullet_settings": "金子弹 设置", "lzxnoneterraria.configuration.golden_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.golden_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.golden_bullet_speed": "速度", "lzxnoneterraria.configuration.golden_bullet_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.golden_bullet_effect_time": "迈达斯持续时间", "lzxnoneterraria.configuration.golden_bullet_effect_time.tooltip": "金子弹命中后施加迈达斯效果的持续时间(刻)", - "lzxnoneterraria.configuration.tungsten_bullet_settings": "钨子弹 设置", "lzxnoneterraria.configuration.tungsten_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.tungsten_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.tungsten_bullet_speed": "速度", "lzxnoneterraria.configuration.tungsten_bullet_speed.tooltip": "子弹每刻移动速度", - "lzxnoneterraria.configuration.luminite_bullet_settings": "夜明弹 设置", "lzxnoneterraria.configuration.luminite_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.luminite_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.luminite_bullet_speed": "速度", "lzxnoneterraria.configuration.luminite_bullet_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.luminite_bullet_damage_decay": "伤害衰减倍率", "lzxnoneterraria.configuration.luminite_bullet_damage_decay.tooltip": "每次额外命中后的伤害倍率", - "lzxnoneterraria.configuration.musket_settings": "火枪 设置", "lzxnoneterraria.configuration.musket_damage": "伤害", "lzxnoneterraria.configuration.musket_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.flintlock_pistol_settings": "燧发枪 设置", "lzxnoneterraria.configuration.flintlock_pistol_damage": "伤害", "lzxnoneterraria.configuration.flintlock_pistol_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.boomstick_settings": "三发猎枪 设置", "lzxnoneterraria.configuration.boomstick_damage": "伤害", "lzxnoneterraria.configuration.boomstick_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.revolver_settings": "左轮手枪 设置", "lzxnoneterraria.configuration.revolver_damage": "伤害", "lzxnoneterraria.configuration.revolver_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.red_ryder_settings": "红莱德枪 设置", "lzxnoneterraria.configuration.red_ryder_damage": "伤害", "lzxnoneterraria.configuration.red_ryder_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.the_undertaker_settings": "夺命枪 设置", "lzxnoneterraria.configuration.the_undertaker_damage": "伤害", "lzxnoneterraria.configuration.the_undertaker_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.quad_barrel_shotgun_settings": "四管霰弹枪 设置", "lzxnoneterraria.configuration.quad_barrel_shotgun_damage": "伤害", "lzxnoneterraria.configuration.quad_barrel_shotgun_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.handgun_settings": "手枪 设置", "lzxnoneterraria.configuration.handgun_damage": "伤害", "lzxnoneterraria.configuration.handgun_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.phoenix_blaster_settings": "凤凰爆破枪 设置", "lzxnoneterraria.configuration.phoenix_blaster_damage": "伤害", "lzxnoneterraria.configuration.phoenix_blaster_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.minishark_settings": "迷你鲨 设置", "lzxnoneterraria.configuration.minishark_ammo_not_consume_chance": "不消耗弹药概率", "lzxnoneterraria.configuration.minishark_ammo_not_consume_chance.tooltip": "每次射击不消耗弹药的概率,范围 0~1", "lzxnoneterraria.configuration.minishark_damage": "伤害", "lzxnoneterraria.configuration.minishark_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.megashark_settings": "巨兽鲨 设置", "lzxnoneterraria.configuration.megashark_ammo_not_consume_chance": "不消耗弹药概率", "lzxnoneterraria.configuration.megashark_ammo_not_consume_chance.tooltip": "每次射击不消耗弹药的概率,范围 0~1", "lzxnoneterraria.configuration.megashark_damage": "伤害", "lzxnoneterraria.configuration.megashark_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.clockwork_assault_rifle_settings": "发条式突击步枪 设置", "lzxnoneterraria.configuration.clockwork_assault_rifle_damage": "伤害", "lzxnoneterraria.configuration.clockwork_assault_rifle_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.gatligator_settings": "鳄鱼机关枪 设置", "lzxnoneterraria.configuration.gatligator_damage": "伤害", "lzxnoneterraria.configuration.gatligator_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.shotgun_settings": "霰弹枪 设置", "lzxnoneterraria.configuration.shotgun_damage": "伤害", "lzxnoneterraria.configuration.shotgun_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.uzi_settings": "乌兹冲锋枪 设置", "lzxnoneterraria.configuration.uzi_damage": "伤害", "lzxnoneterraria.configuration.uzi_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.venus_magnum_settings": "维纳斯万能枪 设置", "lzxnoneterraria.configuration.venus_magnum_damage": "伤害", "lzxnoneterraria.configuration.venus_magnum_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.tactical_shotgun_settings": "战术霰弹枪 设置", "lzxnoneterraria.configuration.tactical_shotgun_damage": "伤害", "lzxnoneterraria.configuration.tactical_shotgun_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.sniper_rifle_settings": "狙击步枪 设置", "lzxnoneterraria.configuration.sniper_rifle_damage": "伤害", "lzxnoneterraria.configuration.sniper_rifle_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.sniper_rifle_zoom_scroll_speed": "滚轮调节系数", "lzxnoneterraria.configuration.sniper_rifle_zoom_scroll_speed.tooltip": "鼠标滚轮调节狙击镜倍率的速度", - "lzxnoneterraria.configuration.chain_gun_settings": "链式机枪 设置", "lzxnoneterraria.configuration.chain_gun_damage": "伤害", "lzxnoneterraria.configuration.chain_gun_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.sdmg_settings": "S.D.M.G. 设置", "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance": "不消耗弹药概率", "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance.tooltip": "每次射击不消耗弹药的概率,范围 0~1", "lzxnoneterraria.configuration.sdmg_damage": "伤害", "lzxnoneterraria.configuration.sdmg_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.snowball_cannon_settings": "雪球炮 设置", "lzxnoneterraria.configuration.snowball_cannon_speed": "速度", "lzxnoneterraria.configuration.snowball_cannon_speed.tooltip": "雪球弹射物速度", "lzxnoneterraria.configuration.snowball_cannon_gravity": "重力", "lzxnoneterraria.configuration.snowball_cannon_gravity.tooltip": "每刻向下施加的加速度", "lzxnoneterraria.configuration.snowball_cannon_damage": "伤害", "lzxnoneterraria.configuration.snowball_cannon_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.star_cannon_settings": "星星炮 设置", "lzxnoneterraria.configuration.star_cannon_damage": "伤害", "lzxnoneterraria.configuration.star_cannon_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.star_cannon_speed": "速度", "lzxnoneterraria.configuration.star_cannon_speed.tooltip": "坠落之星弹射物速度", - "lzxnoneterraria.configuration.super_star_shooter_settings": "超级星星炮 设置", "lzxnoneterraria.configuration.super_star_shooter_damage": "伤害", "lzxnoneterraria.configuration.super_star_shooter_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.super_star_shooter_speed": "速度", @@ -751,7 +758,6 @@ "lzxnoneterraria.configuration.super_star_shooter_bolt_damage.tooltip": "棱彩弹每次命中伤害", "lzxnoneterraria.configuration.super_star_shooter_bolt_speed": "棱彩弹速度", "lzxnoneterraria.configuration.super_star_shooter_bolt_speed.tooltip": "棱彩弹弹射物速度", - "lzxnoneterraria.configuration.flamethrower_settings": "火焰喷射器 设置", "lzxnoneterraria.configuration.flamethrower_damage": "伤害", "lzxnoneterraria.configuration.flamethrower_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.flamethrower_ignite_ticks": "着火时间", @@ -760,7 +766,6 @@ "lzxnoneterraria.configuration.flamethrower_speed.tooltip": "火焰流初始速度", "lzxnoneterraria.configuration.flamethrower_range": "射程", "lzxnoneterraria.configuration.flamethrower_range.tooltip": "火焰流飞行距离", - "lzxnoneterraria.configuration.elf_melter_settings": "精灵熔枪 设置", "lzxnoneterraria.configuration.elf_melter_damage": "伤害", "lzxnoneterraria.configuration.elf_melter_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.elf_melter_speed": "速度", @@ -769,7 +774,6 @@ "lzxnoneterraria.configuration.elf_melter_range.tooltip": "冰霜流飞行距离", "lzxnoneterraria.configuration.elf_melter_freeze_ticks": "冻结时间", "lzxnoneterraria.configuration.elf_melter_freeze_ticks.tooltip": "命中后施加的冻结时间(刻)", - "lzxnoneterraria.configuration.devils_devastation_settings": "破灭魔王剑 设置", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "杀戮模式持续时间", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "杀戮模式持续时间(刻)", "lzxnoneterraria.configuration.devils_devastation_kill_mode_cooldown_time": "杀戮模式冷却时间", @@ -798,8 +802,6 @@ "lzxnoneterraria.configuration.devils_devastation_max_stuck_count.tooltip": "最大附着弹射物数量", "lzxnoneterraria.configuration.devils_devastation_mark_lightning_damage": "标记闪电伤害", "lzxnoneterraria.configuration.devils_devastation_mark_lightning_damage.tooltip": "标记触发后的闪电伤害", - "lzxnoneterraria.configuration.devils_devastation_mark_lightning_lifetime": "标记闪电持续时间", - "lzxnoneterraria.configuration.devils_devastation_mark_lightning_lifetime.tooltip": "标记闪电持续时间(刻)", "lzxnoneterraria.configuration.devils_devastation_projectile_effect_duration": "右键弹射效果持续时间", "lzxnoneterraria.configuration.devils_devastation_projectile_effect_duration.tooltip": "右键弹射命中后造成的效果持续时间(刻)", "lzxnoneterraria.configuration.devils_devastation_stuck_projectile_effect_duration": "弹出弹射效果持续时间", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/adhesive_bandage.json b/src/main/resources/assets/lzxnoneterraria/models/item/adhesive_bandage.json new file mode 100644 index 0000000..fd7bc51 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/adhesive_bandage.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/adhesive_bandage" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/ankh_charm.json b/src/main/resources/assets/lzxnoneterraria/models/item/ankh_charm.json new file mode 100644 index 0000000..d21fd93 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/ankh_charm.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/ankh_charm" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/ankh_shield.json b/src/main/resources/assets/lzxnoneterraria/models/item/ankh_shield.json new file mode 100644 index 0000000..24f47c0 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/ankh_shield.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/ankh_shield" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/armor_bracing.json b/src/main/resources/assets/lzxnoneterraria/models/item/armor_bracing.json new file mode 100644 index 0000000..9e14635 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/armor_bracing.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/armor_bracing" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/armor_polish.json b/src/main/resources/assets/lzxnoneterraria/models/item/armor_polish.json new file mode 100644 index 0000000..585ceac --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/armor_polish.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/armor_polish" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/bezoar.json b/src/main/resources/assets/lzxnoneterraria/models/item/bezoar.json new file mode 100644 index 0000000..7035acd --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/bezoar.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/bezoar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/blindfold.json b/src/main/resources/assets/lzxnoneterraria/models/item/blindfold.json new file mode 100644 index 0000000..328fc57 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/blindfold.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/blindfold" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/cobalt_shield.json b/src/main/resources/assets/lzxnoneterraria/models/item/cobalt_shield.json new file mode 100644 index 0000000..cb3c0dd --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/cobalt_shield.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/cobalt_shield" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/countercurse_mantra.json b/src/main/resources/assets/lzxnoneterraria/models/item/countercurse_mantra.json new file mode 100644 index 0000000..24749a8 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/countercurse_mantra.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/countercurse_mantra" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/fast_clock.json b/src/main/resources/assets/lzxnoneterraria/models/item/fast_clock.json new file mode 100644 index 0000000..d80ff60 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/fast_clock.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/fast_clock" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/hercules_beetle.json b/src/main/resources/assets/lzxnoneterraria/models/item/hercules_beetle.json new file mode 100644 index 0000000..c3f8320 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/hercules_beetle.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/hercules_beetle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/medicated_bandage.json b/src/main/resources/assets/lzxnoneterraria/models/item/medicated_bandage.json new file mode 100644 index 0000000..db2f5e9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/medicated_bandage.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/medicated_bandage" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/megaphone.json b/src/main/resources/assets/lzxnoneterraria/models/item/megaphone.json new file mode 100644 index 0000000..28d57b9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/megaphone.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/megaphone" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/nazar.json b/src/main/resources/assets/lzxnoneterraria/models/item/nazar.json new file mode 100644 index 0000000..0cb6846 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/nazar.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/nazar" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/necromantic_scroll.json b/src/main/resources/assets/lzxnoneterraria/models/item/necromantic_scroll.json new file mode 100644 index 0000000..d401a4b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/necromantic_scroll.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/necromantic_scroll" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_shield.json b/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_shield.json new file mode 100644 index 0000000..eb536d9 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_shield.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/obsidian_shield" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_skull.json b/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_skull.json new file mode 100644 index 0000000..e9712f2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/obsidian_skull.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/obsidian_skull" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/papyrus_scarab.json b/src/main/resources/assets/lzxnoneterraria/models/item/papyrus_scarab.json new file mode 100644 index 0000000..6055d41 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/papyrus_scarab.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/papyrus_scarab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/pocket_mirror.json b/src/main/resources/assets/lzxnoneterraria/models/item/pocket_mirror.json new file mode 100644 index 0000000..99505ba --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/pocket_mirror.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/pocket_mirror" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/pygmy_necklace.json b/src/main/resources/assets/lzxnoneterraria/models/item/pygmy_necklace.json new file mode 100644 index 0000000..a4cc56e --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/pygmy_necklace.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/pygmy_necklace" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/ranger_emblem.json b/src/main/resources/assets/lzxnoneterraria/models/item/ranger_emblem.json new file mode 100644 index 0000000..22d4604 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/ranger_emblem.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/ranger_emblem" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/reflective_shades.json b/src/main/resources/assets/lzxnoneterraria/models/item/reflective_shades.json new file mode 100644 index 0000000..b4054cc --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/reflective_shades.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item3", + "textures": { + "layer0": "lzxnoneterraria:item/reflective_shades" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/sorcerer_emblem.json b/src/main/resources/assets/lzxnoneterraria/models/item/sorcerer_emblem.json new file mode 100644 index 0000000..b680834 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/sorcerer_emblem.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/sorcerer_emblem" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/summoner_emblem.json b/src/main/resources/assets/lzxnoneterraria/models/item/summoner_emblem.json new file mode 100644 index 0000000..dcb13ff --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/summoner_emblem.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/summoner_emblem" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/the_plan.json b/src/main/resources/assets/lzxnoneterraria/models/item/the_plan.json new file mode 100644 index 0000000..c5c9d77 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/the_plan.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/the_plan" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/trifold_map.json b/src/main/resources/assets/lzxnoneterraria/models/item/trifold_map.json new file mode 100644 index 0000000..dcfede7 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/trifold_map.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/trifold_map" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/vitamins.json b/src/main/resources/assets/lzxnoneterraria/models/item/vitamins.json new file mode 100644 index 0000000..17c0e31 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/vitamins.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/vitamins" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/warrior_emblem.json b/src/main/resources/assets/lzxnoneterraria/models/item/warrior_emblem.json new file mode 100644 index 0000000..509f376 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/warrior_emblem.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/warrior_emblem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/adhesive_bandage.png b/src/main/resources/assets/lzxnoneterraria/textures/item/adhesive_bandage.png new file mode 100644 index 0000000..4e44ab6 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/adhesive_bandage.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/ankh_charm.png b/src/main/resources/assets/lzxnoneterraria/textures/item/ankh_charm.png new file mode 100644 index 0000000..b2f3f70 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/ankh_charm.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/ankh_shield.png b/src/main/resources/assets/lzxnoneterraria/textures/item/ankh_shield.png new file mode 100644 index 0000000..f0274d2 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/ankh_shield.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/armor_bracing.png b/src/main/resources/assets/lzxnoneterraria/textures/item/armor_bracing.png new file mode 100644 index 0000000..e1823e6 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/armor_bracing.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/armor_polish.png b/src/main/resources/assets/lzxnoneterraria/textures/item/armor_polish.png new file mode 100644 index 0000000..f3af22b Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/armor_polish.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/bezoar.png b/src/main/resources/assets/lzxnoneterraria/textures/item/bezoar.png new file mode 100644 index 0000000..4fc1be4 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/bezoar.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/blindfold.png b/src/main/resources/assets/lzxnoneterraria/textures/item/blindfold.png new file mode 100644 index 0000000..22e439b Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/blindfold.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/cobalt_shield.png b/src/main/resources/assets/lzxnoneterraria/textures/item/cobalt_shield.png new file mode 100644 index 0000000..708fd52 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/cobalt_shield.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/countercurse_mantra.png b/src/main/resources/assets/lzxnoneterraria/textures/item/countercurse_mantra.png new file mode 100644 index 0000000..d17e39f Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/countercurse_mantra.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/fast_clock.png b/src/main/resources/assets/lzxnoneterraria/textures/item/fast_clock.png new file mode 100644 index 0000000..2e9203d Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/fast_clock.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/hercules_beetle.png b/src/main/resources/assets/lzxnoneterraria/textures/item/hercules_beetle.png new file mode 100644 index 0000000..f114c3e Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/hercules_beetle.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/medicated_bandage.png b/src/main/resources/assets/lzxnoneterraria/textures/item/medicated_bandage.png new file mode 100644 index 0000000..e44c789 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/medicated_bandage.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/megaphone.png b/src/main/resources/assets/lzxnoneterraria/textures/item/megaphone.png new file mode 100644 index 0000000..268c6f8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/megaphone.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/nazar.png b/src/main/resources/assets/lzxnoneterraria/textures/item/nazar.png new file mode 100644 index 0000000..428959a Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/nazar.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/necromantic_scroll.png b/src/main/resources/assets/lzxnoneterraria/textures/item/necromantic_scroll.png new file mode 100644 index 0000000..ddd6a65 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/necromantic_scroll.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_shield.png b/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_shield.png new file mode 100644 index 0000000..05bda76 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_shield.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_skull.png b/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_skull.png new file mode 100644 index 0000000..77a92f8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/obsidian_skull.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/papyrus_scarab.png b/src/main/resources/assets/lzxnoneterraria/textures/item/papyrus_scarab.png new file mode 100644 index 0000000..ff33688 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/papyrus_scarab.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/pocket_mirror.png b/src/main/resources/assets/lzxnoneterraria/textures/item/pocket_mirror.png new file mode 100644 index 0000000..e16ebeb Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/pocket_mirror.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/pygmy_necklace.png b/src/main/resources/assets/lzxnoneterraria/textures/item/pygmy_necklace.png new file mode 100644 index 0000000..12e24b6 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/pygmy_necklace.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/ranger_emblem.png b/src/main/resources/assets/lzxnoneterraria/textures/item/ranger_emblem.png new file mode 100644 index 0000000..ae543ea Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/ranger_emblem.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/reflective_shades.png b/src/main/resources/assets/lzxnoneterraria/textures/item/reflective_shades.png new file mode 100644 index 0000000..3f62c7e Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/reflective_shades.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/sorcerer_emblem.png b/src/main/resources/assets/lzxnoneterraria/textures/item/sorcerer_emblem.png new file mode 100644 index 0000000..4aee22a Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/sorcerer_emblem.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/summoner_emblem.png b/src/main/resources/assets/lzxnoneterraria/textures/item/summoner_emblem.png new file mode 100644 index 0000000..99ad73d Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/summoner_emblem.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/the_plan.png b/src/main/resources/assets/lzxnoneterraria/textures/item/the_plan.png new file mode 100644 index 0000000..5a61c4e Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/the_plan.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/trifold_map.png b/src/main/resources/assets/lzxnoneterraria/textures/item/trifold_map.png new file mode 100644 index 0000000..ef564b8 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/trifold_map.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/vitamins.png b/src/main/resources/assets/lzxnoneterraria/textures/item/vitamins.png new file mode 100644 index 0000000..004c432 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/vitamins.png differ diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/warrior_emblem.png b/src/main/resources/assets/lzxnoneterraria/textures/item/warrior_emblem.png new file mode 100644 index 0000000..0b0c248 Binary files /dev/null and b/src/main/resources/assets/lzxnoneterraria/textures/item/warrior_emblem.png differ diff --git a/src/main/resources/data/lzxnoneterraria/recipe/ankh_charm.json b/src/main/resources/data/lzxnoneterraria/recipe/ankh_charm.json new file mode 100644 index 0000000..5891e80 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/ankh_charm.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:armor_bracing" + }, + { + "item": "lzxnoneterraria:medicated_bandage" + }, + { + "item": "lzxnoneterraria:the_plan" + }, + { + "item": "lzxnoneterraria:countercurse_mantra" + }, + { + "item": "lzxnoneterraria:reflective_shades" + } + ], + "result": { + "id": "lzxnoneterraria:ankh_charm", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/ankh_shield.json b/src/main/resources/data/lzxnoneterraria/recipe/ankh_shield.json new file mode 100644 index 0000000..5ddbbac --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/ankh_shield.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:obsidian_shield" + }, + { + "item": "lzxnoneterraria:ankh_charm" + } + ], + "result": { + "id": "lzxnoneterraria:ankh_shield", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/armor_bracing.json b/src/main/resources/data/lzxnoneterraria/recipe/armor_bracing.json new file mode 100644 index 0000000..d02663f --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/armor_bracing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:armor_polish" + }, + { + "item": "lzxnoneterraria:vitamins" + } + ], + "result": { + "id": "lzxnoneterraria:armor_bracing", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/clockwork_assault_rifle.json b/src/main/resources/data/lzxnoneterraria/recipe/clockwork_assault_rifle.json index c92f311..3f0cbfc 100644 --- a/src/main/resources/data/lzxnoneterraria/recipe/clockwork_assault_rifle.json +++ b/src/main/resources/data/lzxnoneterraria/recipe/clockwork_assault_rifle.json @@ -9,7 +9,7 @@ "key": { "A": { "item": "lzxnoneterraria:minishark" }, "B": { "item": "minecraft:diamond_block" }, - "C": { "item": "minecraft:netherite_ingot" }, + "C": { "item": "minecraft:netherite_scrap" }, "D": { "item": "minecraft:gold_block" } }, "result": { diff --git a/src/main/resources/data/lzxnoneterraria/recipe/countercurse_mantra.json b/src/main/resources/data/lzxnoneterraria/recipe/countercurse_mantra.json new file mode 100644 index 0000000..990d473 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/countercurse_mantra.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:nazar" + }, + { + "item": "lzxnoneterraria:megaphone" + } + ], + "result": { + "id": "lzxnoneterraria:countercurse_mantra", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/medicated_bandage.json b/src/main/resources/data/lzxnoneterraria/recipe/medicated_bandage.json new file mode 100644 index 0000000..1e9622e --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/medicated_bandage.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:adhesive_bandage" + }, + { + "item": "lzxnoneterraria:bezoar" + } + ], + "result": { + "id": "lzxnoneterraria:medicated_bandage", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/obsidian_shield.json b/src/main/resources/data/lzxnoneterraria/recipe/obsidian_shield.json new file mode 100644 index 0000000..7b61d41 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/obsidian_shield.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:obsidian_skull" + }, + { + "item": "lzxnoneterraria:cobalt_shield" + } + ], + "result": { + "id": "lzxnoneterraria:obsidian_shield", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/reflective_shades.json b/src/main/resources/data/lzxnoneterraria/recipe/reflective_shades.json new file mode 100644 index 0000000..124ac7e --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/reflective_shades.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:blindfold" + }, + { + "item": "lzxnoneterraria:pocket_mirror" + } + ], + "result": { + "id": "lzxnoneterraria:reflective_shades", + "count": 1 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/the_plan.json b/src/main/resources/data/lzxnoneterraria/recipe/the_plan.json new file mode 100644 index 0000000..f75d926 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/the_plan.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + { + "item": "lzxnoneterraria:trifold_map" + }, + { + "item": "lzxnoneterraria:fast_clock" + } + ], + "result": { + "id": "lzxnoneterraria:the_plan", + "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 857a541..c70a3bc 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/accessory.json @@ -1,7 +1,35 @@ { "replace": false, "values": [ + "lzxnoneterraria:armor_polish", + "lzxnoneterraria:megaphone", + "lzxnoneterraria:nazar", + "lzxnoneterraria:pocket_mirror", + "lzxnoneterraria:reflective_shades", + "lzxnoneterraria:armor_bracing", + "lzxnoneterraria:countercurse_mantra", + "lzxnoneterraria:ankh_charm", + "lzxnoneterraria:obsidian_skull", + "lzxnoneterraria:cobalt_shield", + "lzxnoneterraria:obsidian_shield", + "lzxnoneterraria:ankh_shield", + "lzxnoneterraria:bezoar", + "lzxnoneterraria:blindfold", + "lzxnoneterraria:fast_clock", + "lzxnoneterraria:vitamins", + "lzxnoneterraria:adhesive_bandage", + "lzxnoneterraria:medicated_bandage", + "lzxnoneterraria:trifold_map", + "lzxnoneterraria:the_plan", "lzxnoneterraria:natures_gift", - "lzxnoneterraria:mana_flower" + "lzxnoneterraria:mana_flower", + "lzxnoneterraria:hercules_beetle", + "lzxnoneterraria:necromantic_scroll", + "lzxnoneterraria:papyrus_scarab", + "lzxnoneterraria:pygmy_necklace", + "lzxnoneterraria:warrior_emblem", + "lzxnoneterraria:summoner_emblem", + "lzxnoneterraria:ranger_emblem", + "lzxnoneterraria:sorcerer_emblem" ] }