From 68716f32119871c9f68a57b25904888667df84f5 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Wed, 22 Jul 2026 21:41:27 +0800 Subject: [PATCH] v1.5.0 --- build.gradle | 5 + gradle.properties | 3 + .../com/lzxnone/terraria/LzxnoneTerraria.java | 5 +- .../terraria/LzxnoneTerrariaClient.java | 4 +- .../java/com/lzxnone/terraria/ModSounds.java | 8 + .../terraria/effect/BloodButcheredEffect.java | 43 ++- .../terraria/effect/DemonicFlamesEffect.java | 42 ++- .../terraria/effect/EffectLogicHandler.java | 20 +- .../terraria/effect/KillModeEffect.java | 3 +- .../terraria/entity/summon/BeeSummon.java | 6 +- .../lzxnone/terraria/event/InputHandler.java | 25 +- .../terraria/item/weapon/melee/BeeKeeper.java | 64 +++- .../item/weapon/melee/BladeOfGrass.java | 115 +++++- .../item/weapon/melee/BloodButcherer.java | 64 +++- .../item/weapon/melee/DevilsDevastation.java | 278 ++++++++++++-- .../item/weapon/melee/EnchantedSword.java | 64 +++- .../terraria/item/weapon/melee/Excalibur.java | 65 +++- .../item/weapon/melee/FirstFractal.java | 129 ++++++- .../item/weapon/melee/InfluxWaver.java | 99 ++++- .../item/weapon/melee/LightsBane.java | 66 +++- .../terraria/item/weapon/melee/Mace.java | 101 +++++- .../terraria/item/weapon/melee/Meowmere.java | 67 +++- .../terraria/item/weapon/melee/Muramasa.java | 41 ++- .../item/weapon/melee/NightsEdge.java | 149 +++++++- .../terraria/item/weapon/melee/Seedler.java | 111 +++++- .../terraria/item/weapon/melee/StarWrath.java | 67 +++- .../terraria/item/weapon/melee/Starfury.java | 67 +++- .../item/weapon/melee/TerraBlade.java | 142 +++++++- .../terraria/item/weapon/melee/Terragrim.java | 70 +++- .../item/weapon/melee/TheHorsemansBlade.java | 117 +++++- .../weapon/melee/TrueCopperShortsword.java | 27 +- .../item/weapon/melee/TrueExcalibur.java | 65 +++- .../item/weapon/melee/TrueNightsEdge.java | 163 ++++++++- .../terraria/item/weapon/melee/Volcano.java | 79 +++- .../terraria/item/weapon/melee/Zenith.java | 183 +++++++++- .../DevilsDevastationKillModeHandler.java | 3 +- .../handler/FirstFractalScrollHandler.java | 11 +- .../network/handler/ZenithScrollHandler.java | 11 +- .../terraria/ui/config/ConfigFactory.java | 339 ++++++++++++++++++ .../terraria/ui/config/ConfigList.java | 73 ++++ .../terraria/ui/config/ConfigListItem.java | 26 ++ .../terraria/ui/config/ConfigScreen.java | 161 +++++++++ .../terraria/ui/config/ConfigUtil.java | 192 ++++++++++ .../terraria/ui/config/IConfigData.java | 6 + .../assets/lzxnoneterraria/lang/en_us.json | 264 +++++++------- .../assets/lzxnoneterraria/lang/zh_cn.json | 264 +++++++------- .../assets/lzxnoneterraria/lss/config.lss | 325 +++++++++++++++++ .../assets/lzxnoneterraria/sounds.json | 6 + .../sounds/demon_sword_final_strike.ogg | Bin 0 -> 73302 bytes .../demon_sword_kill_mode_off_cooldown.ogg | Bin 0 -> 13371 bytes .../textures/ui/nav_effect_icon.png | Bin 0 -> 1587 bytes .../textures/ui/nav_weapon_icon.png | Bin 0 -> 431 bytes .../textures/ui/rounded_square_border.png | Bin 0 -> 896 bytes .../assets/lzxnoneterraria/ui/config.xml | 50 +++ .../templates/META-INF/neoforge.mods.toml | 7 + 55 files changed, 3733 insertions(+), 562 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/ui/config/ConfigFactory.java create mode 100644 src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java create mode 100644 src/main/java/com/lzxnone/terraria/ui/config/ConfigListItem.java create mode 100644 src/main/java/com/lzxnone/terraria/ui/config/ConfigScreen.java create mode 100644 src/main/java/com/lzxnone/terraria/ui/config/ConfigUtil.java create mode 100644 src/main/java/com/lzxnone/terraria/ui/config/IConfigData.java create mode 100644 src/main/resources/assets/lzxnoneterraria/lss/config.lss create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/demon_sword_final_strike.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/demon_sword_kill_mode_off_cooldown.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/ui/nav_effect_icon.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/ui/nav_weapon_icon.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/ui/rounded_square_border.png create mode 100644 src/main/resources/assets/lzxnoneterraria/ui/config.xml diff --git a/build.gradle b/build.gradle index 954c79f..52cb492 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,10 @@ repositories { name = "Gegy" url = "https://maven.gegy.dev" } + maven { + name = "FirstDark" + url = "https://maven.firstdark.dev/snapshots" + } } base { @@ -126,6 +130,7 @@ dependencies { implementation 'net.objecthunter:exp4j:0.4.8' jarJar('net.objecthunter:exp4j:0.4.8') additionalRuntimeClasspath 'net.objecthunter:exp4j:0.4.8' + implementation("com.lowdragmc.ldlib2:ldlib2-neoforge-${minecraft_version}:${ldlib2_version}:all") attributesSchema { attribute(mappingsAttribute) } diff --git a/gradle.properties b/gradle.properties index 264d24e..756d461 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,3 +39,6 @@ mod_version=1.4.2 # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html mod_group_id=com.lzxnone.terraria + +# LDLib2 +ldlib2_version=2.2.29 diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java index 2e97586..5e45d34 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java @@ -6,12 +6,9 @@ import com.lzxnone.terraria.creative_mode_tab.ModCreativeModeTabs; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.BeeSummon; -import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.particle.ModParticles; -import net.minecraft.core.registries.Registries; import net.neoforged.neoforge.event.entity.EntityAttributeCreationEvent; -import net.neoforged.neoforge.registries.RegisterEvent; import org.slf4j.Logger; import com.mojang.logging.LogUtils; @@ -47,4 +44,4 @@ public class LzxnoneTerraria { public void onEntityAttributeCreation(EntityAttributeCreationEvent event) { event.put(ModEntities.BEE_SUMMON.get(), BeeSummon.createAttributes().build()); } -} \ No newline at end of file +} diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java index 28fccc2..b763d7b 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria; +import com.lzxnone.terraria.ui.config.ConfigScreen; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.beam.SwordBeamRenderer; import com.lzxnone.terraria.entity.projectile.StaticProjectileRenderer; @@ -12,13 +13,12 @@ import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.client.event.EntityRenderersEvent; import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent; -import net.neoforged.neoforge.client.gui.ConfigurationScreen; import net.neoforged.neoforge.client.gui.IConfigScreenFactory; @Mod(value = LzxnoneTerraria.MODID, dist = Dist.CLIENT) public class LzxnoneTerrariaClient { public LzxnoneTerrariaClient(ModContainer container, IEventBus modEventBus) { - container.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new); + container.registerExtensionPoint(IConfigScreenFactory.class, (modContainer, parent) -> ConfigScreen.create(parent)); //Entity渲染 modEventBus.addListener(EntityRenderersEvent.RegisterRenderers.class, event -> { diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index 6ea106f..f7db704 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -83,4 +83,12 @@ public class ModSounds { SOUND_EVENTS.register("demon_sword_kill_mode", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "demon_sword_kill_mode"))); + public static final Supplier DEMON_SWORD_KILL_MODE_OFF_COOLDOWN = + SOUND_EVENTS.register("demon_sword_kill_mode_off_cooldown", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "demon_sword_kill_mode_off_cooldown"))); + public static final Supplier DEMON_SWORD_FINAL_STRIKE = + SOUND_EVENTS.register("demon_sword_final_strike", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "demon_sword_final_strike"))); } diff --git a/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java b/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java index 10ab8d2..46c8f05 100644 --- a/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java @@ -1,9 +1,15 @@ package com.lzxnone.terraria.effect; -import com.lzxnone.terraria.Config; +import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.MathUtil; import com.lzxnone.terraria.utils.ParticleUtil; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; @@ -13,10 +19,43 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.phys.Vec3; public class BloodButcheredEffect extends MobEffect { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PER_LEVEL_PATH = "effect.blood_butchered.damage_per_level"; + public static final double DAMAGE_PER_LEVEL_DEFAULT = 0.5; + public static final double DAMAGE_PER_LEVEL_MIN = 0.0; + public static final double DAMAGE_PER_LEVEL_MAX = 8388600.0; + public BloodButcheredEffect() { super(MobEffectCategory.HARMFUL, 0xFF0000); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(DAMAGE_PER_LEVEL_PATH, configText("blood_butcherer_damage_per_level"), configTooltip("blood_butcherer_damage_per_level"), DAMAGE_PER_LEVEL_DEFAULT, DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getDamagePerLevel() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PER_LEVEL_PATH, DAMAGE_PER_LEVEL_DEFAULT), DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "blood_butchered", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/blood_butchered.png"), + Component.translatable("effect.lzxnoneterraria.blood_butchered"), + CONFIG_DATA + ); + @Override public boolean shouldApplyEffectTickThisTick(int duration, int amplifier) { return true; @@ -28,7 +67,7 @@ public class BloodButcheredEffect extends MobEffect { MobEffectInstance instance = entity.getEffect(ModEffects.BLOOD_BUTCHERED); if(instance != null) { if(instance.getDuration() % 20 == 0) { - entity.hurt(entity.damageSources().magic(), (float) Config.bloodButchererDamagePerLevel * (amplifier + 1)); + entity.hurt(entity.damageSources().magic(), (float) getDamagePerLevel() * (amplifier + 1)); } } diff --git a/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java b/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java index 1e0b3ec..8631937 100644 --- a/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/DemonicFlamesEffect.java @@ -1,9 +1,14 @@ package com.lzxnone.terraria.effect; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.particle.CircleParticleOptions; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.ParticleUtil; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; @@ -13,10 +18,43 @@ import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; public class DemonicFlamesEffect extends MobEffect { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PER_LEVEL_PATH = "effect.demonic_flames.damage_per_level"; + public static final double DAMAGE_PER_LEVEL_DEFAULT = 2.5; + public static final double DAMAGE_PER_LEVEL_MIN = 0.0; + public static final double DAMAGE_PER_LEVEL_MAX = 8388600.0; + public DemonicFlamesEffect() { super(MobEffectCategory.HARMFUL, 0xCC2DC7); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(DAMAGE_PER_LEVEL_PATH, configText("demonic_flames_damage_per_level"), configTooltip("demonic_flames_damage_per_level"), DAMAGE_PER_LEVEL_DEFAULT, DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getDamagePerLevel() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PER_LEVEL_PATH, DAMAGE_PER_LEVEL_DEFAULT), DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "demonic_flames", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/demonic_flames.png"), + Component.translatable("effect.lzxnoneterraria.demonic_flames"), + CONFIG_DATA + ); + public static final CircleParticleOptions PARTICLE = new CircleParticleOptions(0.075f, 20, new Vector3f(0.8f, 0.176f, 0.78f)); @Override @@ -31,7 +69,7 @@ public class DemonicFlamesEffect extends MobEffect { if(instance != null) { if(entity.tickCount % 4 == 0) { entity.invulnerableTime = 5; - entity.hurt(entity.damageSources().magic(), (float) Config.demonicFlamesDamagePerLevel * (amplifier + 1)); + entity.hurt(entity.damageSources().magic(), (float) getDamagePerLevel() * (amplifier + 1)); } } diff --git a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java index f5262ba..057342b 100644 --- a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java +++ b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java @@ -1,8 +1,9 @@ package com.lzxnone.terraria.effect; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; +import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.core.Holder; import net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket; import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket; @@ -26,7 +27,7 @@ public class EffectLogicHandler { currentEffect = instance.getEffect(); } if(checkEffect(currentEffect)) { - if(!entity.level().isClientSide() && entity.level() instanceof ServerLevel serverLevel) { + if(entity.level() instanceof ServerLevel serverLevel) { serverLevel.getChunkSource().broadcast(entity, new ClientboundUpdateMobEffectPacket(entity.getId(), instance, false)); } @@ -41,15 +42,17 @@ public class EffectLogicHandler { if(instance != null) { currentEffect = instance.getEffect(); } - if(checkEffect(currentEffect) && !entity.level().isClientSide()) { + if(checkEffect(currentEffect)) { if(entity.level() instanceof ServerLevel serverLevel) { if(event.getEffectInstance() != null) { serverLevel.getChunkSource().broadcast(entity, new ClientboundRemoveMobEffectPacket(entity.getId(), currentEffect)); } if(currentEffect == ModEffects.KILL_MODE) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, Config.devilsDevastationKillModeCooldownTime, 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.getKillModeCooldownTime(), 0); entity.addEffect(effectInstance); + }else if(currentEffect == ModEffects.KILL_MODE_COOLDOWN) { + SoundUtil.playServerSound(entity, ModSounds.DEMON_SWORD_KILL_MODE_OFF_COOLDOWN.get(), 0.5f, 1.0f); } } } @@ -63,15 +66,17 @@ public class EffectLogicHandler { if(instance != null) { currentEffect = instance.getEffect(); } - if(checkEffect(currentEffect) && !entity.level().isClientSide()) { + if(checkEffect(currentEffect)) { if(entity.level() instanceof ServerLevel serverLevel) { if(event.getEffectInstance() != null) { serverLevel.getChunkSource().broadcast(entity, new ClientboundRemoveMobEffectPacket(entity.getId(), currentEffect)); } if(currentEffect == ModEffects.KILL_MODE) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, Config.devilsDevastationKillModeCooldownTime, 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.getKillModeCooldownTime(), 0); entity.addEffect(effectInstance); + }else if(currentEffect == ModEffects.KILL_MODE_COOLDOWN) { + SoundUtil.playServerSound(entity, ModSounds.DEMON_SWORD_KILL_MODE_OFF_COOLDOWN.get(), 0.5f, 1.0f); } } } @@ -81,6 +86,7 @@ public class EffectLogicHandler { if(effect == null) return false; return effect == ModEffects.CONFUSED - || effect == ModEffects.KILL_MODE; + || effect == ModEffects.KILL_MODE + || effect == ModEffects.KILL_MODE_COOLDOWN; } } diff --git a/src/main/java/com/lzxnone/terraria/effect/KillModeEffect.java b/src/main/java/com/lzxnone/terraria/effect/KillModeEffect.java index 2d561a8..4e2d925 100644 --- a/src/main/java/com/lzxnone/terraria/effect/KillModeEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/KillModeEffect.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.effect; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; import com.lzxnone.terraria.particle.CircleParticleOptions; @@ -44,7 +43,7 @@ public class KillModeEffect extends MobEffect { ); } }else { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, Config.devilsDevastationKillModeCooldownTime, 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, DevilsDevastation.getKillModeCooldownTime(), 0); entity.addEffect(effectInstance); MobEffectInstance effectInstance2 = entity.getEffect(ModEffects.KILL_MODE); diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/BeeSummon.java b/src/main/java/com/lzxnone/terraria/entity/summon/BeeSummon.java index 12e8d26..06647c2 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/BeeSummon.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/BeeSummon.java @@ -1,6 +1,6 @@ package com.lzxnone.terraria.entity.summon; -import com.lzxnone.terraria.Config; +import com.lzxnone.terraria.item.weapon.melee.BeeKeeper; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.MathUtil; import net.minecraft.nbt.CompoundTag; @@ -124,10 +124,10 @@ public class BeeSummon extends Bee { if(owner == null) return false; boolean isHurt; if(owner instanceof Player player) { - isHurt = DamageUtil.attack(player, target, (float) Config.beeKeeperBeeDamage); + isHurt = DamageUtil.attack(player, target, (float) BeeKeeper.getBeeDamage()); }else { DamageSource damageSource = this.damageSources().mobAttack(owner); - isHurt = target.hurt(damageSource, (float) Config.beeKeeperBeeDamage); + isHurt = target.hurt(damageSource, (float) BeeKeeper.getBeeDamage()); } if(isHurt) { diff --git a/src/main/java/com/lzxnone/terraria/event/InputHandler.java b/src/main/java/com/lzxnone/terraria/event/InputHandler.java index 909af53..df587a7 100644 --- a/src/main/java/com/lzxnone/terraria/event/InputHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/InputHandler.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.event; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModKeyBindings; import com.lzxnone.terraria.effect.ModEffects; @@ -46,18 +45,18 @@ public class InputHandler { double deltaDist = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) .copyTag().getDouble("deltaDist"); - double finalDelta = deltaDist + scrollDelta * Config.zenithMouseSpeed; + double finalDelta = deltaDist + scrollDelta * Zenith.getMouseSpeed(); - if(Config.zenithDistanceMode) { - if(finalDelta > Config.zenithMaxRange) finalDelta = Config.zenithMaxRange; - else if(finalDelta < -Config.zenithMaxRange) finalDelta = -Config.zenithMaxRange; + if(Zenith.isDistanceMode()) { + if(finalDelta > Zenith.getMaxRange()) finalDelta = Zenith.getMaxRange(); + else if(finalDelta < -Zenith.getMaxRange()) finalDelta = -Zenith.getMaxRange(); }else { - if(finalDelta > Config.zenithMaxRange) finalDelta = Config.zenithMaxRange; + if(finalDelta > Zenith.getMaxRange()) finalDelta = Zenith.getMaxRange(); else if(finalDelta < 0) finalDelta = 0; } MutableComponent displayText = Component.empty(); - displayText.append(Component.literal(String.format("%s", Config.zenithDistanceMode ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) + displayText.append(Component.literal(String.format("%s", Zenith.isDistanceMode() ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) .append(Component.literal(String.format("%.1f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); player.displayClientMessage(displayText, true); @@ -72,17 +71,17 @@ public class InputHandler { double deltaDist = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) .copyTag().getDouble("deltaDist"); - double finalDelta = deltaDist + scrollDelta * Config.firstFractalScrollSpeed; + double finalDelta = deltaDist + scrollDelta * FirstFractal.getScrollSpeed(); - if(Config.firstFractalDistanceMode) { - if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; - else if(finalDelta < -Config.firstFractalMaxRange) finalDelta = -Config.firstFractalMaxRange; + if(FirstFractal.isDistanceMode()) { + if(finalDelta > FirstFractal.getMaxRange()) finalDelta = FirstFractal.getMaxRange(); + else if(finalDelta < -FirstFractal.getMaxRange()) finalDelta = -FirstFractal.getMaxRange(); }else { - if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; + if(finalDelta > FirstFractal.getMaxRange()) finalDelta = FirstFractal.getMaxRange(); else if(finalDelta < 0) finalDelta = 0; } MutableComponent displayText = Component.empty(); - displayText.append(Component.literal(String.format("%s", Config.firstFractalDistanceMode ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) + displayText.append(Component.literal(String.format("%s", FirstFractal.isDistanceMode() ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) .append(Component.literal(String.format("%.1f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); player.displayClientMessage(displayText, true); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BeeKeeper.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BeeKeeper.java index aa1ff05..912a030 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BeeKeeper.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BeeKeeper.java @@ -1,13 +1,17 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.item.IItemWaveBehavior; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; @@ -25,6 +29,23 @@ import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; public class BeeKeeper extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String MAX_BEES_PATH = "weapon.bee_keeper.max_bees"; + public static final int MAX_BEES_DEFAULT = 3; + public static final int MAX_BEES_MIN = 0; + public static final int MAX_BEES_MAX = 10; + + public static final String CONFUSION_DURATION_PATH = "weapon.bee_keeper.confusion_duration"; + public static final int CONFUSION_DURATION_DEFAULT = 40; + public static final int CONFUSION_DURATION_MIN = 0; + public static final int CONFUSION_DURATION_MAX = 1200; + + public static final String BEE_DAMAGE_PATH = "weapon.bee_keeper.bee_damage"; + public static final double BEE_DAMAGE_DEFAULT = 2.0; + public static final double BEE_DAMAGE_MIN = 0.0; + public static final double BEE_DAMAGE_MAX = 2147483647.0; + public BeeKeeper() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -37,6 +58,42 @@ public class BeeKeeper extends SwordItem { )); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadIntConfig(MAX_BEES_PATH, configText("bee_keeper_max_bees"), configTooltip("bee_keeper_max_bees"), MAX_BEES_DEFAULT, MAX_BEES_MIN, MAX_BEES_MAX); + ConfigFactory.loadIntConfig(CONFUSION_DURATION_PATH, configText("bee_keeper_confusion_duration"), configTooltip("bee_keeper_confusion_duration"), CONFUSION_DURATION_DEFAULT, CONFUSION_DURATION_MIN, CONFUSION_DURATION_MAX); + ConfigFactory.loadDoubleConfig(BEE_DAMAGE_PATH, configText("bee_keeper_bee_damage"), configTooltip("bee_keeper_bee_damage"), BEE_DAMAGE_DEFAULT, BEE_DAMAGE_MIN, BEE_DAMAGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static int getMaxBees() { + return Math.clamp(ConfigUtil.readInt(MAX_BEES_PATH, MAX_BEES_DEFAULT), MAX_BEES_MIN, MAX_BEES_MAX); + } + + public static int getConfusionDuration() { + return Math.clamp(ConfigUtil.readInt(CONFUSION_DURATION_PATH, CONFUSION_DURATION_DEFAULT), CONFUSION_DURATION_MIN, CONFUSION_DURATION_MAX); + } + + public static double getBeeDamage() { + return Math.clamp(ConfigUtil.readDouble(BEE_DAMAGE_PATH, BEE_DAMAGE_DEFAULT), BEE_DAMAGE_MIN, BEE_DAMAGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "bee_keeper", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/bee_keeper.png"), + Component.translatable("item.lzxnoneterraria.bee_keeper"), + CONFIG_DATA + ); + public static final IItemWaveBehavior ITEM_WAVE_BEHAVIOR = new IItemWaveBehavior() { @Override public void onAttackEntity(AttackEntityEvent event) { @@ -50,12 +107,13 @@ public class BeeKeeper extends SwordItem { if(target instanceof LivingEntity livingTarget && FilterUtil.createLivingTargetFilter(player).test(livingTarget)) { livingTarget.addEffect(new MobEffectInstance( ModEffects.CONFUSED, - Config.beeKeeperConfusionDuration, + getConfusionDuration(), 0 )); } - int count = Config.beeKeeperMaxBees > 0 ? player.level().random.nextInt(Config.beeKeeperMaxBees) + 1 : 0; + int maxBees = getMaxBees(); + int count = maxBees > 0 ? player.level().random.nextInt(maxBees) + 1 : 0; while(count-- > 0) { BeeSummon bee = ModEntities.BEE_SUMMON.get().create(player.level()); if(bee != null) { diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BladeOfGrass.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BladeOfGrass.java index bf28c63..d0d801d 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BladeOfGrass.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BladeOfGrass.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.effect.ModEffects; @@ -50,11 +49,109 @@ import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.Vec3; import org.joml.Matrix4f; import org.joml.Vector3f; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; import java.util.Comparator; import java.util.List; public class BladeOfGrass extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String PROJECTILE_DAMAGE_PATH = "weapon.blade_of_grass.projectile_damage"; + public static final double PROJECTILE_DAMAGE_DEFAULT = 2.0; + public static final double PROJECTILE_DAMAGE_MIN = 0.0; + public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + + public static final String EFFECT_DURATION_PATH = "weapon.blade_of_grass.effect_duration"; + public static final int EFFECT_DURATION_DEFAULT = 140; + public static final int EFFECT_DURATION_MIN = 0; + public static final int EFFECT_DURATION_MAX = 72000; + + public static final String TARGET_RANGE_PATH = "weapon.blade_of_grass.target_range"; + public static final double TARGET_RANGE_DEFAULT = 8.0; + public static final double TARGET_RANGE_MIN = 1.0; + public static final double TARGET_RANGE_MAX = 64.0; + + public static final String PROJECTILE_LIFETIME_PATH = "weapon.blade_of_grass.projectile_lifetime"; + public static final int PROJECTILE_LIFETIME_DEFAULT = 60; + public static final int PROJECTILE_LIFETIME_MIN = 1; + public static final int PROJECTILE_LIFETIME_MAX = 600; + + public static final String PROJECTILE_MAX_HIT_COUNT_PATH = "weapon.blade_of_grass.projectile_max_hit_count"; + public static final int PROJECTILE_MAX_HIT_COUNT_DEFAULT = 2; + public static final int PROJECTILE_MAX_HIT_COUNT_MIN = 0; + public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100; + + public static final String RADIUS_GROWTH_PATH = "weapon.blade_of_grass.radius_growth"; + public static final double RADIUS_GROWTH_DEFAULT = 0.05; + public static final double RADIUS_GROWTH_MIN = 0.0; + public static final double RADIUS_GROWTH_MAX = 1.0; + + public static final String ROTATION_SPEED_PATH = "weapon.blade_of_grass.rotation_speed"; + public static final double ROTATION_SPEED_DEFAULT = 0.2; + public static final double ROTATION_SPEED_MIN = 0.0; + public static final double ROTATION_SPEED_MAX = 1.0; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("blade_of_grass_projectile_damage"), configTooltip("blade_of_grass_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + ConfigFactory.loadIntConfig(EFFECT_DURATION_PATH, configText("blade_of_grass_effect_duration"), configTooltip("blade_of_grass_effect_duration"), EFFECT_DURATION_DEFAULT, EFFECT_DURATION_MIN, EFFECT_DURATION_MAX); + ConfigFactory.loadDoubleConfig(TARGET_RANGE_PATH, configText("blade_of_grass_target_range"), configTooltip("blade_of_grass_target_range"), TARGET_RANGE_DEFAULT, TARGET_RANGE_MIN, TARGET_RANGE_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("blade_of_grass_projectile_lifetime"), configTooltip("blade_of_grass_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_MAX_HIT_COUNT_PATH, configText("blade_of_grass_projectile_max_hit_count"), configTooltip("blade_of_grass_projectile_max_hit_count"), PROJECTILE_MAX_HIT_COUNT_DEFAULT, PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); + ConfigFactory.loadDoubleConfig(RADIUS_GROWTH_PATH, configText("blade_of_grass_radius_growth"), configTooltip("blade_of_grass_radius_growth"), RADIUS_GROWTH_DEFAULT, RADIUS_GROWTH_MIN, RADIUS_GROWTH_MAX); + ConfigFactory.loadDoubleConfig(ROTATION_SPEED_PATH, configText("blade_of_grass_rotation_speed"), configTooltip("blade_of_grass_rotation_speed"), ROTATION_SPEED_DEFAULT, ROTATION_SPEED_MIN, ROTATION_SPEED_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getProjectileDamage() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + } + + public static int getEffectDuration() { + return Math.clamp(ConfigUtil.readInt(EFFECT_DURATION_PATH, EFFECT_DURATION_DEFAULT), EFFECT_DURATION_MIN, EFFECT_DURATION_MAX); + } + + public static double getTargetRange() { + return Math.clamp(ConfigUtil.readDouble(TARGET_RANGE_PATH, TARGET_RANGE_DEFAULT), TARGET_RANGE_MIN, TARGET_RANGE_MAX); + } + + public static int getProjectileLifetime() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + } + + public static int getProjectileMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_MAX_HIT_COUNT_PATH, PROJECTILE_MAX_HIT_COUNT_DEFAULT), PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); + } + + public static double getRadiusGrowth() { + return Math.clamp(ConfigUtil.readDouble(RADIUS_GROWTH_PATH, RADIUS_GROWTH_DEFAULT), RADIUS_GROWTH_MIN, RADIUS_GROWTH_MAX); + } + + public static double getRotationSpeed() { + return Math.clamp(ConfigUtil.readDouble(ROTATION_SPEED_PATH, ROTATION_SPEED_DEFAULT), ROTATION_SPEED_MIN, ROTATION_SPEED_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "blade_of_grass", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/blade_of_grass.png"), + Component.translatable("item.lzxnoneterraria.blade_of_grass"), + CONFIG_DATA + ); + public BladeOfGrass() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -144,19 +241,19 @@ public class BladeOfGrass extends SwordItem { Entity owner = projectile.getOwner(); if(owner == null) return; CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA); - if(!customData.contains("hitCount") || customData.getInt("hitCount") >= Config.bladeOfGrassProjectileMaxHitCount) return; + if(!customData.contains("hitCount") || customData.getInt("hitCount") >= getProjectileMaxHitCount()) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.attack(player, target, (float) Config.bladeOfGrassProjectileDamage)) { + if(DamageUtil.attack(player, target, (float) getProjectileDamage())) { int count = customData.getInt("hitCount"); count++; if(target instanceof LivingEntity livingEntity && projectile.getRandom().nextInt(4) == 0) { livingEntity.addEffect(new MobEffectInstance( MobEffects.POISON, - Config.bladeOfGrassEffectDuration, + getEffectDuration(), 0 )); } - if(count >= Config.bladeOfGrassProjectileMaxHitCount) onDied(projectile); + if(count >= getProjectileMaxHitCount()) onDied(projectile); else customData.putInt("hitCount", count); } } @@ -182,7 +279,7 @@ public class BladeOfGrass extends SwordItem { if(!level.isClientSide()) { List targets = player.level().getEntitiesOfClass( Monster.class, - AABB.ofSize(player.getBoundingBox().getCenter(), Config.bladeOfGrassTargetRange * 2, Config.bladeOfGrassTargetRange * 2, Config.bladeOfGrassTargetRange * 2), + AABB.ofSize(player.getBoundingBox().getCenter(), getTargetRange() * 2, getTargetRange() * 2, getTargetRange() * 2), FilterUtil.createMonsterFilter(player) ); targets.sort(Comparator.comparingDouble(e -> e.distanceToSqr(player.position()))); @@ -217,9 +314,9 @@ public class BladeOfGrass extends SwordItem { projectile.getEntityData().set(StaticProjectile.RXP, -90); projectile.getEntityData().set(StaticProjectile.RZP, -90); projectile.getEntityData().set(StaticProjectile.RYPS, 10); - projectile.getEntityData().set(StaticProjectile.LIFETIME, Config.bladeOfGrassProjectileLifetime); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("(%.3f+%.3f*t)*cos(%.3f*t+%.3f)", radius, Config.bladeOfGrassRadiusGrowth, Config.bladeOfGrassRotationSpeed, angleRad)); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Y, String.format("(%.3f+%.3f*t)*sin(%.3f*t+%.3f)", radius, Config.bladeOfGrassRadiusGrowth, Config.bladeOfGrassRotationSpeed, angleRad)); + projectile.getEntityData().set(StaticProjectile.LIFETIME, getProjectileLifetime()); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("(%.3f+%.3f*t)*cos(%.3f*t+%.3f)", radius, getRadiusGrowth(), getRotationSpeed(), angleRad)); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Y, String.format("(%.3f+%.3f*t)*sin(%.3f*t+%.3f)", radius, getRadiusGrowth(), getRotationSpeed(), angleRad)); CompoundTag customData = new CompoundTag(); customData.putInt("hitCount", 0); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BloodButcherer.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BloodButcherer.java index 8e62b69..3c2c8b8 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/BloodButcherer.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/BloodButcherer.java @@ -1,12 +1,16 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.item.IItemWaveBehavior; import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.ParticleUtil; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; @@ -25,6 +29,18 @@ import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; public class BloodButcherer extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String EFFECT_DURATION_PATH = "weapon.blood_butcherer.effect_duration"; + public static final int EFFECT_DURATION_DEFAULT = 180; + public static final int EFFECT_DURATION_MIN = 0; + public static final int EFFECT_DURATION_MAX = 72000; + + public static final String MAX_LEVEL_PATH = "weapon.blood_butcherer.max_level"; + public static final int MAX_LEVEL_DEFAULT = 4; + public static final int MAX_LEVEL_MIN = 0; + public static final int MAX_LEVEL_MAX = 255; + public BloodButcherer() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -37,6 +53,37 @@ public class BloodButcherer extends SwordItem { )); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadIntConfig(EFFECT_DURATION_PATH, configText("blood_butcherer_effect_duration"), configTooltip("blood_butcherer_effect_duration"), EFFECT_DURATION_DEFAULT, EFFECT_DURATION_MIN, EFFECT_DURATION_MAX); + ConfigFactory.loadIntConfig(MAX_LEVEL_PATH, configText("blood_butcherer_max_level"), configTooltip("blood_butcherer_max_level"), MAX_LEVEL_DEFAULT, MAX_LEVEL_MIN, MAX_LEVEL_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static int getEffectDuration() { + return Math.clamp(ConfigUtil.readInt(EFFECT_DURATION_PATH, EFFECT_DURATION_DEFAULT), EFFECT_DURATION_MIN, EFFECT_DURATION_MAX); + } + + public static int getMaxLevel() { + return Math.clamp(ConfigUtil.readInt(MAX_LEVEL_PATH, MAX_LEVEL_DEFAULT), MAX_LEVEL_MIN, MAX_LEVEL_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "blood_butcherer", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/blood_butcherer.png"), + Component.translatable("item.lzxnoneterraria.blood_butcherer"), + CONFIG_DATA + ); + public static final IItemWaveBehavior ITEM_WAVE_BEHAVIOR = new IItemWaveBehavior() { @Override public void onLeftClickAir(PlayerInteractEvent.LeftClickEmpty event) { @@ -92,12 +139,15 @@ public class BloodButcherer extends SwordItem { currentLevel = instance.getAmplifier(); } } - if(currentLevel >= Config.bloodButchererMaxLevel) currentLevel = Config.bloodButchererMaxLevel - 1; - livingTarget.addEffect(new MobEffectInstance( - ModEffects.BLOOD_BUTCHERED, - Config.bloodButchererEffectDuration, - currentLevel + 1 - )); + int maxLevel = getMaxLevel(); + if(maxLevel > 0) { + if(currentLevel >= maxLevel) currentLevel = maxLevel - 1; + livingTarget.addEffect(new MobEffectInstance( + ModEffects.BLOOD_BUTCHERED, + getEffectDuration(), + currentLevel + 1 + )); + } } player.getCooldowns().addCooldown(item, 7); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java index e01cabe..3264cf4 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/DevilsDevastation.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.attachment.ModAttachments; @@ -57,12 +56,209 @@ import org.joml.Matrix4f; import org.joml.Quaternionf; import org.joml.Vector3f; import net.minecraft.client.Camera; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import java.util.*; public class DevilsDevastation extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String KILL_MODE_TIME_PATH = "weapon.devils_devastation.kill_mode_time"; + public static final int KILL_MODE_TIME_DEFAULT = 100; + public static final int KILL_MODE_TIME_MIN = 0; + public static final int KILL_MODE_TIME_MAX = 72000; + + public static final String KILL_MODE_COOLDOWN_TIME_PATH = "weapon.devils_devastation.kill_mode_cooldown_time"; + public static final int KILL_MODE_COOLDOWN_TIME_DEFAULT = 100; + public static final int KILL_MODE_COOLDOWN_TIME_MIN = 0; + public static final int KILL_MODE_COOLDOWN_TIME_MAX = 72000; + + public static final String PROJECTILE_DAMAGE_PATH = "weapon.devils_devastation.projectile_damage"; + public static final double PROJECTILE_DAMAGE_DEFAULT = 30.0; + public static final double PROJECTILE_DAMAGE_MIN = 0.0; + public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + + public static final String PROJECTILE_LIFETIME_PATH = "weapon.devils_devastation.projectile_lifetime"; + public static final int PROJECTILE_LIFETIME_DEFAULT = 40; + public static final int PROJECTILE_LIFETIME_MIN = 1; + public static final int PROJECTILE_LIFETIME_MAX = 1200; + + public static final String PROJECTILE_SPEED_PATH = "weapon.devils_devastation.projectile_speed"; + public static final double PROJECTILE_SPEED_DEFAULT = 3.0; + public static final double PROJECTILE_SPEED_MIN = 0.0; + public static final double PROJECTILE_SPEED_MAX = 10.0; + + public static final String STUCK_PROJECTILE_DAMAGE_PATH = "weapon.devils_devastation.stuck_projectile_damage"; + public static final double STUCK_PROJECTILE_DAMAGE_DEFAULT = 30.0; + public static final double STUCK_PROJECTILE_DAMAGE_MIN = 0.0; + public static final double STUCK_PROJECTILE_DAMAGE_MAX = 2147483647.0; + + public static final String STUCK_PROJECTILE_LIFETIME_PATH = "weapon.devils_devastation.stuck_projectile_lifetime"; + public static final int STUCK_PROJECTILE_LIFETIME_DEFAULT = 40; + public static final int STUCK_PROJECTILE_LIFETIME_MIN = 1; + public static final int STUCK_PROJECTILE_LIFETIME_MAX = 1200; + + public static final String STUCK_PROJECTILE_SPEED_PATH = "weapon.devils_devastation.stuck_projectile_speed"; + public static final double STUCK_PROJECTILE_SPEED_DEFAULT = 3.0; + public static final double STUCK_PROJECTILE_SPEED_MIN = 0.0; + public static final double STUCK_PROJECTILE_SPEED_MAX = 10.0; + + public static final String KILL_MODE_PROJECTILE_CYCLE_PATH = "weapon.devils_devastation.kill_mode_projectile_cycle"; + public static final int KILL_MODE_PROJECTILE_CYCLE_DEFAULT = 10; + public static final int KILL_MODE_PROJECTILE_CYCLE_MIN = 1; + public static final int KILL_MODE_PROJECTILE_CYCLE_MAX = 200; + + public static final String KILL_MODE_PROJECTILE_DAMAGE_PATH = "weapon.devils_devastation.kill_mode_projectile_damage"; + public static final double KILL_MODE_PROJECTILE_DAMAGE_DEFAULT = 200.0; + public static final double KILL_MODE_PROJECTILE_DAMAGE_MIN = 0.0; + public static final double KILL_MODE_PROJECTILE_DAMAGE_MAX = 2147483647.0; + + public static final String KILL_MODE_PROJECTILE_ROTATE_PATH = "weapon.devils_devastation.kill_mode_projectile_rotate"; + public static final int KILL_MODE_PROJECTILE_ROTATE_DEFAULT = 30; + public static final int KILL_MODE_PROJECTILE_ROTATE_MIN = 0; + public static final int KILL_MODE_PROJECTILE_ROTATE_MAX = 360; + + public static final String STUCK_LIFETIME_PATH = "weapon.devils_devastation.stuck_lifetime"; + public static final int STUCK_LIFETIME_DEFAULT = 200; + public static final int STUCK_LIFETIME_MIN = 1; + public static final int STUCK_LIFETIME_MAX = 72000; + + public static final String MAX_STUCK_COUNT_PATH = "weapon.devils_devastation.max_stuck_count"; + public static final int MAX_STUCK_COUNT_DEFAULT = 5; + public static final int MAX_STUCK_COUNT_MIN = 1; + public static final int MAX_STUCK_COUNT_MAX = 50; + + public static final String MARK_LIGHTNING_DAMAGE_PATH = "weapon.devils_devastation.mark_lightning_damage"; + public static final double MARK_LIGHTNING_DAMAGE_DEFAULT = 100.0; + public static final double MARK_LIGHTNING_DAMAGE_MIN = 0.0; + public static final double MARK_LIGHTNING_DAMAGE_MAX = 2147483647.0; + + public static final String PROJECTILE_EFFECT_DURATION_PATH = "weapon.devils_devastation.projectile_effect_duration"; + public static final int PROJECTILE_EFFECT_DURATION_DEFAULT = 40; + public static final int PROJECTILE_EFFECT_DURATION_MIN = 0; + public static final int PROJECTILE_EFFECT_DURATION_MAX = 72000; + + public static final String STUCK_PROJECTILE_EFFECT_DURATION_PATH = "weapon.devils_devastation.stuck_projectile_effect_duration"; + public static final int STUCK_PROJECTILE_EFFECT_DURATION_DEFAULT = 60; + public static final int STUCK_PROJECTILE_EFFECT_DURATION_MIN = 0; + public static final int STUCK_PROJECTILE_EFFECT_DURATION_MAX = 72000; + + public static final String KILL_MODE_PROJECTILE_EFFECT_DURATION_PATH = "weapon.devils_devastation.kill_mode_projectile_effect_duration"; + public static final int KILL_MODE_PROJECTILE_EFFECT_DURATION_DEFAULT = 70; + public static final int KILL_MODE_PROJECTILE_EFFECT_DURATION_MIN = 0; + public static final int KILL_MODE_PROJECTILE_EFFECT_DURATION_MAX = 72000; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadIntConfig(KILL_MODE_TIME_PATH, configText("devils_devastation_kill_mode_time"), configTooltip("devils_devastation_kill_mode_time"), KILL_MODE_TIME_DEFAULT, KILL_MODE_TIME_MIN, KILL_MODE_TIME_MAX); + ConfigFactory.loadIntConfig(KILL_MODE_COOLDOWN_TIME_PATH, configText("devils_devastation_kill_mode_cooldown_time"), configTooltip("devils_devastation_kill_mode_cooldown_time"), KILL_MODE_COOLDOWN_TIME_DEFAULT, KILL_MODE_COOLDOWN_TIME_MIN, KILL_MODE_COOLDOWN_TIME_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("devils_devastation_projectile_damage"), configTooltip("devils_devastation_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("devils_devastation_projectile_lifetime"), configTooltip("devils_devastation_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("devils_devastation_projectile_speed"), configTooltip("devils_devastation_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + ConfigFactory.loadDoubleConfig(STUCK_PROJECTILE_DAMAGE_PATH, configText("devils_devastation_stuck_projectile_damage"), configTooltip("devils_devastation_stuck_projectile_damage"), STUCK_PROJECTILE_DAMAGE_DEFAULT, STUCK_PROJECTILE_DAMAGE_MIN, STUCK_PROJECTILE_DAMAGE_MAX); + ConfigFactory.loadIntConfig(STUCK_PROJECTILE_LIFETIME_PATH, configText("devils_devastation_stuck_projectile_lifetime"), configTooltip("devils_devastation_stuck_projectile_lifetime"), STUCK_PROJECTILE_LIFETIME_DEFAULT, STUCK_PROJECTILE_LIFETIME_MIN, STUCK_PROJECTILE_LIFETIME_MAX); + ConfigFactory.loadDoubleConfig(STUCK_PROJECTILE_SPEED_PATH, configText("devils_devastation_stuck_projectile_speed"), configTooltip("devils_devastation_stuck_projectile_speed"), STUCK_PROJECTILE_SPEED_DEFAULT, STUCK_PROJECTILE_SPEED_MIN, STUCK_PROJECTILE_SPEED_MAX); + ConfigFactory.loadIntConfig(KILL_MODE_PROJECTILE_CYCLE_PATH, configText("devils_devastation_kill_mode_projectile_cycle"), configTooltip("devils_devastation_kill_mode_projectile_cycle"), KILL_MODE_PROJECTILE_CYCLE_DEFAULT, KILL_MODE_PROJECTILE_CYCLE_MIN, KILL_MODE_PROJECTILE_CYCLE_MAX); + ConfigFactory.loadDoubleConfig(KILL_MODE_PROJECTILE_DAMAGE_PATH, configText("devils_devastation_kill_mode_projectile_damage"), configTooltip("devils_devastation_kill_mode_projectile_damage"), KILL_MODE_PROJECTILE_DAMAGE_DEFAULT, KILL_MODE_PROJECTILE_DAMAGE_MIN, KILL_MODE_PROJECTILE_DAMAGE_MAX); + ConfigFactory.loadIntConfig(KILL_MODE_PROJECTILE_ROTATE_PATH, configText("devils_devastation_kill_mode_projectile_rotate"), configTooltip("devils_devastation_kill_mode_projectile_rotate"), KILL_MODE_PROJECTILE_ROTATE_DEFAULT, KILL_MODE_PROJECTILE_ROTATE_MIN, KILL_MODE_PROJECTILE_ROTATE_MAX); + ConfigFactory.loadIntConfig(STUCK_LIFETIME_PATH, configText("devils_devastation_stuck_lifetime"), configTooltip("devils_devastation_stuck_lifetime"), STUCK_LIFETIME_DEFAULT, STUCK_LIFETIME_MIN, STUCK_LIFETIME_MAX); + ConfigFactory.loadIntConfig(MAX_STUCK_COUNT_PATH, configText("devils_devastation_max_stuck_count"), configTooltip("devils_devastation_max_stuck_count"), MAX_STUCK_COUNT_DEFAULT, MAX_STUCK_COUNT_MIN, MAX_STUCK_COUNT_MAX); + ConfigFactory.loadDoubleConfig(MARK_LIGHTNING_DAMAGE_PATH, configText("devils_devastation_mark_lightning_damage"), configTooltip("devils_devastation_mark_lightning_damage"), MARK_LIGHTNING_DAMAGE_DEFAULT, MARK_LIGHTNING_DAMAGE_MIN, MARK_LIGHTNING_DAMAGE_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_EFFECT_DURATION_PATH, configText("devils_devastation_projectile_effect_duration"), configTooltip("devils_devastation_projectile_effect_duration"), PROJECTILE_EFFECT_DURATION_DEFAULT, PROJECTILE_EFFECT_DURATION_MIN, PROJECTILE_EFFECT_DURATION_MAX); + ConfigFactory.loadIntConfig(STUCK_PROJECTILE_EFFECT_DURATION_PATH, configText("devils_devastation_stuck_projectile_effect_duration"), configTooltip("devils_devastation_stuck_projectile_effect_duration"), STUCK_PROJECTILE_EFFECT_DURATION_DEFAULT, STUCK_PROJECTILE_EFFECT_DURATION_MIN, STUCK_PROJECTILE_EFFECT_DURATION_MAX); + ConfigFactory.loadIntConfig(KILL_MODE_PROJECTILE_EFFECT_DURATION_PATH, configText("devils_devastation_kill_mode_projectile_effect_duration"), configTooltip("devils_devastation_kill_mode_projectile_effect_duration"), KILL_MODE_PROJECTILE_EFFECT_DURATION_DEFAULT, KILL_MODE_PROJECTILE_EFFECT_DURATION_MIN, KILL_MODE_PROJECTILE_EFFECT_DURATION_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static int getKillModeTime() { + return Math.clamp(ConfigUtil.readInt(KILL_MODE_TIME_PATH, KILL_MODE_TIME_DEFAULT), KILL_MODE_TIME_MIN, KILL_MODE_TIME_MAX); + } + + public static int getKillModeCooldownTime() { + return Math.clamp(ConfigUtil.readInt(KILL_MODE_COOLDOWN_TIME_PATH, KILL_MODE_COOLDOWN_TIME_DEFAULT), KILL_MODE_COOLDOWN_TIME_MIN, KILL_MODE_COOLDOWN_TIME_MAX); + } + + public static double getProjectileDamage() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + } + + public static int getProjectileLifetime() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + } + + public static double getProjectileSpeed() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + } + + public static double getStuckProjectileDamage() { + return Math.clamp(ConfigUtil.readDouble(STUCK_PROJECTILE_DAMAGE_PATH, STUCK_PROJECTILE_DAMAGE_DEFAULT), STUCK_PROJECTILE_DAMAGE_MIN, STUCK_PROJECTILE_DAMAGE_MAX); + } + + public static int getStuckProjectileLifetime() { + return Math.clamp(ConfigUtil.readInt(STUCK_PROJECTILE_LIFETIME_PATH, STUCK_PROJECTILE_LIFETIME_DEFAULT), STUCK_PROJECTILE_LIFETIME_MIN, STUCK_PROJECTILE_LIFETIME_MAX); + } + + public static double getStuckProjectileSpeed() { + return Math.clamp(ConfigUtil.readDouble(STUCK_PROJECTILE_SPEED_PATH, STUCK_PROJECTILE_SPEED_DEFAULT), STUCK_PROJECTILE_SPEED_MIN, STUCK_PROJECTILE_SPEED_MAX); + } + + public static int getKillModeProjectileCycle() { + return Math.clamp(ConfigUtil.readInt(KILL_MODE_PROJECTILE_CYCLE_PATH, KILL_MODE_PROJECTILE_CYCLE_DEFAULT), KILL_MODE_PROJECTILE_CYCLE_MIN, KILL_MODE_PROJECTILE_CYCLE_MAX); + } + + public static double getKillModeProjectileDamage() { + return Math.clamp(ConfigUtil.readDouble(KILL_MODE_PROJECTILE_DAMAGE_PATH, KILL_MODE_PROJECTILE_DAMAGE_DEFAULT), KILL_MODE_PROJECTILE_DAMAGE_MIN, KILL_MODE_PROJECTILE_DAMAGE_MAX); + } + + public static int getKillModeProjectileRotate() { + return Math.clamp(ConfigUtil.readInt(KILL_MODE_PROJECTILE_ROTATE_PATH, KILL_MODE_PROJECTILE_ROTATE_DEFAULT), KILL_MODE_PROJECTILE_ROTATE_MIN, KILL_MODE_PROJECTILE_ROTATE_MAX); + } + + public static int getStuckLifetime() { + return Math.clamp(ConfigUtil.readInt(STUCK_LIFETIME_PATH, STUCK_LIFETIME_DEFAULT), STUCK_LIFETIME_MIN, STUCK_LIFETIME_MAX); + } + + public static int getMaxStuckCount() { + return Math.clamp(ConfigUtil.readInt(MAX_STUCK_COUNT_PATH, MAX_STUCK_COUNT_DEFAULT), MAX_STUCK_COUNT_MIN, MAX_STUCK_COUNT_MAX); + } + + public static double getMarkLightningDamage() { + return Math.clamp(ConfigUtil.readDouble(MARK_LIGHTNING_DAMAGE_PATH, MARK_LIGHTNING_DAMAGE_DEFAULT), MARK_LIGHTNING_DAMAGE_MIN, MARK_LIGHTNING_DAMAGE_MAX); + } + + public static int getProjectileEffectDuration() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_EFFECT_DURATION_PATH, PROJECTILE_EFFECT_DURATION_DEFAULT), PROJECTILE_EFFECT_DURATION_MIN, PROJECTILE_EFFECT_DURATION_MAX); + } + + public static int getStuckProjectileEffectDuration() { + return Math.clamp(ConfigUtil.readInt(STUCK_PROJECTILE_EFFECT_DURATION_PATH, STUCK_PROJECTILE_EFFECT_DURATION_DEFAULT), STUCK_PROJECTILE_EFFECT_DURATION_MIN, STUCK_PROJECTILE_EFFECT_DURATION_MAX); + } + + public static int getKillModeProjectileEffectDuration() { + return Math.clamp(ConfigUtil.readInt(KILL_MODE_PROJECTILE_EFFECT_DURATION_PATH, KILL_MODE_PROJECTILE_EFFECT_DURATION_DEFAULT), KILL_MODE_PROJECTILE_EFFECT_DURATION_MIN, KILL_MODE_PROJECTILE_EFFECT_DURATION_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "devils_devastation", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/devils_devastation.png"), + Component.translatable("item.lzxnoneterraria.devils_devastation"), + CONFIG_DATA + ); + public DevilsDevastation() { super(Tiers.NETHERITE, new Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -99,6 +295,7 @@ public class DevilsDevastation extends SwordItem { //右键射出的弹射 public static final int PROJECTILE_TRAIL_LENGTH = 10; public static final float PROJECTILE_TRAIL_RADIUS = 0.25F; + public static final double PROJECTILE_BOUNDING_SIZE = 1; //弹出的弹射 public static final double STUCK_PROJECTILE_BOUNDING_SIZE = 3.0; @@ -150,7 +347,22 @@ public class DevilsDevastation extends SwordItem { projectile.trailPositions2.addFirst(projectile.position().add(right.scale(-PROJECTILE_TRAIL_RADIUS / 2 * 1.5f))); while(projectile.trailPositions.size() > PROJECTILE_TRAIL_LENGTH) projectile.trailPositions.removeLast(); while(projectile.trailPositions2.size() > PROJECTILE_TRAIL_LENGTH) projectile.trailPositions2.removeLast(); - if(projectile.level().isClientSide()) { + + projectile.setBoundingBox(new AABB( + projectile.getX() - PROJECTILE_BOUNDING_SIZE, projectile.getY() - PROJECTILE_BOUNDING_SIZE, projectile.getZ() - PROJECTILE_BOUNDING_SIZE, + projectile.getX() + PROJECTILE_BOUNDING_SIZE, projectile.getY() + PROJECTILE_BOUNDING_SIZE, projectile.getZ() + PROJECTILE_BOUNDING_SIZE + )); + + if(!projectile.level().isClientSide()) { + List targets = projectile.level().getEntitiesOfClass( + Entity.class, + projectile.getBoundingBox(), + FilterUtil.createTargetFilter(projectile, projectile.getOwner()) + ); + for(Entity target : targets) { + this.onHitEntity(projectile, new EntityHitResult(target, target.position())); + } + }else { if(projectile.getRandom().nextInt(2) == 0) { ParticleUtil.addParticle( projectile.level(), ModParticles.DEVILS_DEVASTATION_RUNE_PARTICLE2.get(), @@ -168,9 +380,9 @@ public class DevilsDevastation extends SwordItem { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.attack(player, target, (float) Config.devilsDevastationProjectileDamage)) { + if(DamageUtil.attack(player, target, (float) getProjectileDamage())) { if(target instanceof LivingEntity le) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, Config.devilsDevastationProjectileEffectDuration, 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, getProjectileEffectDuration(), 0); le.addEffect(effectInstance); } target.invulnerableTime = 5; @@ -187,7 +399,7 @@ public class DevilsDevastation extends SwordItem { summon.getEntityData().set(StaticSummon.SCALE_Z, 4.0f); summon.getEntityData().set(StaticSummon.RXP, -90); summon.getEntityData().set(StaticSummon.RZP, -135); - summon.getEntityData().set(StaticSummon.LIFETIME, Config.devilsDevastationStuckLifetime); + summon.getEntityData().set(StaticSummon.LIFETIME, getStuckLifetime()); summon.getEntityData().set(StaticSummon.GLOW, true); CompoundTag customData = new CompoundTag(); @@ -211,7 +423,7 @@ public class DevilsDevastation extends SwordItem { } if(target.isAlive()) { List uuids = new ArrayList<>(target.getData(ModAttachments.STUCK_DEVILS_DEVASTATION_PROJECTILE)); - if (uuids.size() >= Config.devilsDevastationMaxStuckCount) { + if (uuids.size() >= getMaxStuckCount()) { Entity stuckProjectile = ((ServerLevel) projectile.level()).getEntity(uuids.getFirst()); if (stuckProjectile != null && stuckProjectile.isAlive() && stuckProjectile instanceof StaticSummon stuckStaticProjectile) summonStuckProjectile(stuckStaticProjectile); @@ -334,8 +546,8 @@ public class DevilsDevastation extends SwordItem { @Override public void onMoving(StaticProjectile projectile) { projectile.setBoundingBox(new AABB( - projectile.getX() - STUCK_PROJECTILE_BOUNDING_SIZE, projectile.getY() - STUCK_PROJECTILE_BOUNDING_SIZE, projectile.getX() - STUCK_PROJECTILE_BOUNDING_SIZE, - projectile.getX() + STUCK_PROJECTILE_BOUNDING_SIZE, projectile.getY() + STUCK_PROJECTILE_BOUNDING_SIZE, projectile.getX() + STUCK_PROJECTILE_BOUNDING_SIZE + projectile.getX() - STUCK_PROJECTILE_BOUNDING_SIZE, projectile.getY() - STUCK_PROJECTILE_BOUNDING_SIZE, projectile.getZ() - STUCK_PROJECTILE_BOUNDING_SIZE, + projectile.getX() + STUCK_PROJECTILE_BOUNDING_SIZE, projectile.getY() + STUCK_PROJECTILE_BOUNDING_SIZE, projectile.getZ() + STUCK_PROJECTILE_BOUNDING_SIZE )); if(!projectile.level().isClientSide()) { @@ -400,13 +612,11 @@ public class DevilsDevastation extends SwordItem { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.attack(player, target, (float) Config.devilsDevastationStuckProjectileDamage)) { + if(DamageUtil.attack(player, target, (float) getStuckProjectileDamage())) { if(target instanceof LivingEntity le) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, Config.devilsDevastationStuckProjectileEffectDuration, 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, getStuckProjectileEffectDuration(), 0); le.addEffect(effectInstance); } - target.invulnerableTime = 5; - onDied(projectile); } } } @@ -415,7 +625,7 @@ public class DevilsDevastation extends SwordItem { public void onHitBlock(StaticProjectile projectile, BlockHitResult result) {} }; - //鏉€鎴ā寮忕敓鎴愮殑寮瑰皠 + //杀戮模式弹射 public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR3 = new IStaticProjectileBehavior() { @Override public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { @@ -473,6 +683,7 @@ public class DevilsDevastation extends SwordItem { Vector3f tipDir = dir.toVector3f().rotate(rotationUp); poseStack.translate(-tipDir.x * 2, -tipDir.y * 2, -tipDir.z * 2); + poseStack.translate(-up.x * 0.5, -up.y * 0.5, -up.z * 0.5); poseStack.mulPose(rotationUp2); poseStack.mulPose(rotationDir); poseStack.mulPose(Axis.YP.rotationDegrees(-xyRot[1])); @@ -634,9 +845,9 @@ public class DevilsDevastation extends SwordItem { Entity target = result.getEntity(); List tempStuckList = target.getData(ModAttachments.STUCK_DEVILS_DEVASTATION_PROJECTILE); boolean valid = !tempStuckList.isEmpty(); - if(projectile.getOwner() instanceof Player player && DamageUtil.attack(player, target, (float) Config.devilsDevastationKillModeProjectileDamage)) { + if(projectile.getOwner() instanceof Player player && DamageUtil.attack(player, target, (float) getKillModeProjectileDamage())) { if(target instanceof LivingEntity le) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, Config.devilsDevastationKillModeProjectileEffectDuration, 1); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.DEMONIC_FLAMES, getKillModeProjectileEffectDuration(), 1); le.addEffect(effectInstance); } @@ -659,7 +870,7 @@ public class DevilsDevastation extends SwordItem { summon.setPos(pos); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.DEVILS_DEVASTATION_MARK); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, Config.devilsDevastationKillModeTime); + summon.getEntityData().set(StaticSummon.LIFETIME, getKillModeTime()); summon.getEntityData().set(StaticSummon.GLOW, true); CompoundTag summonCustomData = new CompoundTag(); @@ -714,13 +925,13 @@ public class DevilsDevastation extends SwordItem { CompoundTag customData = projectile.getEntityData().get(StaticProjectile.CUSTOM_DATA); if(projectile.getOwner() instanceof LivingEntity livingEntity) { if(customData.contains("validHit")) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, Config.devilsDevastationKillModeTime, 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, getKillModeTime(), 0); livingEntity.addEffect(effectInstance); MobEffectInstance effectInstance2 = livingEntity.getEffect(ModEffects.KILL_MODE_COOLDOWN); if(effectInstance2 != null) livingEntity.removeEffect(effectInstance2.getEffect()); }else { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, Config.devilsDevastationKillModeCooldownTime, 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE_COOLDOWN, getKillModeCooldownTime(), 0); livingEntity.addEffect(effectInstance); MobEffectInstance effectInstance2 = livingEntity.getEffect(ModEffects.KILL_MODE); @@ -869,6 +1080,15 @@ public class DevilsDevastation extends SwordItem { if(entity != null) { summon.setPos(entity.getBoundingBox().getCenter()); } + if(!summon.level().isClientSide()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + int left = summon.getEntityData().get(StaticSummon.LIFETIME) - summon.getEntityData().get(StaticSummon.AGE); + if(left < 20 && !customData.contains("sound")) { + customData.putBoolean("sound", true); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + SoundUtil.playServerSound(summon.level(), ModSounds.DEMON_SWORD_FINAL_STRIKE.get(), summon.position(),16.0f, 1.0f); + } + } } @Override @@ -887,7 +1107,7 @@ public class DevilsDevastation extends SwordItem { UUID uuid = customData.getUUID("uuid"); Entity entity = serverLevel.getEntity(uuid); if(entity instanceof Player player) { - DamageUtil.attack(player, owner, (float) Config.devilsDevastationMarkLightningDamage); + DamageUtil.attack(player, owner, (float) getMarkLightningDamage()); StaticSummon newSummon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), serverLevel); newSummon.setOwner(player); Vec3 pos = owner.getBoundingBox().getCenter(); @@ -905,7 +1125,7 @@ public class DevilsDevastation extends SwordItem { } } } - SoundUtil.playServerSound(summon.level(), ModSounds.DEMON_SWORD_INSANE_IMPACT.get(), summon.position(), 16.0f, 1.0f); + //SoundUtil.playServerSound(summon.level(), ModSounds.DEMON_SWORD_INSANE_IMPACT.get(), summon.position(), 16.0f, 1.0f); summon.discard(); } } @@ -999,9 +1219,9 @@ public class DevilsDevastation extends SwordItem { projectile.getEntityData().set(StaticProjectile.RIGHT, dirs[2]); projectile.getEntityData().set(StaticProjectile.ITEM, new ItemStack(ModItems.DEVILS_DEVASTATION.get())); projectile.getEntityData().set(StaticProjectile.RZP, rotate); - projectile.getEntityData().set(StaticProjectile.LIFETIME, Config.devilsDevastationStuckProjectileLifetime); + projectile.getEntityData().set(StaticProjectile.LIFETIME, getStuckProjectileLifetime()); projectile.getEntityData().set(StaticProjectile.GLOW, true); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", Config.devilsDevastationStuckProjectileSpeed)); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getStuckProjectileSpeed())); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); serverLevel.addFreshEntity(projectile); @@ -1014,12 +1234,12 @@ public class DevilsDevastation extends SwordItem { ItemStack itemStack = player.getMainHandItem(); if(!itemStack.is(ModItems.DEVILS_DEVASTATION.get())) return; if(player.getCooldowns().isOnCooldown(itemStack.getItem())) return; - player.getCooldowns().addCooldown(itemStack.getItem(), Config.devilsDevastationKillModeProjectileCycle + 10); + player.getCooldowns().addCooldown(itemStack.getItem(), getKillModeProjectileCycle() + 10); if(!player.level().isClientSide()) { float radius = 4.0f; - float w = (float) Math.PI * 1.5f / Config.devilsDevastationKillModeProjectileCycle; + float w = (float) Math.PI * 1.5f / getKillModeProjectileCycle(); if(player.getRandom().nextInt(2) == 0) w = -w; - int rotate = (int) ((Math.random() * 2 - 1) * Config.devilsDevastationKillModeProjectileRotate); + int rotate = (int) ((Math.random() * 2 - 1) * getKillModeProjectileRotate()); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], rotate); @@ -1034,7 +1254,7 @@ public class DevilsDevastation extends SwordItem { projectile.getEntityData().set(StaticProjectile.UP, dirs[1]); projectile.getEntityData().set(StaticProjectile.RIGHT, dirs[2]); projectile.getEntityData().set(StaticProjectile.ITEM, new ItemStack(ModItems.DEVILS_DEVASTATION.get())); - projectile.getEntityData().set(StaticProjectile.LIFETIME, Config.devilsDevastationKillModeProjectileCycle); + projectile.getEntityData().set(StaticProjectile.LIFETIME, getKillModeProjectileCycle()); projectile.getEntityData().set(StaticProjectile.GLOW, true); projectile.getEntityData().set(StaticProjectile.RZP, rotate); projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, w > 0 ? String.format("%.3f*cos(%.3f*t - 0.25 * 3.1415926)", radius, w) : String.format("%.3f*cos(%.3f*t - 0.75 * 3.1415926)", radius, w)); @@ -1244,7 +1464,7 @@ public class DevilsDevastation extends SwordItem { Matrix4f matrix = poseStack.last().pose(); int time = entity.tickCount; - poseStack.translate(0, 2.5, 0.6); + poseStack.translate(0, 1.4, 0.6); float baseRadius = 1.0f; float speed = 0.25f; @@ -1362,9 +1582,9 @@ public class DevilsDevastation extends SwordItem { projectile.getEntityData().set(StaticProjectile.SCALE_Z, 4.0f); projectile.getEntityData().set(StaticProjectile.RXP, -90); projectile.getEntityData().set(StaticProjectile.RZP, -135); - projectile.getEntityData().set(StaticProjectile.LIFETIME, Config.devilsDevastationProjectileLifetime); + projectile.getEntityData().set(StaticProjectile.LIFETIME, getProjectileLifetime()); projectile.getEntityData().set(StaticProjectile.GLOW, true); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", Config.devilsDevastationProjectileSpeed)); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getProjectileSpeed())); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); level.addFreshEntity(projectile); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/EnchantedSword.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/EnchantedSword.java index 345bc36..57e041a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/EnchantedSword.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/EnchantedSword.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -9,8 +8,13 @@ import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.*; import net.minecraft.core.component.DataComponents; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -36,6 +40,22 @@ import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; public class EnchantedSword extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PATH = "weapon.enchanted_sword.damage"; + public static final double DAMAGE_DEFAULT = 4.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String LIFETIME_PATH = "weapon.enchanted_sword.lifetime"; + public static final int LIFETIME_DEFAULT = 60; + public static final int LIFETIME_MIN = 1; + public static final int LIFETIME_MAX = 1200; + + public static final String SPEED_PATH = "weapon.enchanted_sword.speed"; + public static final double SPEED_DEFAULT = 1.0; + public static final double SPEED_MIN = 0.0; + public static final double SPEED_MAX = 10.0; public EnchantedSword() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() @@ -51,6 +71,42 @@ public class EnchantedSword extends SwordItem { )); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("enchanted_sword_damage"), configTooltip("enchanted_sword_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadIntConfig(LIFETIME_PATH, configText("enchanted_sword_lifetime"), configTooltip("enchanted_sword_lifetime"), LIFETIME_DEFAULT, LIFETIME_MIN, LIFETIME_MAX); + ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("enchanted_sword_speed"), configTooltip("enchanted_sword_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static int getLifetime() { + return Math.clamp(ConfigUtil.readInt(LIFETIME_PATH, LIFETIME_DEFAULT), LIFETIME_MIN, LIFETIME_MAX); + } + + public static double getSpeed() { + return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "enchanted_sword", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/enchanted_sword.png"), + Component.translatable("item.lzxnoneterraria.enchanted_sword"), + CONFIG_DATA + ); + public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { @Override public void onMoving(StaticProjectile projectile) { @@ -67,7 +123,7 @@ public class EnchantedSword extends SwordItem { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.attack(player, target, (float) Config.enchantedSwordDamage)) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 5; ParticleUtil.addParticles( (ServerLevel) projectile.level(), ModParticles.COLORFUL_PARTICLE, @@ -110,8 +166,8 @@ public class EnchantedSword extends SwordItem { projectile.getEntityData().set(StaticProjectile.RZP, 45); projectile.getEntityData().set(StaticProjectile.RYPS, 10); projectile.getEntityData().set(StaticProjectile.GLOW, true); - projectile.getEntityData().set(StaticProjectile.LIFETIME, Config.enchantedSwordLifetime); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", Config.enchantedSwordSpeed)); + projectile.getEntityData().set(StaticProjectile.LIFETIME, getLifetime()); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getSpeed())); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); level.addFreshEntity(projectile); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Excalibur.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Excalibur.java index 1904e5b..607953c 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Excalibur.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Excalibur.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.beam.ISwordBeamBehavior; @@ -34,8 +33,66 @@ import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Vector3f; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; public class Excalibur extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String ROTATE_RANGE_PATH = "weapon.excalibur.rotate_range"; + public static final int ROTATE_RANGE_DEFAULT = 45; + public static final int ROTATE_RANGE_MIN = 0; + public static final int ROTATE_RANGE_MAX = 90; + + public static final String MAX_HIT_COUNT_PATH = "weapon.excalibur.max_hit_count"; + public static final int MAX_HIT_COUNT_DEFAULT = 3; + public static final int MAX_HIT_COUNT_MIN = 0; + public static final int MAX_HIT_COUNT_MAX = 100; + + public static final String DAMAGE_PATH = "weapon.excalibur.damage"; + public static final double DAMAGE_DEFAULT = 8.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("excalibur_rotate_range"), configTooltip("excalibur_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + ConfigFactory.loadIntConfig(MAX_HIT_COUNT_PATH, configText("excalibur_max_hit_count"), configTooltip("excalibur_max_hit_count"), MAX_HIT_COUNT_DEFAULT, MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("excalibur_damage"), configTooltip("excalibur_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static int getRotateRange() { + return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + } + + public static int getMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "excalibur", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/excalibur.png"), + Component.translatable("item.lzxnoneterraria.excalibur"), + CONFIG_DATA + ); + public Excalibur() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -93,8 +150,8 @@ public class Excalibur extends SwordItem { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < Config.excaliburMaxHitCount) { - if(DamageUtil.attack(player, target, (float) Config.excaliburDamage)) { + if(count < getMaxHitCount()) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 20; count++; custom_data.putInt("hitEntityCount", count); @@ -113,7 +170,7 @@ public class Excalibur extends SwordItem { @Override public void generate(Entity entity, CompoundTag beamData) { - beamData.putInt("rotate", (int) (Config.excaliburRotateRange * (Math.random() * 2 - 1))); + beamData.putInt("rotate", (int) (getRotateRange() * (Math.random() * 2 - 1))); ISwordBeamBehavior.super.generate(entity, beamData); } }; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java index 3d58316..87415fb 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -43,11 +42,117 @@ import net.minecraft.world.phys.Vec3; import org.joml.Matrix4f; import org.joml.Vector3f; import org.jspecify.annotations.NonNull; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; import java.util.List; import java.util.UUID; public class FirstFractal extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String PROJECTILE_DAMAGE_PATH = "weapon.first_fractal.projectile_damage"; + public static final double PROJECTILE_DAMAGE_DEFAULT = 10.0; + public static final double PROJECTILE_DAMAGE_MIN = 0.0; + public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + + public static final String BOUNDING_BOX_SIZE_PATH = "weapon.first_fractal.bounding_box_size"; + public static final double BOUNDING_BOX_SIZE_DEFAULT = 1.5; + public static final double BOUNDING_BOX_SIZE_MIN = 0.5; + public static final double BOUNDING_BOX_SIZE_MAX = 10.0; + + public static final String PROJECTILE_SPEED_PATH = "weapon.first_fractal.projectile_speed"; + public static final double PROJECTILE_SPEED_DEFAULT = 1.5; + public static final double PROJECTILE_SPEED_MIN = 0.0; + public static final double PROJECTILE_SPEED_MAX = 10.0; + + public static final String PROJECTILE_LIFETIME_PATH = "weapon.first_fractal.projectile_lifetime"; + public static final int PROJECTILE_LIFETIME_DEFAULT = 30; + public static final int PROJECTILE_LIFETIME_MIN = 1; + public static final int PROJECTILE_LIFETIME_MAX = 1200; + + public static final String DISTANCE_MODE_PATH = "weapon.first_fractal.distance_mode"; + public static final boolean DISTANCE_MODE_DEFAULT = true; + + public static final String SCROLL_SPEED_PATH = "weapon.first_fractal.scroll_speed"; + public static final int SCROLL_SPEED_DEFAULT = 4; + public static final int SCROLL_SPEED_MIN = 0; + public static final int SCROLL_SPEED_MAX = 128; + + public static final String MAX_RANGE_PATH = "weapon.first_fractal.max_range"; + public static final double MAX_RANGE_DEFAULT = 64.0; + public static final double MAX_RANGE_MIN = 1.0; + public static final double MAX_RANGE_MAX = 1024.0; + + public static final String SPAWN_RANGE_PATH = "weapon.first_fractal.spawn_range"; + public static final double SPAWN_RANGE_DEFAULT = 16.0; + public static final double SPAWN_RANGE_MIN = 1.0; + public static final double SPAWN_RANGE_MAX = 64.0; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("first_fractal_projectile_damage"), configTooltip("first_fractal_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(BOUNDING_BOX_SIZE_PATH, configText("first_fractal_bounding_box_size"), configTooltip("first_fractal_bounding_box_size"), BOUNDING_BOX_SIZE_DEFAULT, BOUNDING_BOX_SIZE_MIN, BOUNDING_BOX_SIZE_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("first_fractal_projectile_speed"), configTooltip("first_fractal_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("first_fractal_projectile_lifetime"), configTooltip("first_fractal_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + ConfigFactory.loadBooleanConfig(DISTANCE_MODE_PATH, configText("first_fractal_distance_mode"), configTooltip("first_fractal_distance_mode"), DISTANCE_MODE_DEFAULT); + ConfigFactory.loadIntConfig(SCROLL_SPEED_PATH, configText("first_fractal_scroll_speed"), configTooltip("first_fractal_scroll_speed"), SCROLL_SPEED_DEFAULT, SCROLL_SPEED_MIN, SCROLL_SPEED_MAX); + ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("first_fractal_max_range"), configTooltip("first_fractal_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); + ConfigFactory.loadDoubleConfig(SPAWN_RANGE_PATH, configText("first_fractal_spawn_range"), configTooltip("first_fractal_spawn_range"), SPAWN_RANGE_DEFAULT, SPAWN_RANGE_MIN, SPAWN_RANGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getProjectileDamage() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + } + + public static double getBoundingBoxSize() { + return Math.clamp(ConfigUtil.readDouble(BOUNDING_BOX_SIZE_PATH, BOUNDING_BOX_SIZE_DEFAULT), BOUNDING_BOX_SIZE_MIN, BOUNDING_BOX_SIZE_MAX); + } + + public static double getProjectileSpeed() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + } + + public static int getProjectileLifetime() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + } + + public static boolean isDistanceMode() { + return ConfigUtil.readBoolean(DISTANCE_MODE_PATH, DISTANCE_MODE_DEFAULT); + } + + public static int getScrollSpeed() { + return Math.clamp(ConfigUtil.readInt(SCROLL_SPEED_PATH, SCROLL_SPEED_DEFAULT), SCROLL_SPEED_MIN, SCROLL_SPEED_MAX); + } + + public static double getMaxRange() { + return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); + } + + public static double getSpawnRange() { + return Math.clamp(ConfigUtil.readDouble(SPAWN_RANGE_PATH, SPAWN_RANGE_DEFAULT), SPAWN_RANGE_MIN, SPAWN_RANGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "first_fractal", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/first_fractal.png"), + Component.translatable("item.lzxnoneterraria.first_fractal"), + CONFIG_DATA + ); + public FirstFractal() { super(Tiers.NETHERITE, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -291,11 +396,11 @@ public class FirstFractal extends SwordItem { @Override public void tick(StaticSummon summon) { this.checkBeforeTick(summon); - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.firstFractalProjectileSpeed)); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getProjectileSpeed())); summon.setBoundingBox(new AABB( - summon.getX() - Config.firstFractalBoundingBoxSize, summon.getY() - Config.firstFractalBoundingBoxSize, summon.getZ() - Config.firstFractalBoundingBoxSize, - summon.getX() + Config.firstFractalBoundingBoxSize, summon.getY() + Config.firstFractalBoundingBoxSize, summon.getZ() + Config.firstFractalBoundingBoxSize + summon.getX() - getBoundingBoxSize(), summon.getY() - getBoundingBoxSize(), summon.getZ() - getBoundingBoxSize(), + summon.getX() + getBoundingBoxSize(), summon.getY() + getBoundingBoxSize(), summon.getZ() + getBoundingBoxSize() )); if(!summon.level().isClientSide()) { @@ -306,7 +411,7 @@ public class FirstFractal extends SwordItem { FilterUtil.createTargetFilter(summon, summon.getOwner()) ); for(Entity target : targets) { - if(DamageUtil.attack(player, target, (float) Config.firstFractalProjectileDamage)) { + if(DamageUtil.attack(player, target, (float) getProjectileDamage())) { target.invulnerableTime = 10; } } @@ -320,7 +425,7 @@ public class FirstFractal extends SwordItem { Vector3f[] dirs = MathUtil.computeCoordinateSystem(summon.getLookAngle().toVector3f(), 0); ZenithTrailParticleOptions options = new ZenithTrailParticleOptions(0.05f, 40, true, color, dirs[1], dirs[2], 90); Vec3 pos = MathUtil.toVec3(dirs[1]).scale(Math.random() * 2).add(summon.position()); - Vec3 speed = MathUtil.toVec3(dirs[0]).scale(Config.firstFractalProjectileSpeed); + Vec3 speed = MathUtil.toVec3(dirs[0]).scale(getProjectileSpeed()); ParticleUtil.addParticle( summon.level(), options, pos, 0, @@ -333,19 +438,19 @@ public class FirstFractal extends SwordItem { public static void summon(Player player, double deltaDist) { if(!player.level().isClientSide()) { Vec3 targetPos; - if(Config.firstFractalDistanceMode) { - Vec3 origin = MathUtil.getCrosshairPos(player, player.level(), Config.firstFractalMaxRange); + if(isDistanceMode()) { + Vec3 origin = MathUtil.getCrosshairPos(player, player.level(), getMaxRange()); double dist = origin.subtract(player.getEyePosition()).length(); - double maxScale = Config.firstFractalMaxRange - dist; + double maxScale = getMaxRange() - dist; double minScale = -dist; double scale = Math.min(deltaDist, maxScale); if(deltaDist < minScale) scale = -minScale; targetPos = origin.add(player.getLookAngle().normalize().scale(scale)); }else { - targetPos = player.getEyePosition().add(player.getLookAngle().normalize().scale(Math.min(deltaDist, Config.firstFractalMaxRange))); + targetPos = player.getEyePosition().add(player.getLookAngle().normalize().scale(Math.min(deltaDist, getMaxRange()))); } - Vec3 summonPos = MathUtil.getRandomPosInRadius(targetPos, Config.firstFractalSpawnRange); + Vec3 summonPos = MathUtil.getRandomPosInRadius(targetPos, getSpawnRange()); Vector3f color = COLORS[player.getRandom().nextInt(COLORS.length)]; StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), player.level()); @@ -358,7 +463,7 @@ public class FirstFractal extends SwordItem { summon.getEntityData().set(StaticSummon.COLOR_G, color.y); summon.getEntityData().set(StaticSummon.COLOR_B, color.z); summon.getEntityData().set(StaticSummon.GLOW, true); - summon.getEntityData().set(StaticSummon.LIFETIME, Config.firstFractalProjectileLifetime); + summon.getEntityData().set(StaticSummon.LIFETIME, getProjectileLifetime()); Vector3f[] dirs = MathUtil.computeCoordinateSystem(targetPos.subtract(summonPos).toVector3f(), 0); float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java index 3c613ba..310ca4a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/InfluxWaver.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -36,12 +35,90 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.*; import net.objecthunter.exp4j.ExpressionBuilder; import org.joml.Vector3f; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; import java.util.Comparator; import java.util.List; import java.util.Locale; public class InfluxWaver extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PATH = "weapon.influx_waver.damage"; + public static final double DAMAGE_DEFAULT = 12.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String MAX_COUNT_PATH = "weapon.influx_waver.max_count"; + public static final int MAX_COUNT_DEFAULT = 2; + public static final int MAX_COUNT_MIN = 0; + public static final int MAX_COUNT_MAX = 10; + + public static final String SPEED_PATH = "weapon.influx_waver.speed"; + public static final double SPEED_DEFAULT = 1.0; + public static final double SPEED_MIN = 0.0; + public static final double SPEED_MAX = 10.0; + + public static final String SPAWN_RANGE_PATH = "weapon.influx_waver.spawn_range"; + public static final double SPAWN_RANGE_DEFAULT = 8.0; + public static final double SPAWN_RANGE_MIN = 1.0; + public static final double SPAWN_RANGE_MAX = 64.0; + + public static final String TARGET_RANGE_PATH = "weapon.influx_waver.target_range"; + public static final double TARGET_RANGE_DEFAULT = 24.0; + public static final double TARGET_RANGE_MIN = 1.0; + public static final double TARGET_RANGE_MAX = 64.0; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("influx_waver_damage"), configTooltip("influx_waver_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadIntConfig(MAX_COUNT_PATH, configText("influx_waver_max_count"), configTooltip("influx_waver_max_count"), MAX_COUNT_DEFAULT, MAX_COUNT_MIN, MAX_COUNT_MAX); + ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("influx_waver_speed"), configTooltip("influx_waver_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + ConfigFactory.loadDoubleConfig(SPAWN_RANGE_PATH, configText("influx_waver_spawn_range"), configTooltip("influx_waver_spawn_range"), SPAWN_RANGE_DEFAULT, SPAWN_RANGE_MIN, SPAWN_RANGE_MAX); + ConfigFactory.loadDoubleConfig(TARGET_RANGE_PATH, configText("influx_waver_target_range"), configTooltip("influx_waver_target_range"), TARGET_RANGE_DEFAULT, TARGET_RANGE_MIN, TARGET_RANGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static int getMaxCount() { + return Math.clamp(ConfigUtil.readInt(MAX_COUNT_PATH, MAX_COUNT_DEFAULT), MAX_COUNT_MIN, MAX_COUNT_MAX); + } + + public static double getSpeed() { + return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX); + } + + public static double getSpawnRange() { + return Math.clamp(ConfigUtil.readDouble(SPAWN_RANGE_PATH, SPAWN_RANGE_DEFAULT), SPAWN_RANGE_MIN, SPAWN_RANGE_MAX); + } + + public static double getTargetRange() { + return Math.clamp(ConfigUtil.readDouble(TARGET_RANGE_PATH, TARGET_RANGE_DEFAULT), TARGET_RANGE_MIN, TARGET_RANGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "influx_waver", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/influx_waver.png"), + Component.translatable("item.lzxnoneterraria.influx_waver"), + CONFIG_DATA + ); + public InfluxWaver() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -101,23 +178,23 @@ public class InfluxWaver extends SwordItem { checkEntity = false; }else { if(idx == 0) { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.influxWaverSpeed)); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getSpeed())); }else { checkBlock = false; if(customData.contains("target")) { Entity target = summon.level().getEntity(customData.getInt("target")); if(target == null || !target.isAlive()) { - //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.influxWaverSpeed)); + //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getSpeed())); checkEntity = false; }else { //Vec3 targetPos = new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2, target.getZ()); - //summon.setDeltaMovement(targetPos.subtract(summon.position()).normalize().scale(Config.influxWaverSpeed)); + //summon.setDeltaMovement(targetPos.subtract(summon.position()).normalize().scale(getSpeed())); } }else { - //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.influxWaverSpeed)); + //summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getSpeed())); checkEntity = false; } - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.influxWaverSpeed)); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getSpeed())); } } @@ -147,7 +224,7 @@ public class InfluxWaver extends SwordItem { Entity target = customData.contains("target") ? summon.level().getEntity(customData.getInt("target")) : null; if(target != null && !hitTarget.getUUID().equals(target.getUUID())) return; if(summon.getOwner() instanceof Player player && FilterUtil.createTargetFilter(player).test(hitTarget)) { - if(DamageUtil.attack(player, hitTarget, (float) Config.influxWaverDamage)) { + if(DamageUtil.attack(player, hitTarget, (float) getDamage())) { hitTarget.invulnerableTime = 2; } customData.putBoolean("dead", false); @@ -163,12 +240,12 @@ public class InfluxWaver extends SwordItem { public void onDied(StaticSummon summon) { if(!summon.level().isClientSide()) { CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - if(customData.contains("dead") && !customData.getBoolean("dead") && customData.contains("idx") && customData.getInt("idx") < Config.influxWaverMaxCount) { + if(customData.contains("dead") && !customData.getBoolean("dead") && customData.contains("idx") && customData.getInt("idx") < getMaxCount()) { if(summon.getOwner() instanceof Player player) { Entity target = InfluxWaver.search(player, summon.position()); if(target != null) { Vec3 targetPos = new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2, target.getZ()); - Vec3 summonPos = MathUtil.getRandomPosOnRadius(targetPos, Config.influxWaverSpawnRange); + Vec3 summonPos = MathUtil.getRandomPosOnRadius(targetPos, getSpawnRange()); InfluxWaver.summon(player, summonPos, targetPos.subtract(summonPos).normalize(), target, customData.getInt("idx") + 1); } } @@ -214,8 +291,8 @@ public class InfluxWaver extends SwordItem { public static Entity search(Player player, Vec3 pos) { AABB searchBox = new AABB( - pos.x - Config.influxWaverTargetRange, pos.y - Config.influxWaverTargetRange, pos.z - Config.influxWaverTargetRange, - pos.x + Config.influxWaverTargetRange, pos.y + Config.influxWaverTargetRange, pos.z + Config.influxWaverTargetRange + pos.x - getTargetRange(), pos.y - getTargetRange(), pos.z - getTargetRange(), + pos.x + getTargetRange(), pos.y + getTargetRange(), pos.z + getTargetRange() ); List entities = player.level().getEntitiesOfClass( Monster.class, diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java index 51af4cb..e5bbeb6 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/LightsBane.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.ModRenderTypes; @@ -11,6 +10,10 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.IItemWaveBehavior; import com.lzxnone.terraria.particle.DustParticleOptions; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.ParticleUtil; @@ -23,6 +26,7 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlotGroup; @@ -47,6 +51,23 @@ import java.util.Comparator; import java.util.List; public class LightsBane extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String BIG_DAMAGE_PATH = "weapon.lights_bane.big_damage"; + public static final double BIG_DAMAGE_DEFAULT = 4.0; + public static final double BIG_DAMAGE_MIN = 0.0; + public static final double BIG_DAMAGE_MAX = 2147483647.0; + + public static final String SMALL_DAMAGE_PATH = "weapon.lights_bane.small_damage"; + public static final double SMALL_DAMAGE_DEFAULT = 2.0; + public static final double SMALL_DAMAGE_MIN = 0.0; + public static final double SMALL_DAMAGE_MAX = 2147483647.0; + + public static final String TARGET_RANGE_PATH = "weapon.lights_bane.target_range"; + public static final double TARGET_RANGE_DEFAULT = 2.0; + public static final double TARGET_RANGE_MIN = 1.0; + public static final double TARGET_RANGE_MAX = 64.0; + public LightsBane() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -59,6 +80,42 @@ public class LightsBane extends SwordItem { )); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(BIG_DAMAGE_PATH, configText("lights_bane_big_damage"), configTooltip("lights_bane_big_damage"), BIG_DAMAGE_DEFAULT, BIG_DAMAGE_MIN, BIG_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(SMALL_DAMAGE_PATH, configText("lights_bane_small_damage"), configTooltip("lights_bane_small_damage"), SMALL_DAMAGE_DEFAULT, SMALL_DAMAGE_MIN, SMALL_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(TARGET_RANGE_PATH, configText("lights_bane_target_range"), configTooltip("lights_bane_target_range"), TARGET_RANGE_DEFAULT, TARGET_RANGE_MIN, TARGET_RANGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getBigDamage() { + return Math.clamp(ConfigUtil.readDouble(BIG_DAMAGE_PATH, BIG_DAMAGE_DEFAULT), BIG_DAMAGE_MIN, BIG_DAMAGE_MAX); + } + + public static double getSmallDamage() { + return Math.clamp(ConfigUtil.readDouble(SMALL_DAMAGE_PATH, SMALL_DAMAGE_DEFAULT), SMALL_DAMAGE_MIN, SMALL_DAMAGE_MAX); + } + + public static double getTargetRange() { + return Math.clamp(ConfigUtil.readDouble(TARGET_RANGE_PATH, TARGET_RANGE_DEFAULT), TARGET_RANGE_MIN, TARGET_RANGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "lights_bane", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/lights_bane.png"), + Component.translatable("item.lzxnoneterraria.lights_bane"), + CONFIG_DATA + ); + public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.075f, 0.5f, 40, true, new Vector3f[]{ new Vector3f(0.463F, 0.196F, 0.918F), @@ -146,7 +203,7 @@ public class LightsBane extends SwordItem { if(!summon.level().isClientSide() && summon.getOwner() instanceof Player player) { List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); for(Entity target : targets) { - float damage = customData.contains("big") && customData.getBoolean("big") ? (float) Config.lightsBaneBigDamage : (float) Config.lightsBaneSmallDamage; + float damage = customData.contains("big") && customData.getBoolean("big") ? (float) getBigDamage() : (float) getSmallDamage(); if(DamageUtil.attack(player, target, damage)) { } @@ -167,9 +224,10 @@ public class LightsBane extends SwordItem { if(!player.getCooldowns().isOnCooldown(item)) { Entity target = event.getTarget(); Vec3 pos = target.position(); + double targetRange = getTargetRange(); AABB searchBox = new AABB( - pos.x - Config.lightsBaneTargetRange, pos.y - Config.lightsBaneTargetRange, pos.z - Config.lightsBaneTargetRange, - pos.x + Config.lightsBaneTargetRange, pos.y + Config.lightsBaneTargetRange, pos.z + Config.lightsBaneTargetRange + pos.x - targetRange, pos.y - targetRange, pos.z - targetRange, + pos.x + targetRange, pos.y + targetRange, pos.z + targetRange ); List entities = target.level().getEntitiesOfClass( Monster.class, diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Mace.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Mace.java index 20f039a..ec2848d 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Mace.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Mace.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -42,10 +41,88 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.*; import org.joml.Vector3f; import org.jspecify.annotations.NonNull; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; import java.util.List; public class Mace extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String PROJECTILE_SPEED_PATH = "weapon.mace.projectile_speed"; + public static final double PROJECTILE_SPEED_DEFAULT = 2.0; + public static final double PROJECTILE_SPEED_MIN = 0.0; + public static final double PROJECTILE_SPEED_MAX = 10.0; + + public static final String GRAVITY_PATH = "weapon.mace.gravity"; + public static final double GRAVITY_DEFAULT = 0.75; + public static final double GRAVITY_MIN = 0.0; + public static final double GRAVITY_MAX = 5.0; + + public static final String DAMAGE_PATH = "weapon.mace.damage"; + public static final double DAMAGE_DEFAULT = 4.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String FLY_TIME_PATH = "weapon.mace.fly_time"; + public static final int FLY_TIME_DEFAULT = 10; + public static final int FLY_TIME_MIN = 1; + public static final int FLY_TIME_MAX = 100; + + public static final String MAX_RANGE_PATH = "weapon.mace.max_range"; + public static final double MAX_RANGE_DEFAULT = 32.0; + public static final double MAX_RANGE_MIN = 1.0; + public static final double MAX_RANGE_MAX = 512.0; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("mace_projectile_speed"), configTooltip("mace_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + ConfigFactory.loadDoubleConfig(GRAVITY_PATH, configText("mace_gravity"), configTooltip("mace_gravity"), GRAVITY_DEFAULT, GRAVITY_MIN, GRAVITY_MAX); + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("mace_damage"), configTooltip("mace_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadIntConfig(FLY_TIME_PATH, configText("mace_fly_time"), configTooltip("mace_fly_time"), FLY_TIME_DEFAULT, FLY_TIME_MIN, FLY_TIME_MAX); + ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("mace_max_range"), configTooltip("mace_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getProjectileSpeed() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + } + + public static double getGravity() { + return Math.clamp(ConfigUtil.readDouble(GRAVITY_PATH, GRAVITY_DEFAULT), GRAVITY_MIN, GRAVITY_MAX); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static int getFlyTime() { + return Math.clamp(ConfigUtil.readInt(FLY_TIME_PATH, FLY_TIME_DEFAULT), FLY_TIME_MIN, FLY_TIME_MAX); + } + + public static double getMaxRange() { + return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "mace", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/mace.png"), + Component.translatable("item.lzxnoneterraria.mace"), + CONFIG_DATA + ); + public Mace() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -217,7 +294,7 @@ public class Mace extends SwordItem { FilterUtil.createTargetFilter(projectile, player) ); for(Entity target : targets) { - if(DamageUtil.attack(player, target, (float) Config.maceDamage)) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 15; } } @@ -378,7 +455,7 @@ public class Mace extends SwordItem { int flyTime = customData.contains("flyTime") ? customData.getInt("flyTime") : 0; int age = summon.getEntityData().get(StaticSummon.AGE); if(age < flyTime) { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.maceProjectileSpeed)); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getProjectileSpeed())); BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(summon.getDeltaMovement())); if(blockHitResult.getType() != HitResult.Type.MISS) { summon.getEntityData().set(StaticSummon.AGE, flyTime); @@ -395,7 +472,7 @@ public class Mace extends SwordItem { }else { Vec3 moveDir = player.getEyePosition().subtract(summon.position()); double dist = moveDir.length(); - summon.setDeltaMovement(moveDir.normalize().scale(Config.maceProjectileSpeed)); + summon.setDeltaMovement(moveDir.normalize().scale(getProjectileSpeed())); if(dist < 2.0f) { onDied(summon); return; @@ -423,7 +500,7 @@ public class Mace extends SwordItem { } } double dist = summon.position().subtract(player.position()).length(); - if(dist > Config.maceMaxRange) { + if(dist > getMaxRange()) { CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> tag.putInt("state", State.THROWING_BACK.ordinal())); } @@ -431,16 +508,16 @@ public class Mace extends SwordItem { EntityHitResult entityHitResult = CollisionUtil.checkEntityHit(summon, summon.position().add(summon.getDeltaMovement())); if(entityHitResult != null) { Entity target = entityHitResult.getEntity(); - if(DamageUtil.attack(player, target, (float) Config.maceDamage)) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 10; } } } }else if(state == State.DROPPING.ordinal()) { Vec3 g = new Vec3(0, -1, 0); - summon.setDeltaMovement(g.scale(Config.maceGravity)); + summon.setDeltaMovement(g.scale(getGravity())); double dist = summon.position().subtract(player.position()).length(); - if(dist > Config.maceMaxRange) { + if(dist > getMaxRange()) { CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> tag.putInt("state", State.THROWING_BACK.ordinal())); } @@ -450,16 +527,16 @@ public class Mace extends SwordItem { FilterUtil.createTargetFilter(summon, summon.getOwner()) ); for(Entity target : targets) { - DamageUtil.attack(player, target, (float) Config.maceDamage); + DamageUtil.attack(player, target, (float) getDamage()); } }else if(state == State.THROWING_BACK.ordinal()){ Vec3 moveDir = player.getEyePosition().subtract(summon.position()); double dist = moveDir.length(); - summon.setDeltaMovement(moveDir.normalize().scale(Config.maceProjectileSpeed)); + summon.setDeltaMovement(moveDir.normalize().scale(getProjectileSpeed())); EntityHitResult entityHitResult = CollisionUtil.checkEntityHit(summon, summon.position().add(summon.getDeltaMovement())); if(entityHitResult != null) { Entity target = entityHitResult.getEntity(); - if(DamageUtil.attack(player, target, (float) Config.maceDamage)) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 10; } } @@ -553,7 +630,7 @@ public class Mace extends SwordItem { summon.yRotO = xyRot[1]; CompoundTag customData = new CompoundTag(); - customData.putInt("flyTime", Config.maceFlyTime); + customData.putInt("flyTime", getFlyTime()); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); summon.setNoGravity(true); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Meowmere.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Meowmere.java index f058134..204a210 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Meowmere.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Meowmere.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -10,6 +9,10 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.particle.DustParticleOptions; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.*; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -19,6 +22,7 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -39,6 +43,23 @@ import org.joml.Vector3f; import java.util.List; public class Meowmere extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PATH = "weapon.meowmere.damage"; + public static final double DAMAGE_DEFAULT = 20.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String GRAVITY_PATH = "weapon.meowmere.gravity"; + public static final double GRAVITY_DEFAULT = 0.025; + public static final double GRAVITY_MIN = 0.0; + public static final double GRAVITY_MAX = 1.0; + + public static final String INITIAL_SPEED_PATH = "weapon.meowmere.initial_speed"; + public static final double INITIAL_SPEED_DEFAULT = 1.5; + public static final double INITIAL_SPEED_MIN = 0.0; + public static final double INITIAL_SPEED_MAX = 10.0; + public Meowmere() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -51,6 +72,42 @@ public class Meowmere extends SwordItem { ).rarity(Rarity.RARE)); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("meowmere_damage"), configTooltip("meowmere_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(GRAVITY_PATH, configText("meowmere_gravity"), configTooltip("meowmere_gravity"), GRAVITY_DEFAULT, GRAVITY_MIN, GRAVITY_MAX); + ConfigFactory.loadDoubleConfig(INITIAL_SPEED_PATH, configText("meowmere_initial_speed"), configTooltip("meowmere_initial_speed"), INITIAL_SPEED_DEFAULT, INITIAL_SPEED_MIN, INITIAL_SPEED_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static double getGravity() { + return Math.clamp(ConfigUtil.readDouble(GRAVITY_PATH, GRAVITY_DEFAULT), GRAVITY_MIN, GRAVITY_MAX); + } + + public static double getInitialSpeed() { + return Math.clamp(ConfigUtil.readDouble(INITIAL_SPEED_PATH, INITIAL_SPEED_DEFAULT), INITIAL_SPEED_MIN, INITIAL_SPEED_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "meowmere", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/meowmere.png"), + Component.translatable("item.lzxnoneterraria.meowmere"), + CONFIG_DATA + ); + public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.05f, 0.5f, 40, true, new Vector3f[]{ new Vector3f(1.00f, 0.50f, 0.50f), // 淡红 (柔粉红) @@ -136,7 +193,7 @@ public class Meowmere extends SwordItem { public void tick(StaticSummon summon) { this.checkBeforeTick(summon); Vec3 motion = summon.getDeltaMovement(); - motion = motion.add(0, -Config.meowmereGravity, 0); + motion = motion.add(0, -getGravity(), 0); Vec3 up = MathUtil.toVec3(MathUtil.computeCoordinateSystem(motion.toVector3f(), 0)[1]).normalize(); summon.trailPositions.addFirst(summon.position().add(up.scale(0.5))); @@ -149,7 +206,7 @@ public class Meowmere extends SwordItem { if(entityHitResult != null) { Entity target = entityHitResult.getEntity(); if(summon.getOwner() instanceof Player player) { - if(DamageUtil.attack(player, target, (float) Config.meowmereDamage)) { + if(DamageUtil.attack(player, target, (float) getDamage())) { if(customData.contains("hitEntity") && customData.getInt("hitEntity") < 4) { customData.putInt("hitEntity", customData.getInt("hitEntity") + 1); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); @@ -202,7 +259,7 @@ public class Meowmere extends SwordItem { ), FilterUtil.createLivingTargetFilter(summon.getOwner()) ); - for(LivingEntity livingEntity : hitEntities) livingEntity.hurt(summon.damageSources().playerAttack(player), (float) Config.meowmereDamage); + for(LivingEntity livingEntity : hitEntities) livingEntity.hurt(summon.damageSources().playerAttack(player), (float) getDamage()); } } @@ -296,7 +353,7 @@ public class Meowmere extends SwordItem { float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); summon.setXRot(xyRot[0]); summon.setYRot(xyRot[1]); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(Config.meowmereInitialSpeed)); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(getInitialSpeed())); level.addFreshEntity(summon); }else { ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Muramasa.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Muramasa.java index 3c6edcf..96140e8 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Muramasa.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Muramasa.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.ModRenderTypes; @@ -38,8 +37,46 @@ import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import org.joml.Matrix4f; import org.joml.Vector3f; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; public class Muramasa extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String BEAM_DAMAGE_PATH = "weapon.muramasa.beam_damage"; + public static final double BEAM_DAMAGE_DEFAULT = 2.5; + public static final double BEAM_DAMAGE_MIN = 0.0; + public static final double BEAM_DAMAGE_MAX = 2147483647.0; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(BEAM_DAMAGE_PATH, configText("muramasa_beam_damage"), configTooltip("muramasa_beam_damage"), BEAM_DAMAGE_DEFAULT, BEAM_DAMAGE_MIN, BEAM_DAMAGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getBeamDamage() { + return Math.clamp(ConfigUtil.readDouble(BEAM_DAMAGE_PATH, BEAM_DAMAGE_DEFAULT), BEAM_DAMAGE_MIN, BEAM_DAMAGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "muramasa", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/muramasa.png"), + Component.translatable("item.lzxnoneterraria.muramasa"), + CONFIG_DATA + ); + public Muramasa() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -224,7 +261,7 @@ public class Muramasa extends SwordItem { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.attack(player, target, (float) Config.muramasaBeamDamage)) { + if(DamageUtil.attack(player, target, (float) getBeamDamage())) { } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java index e34ae2b..94f6883 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/NightsEdge.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -43,10 +42,136 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Quaternionf; import org.joml.Vector3f; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; import java.util.List; public class NightsEdge extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String PROJECTILE_ALIGN_TO_BLADE_PATH = "weapon.nights_edge.projectile_align_to_blade"; + public static final boolean PROJECTILE_ALIGN_TO_BLADE_DEFAULT = true; + + public static final String ROTATE_RANGE_PATH = "weapon.nights_edge.rotate_range"; + public static final int ROTATE_RANGE_DEFAULT = 45; + public static final int ROTATE_RANGE_MIN = 0; + public static final int ROTATE_RANGE_MAX = 90; + + public static final String PROJECTILE_ROTATE_RANGE_PATH = "weapon.nights_edge.projectile_rotate_range"; + public static final int PROJECTILE_ROTATE_RANGE_DEFAULT = 40; + public static final int PROJECTILE_ROTATE_RANGE_MIN = 0; + public static final int PROJECTILE_ROTATE_RANGE_MAX = 90; + + public static final String MAX_HIT_COUNT_PATH = "weapon.nights_edge.max_hit_count"; + public static final int MAX_HIT_COUNT_DEFAULT = 2; + public static final int MAX_HIT_COUNT_MIN = 0; + public static final int MAX_HIT_COUNT_MAX = 100; + + public static final String PROJECTILE_MAX_HIT_COUNT_PATH = "weapon.nights_edge.projectile_max_hit_count"; + public static final int PROJECTILE_MAX_HIT_COUNT_DEFAULT = 2; + public static final int PROJECTILE_MAX_HIT_COUNT_MIN = 0; + public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100; + + public static final String DAMAGE_PATH = "weapon.nights_edge.damage"; + public static final double DAMAGE_DEFAULT = 7.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String PROJECTILE_DAMAGE_PATH = "weapon.nights_edge.projectile_damage"; + public static final double PROJECTILE_DAMAGE_DEFAULT = 7.0; + public static final double PROJECTILE_DAMAGE_MIN = 0.0; + public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + + public static final String PROJECTILE_SPEED_PATH = "weapon.nights_edge.projectile_speed"; + public static final double PROJECTILE_SPEED_DEFAULT = 0.25; + public static final double PROJECTILE_SPEED_MIN = 0.0; + public static final double PROJECTILE_SPEED_MAX = 10.0; + + public static final String PROJECTILE_LIFETIME_PATH = "weapon.nights_edge.projectile_lifetime"; + public static final int PROJECTILE_LIFETIME_DEFAULT = 10; + public static final int PROJECTILE_LIFETIME_MIN = 1; + public static final int PROJECTILE_LIFETIME_MAX = 1200; + + public static final String PROJECTILE_ROTATION_SPEED_PATH = "weapon.nights_edge.projectile_rotation_speed"; + public static final int PROJECTILE_ROTATION_SPEED_DEFAULT = 36; + public static final int PROJECTILE_ROTATION_SPEED_MIN = 0; + public static final int PROJECTILE_ROTATION_SPEED_MAX = 360; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadBooleanConfig(PROJECTILE_ALIGN_TO_BLADE_PATH, configText("nights_edge_projectile_align_to_blade"), configTooltip("nights_edge_projectile_align_to_blade"), PROJECTILE_ALIGN_TO_BLADE_DEFAULT); + ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("nights_edge_rotate_range"), configTooltip("nights_edge_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_ROTATE_RANGE_PATH, configText("nights_edge_projectile_rotate_range"), configTooltip("nights_edge_projectile_rotate_range"), PROJECTILE_ROTATE_RANGE_DEFAULT, PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); + ConfigFactory.loadIntConfig(MAX_HIT_COUNT_PATH, configText("nights_edge_max_hit_count"), configTooltip("nights_edge_max_hit_count"), MAX_HIT_COUNT_DEFAULT, MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_MAX_HIT_COUNT_PATH, configText("nights_edge_projectile_max_hit_count"), configTooltip("nights_edge_projectile_max_hit_count"), PROJECTILE_MAX_HIT_COUNT_DEFAULT, PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("nights_edge_damage"), configTooltip("nights_edge_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("nights_edge_projectile_damage"), configTooltip("nights_edge_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("nights_edge_projectile_speed"), configTooltip("nights_edge_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("nights_edge_projectile_lifetime"), configTooltip("nights_edge_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_ROTATION_SPEED_PATH, configText("nights_edge_projectile_rotation_speed"), configTooltip("nights_edge_projectile_rotation_speed"), PROJECTILE_ROTATION_SPEED_DEFAULT, PROJECTILE_ROTATION_SPEED_MIN, PROJECTILE_ROTATION_SPEED_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static boolean isProjectileAlignToBlade() { + return ConfigUtil.readBoolean(PROJECTILE_ALIGN_TO_BLADE_PATH, PROJECTILE_ALIGN_TO_BLADE_DEFAULT); + } + + public static int getRotateRange() { + return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + } + + public static int getProjectileRotateRange() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATE_RANGE_PATH, PROJECTILE_ROTATE_RANGE_DEFAULT), PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); + } + + public static int getMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); + } + + public static int getProjectileMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_MAX_HIT_COUNT_PATH, PROJECTILE_MAX_HIT_COUNT_DEFAULT), PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static double getProjectileDamage() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + } + + public static double getProjectileSpeed() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + } + + public static int getProjectileLifetime() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + } + + public static int getProjectileRotationSpeed() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATION_SPEED_PATH, PROJECTILE_ROTATION_SPEED_DEFAULT), PROJECTILE_ROTATION_SPEED_MIN, PROJECTILE_ROTATION_SPEED_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "nights_edge", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/nights_edge.png"), + Component.translatable("item.lzxnoneterraria.nights_edge"), + CONFIG_DATA + ); + public NightsEdge() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -191,8 +316,8 @@ public class NightsEdge extends SwordItem { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < Config.nightsEdgeMaxHitCount) { - if(DamageUtil.attack(player, target, (float) Config.nightsEdgeDamage)) { + if(count < getMaxHitCount()) { + if(DamageUtil.attack(player, target, (float) getDamage())) { ParticleUtil.addParticles( (ServerLevel) target.level(), ModParticles.NIGHTS_EDGE_HIT_PARTICLE.get(), new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2.0, target.getZ()), new Vec3(0, 0, 0), @@ -211,7 +336,7 @@ public class NightsEdge extends SwordItem { @Override public void generate(Entity entity, CompoundTag beamData) { - int randomAngle = (int) (Config.nightsEdgeRotateRange * (Math.random() * 2 - 1)); + int randomAngle = (int) (getRotateRange() * (Math.random() * 2 - 1)); beamData.putInt("rotate", randomAngle); ISwordBeamBehavior.super.generate(entity, beamData); if(entity instanceof Player player) summon(player, randomAngle); @@ -329,11 +454,11 @@ public class NightsEdge extends SwordItem { //碰撞计算 if(!summon.level().isClientSide() && customData.contains("hitCount") && summon.getOwner() instanceof Player player) { int count = customData.getInt("hitCount"); - if(count < Config.nightsEdgeProjectileMaxHitCount) { + if(count < getProjectileMaxHitCount()) { List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); for(Entity target : targets) { - if(count >= Config.nightsEdgeProjectileMaxHitCount) break; - if(DamageUtil.attack(player, target, (float) Config.nightsEdgeProjectileDamage)) { + if(count >= getProjectileMaxHitCount()) break; + if(DamageUtil.attack(player, target, (float) getProjectileDamage())) { count++; ParticleUtil.addParticles( (ServerLevel) target.level(), ModParticles.NIGHTS_EDGE_HIT_PARTICLE.get(), @@ -345,7 +470,7 @@ public class NightsEdge extends SwordItem { } if(!targets.isEmpty()) customData.putInt("hitCount", count); } - if(count >= Config.nightsEdgeProjectileMaxHitCount) this.onDied(summon); + if(count >= getProjectileMaxHitCount()) this.onDied(summon); } ClipContext context = new ClipContext( @@ -377,7 +502,7 @@ public class NightsEdge extends SwordItem { Vec3 pos = new Vec3(player.getX(), player.getEyeY() - 0.1, player.getZ()); summon.setPos(pos); - if(!Config.nightsEdgeProjectileAlignToBlade) randomAngle = (int) (Config.nightsEdgeProjectileRotateRange * (Math.random() * 2 - 1)); + if(!isProjectileAlignToBlade()) randomAngle = (int) (getProjectileRotateRange() * (Math.random() * 2 - 1)); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], randomAngle); @@ -389,9 +514,9 @@ public class NightsEdge extends SwordItem { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.NIGHTS_EDGE_BEAM); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, Config.nightsEdgeProjectileLifetime); + summon.getEntityData().set(StaticSummon.LIFETIME, getProjectileLifetime()); summon.getEntityData().set(StaticSummon.RZP, randomAngle); - summon.getEntityData().set(StaticSummon.RZPS, Config.nightsEdgeProjectileRotationSpeed); + summon.getEntityData().set(StaticSummon.RZPS, getProjectileRotationSpeed()); summon.getEntityData().set(StaticSummon.GLOW, true); summon.setNoGravity(true); summon.noPhysics = true; @@ -428,7 +553,7 @@ public class NightsEdge extends SwordItem { customData.putFloat("rightZ", dirs[2].z); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(Config.nightsEdgeProjectileSpeed)); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(getProjectileSpeed())); player.level().addFreshEntity(summon); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Seedler.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Seedler.java index 6d961fe..12859cd 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Seedler.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Seedler.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -12,8 +11,13 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.*; import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -35,6 +39,38 @@ import java.util.Comparator; import java.util.List; public class Seedler extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String NUT_GRAVITY_PATH = "weapon.seedler.nut_gravity"; + public static final double NUT_GRAVITY_DEFAULT = 0.075; + public static final double NUT_GRAVITY_MIN = 0.0; + public static final double NUT_GRAVITY_MAX = 1.0; + + public static final String NUT_BOUNCE_PATH = "weapon.seedler.nut_bounce"; + public static final double NUT_BOUNCE_DEFAULT = 0.5; + public static final double NUT_BOUNCE_MIN = 0.0; + public static final double NUT_BOUNCE_MAX = 1.0; + + public static final String NUT_INITIAL_SPEED_PATH = "weapon.seedler.nut_initial_speed"; + public static final double NUT_INITIAL_SPEED_DEFAULT = 0.75; + public static final double NUT_INITIAL_SPEED_MIN = 0.0; + public static final double NUT_INITIAL_SPEED_MAX = 10.0; + + public static final String THORN_DAMAGE_PATH = "weapon.seedler.thorn_damage"; + public static final double THORN_DAMAGE_DEFAULT = 2.0; + public static final double THORN_DAMAGE_MIN = 0.0; + public static final double THORN_DAMAGE_MAX = 2147483647.0; + + public static final String THORN_LIFETIME_PATH = "weapon.seedler.thorn_lifetime"; + public static final int THORN_LIFETIME_DEFAULT = 30; + public static final int THORN_LIFETIME_MIN = 1; + public static final int THORN_LIFETIME_MAX = 1200; + + public static final String THORN_SPEED_PATH = "weapon.seedler.thorn_speed"; + public static final double THORN_SPEED_DEFAULT = 2.0; + public static final double THORN_SPEED_MIN = 0.0; + public static final double THORN_SPEED_MAX = 10.0; + public Seedler() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -47,18 +83,69 @@ public class Seedler extends SwordItem { ).rarity(Rarity.UNCOMMON)); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(NUT_GRAVITY_PATH, configText("seedler_nut_gravity"), configTooltip("seedler_nut_gravity"), NUT_GRAVITY_DEFAULT, NUT_GRAVITY_MIN, NUT_GRAVITY_MAX); + ConfigFactory.loadDoubleConfig(NUT_BOUNCE_PATH, configText("seedler_nut_bounce"), configTooltip("seedler_nut_bounce"), NUT_BOUNCE_DEFAULT, NUT_BOUNCE_MIN, NUT_BOUNCE_MAX); + ConfigFactory.loadDoubleConfig(NUT_INITIAL_SPEED_PATH, configText("seedler_nut_initial_speed"), configTooltip("seedler_nut_initial_speed"), NUT_INITIAL_SPEED_DEFAULT, NUT_INITIAL_SPEED_MIN, NUT_INITIAL_SPEED_MAX); + ConfigFactory.loadDoubleConfig(THORN_DAMAGE_PATH, configText("seedler_thorn_damage"), configTooltip("seedler_thorn_damage"), THORN_DAMAGE_DEFAULT, THORN_DAMAGE_MIN, THORN_DAMAGE_MAX); + ConfigFactory.loadIntConfig(THORN_LIFETIME_PATH, configText("seedler_thorn_lifetime"), configTooltip("seedler_thorn_lifetime"), THORN_LIFETIME_DEFAULT, THORN_LIFETIME_MIN, THORN_LIFETIME_MAX); + ConfigFactory.loadDoubleConfig(THORN_SPEED_PATH, configText("seedler_thorn_speed"), configTooltip("seedler_thorn_speed"), THORN_SPEED_DEFAULT, THORN_SPEED_MIN, THORN_SPEED_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getNutGravity() { + return Math.clamp(ConfigUtil.readDouble(NUT_GRAVITY_PATH, NUT_GRAVITY_DEFAULT), NUT_GRAVITY_MIN, NUT_GRAVITY_MAX); + } + + public static double getNutBounce() { + return Math.clamp(ConfigUtil.readDouble(NUT_BOUNCE_PATH, NUT_BOUNCE_DEFAULT), NUT_BOUNCE_MIN, NUT_BOUNCE_MAX); + } + + public static double getNutInitialSpeed() { + return Math.clamp(ConfigUtil.readDouble(NUT_INITIAL_SPEED_PATH, NUT_INITIAL_SPEED_DEFAULT), NUT_INITIAL_SPEED_MIN, NUT_INITIAL_SPEED_MAX); + } + + public static double getThornDamage() { + return Math.clamp(ConfigUtil.readDouble(THORN_DAMAGE_PATH, THORN_DAMAGE_DEFAULT), THORN_DAMAGE_MIN, THORN_DAMAGE_MAX); + } + + public static int getThornLifetime() { + return Math.clamp(ConfigUtil.readInt(THORN_LIFETIME_PATH, THORN_LIFETIME_DEFAULT), THORN_LIFETIME_MIN, THORN_LIFETIME_MAX); + } + + public static double getThornSpeed() { + return Math.clamp(ConfigUtil.readDouble(THORN_SPEED_PATH, THORN_SPEED_DEFAULT), THORN_SPEED_MIN, THORN_SPEED_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "seedler", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/seedler.png"), + Component.translatable("item.lzxnoneterraria.seedler"), + CONFIG_DATA + ); + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { @Override public void tick(StaticSummon summon) { this.checkBeforeTick(summon); Vec3 motion = summon.getDeltaMovement(); - motion = motion.add(0, -Config.seedlerNutGravity, 0); + motion = motion.add(0, -getNutGravity(), 0); EntityHitResult entityHitResult = CollisionUtil.checkEntityHit(summon, summon.position().add(motion)); if(entityHitResult != null) { Entity target = entityHitResult.getEntity(); if(summon.getOwner() instanceof Player player) { - if(DamageUtil.attack(player, target, (float) Config.seedlerThornDamage)) { + if(DamageUtil.attack(player, target, (float) getThornDamage())) { target.invulnerableTime = 2; } } @@ -75,15 +162,15 @@ public class Seedler extends SwordItem { double mz = motion.z; switch(face.getAxis()) { - case X -> mx = -mx * Config.seedlerNutBounce; - case Y -> my = -my * Config.seedlerNutBounce; - case Z -> mz = -mz * Config.seedlerNutBounce; + case X -> mx = -mx * getNutBounce(); + case Y -> my = -my * getNutBounce(); + case Z -> mz = -mz * getNutBounce(); } if(face == Direction.UP && Math.abs(my) < 0.1) { my = 0; - mx *= Config.seedlerNutBounce; - mz *= Config.seedlerNutBounce; + mx *= getNutBounce(); + mz *= getNutBounce(); } motion = new Vec3(mx, my, mz); @@ -129,8 +216,8 @@ public class Seedler extends SwordItem { proj.getEntityData().set(StaticProjectile.SCALE_X, 0.5f); proj.getEntityData().set(StaticProjectile.SCALE_Y, 0.5f); proj.getEntityData().set(StaticProjectile.RXP, 90); - proj.getEntityData().set(StaticProjectile.LIFETIME, Config.seedlerThornLifetime); - proj.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", Config.seedlerThornSpeed)); + proj.getEntityData().set(StaticProjectile.LIFETIME, getThornLifetime()); + proj.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getThornSpeed())); proj.setDeltaMovement(MathUtil.toVec3(dirs[0])); summon.level().addFreshEntity(proj); @@ -174,7 +261,7 @@ public class Seedler extends SwordItem { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.attack(player, target, (float) Config.seedlerThornDamage)) { + if(DamageUtil.attack(player, target, (float) getThornDamage())) { target.invulnerableTime = 2; onDied(projectile); } @@ -213,7 +300,7 @@ public class Seedler extends SwordItem { float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); summon.setXRot(xyRot[0]); summon.setYRot(xyRot[1]); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(Config.seedlerNutInitialSpeed)); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(getNutInitialSpeed())); level.addFreshEntity(summon); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/StarWrath.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/StarWrath.java index 80b44e1..f0f43ce 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/StarWrath.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/StarWrath.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -10,9 +9,14 @@ import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.particle.DustParticleOptions; import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.*; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -31,6 +35,23 @@ import net.minecraft.world.phys.*; import org.joml.Vector3f; public class StarWrath extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PATH = "weapon.star_wrath.damage"; + public static final double DAMAGE_DEFAULT = 16.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String SPEED_PATH = "weapon.star_wrath.speed"; + public static final double SPEED_DEFAULT = 2.0; + public static final double SPEED_MIN = 0.0; + public static final double SPEED_MAX = 10.0; + + public static final String MAX_RANGE_PATH = "weapon.star_wrath.max_range"; + public static final double MAX_RANGE_DEFAULT = 48.0; + public static final double MAX_RANGE_MIN = 1.0; + public static final double MAX_RANGE_MAX = 1024.0; + public StarWrath() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -43,6 +64,42 @@ public class StarWrath extends SwordItem { ).rarity(Rarity.RARE)); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("star_wrath_damage"), configTooltip("star_wrath_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("star_wrath_speed"), configTooltip("star_wrath_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("star_wrath_max_range"), configTooltip("star_wrath_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static double getSpeed() { + return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX); + } + + public static double getMaxRange() { + return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "star_wrath", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/star_wrath.png"), + Component.translatable("item.lzxnoneterraria.star_wrath"), + CONFIG_DATA + ); + public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.05f, 0.5f, 40, true, new Vector3f[]{ new Vector3f(1.0F, 0.8F, 0.5F), @@ -82,7 +139,7 @@ public class StarWrath extends SwordItem { Entity target = result.getEntity(); Entity owner = projectile.getOwner(); if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.attack(player, target, (float) Config.starWrathDamage)) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 2; } } @@ -144,7 +201,7 @@ public class StarWrath extends SwordItem { ItemStack itemstack = player.getItemInHand(hand); if(!level.isClientSide()) { for(int i = 0;i < SPAWN_COUNT;i++) { - Vec3 targetPos = MathUtil.getCrosshairPos(player, level, Config.starWrathMaxRange); + Vec3 targetPos = MathUtil.getCrosshairPos(player, level, getMaxRange()); Vec3 spawnPos = new Vec3( targetPos.x + SPAWN_OFFSET * (Math.random() * 2 - 1), @@ -176,10 +233,10 @@ public class StarWrath extends SwordItem { projectile.getEntityData().set(StaticProjectile.GLOW, true); projectile.getEntityData().set(StaticProjectile.RXP, 90); projectile.getEntityData().set(StaticProjectile.RZP, 90); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", Config.starWrathSpeed)); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getSpeed())); CompoundTag customData = new CompoundTag(); - customData.putInt("targetLifetime", (int) Math.round(targetPos.distanceTo(spawnPos) / Config.starWrathSpeed)); + customData.putInt("targetLifetime", (int) Math.round(targetPos.distanceTo(spawnPos) / getSpeed())); projectile.getEntityData().set(StaticProjectile.CUSTOM_DATA, customData); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java index c302981..65da7c6 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Starfury.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -9,9 +8,14 @@ import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.*; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -34,6 +38,23 @@ import net.minecraft.world.phys.*; import org.joml.Vector3f; public class Starfury extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PATH = "weapon.starfury.damage"; + public static final double DAMAGE_DEFAULT = 6.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String MAX_RANGE_PATH = "weapon.starfury.max_range"; + public static final double MAX_RANGE_DEFAULT = 24.0; + public static final double MAX_RANGE_MIN = 1.0; + public static final double MAX_RANGE_MAX = 1024.0; + + public static final String SPEED_PATH = "weapon.starfury.speed"; + public static final double SPEED_DEFAULT = 2.0; + public static final double SPEED_MIN = 0.0; + public static final double SPEED_MAX = 10.0; + public Starfury() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -46,6 +67,42 @@ public class Starfury extends SwordItem { )); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("starfury_damage"), configTooltip("starfury_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("starfury_max_range"), configTooltip("starfury_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); + ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("starfury_speed"), configTooltip("starfury_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static double getMaxRange() { + return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); + } + + public static double getSpeed() { + return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "starfury", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/starfury.png"), + Component.translatable("item.lzxnoneterraria.starfury"), + CONFIG_DATA + ); + public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { @Override public void onMoving(StaticProjectile projectile) { @@ -62,7 +119,7 @@ public class Starfury extends SwordItem { Entity owner = projectile.getOwner(); if(owner == null) return; if(!FilterUtil.createTargetFilter(owner).test(target) || !(owner instanceof Player player)) return; - if(DamageUtil.attack(player, target, (float) Config.starfuryDamage)) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 5; } } @@ -109,7 +166,7 @@ public class Starfury extends SwordItem { public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack itemstack = player.getItemInHand(hand); if(!level.isClientSide()) { - Vec3 targetPos = MathUtil.getCrosshairPos(player, level, Config.starfuryMaxRange); + Vec3 targetPos = MathUtil.getCrosshairPos(player, level, getMaxRange()); Vec3 spawnPos = new Vec3( targetPos.x + SPAWN_OFFSET * (Math.random() * 2 - 1), @@ -135,10 +192,10 @@ public class Starfury extends SwordItem { projectile.getEntityData().set(StaticProjectile.GLOW, true); projectile.getEntityData().set(StaticProjectile.RXP, 90); projectile.getEntityData().set(StaticProjectile.RZP, 90); - projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", Config.starfurySpeed)); + projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*t", getSpeed())); CompoundTag customData = new CompoundTag(); - customData.putInt("targetLifetime", (int) Math.floor(targetPos.distanceTo(spawnPos) / Config.starfurySpeed)); + customData.putInt("targetLifetime", (int) Math.floor(targetPos.distanceTo(spawnPos) / getSpeed())); projectile.getEntityData().set(StaticProjectile.CUSTOM_DATA, customData); projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java index 381c645..17d6a81 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TerraBlade.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -15,23 +14,24 @@ import com.lzxnone.terraria.item.IItemWaveBehavior; import com.lzxnone.terraria.network.payload.SwordBeamPayload; import com.lzxnone.terraria.particle.DustParticleOptions; import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.*; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import net.minecraft.Util; -import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlotGroup; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; @@ -39,18 +39,61 @@ import net.minecraft.world.item.*; import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.*; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; -import org.joml.Matrix4f; import org.joml.Quaternionf; import org.joml.Vector3f; import java.util.List; public class TerraBlade extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String PROJECTILE_ALIGN_TO_SWORD_BEAM_PATH = "weapon.terra_blade.projectile_align_to_sword_beam"; + public static final boolean PROJECTILE_ALIGN_TO_SWORD_BEAM_DEFAULT = true; + + public static final String SWORD_BEAM_ROTATE_RANGE_PATH = "weapon.terra_blade.sword_beam_rotate_range"; + public static final int SWORD_BEAM_ROTATE_RANGE_DEFAULT = 45; + public static final int SWORD_BEAM_ROTATE_RANGE_MIN = 0; + public static final int SWORD_BEAM_ROTATE_RANGE_MAX = 90; + + public static final String PROJECTILE_ROTATE_RANGE_PATH = "weapon.terra_blade.projectile_rotate_range"; + public static final int PROJECTILE_ROTATE_RANGE_DEFAULT = 45; + public static final int PROJECTILE_ROTATE_RANGE_MIN = 0; + public static final int PROJECTILE_ROTATE_RANGE_MAX = 90; + + public static final String SWORD_BEAM_MAX_HIT_COUNT_PATH = "weapon.terra_blade.sword_beam_max_hit_count"; + public static final int SWORD_BEAM_MAX_HIT_COUNT_DEFAULT = 3; + public static final int SWORD_BEAM_MAX_HIT_COUNT_MIN = 0; + public static final int SWORD_BEAM_MAX_HIT_COUNT_MAX = 100; + + public static final String SWORD_BEAM_DAMAGE_PATH = "weapon.terra_blade.sword_beam_damage"; + public static final double SWORD_BEAM_DAMAGE_DEFAULT = 11.0; + public static final double SWORD_BEAM_DAMAGE_MIN = 0.0; + public static final double SWORD_BEAM_DAMAGE_MAX = 2147483647.0; + + public static final String PROJECTILE_DAMAGE_PATH = "weapon.terra_blade.projectile_damage"; + public static final double PROJECTILE_DAMAGE_DEFAULT = 11.0; + public static final double PROJECTILE_DAMAGE_MIN = 0.0; + public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + + public static final String PROJECTILE_SPEED_PATH = "weapon.terra_blade.projectile_speed"; + public static final double PROJECTILE_SPEED_DEFAULT = 2.0; + public static final double PROJECTILE_SPEED_MIN = 0.0; + public static final double PROJECTILE_SPEED_MAX = 10.0; + + public static final String PROJECTILE_LIFETIME_PATH = "weapon.terra_blade.projectile_lifetime"; + public static final int PROJECTILE_LIFETIME_DEFAULT = 60; + public static final int PROJECTILE_LIFETIME_MIN = 1; + public static final int PROJECTILE_LIFETIME_MAX = 1200; + + public static final String PROJECTILE_DAMAGE_DECAY_PATH = "weapon.terra_blade.projectile_damage_decay"; + public static final double PROJECTILE_DAMAGE_DECAY_DEFAULT = 0.75; + public static final double PROJECTILE_DAMAGE_DECAY_MIN = 0.0; + public static final double PROJECTILE_DAMAGE_DECAY_MAX = 1.0; + public TerraBlade() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -63,6 +106,72 @@ public class TerraBlade extends SwordItem { ).rarity(Rarity.RARE)); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadBooleanConfig(PROJECTILE_ALIGN_TO_SWORD_BEAM_PATH, configText("terra_projectile_align_to_blade"), configTooltip("terra_projectile_align_to_blade"), PROJECTILE_ALIGN_TO_SWORD_BEAM_DEFAULT); + ConfigFactory.loadIntConfig(SWORD_BEAM_ROTATE_RANGE_PATH, configText("terra_blade_rotate_range"), configTooltip("terra_blade_rotate_range"), SWORD_BEAM_ROTATE_RANGE_DEFAULT, SWORD_BEAM_ROTATE_RANGE_MIN, SWORD_BEAM_ROTATE_RANGE_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_ROTATE_RANGE_PATH, configText("terra_projectile_rotate_range"), configTooltip("terra_projectile_rotate_range"), PROJECTILE_ROTATE_RANGE_DEFAULT, PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); + ConfigFactory.loadIntConfig(SWORD_BEAM_MAX_HIT_COUNT_PATH, configText("terra_blade_max_hit_count"), configTooltip("terra_blade_max_hit_count"), SWORD_BEAM_MAX_HIT_COUNT_DEFAULT, SWORD_BEAM_MAX_HIT_COUNT_MIN, SWORD_BEAM_MAX_HIT_COUNT_MAX); + ConfigFactory.loadDoubleConfig(SWORD_BEAM_DAMAGE_PATH, configText("terra_blade_damage"), configTooltip("terra_blade_damage"), SWORD_BEAM_DAMAGE_DEFAULT, SWORD_BEAM_DAMAGE_MIN, SWORD_BEAM_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("terra_projectile_damage"), configTooltip("terra_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_SPEED_PATH, configText("terra_projectile_speed"), configTooltip("terra_projectile_speed"), PROJECTILE_SPEED_DEFAULT, PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("terra_projectile_lifetime"), configTooltip("terra_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_DAMAGE_DECAY_PATH, configText("terra_projectile_damage_decay"), configTooltip("terra_projectile_damage_decay"), PROJECTILE_DAMAGE_DECAY_DEFAULT, PROJECTILE_DAMAGE_DECAY_MIN, PROJECTILE_DAMAGE_DECAY_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static boolean isProjectileAlignToSwordBeam() { + return ConfigUtil.readBoolean(PROJECTILE_ALIGN_TO_SWORD_BEAM_PATH, PROJECTILE_ALIGN_TO_SWORD_BEAM_DEFAULT); + } + + public static int getSwordBeamRotateRange() { + return Math.clamp(ConfigUtil.readInt(SWORD_BEAM_ROTATE_RANGE_PATH, SWORD_BEAM_ROTATE_RANGE_DEFAULT), SWORD_BEAM_ROTATE_RANGE_MIN, SWORD_BEAM_ROTATE_RANGE_MAX); + } + + public static int getProjectileRotateRange() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATE_RANGE_PATH, PROJECTILE_ROTATE_RANGE_DEFAULT), PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); + } + + public static int getSwordBeamMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(SWORD_BEAM_MAX_HIT_COUNT_PATH, SWORD_BEAM_MAX_HIT_COUNT_DEFAULT), SWORD_BEAM_MAX_HIT_COUNT_MIN, SWORD_BEAM_MAX_HIT_COUNT_MAX); + } + + public static double getSwordBeamDamage() { + return Math.clamp(ConfigUtil.readDouble(SWORD_BEAM_DAMAGE_PATH, SWORD_BEAM_DAMAGE_DEFAULT), SWORD_BEAM_DAMAGE_MIN, SWORD_BEAM_DAMAGE_MAX); + } + + public static double getProjectileDamage() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + } + + public static double getProjectileSpeed() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_SPEED_PATH, PROJECTILE_SPEED_DEFAULT), PROJECTILE_SPEED_MIN, PROJECTILE_SPEED_MAX); + } + + public static int getProjectileLifetime() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + } + + public static double getProjectileDamageDecay() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_DECAY_PATH, PROJECTILE_DAMAGE_DECAY_DEFAULT), PROJECTILE_DAMAGE_DECAY_MIN, PROJECTILE_DAMAGE_DECAY_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "terra_blade", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/terra_blade.png"), + Component.translatable("item.lzxnoneterraria.terra_blade"), + CONFIG_DATA + ); + public static final CompoundTag BEAM_DATA = Util.make(new CompoundTag(), tag -> { tag.putString("behavior", "terra_blade"); tag.putInt("lifetime", 5); @@ -109,8 +218,8 @@ public class TerraBlade extends SwordItem { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < Config.terraBladeMaxHitCount) { - if(DamageUtil.attack(player, target, (float) Config.terraBladeDamage)) { + if(count < getSwordBeamMaxHitCount()) { + if(DamageUtil.attack(player, target, (float)getSwordBeamDamage())) { target.invulnerableTime = 20; count++; custom_data.putInt("hitEntityCount", count); @@ -124,7 +233,7 @@ public class TerraBlade extends SwordItem { @Override public void generate(Entity entity, CompoundTag beamData) { - int randomAngle = (int) (Config.terraBladeRotateRange * (Math.random() * 2 - 1)); + int randomAngle = (int) (getSwordBeamRotateRange() * (Math.random() * 2 - 1)); beamData.putInt("rotate", randomAngle); ISwordBeamBehavior.super.generate(entity, beamData); if(entity instanceof Player player) summon(player, randomAngle); @@ -348,9 +457,10 @@ public class TerraBlade extends SwordItem { if(!customData.contains("dead")) { float progress = summon.getEntityData().get(StaticSummon.AGE) / (float) summon.getEntityData().get(StaticSummon.LIFETIME); if(progress > FADE_IN) { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.terraProjectileSpeed - Config.terraProjectileSpeed * (progress - FADE_IN) / (1.0f - FADE_IN))); + double projectileSpeed = getProjectileSpeed(); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(projectileSpeed - projectileSpeed * (progress - FADE_IN) / (1.0f - FADE_IN))); }else { - summon.setDeltaMovement(summon.getLookAngle().normalize().scale(Config.terraProjectileSpeed)); + summon.setDeltaMovement(summon.getLookAngle().normalize().scale(getProjectileSpeed())); } }else { summon.setDeltaMovement(summon.getLookAngle().normalize().scale(0.1)); @@ -371,7 +481,7 @@ public class TerraBlade extends SwordItem { int count = customData.getInt("hitCount"); List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); for(Entity target : targets) { - if(DamageUtil.attack(player, target, (float) Config.terraProjectileDamage * (float) Math.pow(Config.terraProjectileDamageDecay, count))) { + if(DamageUtil.attack(player, target, (float)getProjectileDamage() * (float)Math.pow(getProjectileDamageDecay(), count))) { count++; ParticleUtil.addParticles( (ServerLevel) summon.level(), ModParticles.TERRA_BEAM_HIT_PARTICLE.get(), @@ -429,7 +539,7 @@ public class TerraBlade extends SwordItem { Vec3 pos = new Vec3(player.getX(), player.getEyeY() - 0.1, player.getZ()); summon.setPos(pos); - if(!Config.terraProjectileAlignToBlade) randomAngle = (int) (Config.terraProjectileRotateRange * (Math.random() * 2 - 1)); + if(!isProjectileAlignToSwordBeam()) randomAngle = (int) (getProjectileRotateRange() * (Math.random() * 2 - 1)); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], randomAngle); @@ -441,7 +551,7 @@ public class TerraBlade extends SwordItem { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TERRA_BLADE_BEAM); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, Config.terraProjectileLifetime); + summon.getEntityData().set(StaticSummon.LIFETIME, getProjectileLifetime()); summon.getEntityData().set(StaticSummon.RZP, randomAngle); summon.getEntityData().set(StaticSummon.GLOW, true); summon.setNoGravity(true); @@ -479,7 +589,7 @@ public class TerraBlade extends SwordItem { customData.putFloat("rightZ", dirs[2].z); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(Config.terraProjectileSpeed)); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(getProjectileSpeed())); player.level().addFreshEntity(summon); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java index a631fd2..d3970b8 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -8,6 +7,10 @@ import com.lzxnone.terraria.entity.ModRenderTypes; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; @@ -20,6 +23,7 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -43,6 +47,23 @@ import org.jspecify.annotations.NonNull; import java.util.List; public class Terragrim extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String HIT_RANGE_PATH = "weapon.terragrim.hit_range"; + public static final double HIT_RANGE_DEFAULT = 2.5; + public static final double HIT_RANGE_MIN = 0.5; + public static final double HIT_RANGE_MAX = 10.0; + + public static final String DAMAGE_PATH = "weapon.terragrim.damage"; + public static final double DAMAGE_DEFAULT = 0.25; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String ROTATE_RANGE_PATH = "weapon.terragrim.rotate_range"; + public static final int ROTATE_RANGE_DEFAULT = 45; + public static final int ROTATE_RANGE_MIN = 0; + public static final int ROTATE_RANGE_MAX = 90; + public Terragrim() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -55,6 +76,42 @@ public class Terragrim extends SwordItem { ).rarity(Rarity.RARE)); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(HIT_RANGE_PATH, configText("terragrim_hit_range"), configTooltip("terragrim_hit_range"), HIT_RANGE_DEFAULT, HIT_RANGE_MIN, HIT_RANGE_MAX); + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("terragrim_damage"), configTooltip("terragrim_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("terragrim_rotate_range"), configTooltip("terragrim_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getHitRange() { + return Math.clamp(ConfigUtil.readDouble(HIT_RANGE_PATH, HIT_RANGE_DEFAULT), HIT_RANGE_MIN, HIT_RANGE_MAX); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static int getRotateRange() { + return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "terragrim", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/terragrim.png"), + Component.translatable("item.lzxnoneterraria.terragrim"), + CONFIG_DATA + ); + public static final ResourceLocation[] RES = { ResourceLocation.parse("lzxnoneterraria:textures/vfx/terragrim_beam0.png"), ResourceLocation.parse("lzxnoneterraria:textures/vfx/terragrim_beam1.png"), @@ -135,9 +192,10 @@ public class Terragrim extends SwordItem { if(summon.getOwner() != null) { summon.setPos(summon.getOwner().getX(), summon.getOwner().getY() + summon.getOwner().getBbHeight() * 0.5, summon.getOwner().getZ()); } + double hitRange = getHitRange(); summon.setBoundingBox(new AABB( - summon.getX() - Config.terragrimHitRange, summon.getY() - Config.terragrimHitRange, summon.getZ() - Config.terragrimHitRange, - summon.getX() + Config.terragrimHitRange, summon.getY() + Config.terragrimHitRange, summon.getZ() + Config.terragrimHitRange + summon.getX() - hitRange, summon.getY() - hitRange, summon.getZ() - hitRange, + summon.getX() + hitRange, summon.getY() + hitRange, summon.getZ() + hitRange )); if(!summon.level().isClientSide()) { if(summon.getOwner() instanceof Player player) { @@ -156,7 +214,7 @@ public class Terragrim extends SwordItem { knockbackResist.setBaseValue(Math.max(0.9, originalResist)); } - if(DamageUtil.attack(player, target, (float) Config.terragrimDamage)) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 0; } @@ -164,7 +222,7 @@ public class Terragrim extends SwordItem { knockbackResist.setBaseValue(originalResist); } }else { - if(DamageUtil.attack(player, target, (float) Config.terragrimDamage)) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 0; } } @@ -195,7 +253,7 @@ public class Terragrim extends SwordItem { summon.setPos(pos); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TERRAGRIM_BEAM); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.RZP, (int) ((Math.random() * 2 - 1) * Config.terragrimRotateRange)); + summon.getEntityData().set(StaticSummon.RZP, (int) ((Math.random() * 2 - 1) * getRotateRange())); summon.getEntityData().set(StaticSummon.LIFETIME, 1); summon.getEntityData().set(StaticSummon.GLOW, true); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TheHorsemansBlade.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TheHorsemansBlade.java index a710b00..b96e5d1 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TheHorsemansBlade.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TheHorsemansBlade.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -42,11 +41,109 @@ import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Vector3f; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; import java.util.Comparator; import java.util.List; public class TheHorsemansBlade extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String BLADE_ROTATE_RANGE_PATH = "weapon.the_horsemans_blade.blade_rotate_range"; + public static final int BLADE_ROTATE_RANGE_DEFAULT = 45; + public static final int BLADE_ROTATE_RANGE_MIN = 0; + public static final int BLADE_ROTATE_RANGE_MAX = 90; + + public static final String BLADE_MAX_HIT_COUNT_PATH = "weapon.the_horsemans_blade.blade_max_hit_count"; + public static final int BLADE_MAX_HIT_COUNT_DEFAULT = 3; + public static final int BLADE_MAX_HIT_COUNT_MIN = 0; + public static final int BLADE_MAX_HIT_COUNT_MAX = 100; + + public static final String BLADE_DAMAGE_PATH = "weapon.the_horsemans_blade.blade_damage"; + public static final double BLADE_DAMAGE_DEFAULT = 15.0; + public static final double BLADE_DAMAGE_MIN = 0.0; + public static final double BLADE_DAMAGE_MAX = 2147483647.0; + + public static final String PUMPKIN_SPAWN_RANGE_PATH = "weapon.the_horsemans_blade.pumpkin_spawn_range"; + public static final double PUMPKIN_SPAWN_RANGE_DEFAULT = 16.0; + public static final double PUMPKIN_SPAWN_RANGE_MIN = 1.0; + public static final double PUMPKIN_SPAWN_RANGE_MAX = 64.0; + + public static final String PUMPKIN_SPEED_PATH = "weapon.the_horsemans_blade.pumpkin_speed"; + public static final double PUMPKIN_SPEED_DEFAULT = 0.5; + public static final double PUMPKIN_SPEED_MIN = 0.0; + public static final double PUMPKIN_SPEED_MAX = 10.0; + + public static final String PUMPKIN_DAMAGE_PATH = "weapon.the_horsemans_blade.pumpkin_damage"; + public static final double PUMPKIN_DAMAGE_DEFAULT = 15.0; + public static final double PUMPKIN_DAMAGE_MIN = 0.0; + public static final double PUMPKIN_DAMAGE_MAX = 2147483647.0; + + public static final String PUMPKIN_MAX_TARGET_RANGE_PATH = "weapon.the_horsemans_blade.pumpkin_max_target_range"; + public static final double PUMPKIN_MAX_TARGET_RANGE_DEFAULT = 32.0; + public static final double PUMPKIN_MAX_TARGET_RANGE_MIN = 1.0; + public static final double PUMPKIN_MAX_TARGET_RANGE_MAX = 64.0; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadIntConfig(BLADE_ROTATE_RANGE_PATH, configText("horsemans_blade_rotate_range"), configTooltip("horsemans_blade_rotate_range"), BLADE_ROTATE_RANGE_DEFAULT, BLADE_ROTATE_RANGE_MIN, BLADE_ROTATE_RANGE_MAX); + ConfigFactory.loadIntConfig(BLADE_MAX_HIT_COUNT_PATH, configText("horsemans_blade_max_hit_count"), configTooltip("horsemans_blade_max_hit_count"), BLADE_MAX_HIT_COUNT_DEFAULT, BLADE_MAX_HIT_COUNT_MIN, BLADE_MAX_HIT_COUNT_MAX); + ConfigFactory.loadDoubleConfig(BLADE_DAMAGE_PATH, configText("horsemans_blade_damage"), configTooltip("horsemans_blade_damage"), BLADE_DAMAGE_DEFAULT, BLADE_DAMAGE_MIN, BLADE_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(PUMPKIN_SPAWN_RANGE_PATH, configText("horsemans_pumpkin_spawn_range"), configTooltip("horsemans_pumpkin_spawn_range"), PUMPKIN_SPAWN_RANGE_DEFAULT, PUMPKIN_SPAWN_RANGE_MIN, PUMPKIN_SPAWN_RANGE_MAX); + ConfigFactory.loadDoubleConfig(PUMPKIN_SPEED_PATH, configText("horsemans_pumpkin_speed"), configTooltip("horsemans_pumpkin_speed"), PUMPKIN_SPEED_DEFAULT, PUMPKIN_SPEED_MIN, PUMPKIN_SPEED_MAX); + ConfigFactory.loadDoubleConfig(PUMPKIN_DAMAGE_PATH, configText("horsemans_pumpkin_damage"), configTooltip("horsemans_pumpkin_damage"), PUMPKIN_DAMAGE_DEFAULT, PUMPKIN_DAMAGE_MIN, PUMPKIN_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(PUMPKIN_MAX_TARGET_RANGE_PATH, configText("horsemans_pumpkin_max_target_range"), configTooltip("horsemans_pumpkin_max_target_range"), PUMPKIN_MAX_TARGET_RANGE_DEFAULT, PUMPKIN_MAX_TARGET_RANGE_MIN, PUMPKIN_MAX_TARGET_RANGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static int getBladeRotateRange() { + return Math.clamp(ConfigUtil.readInt(BLADE_ROTATE_RANGE_PATH, BLADE_ROTATE_RANGE_DEFAULT), BLADE_ROTATE_RANGE_MIN, BLADE_ROTATE_RANGE_MAX); + } + + public static int getBladeMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(BLADE_MAX_HIT_COUNT_PATH, BLADE_MAX_HIT_COUNT_DEFAULT), BLADE_MAX_HIT_COUNT_MIN, BLADE_MAX_HIT_COUNT_MAX); + } + + public static double getBladeDamage() { + return Math.clamp(ConfigUtil.readDouble(BLADE_DAMAGE_PATH, BLADE_DAMAGE_DEFAULT), BLADE_DAMAGE_MIN, BLADE_DAMAGE_MAX); + } + + public static double getPumpkinSpawnRange() { + return Math.clamp(ConfigUtil.readDouble(PUMPKIN_SPAWN_RANGE_PATH, PUMPKIN_SPAWN_RANGE_DEFAULT), PUMPKIN_SPAWN_RANGE_MIN, PUMPKIN_SPAWN_RANGE_MAX); + } + + public static double getPumpkinSpeed() { + return Math.clamp(ConfigUtil.readDouble(PUMPKIN_SPEED_PATH, PUMPKIN_SPEED_DEFAULT), PUMPKIN_SPEED_MIN, PUMPKIN_SPEED_MAX); + } + + public static double getPumpkinDamage() { + return Math.clamp(ConfigUtil.readDouble(PUMPKIN_DAMAGE_PATH, PUMPKIN_DAMAGE_DEFAULT), PUMPKIN_DAMAGE_MIN, PUMPKIN_DAMAGE_MAX); + } + + public static double getPumpkinMaxTargetRange() { + return Math.clamp(ConfigUtil.readDouble(PUMPKIN_MAX_TARGET_RANGE_PATH, PUMPKIN_MAX_TARGET_RANGE_DEFAULT), PUMPKIN_MAX_TARGET_RANGE_MIN, PUMPKIN_MAX_TARGET_RANGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "the_horsemans_blade", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/the_horsemans_blade.png"), + Component.translatable("item.lzxnoneterraria.the_horsemans_blade"), + CONFIG_DATA + ); + public TheHorsemansBlade() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -104,8 +201,8 @@ public class TheHorsemansBlade extends SwordItem { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < Config.horsemansBladeMaxHitCount) { - if(DamageUtil.attack(player, target, (float) Config.horsemansBladeDamage)) { + if(count < getBladeMaxHitCount()) { + if(DamageUtil.attack(player, target, (float) getBladeDamage())) { target.invulnerableTime = 20; count++; custom_data.putInt("hitEntityCount", count); @@ -115,7 +212,7 @@ public class TheHorsemansBlade extends SwordItem { Entity entity = beam.getOwner(); if(entity == null) return; summon.setOwner(entity); - Vec3 pos = MathUtil.getRandomPosInRadius(entity.position(), Config.horsemansPumpkinSpawnRange); + Vec3 pos = MathUtil.getRandomPosInRadius(entity.position(), getPumpkinSpawnRange()); summon.setPos(pos); float[] xyRot = MathUtil.computeXYRot(MathUtil.toVector3f(target.position().subtract(pos))); @@ -150,7 +247,7 @@ public class TheHorsemansBlade extends SwordItem { @Override public void generate(Entity entity, CompoundTag beamData) { - beamData.putInt("rotate", (int) (Config.horsemansBladeRotateRange * (Math.random() * 2 - 1))); + beamData.putInt("rotate", (int) (getBladeRotateRange() * (Math.random() * 2 - 1))); //beamData.putBoolean("right", entity.getRandom().nextInt(2) == 0); ISwordBeamBehavior.super.generate(entity, beamData); } @@ -213,7 +310,7 @@ public class TheHorsemansBlade extends SwordItem { if(target == null) { List targets = summon.level().getEntitiesOfClass( Monster.class, - AABB.ofSize(summon.position(), Config.horsemansPumpkinMaxTargetRange * 2, Config.horsemansPumpkinMaxTargetRange * 2, Config.horsemansPumpkinMaxTargetRange * 2), + AABB.ofSize(summon.position(), getPumpkinMaxTargetRange() * 2, getPumpkinMaxTargetRange() * 2, getPumpkinMaxTargetRange() * 2), FilterUtil.createMonsterFilter(summon.getOwner()) ); targets.sort(Comparator.comparingDouble(e -> e.distanceToSqr(summon.position()))); @@ -230,18 +327,18 @@ public class TheHorsemansBlade extends SwordItem { Vec3 selfPos = summon.position(); Vec3 dir = targetPos.subtract(selfPos).normalize(); - summon.setDeltaMovement(dir.scale(Config.horsemansPumpkinSpeed)); + summon.setDeltaMovement(dir.scale(getPumpkinSpeed())); float[] xyRot = MathUtil.computeXYRot(MathUtil.toVector3f(dir)); summon.setXRot(xyRot[0]); summon.setYRot(xyRot[1]); if(selfPos.distanceToSqr(targetPos) < 2.0D) { - if(summon.getOwner() instanceof Player player && FilterUtil.createLivingTargetFilter(player).test(target) && DamageUtil.attack(player, target, (float) Config.horsemansPumpkinDamage)) onDied(summon); + if(summon.getOwner() instanceof Player player && FilterUtil.createLivingTargetFilter(player).test(target) && DamageUtil.attack(player, target, (float) getPumpkinDamage())) onDied(summon); } }else { Vec3 dir = summon.getLookAngle().normalize(); - summon.setDeltaMovement(dir.scale(Config.horsemansPumpkinSpeed)); + summon.setDeltaMovement(dir.scale(getPumpkinSpeed())); } if(!summon.level().isClientSide()) { @@ -262,7 +359,7 @@ public class TheHorsemansBlade extends SwordItem { for(Entity hitEntity : hitEntities) { if(target != null && hitEntity.getUUID() == target.getUUID()) continue; if(summon.getOwner() instanceof Player player) { - if(DamageUtil.attack(player, target, (float) Config.horsemansPumpkinDamage)) { + if(DamageUtil.attack(player, target, (float) getPumpkinDamage())) { hitEntity.invulnerableTime = 2; } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueCopperShortsword.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueCopperShortsword.java index 2ecb873..ffd29a5 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueCopperShortsword.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueCopperShortsword.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -42,24 +41,24 @@ public class TrueCopperShortsword extends SwordItem { public static void summon(Player player, double deltaDist) { Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - int randomAngle = (int) ((Math.random() * 2 - 1) * Config.zenithTrailOffset); + int randomAngle = (int) ((Math.random() * 2 - 1) * Zenith.getTrailOffset()); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], randomAngle); Vec3 pos = (player.getBoundingBox().getCenter()).add(MathUtil.toVec3(dirs[0]).scale(-2)); double dist; - if(Config.zenithDistanceMode) { - Vec3 targetPos = MathUtil.getCrosshairPos(player, player.level(), Config.zenithMaxRange); - dist = Math.max(0, Math.min(targetPos.subtract(pos).length() + deltaDist, Config.zenithMaxRange)); + if(Zenith.isDistanceMode()) { + Vec3 targetPos = MathUtil.getCrosshairPos(player, player.level(), Zenith.getMaxRange()); + dist = Math.max(0, Math.min(targetPos.subtract(pos).length() + deltaDist, Zenith.getMaxRange())); }else { dist = deltaDist; } - int cycle = (int) Math.max(10, dist / Config.zenithMaxRange * Config.zenithCycle); + int cycle = (int) Math.max(10, dist / Zenith.getMaxRange() * Zenith.getCycle()); double a = Math.max(dist / 2, 2); - double b = Math.min(Math.random() * Config.zenithTrailB + Config.zenithTrailB, a / 2); + double b = Math.min(Math.random() * Zenith.getTrailB() + Zenith.getTrailB(), a / 2); double w = Math.PI * 2 / (double) cycle; if(player.getRandom().nextInt(2) == 0) w = -w; - for(int i = 0;i < Config.zenithWeaponCount;i++) { + for(int i = 0;i < Zenith.getWeaponCount();i++) { StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), player.level()); projectile.setOwner(player); @@ -85,16 +84,16 @@ public class TrueCopperShortsword extends SwordItem { customData.putInt("angle", randomAngle); if(i == 0) { projectile.getEntityData().set(StaticProjectile.COLOR_A, 1.0f); - projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) Config.zenithScale); - projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) Config.zenithScale); + projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) Zenith.getScale()); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) Zenith.getScale()); projectile.getEntityData().set(StaticProjectile.LIFETIME, cycle); projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format("%.3f*cos(%.3ft-1.571)", b, w)); projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*sin(%.3ft-1.571)+%.3f", a, w, a)); customData.putInt("start", 0); }else if(i == 1) { projectile.getEntityData().set(StaticProjectile.COLOR_A, 0.75f); - projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) Config.zenithScale * 0.75f); - projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) Config.zenithScale * 0.75f); + projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) Zenith.getScale() * 0.75f); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) Zenith.getScale() * 0.75f); projectile.getEntityData().set(StaticProjectile.LIFETIME, (int) (cycle * 1.25)); if(w > 0) { projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format("%.3f*cos(%.3ft-3.142)", b, w)); @@ -106,8 +105,8 @@ public class TrueCopperShortsword extends SwordItem { customData.putInt("start", (int) (cycle * 0.25)); }else if(i == 2) { projectile.getEntityData().set(StaticProjectile.COLOR_A, 0.5f); - projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) Config.zenithScale * 0.5f); - projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) Config.zenithScale * 0.5f); + projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) Zenith.getScale() * 0.5f); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) Zenith.getScale() * 0.5f); projectile.getEntityData().set(StaticProjectile.LIFETIME, (int) (cycle * 1.5)); if(w > 0) { projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format("%.3f*cos(%.3ft-4.713)", b, w)); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueExcalibur.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueExcalibur.java index 7de71ab..7b7034a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueExcalibur.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueExcalibur.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModRenderTypes; @@ -37,8 +36,66 @@ import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Vector3f; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; public class TrueExcalibur extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String ROTATE_RANGE_PATH = "weapon.true_excalibur.rotate_range"; + public static final int ROTATE_RANGE_DEFAULT = 45; + public static final int ROTATE_RANGE_MIN = 0; + public static final int ROTATE_RANGE_MAX = 90; + + public static final String MAX_HIT_COUNT_PATH = "weapon.true_excalibur.max_hit_count"; + public static final int MAX_HIT_COUNT_DEFAULT = 6; + public static final int MAX_HIT_COUNT_MIN = 0; + public static final int MAX_HIT_COUNT_MAX = 100; + + public static final String DAMAGE_PATH = "weapon.true_excalibur.damage"; + public static final double DAMAGE_DEFAULT = 8.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("true_excalibur_rotate_range"), configTooltip("true_excalibur_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + ConfigFactory.loadIntConfig(MAX_HIT_COUNT_PATH, configText("true_excalibur_max_hit_count"), configTooltip("true_excalibur_max_hit_count"), MAX_HIT_COUNT_DEFAULT, MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("true_excalibur_damage"), configTooltip("true_excalibur_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static int getRotateRange() { + return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + } + + public static int getMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "true_excalibur", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/true_excalibur.png"), + Component.translatable("item.lzxnoneterraria.true_excalibur"), + CONFIG_DATA + ); + public TrueExcalibur() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -219,8 +276,8 @@ public class TrueExcalibur extends SwordItem { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < Config.trueExcaliburMaxHitCount) { - if(DamageUtil.attack(player, target, (float) Config.trueExcaliburDamage)) { + if(count < getMaxHitCount()) { + if(DamageUtil.attack(player, target, (float) getDamage())) { target.invulnerableTime = 20; count++; custom_data.putInt("hitEntityCount", count); @@ -244,7 +301,7 @@ public class TrueExcalibur extends SwordItem { @Override public void generate(Entity entity, CompoundTag beamData) { - beamData.putInt("rotate", (int) (Config.trueExcaliburRotateRange * (Math.random() * 2 - 1))); + beamData.putInt("rotate", (int) (getRotateRange() * (Math.random() * 2 - 1))); ISwordBeamBehavior.super.generate(entity, beamData); } }; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java index d82c53f..3f42ee6 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueNightsEdge.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -43,10 +42,146 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.network.PacketDistributor; import org.joml.Quaternionf; import org.joml.Vector3f; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; import java.util.List; public class TrueNightsEdge extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String PROJECTILE_ALIGN_TO_BLADE_PATH = "weapon.true_nights_edge.projectile_align_to_blade"; + public static final boolean PROJECTILE_ALIGN_TO_BLADE_DEFAULT = true; + + public static final String ROTATE_RANGE_PATH = "weapon.true_nights_edge.rotate_range"; + public static final int ROTATE_RANGE_DEFAULT = 45; + public static final int ROTATE_RANGE_MIN = 0; + public static final int ROTATE_RANGE_MAX = 90; + + public static final String PROJECTILE_ROTATE_RANGE_PATH = "weapon.true_nights_edge.projectile_rotate_range"; + public static final int PROJECTILE_ROTATE_RANGE_DEFAULT = 45; + public static final int PROJECTILE_ROTATE_RANGE_MIN = 0; + public static final int PROJECTILE_ROTATE_RANGE_MAX = 90; + + public static final String MAX_HIT_COUNT_PATH = "weapon.true_nights_edge.max_hit_count"; + public static final int MAX_HIT_COUNT_DEFAULT = 2; + public static final int MAX_HIT_COUNT_MIN = 0; + public static final int MAX_HIT_COUNT_MAX = 100; + + public static final String PROJECTILE_MAX_HIT_COUNT_PATH = "weapon.true_nights_edge.projectile_max_hit_count"; + public static final int PROJECTILE_MAX_HIT_COUNT_DEFAULT = 3; + public static final int PROJECTILE_MAX_HIT_COUNT_MIN = 0; + public static final int PROJECTILE_MAX_HIT_COUNT_MAX = 100; + + public static final String DAMAGE_PATH = "weapon.true_nights_edge.damage"; + public static final double DAMAGE_DEFAULT = 8.0; + public static final double DAMAGE_MIN = 0.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String PROJECTILE_DAMAGE_PATH = "weapon.true_nights_edge.projectile_damage"; + public static final double PROJECTILE_DAMAGE_DEFAULT = 4.0; + public static final double PROJECTILE_DAMAGE_MIN = 0.0; + public static final double PROJECTILE_DAMAGE_MAX = 2147483647.0; + + public static final String PROJECTILE_MAX_SPEED_PATH = "weapon.true_nights_edge.projectile_max_speed"; + public static final double PROJECTILE_MAX_SPEED_DEFAULT = 2.0; + public static final double PROJECTILE_MAX_SPEED_MIN = 0.0; + public static final double PROJECTILE_MAX_SPEED_MAX = 10.0; + + public static final String PROJECTILE_ACCELERATION_PATH = "weapon.true_nights_edge.projectile_acceleration"; + public static final double PROJECTILE_ACCELERATION_DEFAULT = 0.03; + public static final double PROJECTILE_ACCELERATION_MIN = 0.0; + public static final double PROJECTILE_ACCELERATION_MAX = 10.0; + + public static final String PROJECTILE_LIFETIME_PATH = "weapon.true_nights_edge.projectile_lifetime"; + public static final int PROJECTILE_LIFETIME_DEFAULT = 60; + public static final int PROJECTILE_LIFETIME_MIN = 1; + public static final int PROJECTILE_LIFETIME_MAX = 1200; + + public static final String PROJECTILE_ROTATION_SPEED_PATH = "weapon.true_nights_edge.projectile_rotation_speed"; + public static final int PROJECTILE_ROTATION_SPEED_DEFAULT = 30; + public static final int PROJECTILE_ROTATION_SPEED_MIN = 0; + public static final int PROJECTILE_ROTATION_SPEED_MAX = 360; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadBooleanConfig(PROJECTILE_ALIGN_TO_BLADE_PATH, configText("true_nights_edge_projectile_align_to_blade"), configTooltip("true_nights_edge_projectile_align_to_blade"), PROJECTILE_ALIGN_TO_BLADE_DEFAULT); + ConfigFactory.loadIntConfig(ROTATE_RANGE_PATH, configText("true_nights_edge_rotate_range"), configTooltip("true_nights_edge_rotate_range"), ROTATE_RANGE_DEFAULT, ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_ROTATE_RANGE_PATH, configText("true_nights_edge_projectile_rotate_range"), configTooltip("true_nights_edge_projectile_rotate_range"), PROJECTILE_ROTATE_RANGE_DEFAULT, PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); + ConfigFactory.loadIntConfig(MAX_HIT_COUNT_PATH, configText("true_nights_edge_max_hit_count"), configTooltip("true_nights_edge_max_hit_count"), MAX_HIT_COUNT_DEFAULT, MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_MAX_HIT_COUNT_PATH, configText("true_nights_edge_projectile_max_hit_count"), configTooltip("true_nights_edge_projectile_max_hit_count"), PROJECTILE_MAX_HIT_COUNT_DEFAULT, PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("true_nights_edge_damage"), configTooltip("true_nights_edge_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_DAMAGE_PATH, configText("true_nights_edge_projectile_damage"), configTooltip("true_nights_edge_projectile_damage"), PROJECTILE_DAMAGE_DEFAULT, PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_MAX_SPEED_PATH, configText("true_nights_edge_projectile_max_speed"), configTooltip("true_nights_edge_projectile_max_speed"), PROJECTILE_MAX_SPEED_DEFAULT, PROJECTILE_MAX_SPEED_MIN, PROJECTILE_MAX_SPEED_MAX); + ConfigFactory.loadDoubleConfig(PROJECTILE_ACCELERATION_PATH, configText("true_nights_edge_projectile_acceleration"), configTooltip("true_nights_edge_projectile_acceleration"), PROJECTILE_ACCELERATION_DEFAULT, PROJECTILE_ACCELERATION_MIN, PROJECTILE_ACCELERATION_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_LIFETIME_PATH, configText("true_nights_edge_projectile_lifetime"), configTooltip("true_nights_edge_projectile_lifetime"), PROJECTILE_LIFETIME_DEFAULT, PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + ConfigFactory.loadIntConfig(PROJECTILE_ROTATION_SPEED_PATH, configText("true_nights_edge_projectile_rotation_speed"), configTooltip("true_nights_edge_projectile_rotation_speed"), PROJECTILE_ROTATION_SPEED_DEFAULT, PROJECTILE_ROTATION_SPEED_MIN, PROJECTILE_ROTATION_SPEED_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static boolean isProjectileAlignToBlade() { + return ConfigUtil.readBoolean(PROJECTILE_ALIGN_TO_BLADE_PATH, PROJECTILE_ALIGN_TO_BLADE_DEFAULT); + } + + public static int getRotateRange() { + return Math.clamp(ConfigUtil.readInt(ROTATE_RANGE_PATH, ROTATE_RANGE_DEFAULT), ROTATE_RANGE_MIN, ROTATE_RANGE_MAX); + } + + public static int getProjectileRotateRange() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATE_RANGE_PATH, PROJECTILE_ROTATE_RANGE_DEFAULT), PROJECTILE_ROTATE_RANGE_MIN, PROJECTILE_ROTATE_RANGE_MAX); + } + + public static int getMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(MAX_HIT_COUNT_PATH, MAX_HIT_COUNT_DEFAULT), MAX_HIT_COUNT_MIN, MAX_HIT_COUNT_MAX); + } + + public static int getProjectileMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_MAX_HIT_COUNT_PATH, PROJECTILE_MAX_HIT_COUNT_DEFAULT), PROJECTILE_MAX_HIT_COUNT_MIN, PROJECTILE_MAX_HIT_COUNT_MAX); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static double getProjectileDamage() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_DAMAGE_PATH, PROJECTILE_DAMAGE_DEFAULT), PROJECTILE_DAMAGE_MIN, PROJECTILE_DAMAGE_MAX); + } + + public static double getProjectileMaxSpeed() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_MAX_SPEED_PATH, PROJECTILE_MAX_SPEED_DEFAULT), PROJECTILE_MAX_SPEED_MIN, PROJECTILE_MAX_SPEED_MAX); + } + + public static double getProjectileAcceleration() { + return Math.clamp(ConfigUtil.readDouble(PROJECTILE_ACCELERATION_PATH, PROJECTILE_ACCELERATION_DEFAULT), PROJECTILE_ACCELERATION_MIN, PROJECTILE_ACCELERATION_MAX); + } + + public static int getProjectileLifetime() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_LIFETIME_PATH, PROJECTILE_LIFETIME_DEFAULT), PROJECTILE_LIFETIME_MIN, PROJECTILE_LIFETIME_MAX); + } + + public static int getProjectileRotationSpeed() { + return Math.clamp(ConfigUtil.readInt(PROJECTILE_ROTATION_SPEED_PATH, PROJECTILE_ROTATION_SPEED_DEFAULT), PROJECTILE_ROTATION_SPEED_MIN, PROJECTILE_ROTATION_SPEED_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "true_nights_edge", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/true_nights_edge.png"), + Component.translatable("item.lzxnoneterraria.true_nights_edge"), + CONFIG_DATA + ); + public TrueNightsEdge() { super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -197,8 +332,8 @@ public class TrueNightsEdge extends SwordItem { CompoundTag custom_data = beam.getEntityData().get(SwordBeam.CUSTOM_DATA); if(custom_data.contains("hitEntityCount")) { int count = custom_data.getInt("hitEntityCount"); - if(count < Config.trueNightsEdgeMaxHitCount) { - if(DamageUtil.attack(player, target, (float) Config.trueNightsEdgeDamage)) { + if(count < getMaxHitCount()) { + if(DamageUtil.attack(player, target, (float) getDamage())) { ParticleUtil.addParticles( (ServerLevel) target.level(), ModParticles.NIGHTS_EDGE_HIT_PARTICLE.get(), new Vec3(target.getX(), target.getY() + target.getBbHeight() / 2.0, target.getZ()), new Vec3(0, 0, 0), @@ -217,7 +352,7 @@ public class TrueNightsEdge extends SwordItem { @Override public void generate(Entity entity, CompoundTag beamData) { - int randomAngle = (int) (Config.trueNightsEdgeRotateRange * (Math.random() * 2 - 1)); + int randomAngle = (int) (getRotateRange() * (Math.random() * 2 - 1)); beamData.putInt("rotate", randomAngle); ISwordBeamBehavior.super.generate(entity, beamData); if(entity instanceof Player player) summon(player, randomAngle); @@ -410,8 +545,8 @@ public class TrueNightsEdge extends SwordItem { //运动逻辑 Vec3 motion = summon.getDeltaMovement(); double currentSpeed = motion.length(); - double maxSpeed = Config.trueNightsEdgeProjectileMaxSpeed; - double acceleration = Config.trueNightsEdgeProjectileAcceleration; + double maxSpeed = getProjectileMaxSpeed(); + double acceleration = getProjectileAcceleration(); if(currentSpeed < maxSpeed && currentSpeed > 0) { Vec3 dir = motion.normalize(); double newSpeed = Math.min(currentSpeed + acceleration, maxSpeed); @@ -432,11 +567,11 @@ public class TrueNightsEdge extends SwordItem { //碰撞计算 if(!summon.level().isClientSide() && customData.contains("hitCount") && summon.getOwner() instanceof Player player) { int count = customData.getInt("hitCount"); - if(count < Config.trueNightsEdgeProjectileMaxHitCount) { + if(count < getProjectileMaxHitCount()) { List targets = summon.level().getEntitiesOfClass(Entity.class, summon.getBoundingBox(), FilterUtil.createTargetFilter(summon, summon.getOwner())); for(Entity target : targets) { - if(count >= Config.trueNightsEdgeProjectileMaxHitCount) break; - if(DamageUtil.attack(player, target, (float) Config.trueNightsEdgeProjectileDamage)) { + if(count >= getProjectileMaxHitCount()) break; + if(DamageUtil.attack(player, target, (float) getProjectileDamage())) { count++; ParticleUtil.addParticles( (ServerLevel) target.level(), ModParticles.TRUE_NIGHTS_EDGE_HIT_PARTICLE.get(), @@ -448,7 +583,7 @@ public class TrueNightsEdge extends SwordItem { } if(!targets.isEmpty()) customData.putInt("hitCount", count); } - if(count >= Config.trueNightsEdgeProjectileMaxHitCount) this.onDied(summon); + if(count >= getProjectileMaxHitCount()) this.onDied(summon); } ClipContext context = new ClipContext( @@ -480,7 +615,7 @@ public class TrueNightsEdge extends SwordItem { Vec3 pos = new Vec3(player.getX(), player.getEyeY() - 0.1, player.getZ()); summon.setPos(pos); - if(!Config.trueNightsEdgeProjectileAlignToBlade) randomAngle = (int) (Config.trueNightsEdgeProjectileRotateRange * (Math.random() * 2 - 1)); + if(!isProjectileAlignToBlade()) randomAngle = (int) (getProjectileRotateRange() * (Math.random() * 2 - 1)); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], randomAngle); @@ -492,9 +627,9 @@ public class TrueNightsEdge extends SwordItem { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TRUE_NIGHTS_EDGE_BEAM); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, Config.trueNightsEdgeProjectileLifetime); + summon.getEntityData().set(StaticSummon.LIFETIME, getProjectileLifetime()); summon.getEntityData().set(StaticSummon.RZP, randomAngle); - summon.getEntityData().set(StaticSummon.RZPS, Config.trueNightsEdgeProjectileRotationSpeed); + summon.getEntityData().set(StaticSummon.RZPS, getProjectileRotationSpeed()); summon.getEntityData().set(StaticSummon.GLOW, true); summon.setNoGravity(true); summon.noPhysics = true; @@ -531,7 +666,7 @@ public class TrueNightsEdge extends SwordItem { customData.putFloat("rightZ", dirs[2].z); summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - summon.setDeltaMovement(player.getLookAngle().normalize().scale(Config.trueNightsEdgeProjectileMaxSpeed * 0.1)); + summon.setDeltaMovement(player.getLookAngle().normalize().scale(getProjectileMaxSpeed() * 0.1)); player.level().addFreshEntity(summon); } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Volcano.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Volcano.java index 51c8a5b..622bf2c 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Volcano.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Volcano.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -10,10 +9,15 @@ import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.IItemWaveBehavior; import com.lzxnone.terraria.particle.DustParticleOptions; import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.ParticleUtil; import com.lzxnone.terraria.utils.SoundUtil; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; @@ -38,6 +42,28 @@ import java.util.Comparator; import java.util.List; public class Volcano extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String EXPLOSION_RANGE_PATH = "weapon.volcano.explosion_range"; + public static final double EXPLOSION_RANGE_DEFAULT = 4.0; + public static final double EXPLOSION_RANGE_MIN = 1.0; + public static final double EXPLOSION_RANGE_MAX = 64.0; + + public static final String EXPLOSION_DAMAGE_PATH = "weapon.volcano.explosion_damage"; + public static final double EXPLOSION_DAMAGE_DEFAULT = 6.0; + public static final double EXPLOSION_DAMAGE_MIN = 0.0; + public static final double EXPLOSION_DAMAGE_MAX = 2147483647.0; + + public static final String EXPLOSION_MAX_HIT_COUNT_PATH = "weapon.volcano.explosion_max_hit_count"; + public static final int EXPLOSION_MAX_HIT_COUNT_DEFAULT = 2; + public static final int EXPLOSION_MAX_HIT_COUNT_MIN = 0; + public static final int EXPLOSION_MAX_HIT_COUNT_MAX = 100; + + public static final String IGNITE_SECONDS_PATH = "weapon.volcano.ignite_seconds"; + public static final int IGNITE_SECONDS_DEFAULT = 3; + public static final int IGNITE_SECONDS_MIN = 0; + public static final int IGNITE_SECONDS_MAX = 60; + public Volcano() { super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -50,6 +76,47 @@ public class Volcano extends SwordItem { )); } + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(EXPLOSION_RANGE_PATH, configText("volcano_explosion_range"), configTooltip("volcano_explosion_range"), EXPLOSION_RANGE_DEFAULT, EXPLOSION_RANGE_MIN, EXPLOSION_RANGE_MAX); + ConfigFactory.loadDoubleConfig(EXPLOSION_DAMAGE_PATH, configText("volcano_explosion_damage"), configTooltip("volcano_explosion_damage"), EXPLOSION_DAMAGE_DEFAULT, EXPLOSION_DAMAGE_MIN, EXPLOSION_DAMAGE_MAX); + ConfigFactory.loadIntConfig(EXPLOSION_MAX_HIT_COUNT_PATH, configText("volcano_explosion_max_hit_count"), configTooltip("volcano_explosion_max_hit_count"), EXPLOSION_MAX_HIT_COUNT_DEFAULT, EXPLOSION_MAX_HIT_COUNT_MIN, EXPLOSION_MAX_HIT_COUNT_MAX); + ConfigFactory.loadIntConfig(IGNITE_SECONDS_PATH, configText("volcano_ignite_seconds"), configTooltip("volcano_ignite_seconds"), IGNITE_SECONDS_DEFAULT, IGNITE_SECONDS_MIN, IGNITE_SECONDS_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getExplosionRange() { + return Math.clamp(ConfigUtil.readDouble(EXPLOSION_RANGE_PATH, EXPLOSION_RANGE_DEFAULT), EXPLOSION_RANGE_MIN, EXPLOSION_RANGE_MAX); + } + + public static double getExplosionDamage() { + return Math.clamp(ConfigUtil.readDouble(EXPLOSION_DAMAGE_PATH, EXPLOSION_DAMAGE_DEFAULT), EXPLOSION_DAMAGE_MIN, EXPLOSION_DAMAGE_MAX); + } + + public static int getExplosionMaxHitCount() { + return Math.clamp(ConfigUtil.readInt(EXPLOSION_MAX_HIT_COUNT_PATH, EXPLOSION_MAX_HIT_COUNT_DEFAULT), EXPLOSION_MAX_HIT_COUNT_MIN, EXPLOSION_MAX_HIT_COUNT_MAX); + } + + public static int getIgniteSeconds() { + return Math.clamp(ConfigUtil.readInt(IGNITE_SECONDS_PATH, IGNITE_SECONDS_DEFAULT), IGNITE_SECONDS_MIN, IGNITE_SECONDS_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "volcano", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/volcano.png"), + Component.translatable("item.lzxnoneterraria.volcano"), + CONFIG_DATA + ); + public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.075f, 0.5f, 40, true, new Vector3f[]{ new Vector3f(1.0F, 0.8F, 0.5F), @@ -110,16 +177,16 @@ public class Volcano extends SwordItem { if(!player.getCooldowns().isOnCooldown(item)) { List targets = player.level().getEntitiesOfClass( LivingEntity.class, - AABB.ofSize(player.getBoundingBox().getCenter(), Config.volcanoExplosionRange * 2, Config.volcanoExplosionRange * 2, Config.volcanoExplosionRange * 2), + AABB.ofSize(player.getBoundingBox().getCenter(), getExplosionRange() * 2, getExplosionRange() * 2, getExplosionRange() * 2), FilterUtil.createLivingTargetFilter(player) ); targets.sort(Comparator.comparingDouble(e -> e.distanceToSqr(target.position()))); int hitCount = 0; for(LivingEntity livingEntity : targets) { if(livingEntity.getUUID() == target.getUUID()) continue; - if(hitCount >= Config.volcanoExplosionMaxHitCount) break; - if(DamageUtil.attack(player, livingEntity, (float) Config.volcanoExplosionDamage)) { - livingTarget.igniteForSeconds(Config.volcanoIgniteSeconds); + if(hitCount >= getExplosionMaxHitCount()) break; + if(DamageUtil.attack(player, livingEntity, (float) getExplosionDamage())) { + livingTarget.igniteForSeconds(getIgniteSeconds()); hitCount++; } } @@ -160,7 +227,7 @@ public class Volcano extends SwordItem { ); player.getCooldowns().addCooldown(item, 10); } - if(player.getRandom().nextInt(2) == 0) livingTarget.igniteForSeconds(Config.volcanoIgniteSeconds); + if(player.getRandom().nextInt(2) == 0) livingTarget.igniteForSeconds(getIgniteSeconds()); } }else { ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java index 33cdb48..b81e56a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; @@ -42,10 +41,156 @@ import org.joml.Matrix4f; import org.joml.Quaternionf; import org.joml.Vector3f; import org.jspecify.annotations.NonNull; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; import java.util.List; public class Zenith extends SwordItem { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PATH = "weapon.zenith.damage"; + public static final double DAMAGE_DEFAULT = 4.0; + public static final double DAMAGE_MIN = 1.0; + public static final double DAMAGE_MAX = 2147483647.0; + + public static final String MAX_RANGE_PATH = "weapon.zenith.max_range"; + public static final double MAX_RANGE_DEFAULT = 64.0; + public static final double MAX_RANGE_MIN = 1.0; + public static final double MAX_RANGE_MAX = 1024.0; + + public static final String DISTANCE_MODE_PATH = "weapon.zenith.distance_mode"; + public static final boolean DISTANCE_MODE_DEFAULT = true; + + public static final String MOUSE_SPEED_PATH = "weapon.zenith.mouse_speed"; + public static final int MOUSE_SPEED_DEFAULT = 4; + public static final int MOUSE_SPEED_MIN = 0; + public static final int MOUSE_SPEED_MAX = 128; + + public static final String TRAIL_B_PATH = "weapon.zenith.trail_b"; + public static final double TRAIL_B_DEFAULT = 4.0; + public static final double TRAIL_B_MIN = 0.1; + public static final double TRAIL_B_MAX = 512.0; + + public static final String TRAIL_OFFSET_PATH = "weapon.zenith.trail_offset"; + public static final int TRAIL_OFFSET_DEFAULT = 30; + public static final int TRAIL_OFFSET_MIN = 0; + public static final int TRAIL_OFFSET_MAX = 90; + + public static final String WEAPON_COUNT_PATH = "weapon.zenith.weapon_count"; + public static final int WEAPON_COUNT_DEFAULT = 3; + public static final int WEAPON_COUNT_MIN = 1; + public static final int WEAPON_COUNT_MAX = 3; + + public static final String BOUNDING_BOX_SIZE_PATH = "weapon.zenith.bounding_box_size"; + public static final double BOUNDING_BOX_SIZE_DEFAULT = 1.5; + public static final double BOUNDING_BOX_SIZE_MIN = 0.1; + public static final double BOUNDING_BOX_SIZE_MAX = 4.0; + + public static final String CYCLE_PATH = "weapon.zenith.cycle"; + public static final int CYCLE_DEFAULT = 20; + public static final int CYCLE_MIN = 10; + public static final int CYCLE_MAX = 100; + + public static final String SCALE_PATH = "weapon.zenith.scale"; + public static final double SCALE_DEFAULT = 2.0; + public static final double SCALE_MIN = 0.1; + public static final double SCALE_MAX = 10.0; + + public static final String TRAIL_ALPHA_PATH = "weapon.zenith.trail_alpha"; + public static final double TRAIL_ALPHA_DEFAULT = 0.15; + public static final double TRAIL_ALPHA_MIN = 0.0; + public static final double TRAIL_ALPHA_MAX = 1.0; + + public static final String TRAIL_MAX_LENGTH_PATH = "weapon.zenith.trail_max_length"; + public static final int TRAIL_MAX_LENGTH_DEFAULT = 10; + public static final int TRAIL_MAX_LENGTH_MIN = 0; + public static final int TRAIL_MAX_LENGTH_MAX = 100; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadDoubleConfig(DAMAGE_PATH, configText("zenith_damage"), configTooltip("zenith_damage"), DAMAGE_DEFAULT, DAMAGE_MIN, DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(MAX_RANGE_PATH, configText("zenith_max_range"), configTooltip("zenith_max_range"), MAX_RANGE_DEFAULT, MAX_RANGE_MIN, MAX_RANGE_MAX); + ConfigFactory.loadBooleanConfig(DISTANCE_MODE_PATH, configText("zenith_distance_mode"), configTooltip("zenith_distance_mode"), DISTANCE_MODE_DEFAULT); + ConfigFactory.loadIntConfig(MOUSE_SPEED_PATH, configText("zenith_mouse_speed"), configTooltip("zenith_mouse_speed"), MOUSE_SPEED_DEFAULT, MOUSE_SPEED_MIN, MOUSE_SPEED_MAX); + ConfigFactory.loadDoubleConfig(TRAIL_B_PATH, configText("zenith_trail_b"), configTooltip("zenith_trail_b"), TRAIL_B_DEFAULT, TRAIL_B_MIN, TRAIL_B_MAX); + ConfigFactory.loadIntConfig(TRAIL_OFFSET_PATH, configText("zenith_trail_offset"), configTooltip("zenith_trail_offset"), TRAIL_OFFSET_DEFAULT, TRAIL_OFFSET_MIN, TRAIL_OFFSET_MAX); + ConfigFactory.loadIntConfig(WEAPON_COUNT_PATH, configText("zenith_weapon_count"), configTooltip("zenith_weapon_count"), WEAPON_COUNT_DEFAULT, WEAPON_COUNT_MIN, WEAPON_COUNT_MAX); + ConfigFactory.loadDoubleConfig(BOUNDING_BOX_SIZE_PATH, configText("zenith_bounding_box_size"), configTooltip("zenith_bounding_box_size"), BOUNDING_BOX_SIZE_DEFAULT, BOUNDING_BOX_SIZE_MIN, BOUNDING_BOX_SIZE_MAX); + ConfigFactory.loadIntConfig(CYCLE_PATH, configText("zenith_cycle"), configTooltip("zenith_cycle"), CYCLE_DEFAULT, CYCLE_MIN, CYCLE_MAX); + ConfigFactory.loadDoubleConfig(SCALE_PATH, configText("zenith_scale"), configTooltip("zenith_scale"), SCALE_DEFAULT, SCALE_MIN, SCALE_MAX); + ConfigFactory.loadDoubleConfig(TRAIL_ALPHA_PATH, configText("zenith_trail_alpha"), configTooltip("zenith_trail_alpha"), TRAIL_ALPHA_DEFAULT, TRAIL_ALPHA_MIN, TRAIL_ALPHA_MAX); + ConfigFactory.loadIntConfig(TRAIL_MAX_LENGTH_PATH, configText("zenith_trail_max_length"), configTooltip("zenith_trail_max_length"), TRAIL_MAX_LENGTH_DEFAULT, TRAIL_MAX_LENGTH_MIN, TRAIL_MAX_LENGTH_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static double getDamage() { + return Math.clamp(ConfigUtil.readDouble(DAMAGE_PATH, DAMAGE_DEFAULT), DAMAGE_MIN, DAMAGE_MAX); + } + + public static double getMaxRange() { + return Math.clamp(ConfigUtil.readDouble(MAX_RANGE_PATH, MAX_RANGE_DEFAULT), MAX_RANGE_MIN, MAX_RANGE_MAX); + } + + public static boolean isDistanceMode() { + return ConfigUtil.readBoolean(DISTANCE_MODE_PATH, DISTANCE_MODE_DEFAULT); + } + + public static int getMouseSpeed() { + return Math.clamp(ConfigUtil.readInt(MOUSE_SPEED_PATH, MOUSE_SPEED_DEFAULT), MOUSE_SPEED_MIN, MOUSE_SPEED_MAX); + } + + public static double getTrailB() { + return Math.clamp(ConfigUtil.readDouble(TRAIL_B_PATH, TRAIL_B_DEFAULT), TRAIL_B_MIN, TRAIL_B_MAX); + } + + public static int getTrailOffset() { + return Math.clamp(ConfigUtil.readInt(TRAIL_OFFSET_PATH, TRAIL_OFFSET_DEFAULT), TRAIL_OFFSET_MIN, TRAIL_OFFSET_MAX); + } + + public static int getWeaponCount() { + return Math.clamp(ConfigUtil.readInt(WEAPON_COUNT_PATH, WEAPON_COUNT_DEFAULT), WEAPON_COUNT_MIN, WEAPON_COUNT_MAX); + } + + public static double getBoundingBoxSize() { + return Math.clamp(ConfigUtil.readDouble(BOUNDING_BOX_SIZE_PATH, BOUNDING_BOX_SIZE_DEFAULT), BOUNDING_BOX_SIZE_MIN, BOUNDING_BOX_SIZE_MAX); + } + + public static int getCycle() { + return Math.clamp(ConfigUtil.readInt(CYCLE_PATH, CYCLE_DEFAULT), CYCLE_MIN, CYCLE_MAX); + } + + public static double getScale() { + return Math.clamp(ConfigUtil.readDouble(SCALE_PATH, SCALE_DEFAULT), SCALE_MIN, SCALE_MAX); + } + + public static double getTrailAlpha() { + return Math.clamp(ConfigUtil.readDouble(TRAIL_ALPHA_PATH, TRAIL_ALPHA_DEFAULT), TRAIL_ALPHA_MIN, TRAIL_ALPHA_MAX); + } + + public static int getTrailMaxLength() { + return Math.clamp(ConfigUtil.readInt(TRAIL_MAX_LENGTH_PATH, TRAIL_MAX_LENGTH_DEFAULT), TRAIL_MAX_LENGTH_MIN, TRAIL_MAX_LENGTH_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "zenith", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/zenith.png"), + Component.translatable("item.lzxnoneterraria.zenith"), + CONFIG_DATA + ); + public Zenith() { super(Tiers.NETHERITE, new Item.Properties().attributes(ItemAttributeModifiers.builder() .add(Attributes.ATTACK_DAMAGE, @@ -191,7 +336,7 @@ public class Zenith extends SwordItem { proj.getEntityData().get(StaticProjectile.COLOR_G), proj.getEntityData().get(StaticProjectile.COLOR_B) ); - float mainAlpha = (float) Config.zenithTrailAlpha; + float mainAlpha = (float) getTrailAlpha(); if(idx == 1) mainAlpha = mainAlpha * 0.5f; if(idx == 2) mainAlpha = mainAlpha * 0.25f; @@ -321,11 +466,11 @@ public class Zenith extends SwordItem { projectile.trailPositions.addFirst(projectile.position().add(right.scale(-1.2))); projectile.trailPositions.addFirst(projectile.position().add(right.scale(1.5))); - while(projectile.trailPositions.size() > Config.zenithTrailMaxLength) projectile.trailPositions.removeLast(); + while(projectile.trailPositions.size() > getTrailMaxLength()) projectile.trailPositions.removeLast(); projectile.setBoundingBox(new AABB( - projectile.getX() - Config.zenithBoundingBoxSize, projectile.getY() - Config.zenithBoundingBoxSize, projectile.getZ() - Config.zenithBoundingBoxSize, - projectile.getX() + Config.zenithBoundingBoxSize, projectile.getY() + Config.zenithBoundingBoxSize, projectile.getZ() + Config.zenithBoundingBoxSize + projectile.getX() - getBoundingBoxSize(), projectile.getY() - getBoundingBoxSize(), projectile.getZ() - getBoundingBoxSize(), + projectile.getX() + getBoundingBoxSize(), projectile.getY() + getBoundingBoxSize(), projectile.getZ() + getBoundingBoxSize() )); if(!projectile.level().isClientSide()) { @@ -362,7 +507,7 @@ public class Zenith extends SwordItem { if(!projectile.level().isClientSide()) { Entity target = result.getEntity(); if(projectile.getOwner() instanceof Player player && FilterUtil.createTargetFilter(projectile, projectile.getOwner()).test(target)) { - if(DamageUtil.attack(player, target, (float) (Config.zenithDamage + Math.random() * Config.zenithDamage))) { + if(DamageUtil.attack(player, target, (float) (getDamage() + Math.random() * getDamage()))) { target.invulnerableTime = 2; } } @@ -372,26 +517,26 @@ public class Zenith extends SwordItem { public static void summon(Player player, double deltaDist, boolean isFirst) { Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - int randomAngle = (int) ((Math.random() * 2 - 1) * Config.zenithTrailOffset); + int randomAngle = (int) ((Math.random() * 2 - 1) * getTrailOffset()); dirs = MathUtil.rotateCoordinateSystem(dirs[0], dirs[2], randomAngle); Vec3 pos = (player.getBoundingBox().getCenter()).add(MathUtil.toVec3(dirs[0]).scale(-2)); double dist; - if(Config.zenithDistanceMode) { - Vec3 targetPos = MathUtil.getCrosshairPos(player, player.level(), Config.zenithMaxRange); - dist = Math.max(0, Math.min(targetPos.subtract(pos).length() + deltaDist, Config.zenithMaxRange)); + if(isDistanceMode()) { + Vec3 targetPos = MathUtil.getCrosshairPos(player, player.level(), getMaxRange()); + dist = Math.max(0, Math.min(targetPos.subtract(pos).length() + deltaDist, getMaxRange())); }else { dist = deltaDist; } - int cycle = (int) Math.max(10, dist / Config.zenithMaxRange * Config.zenithCycle); + int cycle = (int) Math.max(10, dist / getMaxRange() * getCycle()); double a = Math.max(dist / 2, 2); - double b = Math.min(Math.random() * Config.zenithTrailB + Config.zenithTrailB, a / 2); + double b = Math.min(Math.random() * getTrailB() + getTrailB(), a / 2); double w = Math.PI * 2 / (double) cycle; if(player.getRandom().nextInt(2) == 0) w = -w; int randomIndex = isFirst ? getWeapons().length - 1 : player.getRandom().nextInt(getWeapons().length); - for(int i = 0;i < Config.zenithWeaponCount;i++) { + for(int i = 0;i < getWeaponCount();i++) { StaticProjectile projectile = new StaticProjectile(ModEntities.STATIC_PROJECTILE.get(), player.level()); projectile.setOwner(player); @@ -417,16 +562,16 @@ public class Zenith extends SwordItem { customData.putInt("angle", randomAngle); if(i == 0) { projectile.getEntityData().set(StaticProjectile.COLOR_A, 1.0f); - projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) Config.zenithScale); - projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) Config.zenithScale); + projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) getScale()); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) getScale()); projectile.getEntityData().set(StaticProjectile.LIFETIME, cycle); projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format("%.3f*cos(%.3ft-1.571)", b, w)); projectile.getEntityData().set(StaticProjectile.EXPRESSION_Z, String.format("%.3f*sin(%.3ft-1.571)+%.3f", a, w, a)); customData.putInt("start", 0); }else if(i == 1) { projectile.getEntityData().set(StaticProjectile.COLOR_A, 0.75f); - projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) Config.zenithScale * 0.75f); - projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) Config.zenithScale * 0.75f); + projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) getScale() * 0.75f); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) getScale() * 0.75f); projectile.getEntityData().set(StaticProjectile.LIFETIME, (int) (cycle * 1.25)); if(w > 0) { projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format("%.3f*cos(%.3ft-3.142)", b, w)); @@ -438,8 +583,8 @@ public class Zenith extends SwordItem { customData.putInt("start", (int) (cycle * 0.25)); }else if(i == 2) { projectile.getEntityData().set(StaticProjectile.COLOR_A, 0.5f); - projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) Config.zenithScale * 0.5f); - projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) Config.zenithScale * 0.5f); + projectile.getEntityData().set(StaticProjectile.SCALE_X, (float) getScale() * 0.5f); + projectile.getEntityData().set(StaticProjectile.SCALE_Y, (float) getScale() * 0.5f); projectile.getEntityData().set(StaticProjectile.LIFETIME, (int) (cycle * 1.5)); if(w > 0) { projectile.getEntityData().set(StaticProjectile.EXPRESSION_X, String.format("%.3f*cos(%.3ft-4.713)", b, w)); diff --git a/src/main/java/com/lzxnone/terraria/network/handler/DevilsDevastationKillModeHandler.java b/src/main/java/com/lzxnone/terraria/network/handler/DevilsDevastationKillModeHandler.java index f3679fa..467ef65 100644 --- a/src/main/java/com/lzxnone/terraria/network/handler/DevilsDevastationKillModeHandler.java +++ b/src/main/java/com/lzxnone/terraria/network/handler/DevilsDevastationKillModeHandler.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.network.handler; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; @@ -22,7 +21,7 @@ public class DevilsDevastationKillModeHandler { MobEffectInstance instance = player.getEffect(ModEffects.KILL_MODE_COOLDOWN); MobEffectInstance instance2 = player.getEffect(ModEffects.KILL_MODE); if(instance == null && instance2 == null) { - MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, Config.devilsDevastationKillModeTime, 0); + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.KILL_MODE, DevilsDevastation.getKillModeTime(), 0); player.addEffect(effectInstance); } } diff --git a/src/main/java/com/lzxnone/terraria/network/handler/FirstFractalScrollHandler.java b/src/main/java/com/lzxnone/terraria/network/handler/FirstFractalScrollHandler.java index bf488f0..5dd3751 100644 --- a/src/main/java/com/lzxnone/terraria/network/handler/FirstFractalScrollHandler.java +++ b/src/main/java/com/lzxnone/terraria/network/handler/FirstFractalScrollHandler.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.network.handler; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.item.weapon.melee.FirstFractal; import com.lzxnone.terraria.network.payload.FirstFractalScrollPayload; import net.minecraft.core.component.DataComponents; @@ -21,13 +20,13 @@ public class FirstFractalScrollHandler { double scrollDelta = payload.scrollDelta(); double deltaDist = weapon.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) .copyTag().getDouble("deltaDist"); - double finalDelta = deltaDist + scrollDelta * Config.firstFractalScrollSpeed; + double finalDelta = deltaDist + scrollDelta * FirstFractal.getScrollSpeed(); - if(Config.firstFractalDistanceMode) { - if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; - else if(finalDelta < -Config.firstFractalMaxRange) finalDelta = -Config.firstFractalMaxRange; + if(FirstFractal.isDistanceMode()) { + if(finalDelta > FirstFractal.getMaxRange()) finalDelta = FirstFractal.getMaxRange(); + else if(finalDelta < -FirstFractal.getMaxRange()) finalDelta = -FirstFractal.getMaxRange(); }else { - if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; + if(finalDelta > FirstFractal.getMaxRange()) finalDelta = FirstFractal.getMaxRange(); else if(finalDelta < 0) finalDelta = 0; } diff --git a/src/main/java/com/lzxnone/terraria/network/handler/ZenithScrollHandler.java b/src/main/java/com/lzxnone/terraria/network/handler/ZenithScrollHandler.java index 024477a..7673f94 100644 --- a/src/main/java/com/lzxnone/terraria/network/handler/ZenithScrollHandler.java +++ b/src/main/java/com/lzxnone/terraria/network/handler/ZenithScrollHandler.java @@ -1,6 +1,5 @@ package com.lzxnone.terraria.network.handler; -import com.lzxnone.terraria.Config; import com.lzxnone.terraria.item.weapon.melee.TrueCopperShortsword; import com.lzxnone.terraria.item.weapon.melee.Zenith; import com.lzxnone.terraria.network.payload.ZenithScrollPayload; @@ -22,14 +21,14 @@ public class ZenithScrollHandler { double scrollDelta = payload.scrollDelta(); double deltaDist = weapon.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) .copyTag().getDouble("deltaDist"); - double finalDelta = deltaDist + scrollDelta * Config.zenithMouseSpeed; + double finalDelta = deltaDist + scrollDelta * Zenith.getMouseSpeed(); - if(Config.zenithDistanceMode) { + if(Zenith.isDistanceMode()) { - if(finalDelta > Config.zenithMaxRange) finalDelta = Config.zenithMaxRange; - else if(finalDelta < -Config.zenithMaxRange) finalDelta = -Config.zenithMaxRange; + if(finalDelta > Zenith.getMaxRange()) finalDelta = Zenith.getMaxRange(); + else if(finalDelta < -Zenith.getMaxRange()) finalDelta = -Zenith.getMaxRange(); }else { - if(finalDelta > Config.zenithMaxRange) finalDelta = Config.zenithMaxRange; + if(finalDelta > Zenith.getMaxRange()) finalDelta = Zenith.getMaxRange(); else if(finalDelta < 0) finalDelta = 0; } diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigFactory.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigFactory.java new file mode 100644 index 0000000..c5ecbcc --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigFactory.java @@ -0,0 +1,339 @@ +package com.lzxnone.terraria.ui.config; + +import com.lowdragmc.lowdraglib2.gui.ui.UIElement; +import com.lowdragmc.lowdraglib2.gui.ui.elements.Button; +import com.lowdragmc.lowdraglib2.gui.ui.elements.Label; +import com.lowdragmc.lowdraglib2.gui.ui.elements.Scroller; +import com.lowdragmc.lowdraglib2.gui.ui.elements.Switch; +import com.lowdragmc.lowdraglib2.gui.ui.elements.TextField; +import net.minecraft.network.chat.Component; + +public class ConfigFactory { + private static final String RESET_BUTTON_TRANSLATION_KEY = "lzxnoneterraria.configuration.reset_button"; + private static UIElement configContainer; + + public static void bindConfigContainer(UIElement container) { + configContainer = container; + } + + public static void clearConfigContainer() { + if(configContainer != null) { + configContainer.clearAllChildren(); + } + } + + public static void addConfigElement(UIElement element) { + if(configContainer == null) { + throw new IllegalStateException("Config container has not been bound."); + } + configContainer.addChild(element); + } + + public static void loadIntConfig(String path, String text, int defaultValue, int minValue, int maxValue) { + loadIntConfig(path, Component.literal(text), null, defaultValue, minValue, maxValue); + } + + public static void loadIntConfig(String path, Component text, int defaultValue, int minValue, int maxValue) { + loadIntConfig(path, text, null, defaultValue, minValue, maxValue); + } + + public static void loadIntConfig(String path, Component text, Component tooltip, int defaultValue, int minValue, int maxValue) { + if(configContainer == null) { + throw new IllegalStateException("Config container has not been bound."); + } + + int value = Math.clamp(ConfigUtil.readInt(path, defaultValue), minValue, maxValue); + int resetValue = Math.clamp(defaultValue, minValue, maxValue); + + UIElement container = new UIElement(); + container.addClass("config-scroller-container"); + + Label label = new Label(); + label.addClass("config-scroller-label"); + label.setText(text); + applyLabelTooltip(label, tooltip); + + Scroller.Horizontal scroller = new Scroller.Horizontal(); + scroller.addClass("config-scroller"); + disableScrollerWheel(scroller); + scroller.setRange(minValue, maxValue); + scroller.setValue((float)value, false); + + TextField valueField = new TextField(); + valueField.addClass("config-scroller-textfield"); + valueField.setNumbersOnlyInt(minValue, maxValue); + disableTextFieldWheel(valueField); + valueField.setText(Integer.toString(value), false); + + Button resetButton = new Button(); + resetButton.addClass("reset-button"); + resetButton.setText(Component.translatable(RESET_BUTTON_TRANSLATION_KEY)); + + scroller.setOnValueChanged(floatValue -> setIntConfigValue(path, scroller, valueField, Math.round(floatValue), minValue, maxValue)); + valueField.setTextResponder(textValue -> setIntConfigValue(path, scroller, valueField, parseInt(textValue, defaultValue), minValue, maxValue)); + resetButton.setOnClick(event -> setIntConfigValue(path, scroller, valueField, resetValue, minValue, maxValue)); + + container.addChildren(label, scroller, valueField, resetButton); + configContainer.addChild(container); + configContainer.addChild(new UIElement().addClass("config-divider")); + } + + public static void loadFloatConfig(String path, String text, float defaultValue, float minValue, float maxValue) { + loadFloatConfig(path, Component.literal(text), null, defaultValue, minValue, maxValue); + } + + public static void loadFloatConfig(String path, Component text, float defaultValue, float minValue, float maxValue) { + loadFloatConfig(path, text, null, defaultValue, minValue, maxValue); + } + + public static void loadFloatConfig(String path, Component text, Component tooltip, float defaultValue, float minValue, float maxValue) { + if(configContainer == null) { + throw new IllegalStateException("Config container has not been bound."); + } + + float value = Math.clamp(ConfigUtil.readFloat(path, defaultValue), minValue, maxValue); + float resetValue = Math.clamp(defaultValue, minValue, maxValue); + + UIElement container = new UIElement(); + container.addClass("config-scroller-container"); + + Label label = new Label(); + label.addClass("config-scroller-label"); + label.setText(text); + applyLabelTooltip(label, tooltip); + + Scroller.Horizontal scroller = new Scroller.Horizontal(); + scroller.addClass("config-scroller"); + disableScrollerWheel(scroller); + scroller.setRange(minValue, maxValue); + scroller.setValue(value, false); + + TextField valueField = new TextField(); + valueField.addClass("config-scroller-textfield"); + valueField.setNumbersOnlyFloat(minValue, maxValue); + disableTextFieldWheel(valueField); + valueField.setText(formatFloat(value), false); + + Button resetButton = new Button(); + resetButton.addClass("reset-button"); + resetButton.setText(Component.translatable(RESET_BUTTON_TRANSLATION_KEY)); + + scroller.setOnValueChanged(floatValue -> setFloatConfigValue(path, scroller, valueField, floatValue, minValue, maxValue)); + valueField.setTextResponder(textValue -> setFloatConfigValue(path, scroller, valueField, parseFloat(textValue, defaultValue), minValue, maxValue)); + resetButton.setOnClick(event -> setFloatConfigValue(path, scroller, valueField, resetValue, minValue, maxValue)); + + container.addChildren(label, scroller, valueField, resetButton); + configContainer.addChild(container); + configContainer.addChild(new UIElement().addClass("config-divider")); + } + + public static void loadDoubleConfig(String path, String text, double defaultValue, double minValue, double maxValue) { + loadDoubleConfig(path, Component.literal(text), null, defaultValue, minValue, maxValue); + } + + public static void loadDoubleConfig(String path, Component text, double defaultValue, double minValue, double maxValue) { + loadDoubleConfig(path, text, null, defaultValue, minValue, maxValue); + } + + public static void loadDoubleConfig(String path, Component text, Component tooltip, double defaultValue, double minValue, double maxValue) { + if(configContainer == null) { + throw new IllegalStateException("Config container has not been bound."); + } + + double value = Math.clamp(ConfigUtil.readDouble(path, defaultValue), minValue, maxValue); + double resetValue = Math.clamp(defaultValue, minValue, maxValue); + + UIElement container = new UIElement(); + container.addClass("config-scroller-container"); + + Label label = new Label(); + label.addClass("config-scroller-label"); + label.setText(text); + applyLabelTooltip(label, tooltip); + + Scroller.Horizontal scroller = new Scroller.Horizontal(); + scroller.addClass("config-scroller"); + disableScrollerWheel(scroller); + scroller.setRange((float)minValue, (float)maxValue); + scroller.setValue((float)value, false); + + TextField valueField = new TextField(); + valueField.addClass("config-scroller-textfield"); + valueField.setNumbersOnlyDouble(minValue, maxValue); + disableTextFieldWheel(valueField); + valueField.setText(formatDouble(value), false); + + Button resetButton = new Button(); + resetButton.addClass("reset-button"); + resetButton.setText(Component.translatable(RESET_BUTTON_TRANSLATION_KEY)); + + scroller.setOnValueChanged(floatValue -> setDoubleConfigValue(path, scroller, valueField, floatValue, minValue, maxValue)); + valueField.setTextResponder(textValue -> setDoubleConfigValue(path, scroller, valueField, parseDouble(textValue, defaultValue), minValue, maxValue)); + resetButton.setOnClick(event -> setDoubleConfigValue(path, scroller, valueField, resetValue, minValue, maxValue)); + + container.addChildren(label, scroller, valueField, resetButton); + configContainer.addChild(container); + configContainer.addChild(new UIElement().addClass("config-divider")); + } + + public static void loadStringConfig(String path, String text, String defaultValue) { + loadStringConfig(path, Component.literal(text), null, defaultValue); + } + + public static void loadStringConfig(String path, Component text, String defaultValue) { + loadStringConfig(path, text, null, defaultValue); + } + + public static void loadStringConfig(String path, Component text, Component tooltip, String defaultValue) { + if(configContainer == null) { + throw new IllegalStateException("Config container has not been bound."); + } + + String value = ConfigUtil.readString(path, defaultValue); + + UIElement container = new UIElement(); + container.addClass("config-textfield-container"); + + Label label = new Label(); + label.addClass("config-textfield-label"); + label.setText(text); + applyLabelTooltip(label, tooltip); + + TextField textField = new TextField(); + textField.addClass("config-textfield"); + textField.setText(value, false); + + Button resetButton = new Button(); + resetButton.addClass("reset-button"); + resetButton.setText(Component.translatable(RESET_BUTTON_TRANSLATION_KEY)); + + textField.setTextResponder(textValue -> ConfigUtil.setString(path, textValue)); + resetButton.setOnClick(event -> setStringConfigValue(path, textField, defaultValue)); + + container.addChildren(label, textField, resetButton); + configContainer.addChild(container); + configContainer.addChild(new UIElement().addClass("config-divider")); + } + + public static void loadBooleanConfig(String path, String text, boolean defaultValue) { + loadBooleanConfig(path, Component.literal(text), null, defaultValue); + } + + public static void loadBooleanConfig(String path, Component text, boolean defaultValue) { + loadBooleanConfig(path, text, null, defaultValue); + } + + public static void loadBooleanConfig(String path, Component text, Component tooltip, boolean defaultValue) { + if(configContainer == null) { + throw new IllegalStateException("Config container has not been bound."); + } + + boolean value = ConfigUtil.readBoolean(path, defaultValue); + + UIElement container = new UIElement(); + container.addClass("config-switch-container"); + + Label label = new Label(); + label.addClass("config-switch-label"); + label.setText(text); + applyLabelTooltip(label, tooltip); + + Switch configSwitch = new Switch(); + configSwitch.addClass("config-switch"); + configSwitch.setOn(value, false); + + Button resetButton = new Button(); + resetButton.addClass("reset-button"); + resetButton.setText(Component.translatable(RESET_BUTTON_TRANSLATION_KEY)); + + configSwitch.setOnSwitchChanged(switchValue -> ConfigUtil.setBoolean(path, switchValue)); + resetButton.setOnClick(event -> setBooleanConfigValue(path, configSwitch, defaultValue)); + + container.addChildren(label, configSwitch, resetButton); + configContainer.addChild(container); + configContainer.addChild(new UIElement().addClass("config-divider")); + } + + private static void setIntConfigValue(String path, Scroller scroller, TextField valueField, int value, int minValue, int maxValue) { + int intValue = Math.clamp(value, minValue, maxValue); + if(scroller.getValue() != intValue) { + scroller.setValue((float)intValue, false); + } + valueField.setText(Integer.toString(intValue), false); + ConfigUtil.setInt(path, intValue); + } + + private static void setFloatConfigValue(String path, Scroller scroller, TextField valueField, float value, float minValue, float maxValue) { + float floatValue = Math.clamp(value, minValue, maxValue); + if(scroller.getValue() != floatValue) { + scroller.setValue(floatValue, false); + } + valueField.setText(formatFloat(floatValue), false); + ConfigUtil.setFloat(path, floatValue); + } + + private static void setDoubleConfigValue(String path, Scroller scroller, TextField valueField, double value, double minValue, double maxValue) { + double doubleValue = Math.clamp(value, minValue, maxValue); + if(scroller.getValue() != (float)doubleValue) { + scroller.setValue((float)doubleValue, false); + } + valueField.setText(formatDouble(doubleValue), false); + ConfigUtil.setDouble(path, doubleValue); + } + + private static void setStringConfigValue(String path, TextField textField, String value) { + textField.setText(value, false); + ConfigUtil.setString(path, value); + } + + private static void setBooleanConfigValue(String path, Switch configSwitch, boolean value) { + configSwitch.setOn(value, false); + ConfigUtil.setBoolean(path, value); + } + + private static void disableScrollerWheel(Scroller scroller) { + scroller.scrollerStyle(style -> style.scrollDelta(0)); + } + + private static void disableTextFieldWheel(TextField textField) { + textField.setWheelDur(0); + } + + private static void applyLabelTooltip(Label label, Component tooltip) { + if(tooltip != null) { + label.style(style -> style.tooltips(tooltip)); + } + } + + private static int parseInt(String value, int defaultValue) { + try { + return Integer.parseInt(value); + } catch(NumberFormatException ignored) { + return defaultValue; + } + } + + private static float parseFloat(String value, float defaultValue) { + try { + return Float.parseFloat(value); + } catch(NumberFormatException ignored) { + return defaultValue; + } + } + + private static double parseDouble(String value, double defaultValue) { + try { + return Double.parseDouble(value); + } catch(NumberFormatException ignored) { + return defaultValue; + } + } + + private static String formatFloat(float value) { + return Float.toString(value); + } + + private static String formatDouble(double value) { + return Double.toString(value); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java new file mode 100644 index 0000000..bd5fc81 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -0,0 +1,73 @@ +package com.lzxnone.terraria.ui.config; + +import com.lzxnone.terraria.effect.BloodButcheredEffect; +import com.lzxnone.terraria.effect.DemonicFlamesEffect; +import com.lzxnone.terraria.item.weapon.melee.BeeKeeper; +import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass; +import com.lzxnone.terraria.item.weapon.melee.BloodButcherer; +import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; +import com.lzxnone.terraria.item.weapon.melee.EnchantedSword; +import com.lzxnone.terraria.item.weapon.melee.Excalibur; +import com.lzxnone.terraria.item.weapon.melee.FirstFractal; +import com.lzxnone.terraria.item.weapon.melee.InfluxWaver; +import com.lzxnone.terraria.item.weapon.melee.LightsBane; +import com.lzxnone.terraria.item.weapon.melee.Mace; +import com.lzxnone.terraria.item.weapon.melee.Meowmere; +import com.lzxnone.terraria.item.weapon.melee.Muramasa; +import com.lzxnone.terraria.item.weapon.melee.NightsEdge; +import com.lzxnone.terraria.item.weapon.melee.Seedler; +import com.lzxnone.terraria.item.weapon.melee.StarWrath; +import com.lzxnone.terraria.item.weapon.melee.Starfury; +import com.lzxnone.terraria.item.weapon.melee.TerraBlade; +import com.lzxnone.terraria.item.weapon.melee.Terragrim; +import com.lzxnone.terraria.item.weapon.melee.TheHorsemansBlade; +import com.lzxnone.terraria.item.weapon.melee.TrueExcalibur; +import com.lzxnone.terraria.item.weapon.melee.TrueNightsEdge; +import com.lzxnone.terraria.item.weapon.melee.Volcano; +import com.lzxnone.terraria.item.weapon.melee.Zenith; + +import java.util.HashMap; +import java.util.Map; + +public class ConfigList { + public static final String WEAPON = "weapon"; + public static final String EFFECT = "effect"; + + private static final Map ITEMS = new HashMap<>(); + + static { + ITEMS.put(WEAPON, new ConfigListItem[]{ + EnchantedSword.CONFIG_LIST_ITEM, + BeeKeeper.CONFIG_LIST_ITEM, + Starfury.CONFIG_LIST_ITEM, + Seedler.CONFIG_LIST_ITEM, + TheHorsemansBlade.CONFIG_LIST_ITEM, + InfluxWaver.CONFIG_LIST_ITEM, + StarWrath.CONFIG_LIST_ITEM, + Meowmere.CONFIG_LIST_ITEM, + TerraBlade.CONFIG_LIST_ITEM, + Zenith.CONFIG_LIST_ITEM, + Excalibur.CONFIG_LIST_ITEM, + NightsEdge.CONFIG_LIST_ITEM, + TrueExcalibur.CONFIG_LIST_ITEM, + TrueNightsEdge.CONFIG_LIST_ITEM, + LightsBane.CONFIG_LIST_ITEM, + BloodButcherer.CONFIG_LIST_ITEM, + Muramasa.CONFIG_LIST_ITEM, + BladeOfGrass.CONFIG_LIST_ITEM, + Volcano.CONFIG_LIST_ITEM, + Terragrim.CONFIG_LIST_ITEM, + FirstFractal.CONFIG_LIST_ITEM, + Mace.CONFIG_LIST_ITEM, + DevilsDevastation.CONFIG_LIST_ITEM + }); + ITEMS.put(EFFECT, new ConfigListItem[]{ + BloodButcheredEffect.CONFIG_LIST_ITEM, + DemonicFlamesEffect.CONFIG_LIST_ITEM + }); + } + + public static ConfigListItem[] getItems(String id) { + return ITEMS.getOrDefault(id, ITEMS.get(WEAPON)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigListItem.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigListItem.java new file mode 100644 index 0000000..a46e904 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigListItem.java @@ -0,0 +1,26 @@ +package com.lzxnone.terraria.ui.config; + +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; + +public class ConfigListItem { + String id; + ResourceLocation icon; + Component name; + IConfigData data; + + public ConfigListItem(String id, ResourceLocation icon, Component name, IConfigData data) { + this.id = id; + this.icon = icon; + this.name = name; + this.data = data; + } + + public void onConfigLoad() { + data.onConfigLoad(); + } + + public void onConfigSave() { + data.onConfigSave(); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigScreen.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigScreen.java new file mode 100644 index 0000000..9cba1cd --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigScreen.java @@ -0,0 +1,161 @@ +package com.lzxnone.terraria.ui.config; + +import com.lowdragmc.lowdraglib2.gui.holder.ModularUIScreen; +import com.lowdragmc.lowdraglib2.gui.ui.ModularUI; +import com.lowdragmc.lowdraglib2.gui.ui.UI; +import com.lowdragmc.lowdraglib2.gui.ui.UIElement; +import com.lowdragmc.lowdraglib2.gui.texture.SpriteTexture; +import com.lowdragmc.lowdraglib2.gui.ui.elements.Button; +import com.lowdragmc.lowdraglib2.gui.ui.elements.Label; +import com.lowdragmc.lowdraglib2.utils.XmlUtils; +import com.lzxnone.terraria.LzxnoneTerraria; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import org.w3c.dom.Document; + +import java.util.HashMap; +import java.util.Map; + +public class ConfigScreen { + private static final ResourceLocation UI_PATH = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "ui/config.xml"); + private static final String[] NAV_KEYS = {"weapon", "effect"}; + private static String selectedNavKey = ConfigList.WEAPON; + private static final Map NAV_SELECTED_INDEXES = new HashMap<>(); + + public static Screen create(Screen parent) { + UI ui = loadUI(); + + //返回回调 + findElement(ui, "back-button", Button.class).setOnClick(event -> saveAndReturn(parent)); + + //为头部导航按钮设置回调 + findElement(ui, "nav-button-weapon", Button.class).setOnClick(event -> onNavSelected(ui, ConfigList.WEAPON)); + findElement(ui, "nav-button-effect", Button.class).setOnClick(event -> onNavSelected(ui, ConfigList.EFFECT)); + + //底部回调 + findElement(ui, "button-cancel", Button.class).setOnClick(event -> discardAndReturn(parent)); + findElement(ui, "button-confirm", Button.class).setOnClick(event -> saveAndReturn(parent)); + + ConfigFactory.bindConfigContainer(findElement(ui, "config-container", UIElement.class)); + + onNavSelected(ui, getCachedNavKey()); + + ModularUI modularUI = ModularUI.of(UI.of(ui.rootElement, ui.stylesheets, screenSize -> screenSize)); + modularUI.shouldCloseOnEsc(true); + return new ModularUIScreen(modularUI, Component.translatable("lzxnoneterraria.configuration.title")) { + @Override + public boolean isPauseScreen() { + return true; + } + }; + } + + //UI文件加载 + private static UI loadUI() { + Document document = XmlUtils.loadXml(UI_PATH); + if(document == null) { + LzxnoneTerraria.LOGGER.error("Failed to load LDLib2 UI template {}", UI_PATH); + return UI.of(new UIElement()); + } + return UI.of(document); + } + + //头部导航按钮回调 + private static void onNavSelected(UI ui, String key) { + selectedNavKey = getValidNavKey(key); + for(String navKey : NAV_KEYS) { + findElement(ui, "nav-item-" + navKey, UIElement.class).removeClass("nav-item--selected"); + } + findElement(ui, "nav-item-" + selectedNavKey, UIElement.class).addClass("nav-item--selected"); + ConfigFactory.clearConfigContainer(); + + ConfigListItem[] items = ConfigList.getItems(selectedNavKey); + UIElement toggleContainer = findElement(ui, "toggle-container", UIElement.class); + toggleContainer.clearAllChildren(); + + for(int index = 0; index < items.length; index++) { + ConfigListItem item = items[index]; + int itemIndex = index; + Button toggleItem = new Button(); + toggleItem.setId(getToggleItemId(selectedNavKey, itemIndex)); + toggleItem.addClass("toggle-item"); + toggleItem.noText(); + toggleItem.setOnClick(event -> loadConfigItem(ui, selectedNavKey, itemIndex, item)); + + UIElement itemIcon = new UIElement(); + itemIcon.addClass("toggle-item-img"); + itemIcon.style(style -> style.backgroundTexture(SpriteTexture.of(item.icon))); + + Label itemLabel = new Label(); + itemLabel.addClass("toggle-item-label"); + itemLabel.setText(item.name); + + toggleItem.addChildren(itemIcon, itemLabel); + toggleContainer.addChild(toggleItem); + } + + if(items.length > 0) { + int selectedIndex = Math.clamp(NAV_SELECTED_INDEXES.getOrDefault(selectedNavKey, 0), 0, items.length - 1); + loadConfigItem(ui, selectedNavKey, selectedIndex, items[selectedIndex]); + } + } + + private static String getCachedNavKey() { + return getValidNavKey(selectedNavKey); + } + + private static String getValidNavKey(String key) { + for(String navKey : NAV_KEYS) { + if(navKey.equals(key)) { + return key; + } + } + return NAV_KEYS[0]; + } + + private static void loadConfigItem(UI ui, String navKey, int index, ConfigListItem item) { + NAV_SELECTED_INDEXES.put(navKey, index); + updateToggleSelected(ui, navKey, index); + ConfigFactory.clearConfigContainer(); + ConfigFactory.addConfigElement(createConfigTitle(item.name)); + item.onConfigLoad(); + } + + private static Label createConfigTitle(Component name) { + Label title = new Label(); + title.addClass("config-title"); + title.setText(name); + return title; + } + + private static void updateToggleSelected(UI ui, String navKey, int selectedIndex) { + UIElement toggleContainer = findElement(ui, "toggle-container", UIElement.class); + for(UIElement child : toggleContainer.getChildren()) { + child.removeClass("toggle-item--selected"); + } + ui.selectId(getToggleItemId(navKey, selectedIndex), UIElement.class) + .findFirst() + .ifPresent(element -> element.addClass("toggle-item--selected")); + } + + private static String getToggleItemId(String navKey, int index) { + return "toggle-item-" + navKey + "-" + index; + } + + private static void saveAndReturn(Screen parent) { + ConfigUtil.save(); + Minecraft.getInstance().setScreen(parent); + } + + private static void discardAndReturn(Screen parent) { + ConfigUtil.reload(); + Minecraft.getInstance().setScreen(parent); + } + + private static T findElement(UI ui, String id, Class type) { + return ui.selectId(id, type).findFirst().orElseThrow(() -> + new IllegalStateException("Missing " + type.getSimpleName() + " with id '" + id + "' in " + UI_PATH)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigUtil.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigUtil.java new file mode 100644 index 0000000..bfd8418 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigUtil.java @@ -0,0 +1,192 @@ +package com.lzxnone.terraria.ui.config; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.google.gson.JsonPrimitive; +import com.lzxnone.terraria.LzxnoneTerraria; +import net.neoforged.fml.loading.FMLPaths; + +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.function.Function; + +public final class ConfigUtil { + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private static final Path CONFIG_PATH = FMLPaths.CONFIGDIR.get().resolve(LzxnoneTerraria.MODID + "-config.json"); + private static JsonObject configCache; + private static boolean loaded; + private static boolean dirty; + + private ConfigUtil() { + } + + public static Path getConfigPath() { + return CONFIG_PATH; + } + + public static T read(String path, T defaultValue, Function parser) { + ensureLoaded(); + JsonElement element = findElement(configCache, path); + if(element == null || element.isJsonNull()) { + return defaultValue; + } + + try { + T value = parser.apply(element); + return value == null ? defaultValue : value; + } catch(RuntimeException exception) { + return defaultValue; + } + } + + public static int readInt(String path, int defaultValue) { + return read(path, defaultValue, JsonElement::getAsInt); + } + + public static float readFloat(String path, float defaultValue) { + return read(path, defaultValue, JsonElement::getAsFloat); + } + + public static double readDouble(String path, double defaultValue) { + return read(path, defaultValue, JsonElement::getAsDouble); + } + + public static boolean readBoolean(String path, boolean defaultValue) { + return read(path, defaultValue, JsonElement::getAsBoolean); + } + + public static String readString(String path, String defaultValue) { + return read(path, defaultValue, JsonElement::getAsString); + } + + public static void setInt(String path, int value) { + set(path, new JsonPrimitive(value)); + } + + public static void setFloat(String path, float value) { + set(path, new JsonPrimitive(value)); + } + + public static void setDouble(String path, double value) { + set(path, new JsonPrimitive(value)); + } + + public static void setBoolean(String path, boolean value) { + set(path, new JsonPrimitive(value)); + } + + public static void setString(String path, String value) { + set(path, new JsonPrimitive(value)); + } + + public static void save() { + save(false); + } + + public static void save(boolean force) { + ensureLoaded(); + if(!dirty && !force) { + return; + } + + try { + Files.createDirectories(CONFIG_PATH.getParent()); + try(Writer writer = Files.newBufferedWriter(CONFIG_PATH)) { + GSON.toJson(configCache, writer); + } + dirty = false; + } catch(IOException exception) { + LzxnoneTerraria.LOGGER.warn("Failed to save config to {}", CONFIG_PATH, exception); + } + } + + public static void reload() { + configCache = null; + loaded = false; + dirty = false; + ensureLoaded(); + } + + private static void ensureLoaded() { + if(loaded) { + return; + } + configCache = loadRoot(); + loaded = true; + } + + private static JsonObject loadRoot() { + if(!Files.exists(CONFIG_PATH)) { + return new JsonObject(); + } + + try(Reader reader = Files.newBufferedReader(CONFIG_PATH)) { + JsonElement element = JsonParser.parseReader(reader); + return element != null && element.isJsonObject() ? element.getAsJsonObject() : new JsonObject(); + } catch(IOException | RuntimeException exception) { + LzxnoneTerraria.LOGGER.warn("Failed to load config from {}", CONFIG_PATH, exception); + return new JsonObject(); + } + } + + private static void set(String path, JsonElement value) { + ensureLoaded(); + + String[] parts = splitPath(path); + if(parts.length == 0) { + LzxnoneTerraria.LOGGER.warn("Ignored config write with invalid path '{}'", path); + return; + } + + JsonObject current = configCache; + for(int i = 0; i < parts.length - 1; i++) { + JsonElement child = current.get(parts[i]); + if(child == null || !child.isJsonObject()) { + JsonObject childObject = new JsonObject(); + current.add(parts[i], childObject); + current = childObject; + } else { + current = child.getAsJsonObject(); + } + } + + current.add(parts[parts.length - 1], value); + dirty = true; + } + + private static JsonElement findElement(JsonObject root, String path) { + String[] parts = splitPath(path); + if(parts.length == 0) { + return null; + } + + JsonElement current = root; + for(String part : parts) { + if(current == null || !current.isJsonObject()) { + return null; + } + current = current.getAsJsonObject().get(part); + } + return current; + } + + private static String[] splitPath(String path) { + if(path == null || path.isBlank()) { + return new String[0]; + } + + String[] parts = path.split("\\."); + for(String part : parts) { + if(part.isBlank()) { + return new String[0]; + } + } + return parts; + } +} diff --git a/src/main/java/com/lzxnone/terraria/ui/config/IConfigData.java b/src/main/java/com/lzxnone/terraria/ui/config/IConfigData.java new file mode 100644 index 0000000..53e221c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/ui/config/IConfigData.java @@ -0,0 +1,6 @@ +package com.lzxnone.terraria.ui.config; + +public interface IConfigData { + default void onConfigLoad() {} + default void onConfigSave() {} +} diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index cd36103..29a984b 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -1,58 +1,56 @@ { "itemGroup.lzxnoneterraria.melee": "Terraria Melee", "itemGroup.lzxnoneterraria.block": "Terraria Block", - "itemGroup.lzxnoneterraria.calamity_melee": "Terraria Calamity Melee", - - "item.lzxnoneterraria.bee_keeper": "Bee Keeper", "item.lzxnoneterraria.copper_shortsword": "Copper Shortsword", "item.lzxnoneterraria.enchanted_sword": "Enchanted Sword", - "item.lzxnoneterraria.influx_waver": "Influx Waver", - "item.lzxnoneterraria.meowmere": "Meowmere", - "item.lzxnoneterraria.seedler": "Seedler", - "item.lzxnoneterraria.star_wrath": "Star Wrath", + "item.lzxnoneterraria.bee_keeper": "Bee Keeper", "item.lzxnoneterraria.starfury": "Starfury", - "item.lzxnoneterraria.terra_blade": "Terra Blade", + "item.lzxnoneterraria.seedler": "Seedler", "item.lzxnoneterraria.the_horsemans_blade": "The Horseman's Blade", + "item.lzxnoneterraria.influx_waver": "Influx Waver", + "item.lzxnoneterraria.star_wrath": "Star Wrath", + "item.lzxnoneterraria.meowmere": "Meowmere", + "item.lzxnoneterraria.terra_blade": "Terra Blade", "item.lzxnoneterraria.zenith": "Zenith", + "item.lzxnoneterraria.true_copper_shortsword": "True Copper Shortsword", + "item.lzxnoneterraria.excalibur": "Excalibur", + "item.lzxnoneterraria.nights_edge": "Night's Edge", + "item.lzxnoneterraria.true_excalibur": "True Excalibur", + "item.lzxnoneterraria.true_nights_edge": "True Night's Edge", "item.lzxnoneterraria.lights_bane": "Lights Bane", "item.lzxnoneterraria.blood_butcherer": "Blood Butcherer", "item.lzxnoneterraria.muramasa": "Muramasa", - "item.lzxnoneterraria.terragrim": "Terragrim", "item.lzxnoneterraria.blade_of_grass": "Blade of Grass", "item.lzxnoneterraria.volcano": "Volcano", - "item.lzxnoneterraria.nights_edge": "Night's Edge", - "item.lzxnoneterraria.true_nights_edge": "True Night's Edge", - "item.lzxnoneterraria.excalibur": "Excalibur", - "item.lzxnoneterraria.true_excalibur": "True Excalibur", - "item.lzxnoneterraria.true_copper_shortsword": "True Copper Shortsword", + "item.lzxnoneterraria.terragrim": "Terragrim", "item.lzxnoneterraria.first_fractal": "First Fractal", "item.lzxnoneterraria.mace": "Mace", "item.lzxnoneterraria.devils_devastation": "Devil's Devastation", - "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.", - "entity.lzxnoneterraria.static_projectile": "Projectile", "entity.lzxnoneterraria.static_summon": "Summon", "entity.lzxnoneterraria.bee_summon": "Bee", - "effect.lzxnoneterraria.confused": "Confused", "effect.lzxnoneterraria.blood_butchered": "Blood Butchered", "effect.lzxnoneterraria.kill_mode": "Kill Mode", "effect.lzxnoneterraria.kill_mode_cooldown": "Kill Mode Cooldown", "effect.lzxnoneterraria.demonic_flames": "Demonic Flames", - "key.lzxnoneterraria.kill_mode": "Kill Mode", "key.categories.lzxnoneterraria": "lzxnoneterraria", - + "lzxnoneterraria.configuration.title": "LzxnoneTerraria Config", + "lzxnoneterraria.configuration.nav_weapon": "Weapon", + "lzxnoneterraria.configuration.nav_effect": "Effect", + "lzxnoneterraria.configuration.reset_button": "Reset", + "lzxnoneterraria.configuration.cancel_button": "Cancel", + "lzxnoneterraria.configuration.confirm_button": "Confirm", "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.enchanted_sword_settings": "Enchanted Sword Settings", "lzxnoneterraria.configuration.enchanted_sword_damage": "Projectile Damage", "lzxnoneterraria.configuration.enchanted_sword_damage.tooltip": "Damage per hit", @@ -60,7 +58,6 @@ "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", @@ -68,39 +65,6 @@ "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.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.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", - "lzxnoneterraria.configuration.blade_of_grass_effect_duration.tooltip": "Poison effect duration in ticks", - "lzxnoneterraria.configuration.blade_of_grass_target_range": "Target Acquisition Range", - "lzxnoneterraria.configuration.blade_of_grass_target_range.tooltip": "Maximum range to search for enemies", - "lzxnoneterraria.configuration.blade_of_grass_projectile_lifetime": "Projectile Lifetime", - "lzxnoneterraria.configuration.blade_of_grass_projectile_lifetime.tooltip": "Projectile duration in ticks", - "lzxnoneterraria.configuration.blade_of_grass_projectile_max_hit_count": "Projectile Max Hit Count", - "lzxnoneterraria.configuration.blade_of_grass_projectile_max_hit_count.tooltip": "Maximum entities hit per projectile", - "lzxnoneterraria.configuration.blade_of_grass_radius_growth": "Radius Growth Speed", - "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", - "lzxnoneterraria.configuration.volcano_explosion_damage.tooltip": "Damage dealt by the explosion", - "lzxnoneterraria.configuration.volcano_explosion_max_hit_count": "Max Hit Count", - "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.starfury_settings": "Starfury Settings", "lzxnoneterraria.configuration.starfury_damage": "Projectile Damage", "lzxnoneterraria.configuration.starfury_damage.tooltip": "Damage per hit", @@ -108,7 +72,6 @@ "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", @@ -122,7 +85,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", @@ -138,7 +100,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", @@ -150,7 +111,6 @@ "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", @@ -158,7 +118,6 @@ "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", @@ -166,70 +125,6 @@ "lzxnoneterraria.configuration.meowmere_gravity.tooltip": "Gravity applied to projectile", "lzxnoneterraria.configuration.meowmere_initial_speed": "Initial Speed", "lzxnoneterraria.configuration.meowmere_initial_speed.tooltip": "Projectile initial 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.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", - "lzxnoneterraria.configuration.mace_gravity.tooltip": "Gravity applied to projectile", - "lzxnoneterraria.configuration.mace_damage": "Damage", - "lzxnoneterraria.configuration.mace_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.mace_fly_time": "Max Fly Time", - "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.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.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.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", - "lzxnoneterraria.configuration.nights_edge_rotate_range.tooltip": "Blade rotation angle range", - "lzxnoneterraria.configuration.nights_edge_projectile_rotate_range": "Projectile Rotate Range", - "lzxnoneterraria.configuration.nights_edge_projectile_rotate_range.tooltip": "Projectile rotation angle range", - "lzxnoneterraria.configuration.nights_edge_max_hit_count": "Blade Max Hit Count", - "lzxnoneterraria.configuration.nights_edge_max_hit_count.tooltip": "Maximum entities hit per blade swing", - "lzxnoneterraria.configuration.nights_edge_projectile_max_hit_count": "Projectile Max Hit Count", - "lzxnoneterraria.configuration.nights_edge_projectile_max_hit_count.tooltip": "Maximum entities hit per projectile", - "lzxnoneterraria.configuration.nights_edge_damage": "Blade Damage", - "lzxnoneterraria.configuration.nights_edge_damage.tooltip": "Damage dealt by blade", - "lzxnoneterraria.configuration.nights_edge_projectile_damage": "Projectile Damage", - "lzxnoneterraria.configuration.nights_edge_projectile_damage.tooltip": "Damage per hit", - "lzxnoneterraria.configuration.nights_edge_projectile_speed": "Projectile Speed", - "lzxnoneterraria.configuration.nights_edge_projectile_speed.tooltip": "Projectile movement speed", - "lzxnoneterraria.configuration.nights_edge_projectile_lifetime": "Projectile Lifetime", - "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.terra_blade_settings": "Terra Blade Settings", "lzxnoneterraria.configuration.terra_projectile_align_to_blade": "Projectile Align To Blade", "lzxnoneterraria.configuration.terra_projectile_align_to_blade.tooltip": "Whether projectile direction follows blade direction", "lzxnoneterraria.configuration.terra_blade_rotate_range": "Blade Rotate Range", @@ -248,7 +143,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)", @@ -274,25 +168,34 @@ "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.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", - "lzxnoneterraria.configuration.first_fractal_bounding_box_size.tooltip": "AABB collision box half-size", - "lzxnoneterraria.configuration.first_fractal_projectile_speed": "Projectile Speed", - "lzxnoneterraria.configuration.first_fractal_projectile_speed.tooltip": "Projectile movement speed", - "lzxnoneterraria.configuration.first_fractal_projectile_lifetime": "Projectile Lifetime", - "lzxnoneterraria.configuration.first_fractal_projectile_lifetime.tooltip": "Projectile duration in ticks", - "lzxnoneterraria.configuration.first_fractal_distance_mode": "Enable Relative Distance Mode", - "lzxnoneterraria.configuration.first_fractal_distance_mode.tooltip": "Whether projectile range follows crosshair distance", - "lzxnoneterraria.configuration.first_fractal_scroll_speed": "Scroll Speed", - "lzxnoneterraria.configuration.first_fractal_scroll_speed.tooltip": "Mouse scroll adjustment speed", - "lzxnoneterraria.configuration.first_fractal_max_range": "Max Range", - "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.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", + "lzxnoneterraria.configuration.nights_edge_rotate_range.tooltip": "Blade rotation angle range", + "lzxnoneterraria.configuration.nights_edge_projectile_rotate_range": "Projectile Rotate Range", + "lzxnoneterraria.configuration.nights_edge_projectile_rotate_range.tooltip": "Projectile rotation angle range", + "lzxnoneterraria.configuration.nights_edge_max_hit_count": "Blade Max Hit Count", + "lzxnoneterraria.configuration.nights_edge_max_hit_count.tooltip": "Maximum entities hit per blade swing", + "lzxnoneterraria.configuration.nights_edge_projectile_max_hit_count": "Projectile Max Hit Count", + "lzxnoneterraria.configuration.nights_edge_projectile_max_hit_count.tooltip": "Maximum entities hit per projectile", + "lzxnoneterraria.configuration.nights_edge_damage": "Blade Damage", + "lzxnoneterraria.configuration.nights_edge_damage.tooltip": "Damage dealt by blade", + "lzxnoneterraria.configuration.nights_edge_projectile_damage": "Projectile Damage", + "lzxnoneterraria.configuration.nights_edge_projectile_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.nights_edge_projectile_speed": "Projectile Speed", + "lzxnoneterraria.configuration.nights_edge_projectile_speed.tooltip": "Projectile movement speed", + "lzxnoneterraria.configuration.nights_edge_projectile_lifetime": "Projectile Lifetime", + "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", @@ -300,7 +203,6 @@ "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", @@ -324,6 +226,80 @@ "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", + "lzxnoneterraria.configuration.blade_of_grass_effect_duration.tooltip": "Poison effect duration in ticks", + "lzxnoneterraria.configuration.blade_of_grass_target_range": "Target Acquisition Range", + "lzxnoneterraria.configuration.blade_of_grass_target_range.tooltip": "Maximum range to search for enemies", + "lzxnoneterraria.configuration.blade_of_grass_projectile_lifetime": "Projectile Lifetime", + "lzxnoneterraria.configuration.blade_of_grass_projectile_lifetime.tooltip": "Projectile duration in ticks", + "lzxnoneterraria.configuration.blade_of_grass_projectile_max_hit_count": "Projectile Max Hit Count", + "lzxnoneterraria.configuration.blade_of_grass_projectile_max_hit_count.tooltip": "Maximum entities hit per projectile", + "lzxnoneterraria.configuration.blade_of_grass_radius_growth": "Radius Growth Speed", + "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", + "lzxnoneterraria.configuration.volcano_explosion_damage.tooltip": "Damage dealt by the explosion", + "lzxnoneterraria.configuration.volcano_explosion_max_hit_count": "Max Hit Count", + "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", + "lzxnoneterraria.configuration.first_fractal_bounding_box_size.tooltip": "AABB collision box half-size", + "lzxnoneterraria.configuration.first_fractal_projectile_speed": "Projectile Speed", + "lzxnoneterraria.configuration.first_fractal_projectile_speed.tooltip": "Projectile movement speed", + "lzxnoneterraria.configuration.first_fractal_projectile_lifetime": "Projectile Lifetime", + "lzxnoneterraria.configuration.first_fractal_projectile_lifetime.tooltip": "Projectile duration in ticks", + "lzxnoneterraria.configuration.first_fractal_distance_mode": "Enable Relative Distance Mode", + "lzxnoneterraria.configuration.first_fractal_distance_mode.tooltip": "Whether projectile range follows crosshair distance", + "lzxnoneterraria.configuration.first_fractal_scroll_speed": "Scroll Speed", + "lzxnoneterraria.configuration.first_fractal_scroll_speed.tooltip": "Mouse scroll adjustment speed", + "lzxnoneterraria.configuration.first_fractal_max_range": "Max Range", + "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", + "lzxnoneterraria.configuration.mace_gravity.tooltip": "Gravity applied to projectile", + "lzxnoneterraria.configuration.mace_damage": "Damage", + "lzxnoneterraria.configuration.mace_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.mace_fly_time": "Max Fly Time", + "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.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", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 6f071cd..a7a10eb 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -1,58 +1,56 @@ { "itemGroup.lzxnoneterraria.melee": "泰拉瑞亚 近战武器", "itemGroup.lzxnoneterraria.block": "泰拉瑞亚 方块", - "itemGroup.lzxnoneterraria.calamity_melee": "泰拉瑞亚灾厄 近战武器", - - "item.lzxnoneterraria.bee_keeper": "养蜂人", "item.lzxnoneterraria.copper_shortsword": "铜短剑", "item.lzxnoneterraria.enchanted_sword": "附魔剑", - "item.lzxnoneterraria.influx_waver": "波涌之刃", - "item.lzxnoneterraria.meowmere": "彩虹喵之刃", - "item.lzxnoneterraria.seedler": "种子弯刀", - "item.lzxnoneterraria.star_wrath": "狂星之怒", + "item.lzxnoneterraria.bee_keeper": "养蜂人", "item.lzxnoneterraria.starfury": "星怒", - "item.lzxnoneterraria.terra_blade": "泰拉刃", + "item.lzxnoneterraria.seedler": "种子弯刀", "item.lzxnoneterraria.the_horsemans_blade": "无头骑士剑", + "item.lzxnoneterraria.influx_waver": "波涌之刃", + "item.lzxnoneterraria.star_wrath": "狂星之怒", + "item.lzxnoneterraria.meowmere": "彩虹喵之刃", + "item.lzxnoneterraria.terra_blade": "泰拉刃", "item.lzxnoneterraria.zenith": "天顶剑", + "item.lzxnoneterraria.true_copper_shortsword": "真铜短剑", + "item.lzxnoneterraria.excalibur": "断钢剑", + "item.lzxnoneterraria.nights_edge": "永夜刃", + "item.lzxnoneterraria.true_excalibur": "真断钢剑", + "item.lzxnoneterraria.true_nights_edge": "真永夜刃", "item.lzxnoneterraria.lights_bane": "魔光剑", "item.lzxnoneterraria.blood_butcherer": "血腥屠刀", "item.lzxnoneterraria.muramasa": "村正", - "item.lzxnoneterraria.terragrim": "泰拉魔刃", "item.lzxnoneterraria.blade_of_grass": "草剑", "item.lzxnoneterraria.volcano": "火山", - "item.lzxnoneterraria.nights_edge": "永夜刃", - "item.lzxnoneterraria.true_nights_edge": "真永夜刃", - "item.lzxnoneterraria.excalibur": "断钢剑", - "item.lzxnoneterraria.true_excalibur": "真断钢剑", - "item.lzxnoneterraria.true_copper_shortsword": "真铜短剑", + "item.lzxnoneterraria.terragrim": "泰拉魔刃", "item.lzxnoneterraria.first_fractal": "第一分形", "item.lzxnoneterraria.mace": "链锤", "item.lzxnoneterraria.devils_devastation": "破灭魔王剑", - "tooltip.lzxnoneterraria.devils_devastation.0": "完美的地狱之剑,直接掌握着硫磺火之力。", "tooltip.lzxnoneterraria.devils_devastation.1": "人类将这种力量理解为浩劫,即一切秩序在火焰之中的必然毁灭。", "tooltip.lzxnoneterraria.devils_devastation.2": "或许这就是硫磺火元素掌握着她的姐妹所不能匹敌之力量的原因。", - "entity.lzxnoneterraria.static_projectile": "弹射物", "entity.lzxnoneterraria.static_summon": "召唤物", "entity.lzxnoneterraria.bee_summon": "蜜蜂", - "effect.lzxnoneterraria.confused": "困惑", "effect.lzxnoneterraria.blood_butchered": "血腥屠宰", "effect.lzxnoneterraria.kill_mode": "杀戮模式", "effect.lzxnoneterraria.kill_mode_cooldown": "杀戮模式 冷却", "effect.lzxnoneterraria.demonic_flames": "恶魔之焰", - "key.lzxnoneterraria.kill_mode": "进入杀戮模式", "key.categories.lzxnoneterraria": "lzxnoneterraria", - + "lzxnoneterraria.configuration.title": "LzxnoneTerraria 配置", + "lzxnoneterraria.configuration.nav_weapon": "武器", + "lzxnoneterraria.configuration.nav_effect": "药水效果", + "lzxnoneterraria.configuration.reset_button": "重置", + "lzxnoneterraria.configuration.cancel_button": "取消", + "lzxnoneterraria.configuration.confirm_button": "确定", "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.enchanted_sword_settings": "附魔剑 设置", "lzxnoneterraria.configuration.enchanted_sword_damage": "弹射伤害", "lzxnoneterraria.configuration.enchanted_sword_damage.tooltip": "每次命中伤害", @@ -60,7 +58,6 @@ "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": "每次命中生成的最大蜜蜂数", @@ -68,39 +65,6 @@ "lzxnoneterraria.configuration.bee_keeper_confusion_duration.tooltip": "困惑效果持续时间(刻),设为 0 禁用", "lzxnoneterraria.configuration.bee_keeper_bee_damage": "蜜蜂伤害", "lzxnoneterraria.configuration.bee_keeper_bee_damage.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.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": "效果持续时间", - "lzxnoneterraria.configuration.blade_of_grass_effect_duration.tooltip": "中毒效果持续时间(刻)", - "lzxnoneterraria.configuration.blade_of_grass_target_range": "寻敌范围", - "lzxnoneterraria.configuration.blade_of_grass_target_range.tooltip": "搜索敌人的最大距离", - "lzxnoneterraria.configuration.blade_of_grass_projectile_lifetime": "弹射持续时间", - "lzxnoneterraria.configuration.blade_of_grass_projectile_lifetime.tooltip": "弹射物持续时间(刻)", - "lzxnoneterraria.configuration.blade_of_grass_projectile_max_hit_count": "弹射最大击中数", - "lzxnoneterraria.configuration.blade_of_grass_projectile_max_hit_count.tooltip": "弹射物单次最大击中生物数量", - "lzxnoneterraria.configuration.blade_of_grass_radius_growth": "半径增大速度", - "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": "爆炸伤害", - "lzxnoneterraria.configuration.volcano_explosion_damage.tooltip": "爆炸造成的伤害", - "lzxnoneterraria.configuration.volcano_explosion_max_hit_count": "最大击中数", - "lzxnoneterraria.configuration.volcano_explosion_max_hit_count.tooltip": "单次爆炸最大击中生物数量", - "lzxnoneterraria.configuration.volcano_ignite_seconds": "着火时间", - "lzxnoneterraria.configuration.volcano_ignite_seconds.tooltip": "着火效果持续时间(秒)", - "lzxnoneterraria.configuration.starfury_settings": "星怒 设置", "lzxnoneterraria.configuration.starfury_damage": "弹射伤害", "lzxnoneterraria.configuration.starfury_damage.tooltip": "每次命中伤害", @@ -108,7 +72,6 @@ "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": "坚果受到的重力", @@ -122,7 +85,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": "刀光旋转角度范围", @@ -138,7 +100,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": "每次命中伤害", @@ -150,7 +111,6 @@ "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": "每次命中伤害", @@ -158,7 +118,6 @@ "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": "每次命中伤害", @@ -166,70 +125,6 @@ "lzxnoneterraria.configuration.meowmere_gravity.tooltip": "弹射物受到的重力", "lzxnoneterraria.configuration.meowmere_initial_speed": "弹射初速度", "lzxnoneterraria.configuration.meowmere_initial_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.mace_settings": "链球 设置", - "lzxnoneterraria.configuration.mace_projectile_speed": "弹射速度", - "lzxnoneterraria.configuration.mace_projectile_speed.tooltip": "弹射物移动速度", - "lzxnoneterraria.configuration.mace_gravity": "重力", - "lzxnoneterraria.configuration.mace_gravity.tooltip": "弹射物受到的重力", - "lzxnoneterraria.configuration.mace_damage": "伤害", - "lzxnoneterraria.configuration.mace_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.mace_fly_time": "最大飞行时间", - "lzxnoneterraria.configuration.mace_fly_time.tooltip": "弹射物最大飞行时间(刻)", - "lzxnoneterraria.configuration.mace_max_range": "最大范围", - "lzxnoneterraria.configuration.mace_max_range.tooltip": "弹射物最大飞行距离", - - "lzxnoneterraria.configuration.muramasa_settings": "村正 设置", - "lzxnoneterraria.configuration.muramasa_beam_damage": "光线伤害", - "lzxnoneterraria.configuration.muramasa_beam_damage.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.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": "刀光偏转角范围", - "lzxnoneterraria.configuration.nights_edge_rotate_range.tooltip": "刀光旋转角度范围", - "lzxnoneterraria.configuration.nights_edge_projectile_rotate_range": "弹射偏转角范围", - "lzxnoneterraria.configuration.nights_edge_projectile_rotate_range.tooltip": "弹射物偏转角度范围", - "lzxnoneterraria.configuration.nights_edge_max_hit_count": "刀光最大击中数", - "lzxnoneterraria.configuration.nights_edge_max_hit_count.tooltip": "刀光单次最大击中生物数量", - "lzxnoneterraria.configuration.nights_edge_projectile_max_hit_count": "弹射刀光最大击中数", - "lzxnoneterraria.configuration.nights_edge_projectile_max_hit_count.tooltip": "弹射刀光单次最大击中生物数量", - "lzxnoneterraria.configuration.nights_edge_damage": "刀光伤害", - "lzxnoneterraria.configuration.nights_edge_damage.tooltip": "刀光造成的伤害", - "lzxnoneterraria.configuration.nights_edge_projectile_damage": "弹射伤害", - "lzxnoneterraria.configuration.nights_edge_projectile_damage.tooltip": "每次命中伤害", - "lzxnoneterraria.configuration.nights_edge_projectile_speed": "弹射速度", - "lzxnoneterraria.configuration.nights_edge_projectile_speed.tooltip": "弹射物移动速度", - "lzxnoneterraria.configuration.nights_edge_projectile_lifetime": "弹射持续时间", - "lzxnoneterraria.configuration.nights_edge_projectile_lifetime.tooltip": "弹射物持续时间(刻)", - "lzxnoneterraria.configuration.nights_edge_projectile_rotation_speed": "弹射旋转速度", - "lzxnoneterraria.configuration.nights_edge_projectile_rotation_speed.tooltip": "弹射物旋转速度", - - "lzxnoneterraria.configuration.terra_blade_settings": "泰拉刃 设置", "lzxnoneterraria.configuration.terra_projectile_align_to_blade": "弹射匹配刀光方向", "lzxnoneterraria.configuration.terra_projectile_align_to_blade.tooltip": "弹射方向是否跟随刀光方向", "lzxnoneterraria.configuration.terra_blade_rotate_range": "刀光偏转角范围", @@ -248,7 +143,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 此值)", @@ -274,25 +168,34 @@ "lzxnoneterraria.configuration.zenith_trail_alpha.tooltip": "尾迹渲染透明度", "lzxnoneterraria.configuration.zenith_trail_max_length": "尾迹长度", "lzxnoneterraria.configuration.zenith_trail_max_length.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": "碰撞箱大小", - "lzxnoneterraria.configuration.first_fractal_bounding_box_size.tooltip": "AABB 碰撞箱半边长", - "lzxnoneterraria.configuration.first_fractal_projectile_speed": "弹射速度", - "lzxnoneterraria.configuration.first_fractal_projectile_speed.tooltip": "弹射物移动速度", - "lzxnoneterraria.configuration.first_fractal_projectile_lifetime": "弹射生命周期", - "lzxnoneterraria.configuration.first_fractal_projectile_lifetime.tooltip": "弹射物持续时间(刻)", - "lzxnoneterraria.configuration.first_fractal_distance_mode": "启用相对距离模式", - "lzxnoneterraria.configuration.first_fractal_distance_mode.tooltip": "弹射范围是否跟随准星距离", - "lzxnoneterraria.configuration.first_fractal_scroll_speed": "鼠标滚轮调节距离的速度", - "lzxnoneterraria.configuration.first_fractal_scroll_speed.tooltip": "鼠标滚轮调节距离的速度", - "lzxnoneterraria.configuration.first_fractal_max_range": "最大范围", - "lzxnoneterraria.configuration.first_fractal_max_range.tooltip": "弹射物最大飞行距离", - "lzxnoneterraria.configuration.first_fractal_spawn_range": "生成范围", - "lzxnoneterraria.configuration.first_fractal_spawn_range.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": "刀光偏转角范围", + "lzxnoneterraria.configuration.nights_edge_rotate_range.tooltip": "刀光旋转角度范围", + "lzxnoneterraria.configuration.nights_edge_projectile_rotate_range": "弹射偏转角范围", + "lzxnoneterraria.configuration.nights_edge_projectile_rotate_range.tooltip": "弹射物偏转角度范围", + "lzxnoneterraria.configuration.nights_edge_max_hit_count": "刀光最大击中数", + "lzxnoneterraria.configuration.nights_edge_max_hit_count.tooltip": "刀光单次最大击中生物数量", + "lzxnoneterraria.configuration.nights_edge_projectile_max_hit_count": "弹射刀光最大击中数", + "lzxnoneterraria.configuration.nights_edge_projectile_max_hit_count.tooltip": "弹射刀光单次最大击中生物数量", + "lzxnoneterraria.configuration.nights_edge_damage": "刀光伤害", + "lzxnoneterraria.configuration.nights_edge_damage.tooltip": "刀光造成的伤害", + "lzxnoneterraria.configuration.nights_edge_projectile_damage": "弹射伤害", + "lzxnoneterraria.configuration.nights_edge_projectile_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.nights_edge_projectile_speed": "弹射速度", + "lzxnoneterraria.configuration.nights_edge_projectile_speed.tooltip": "弹射物移动速度", + "lzxnoneterraria.configuration.nights_edge_projectile_lifetime": "弹射持续时间", + "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": "刀光旋转角度范围", @@ -300,7 +203,6 @@ "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": "弹射方向是否跟随刀光方向", @@ -324,6 +226,80 @@ "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": "效果持续时间", + "lzxnoneterraria.configuration.blade_of_grass_effect_duration.tooltip": "中毒效果持续时间(刻)", + "lzxnoneterraria.configuration.blade_of_grass_target_range": "寻敌范围", + "lzxnoneterraria.configuration.blade_of_grass_target_range.tooltip": "搜索敌人的最大距离", + "lzxnoneterraria.configuration.blade_of_grass_projectile_lifetime": "弹射持续时间", + "lzxnoneterraria.configuration.blade_of_grass_projectile_lifetime.tooltip": "弹射物持续时间(刻)", + "lzxnoneterraria.configuration.blade_of_grass_projectile_max_hit_count": "弹射最大击中数", + "lzxnoneterraria.configuration.blade_of_grass_projectile_max_hit_count.tooltip": "弹射物单次最大击中生物数量", + "lzxnoneterraria.configuration.blade_of_grass_radius_growth": "半径增大速度", + "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": "爆炸伤害", + "lzxnoneterraria.configuration.volcano_explosion_damage.tooltip": "爆炸造成的伤害", + "lzxnoneterraria.configuration.volcano_explosion_max_hit_count": "最大击中数", + "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": "碰撞箱大小", + "lzxnoneterraria.configuration.first_fractal_bounding_box_size.tooltip": "AABB 碰撞箱半边长", + "lzxnoneterraria.configuration.first_fractal_projectile_speed": "弹射速度", + "lzxnoneterraria.configuration.first_fractal_projectile_speed.tooltip": "弹射物移动速度", + "lzxnoneterraria.configuration.first_fractal_projectile_lifetime": "弹射生命周期", + "lzxnoneterraria.configuration.first_fractal_projectile_lifetime.tooltip": "弹射物持续时间(刻)", + "lzxnoneterraria.configuration.first_fractal_distance_mode": "启用相对距离模式", + "lzxnoneterraria.configuration.first_fractal_distance_mode.tooltip": "弹射范围是否跟随准星距离", + "lzxnoneterraria.configuration.first_fractal_scroll_speed": "鼠标滚轮调节距离的速度", + "lzxnoneterraria.configuration.first_fractal_scroll_speed.tooltip": "鼠标滚轮调节距离的速度", + "lzxnoneterraria.configuration.first_fractal_max_range": "最大范围", + "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": "重力", + "lzxnoneterraria.configuration.mace_gravity.tooltip": "弹射物受到的重力", + "lzxnoneterraria.configuration.mace_damage": "伤害", + "lzxnoneterraria.configuration.mace_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.mace_fly_time": "最大飞行时间", + "lzxnoneterraria.configuration.mace_fly_time.tooltip": "弹射物最大飞行时间(刻)", + "lzxnoneterraria.configuration.mace_max_range": "最大范围", + "lzxnoneterraria.configuration.mace_max_range.tooltip": "弹射物最大飞行距离", "lzxnoneterraria.configuration.devils_devastation_settings": "破灭魔王剑 设置", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "杀戮模式持续时间", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "杀戮模式持续时间(刻)", diff --git a/src/main/resources/assets/lzxnoneterraria/lss/config.lss b/src/main/resources/assets/lzxnoneterraria/lss/config.lss new file mode 100644 index 0000000..43f3aa8 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/lss/config.lss @@ -0,0 +1,325 @@ +// colors +// background: sdf(#d4141820, 0) +// hover-background: sdf(#44ffffff, 4) +// pressed-background: sdf(#33000000, 4) + +.root { + width: 100%; + height: 100%; + flex-direction: column; + padding-all: 8; + gap-all: 8; + background: sdf(#a8141820, 0); +} + +.header { + width: 100%; + flex-direction: column; + gap-all: 2; + background: sdf(#CC141821, 6); +} + +.meta { + width: 100%; + flex-direction: row; + gap-all: 8; +} + +.back-button { + width: 24; + padding-all: 0; + base-background: empty; + hover-background: sdf(#44ffffff, 4); + pressed-background: sdf(#33000000, 4); +} + +.title { + flex: 1; + height: 100%; + horizontal-align: CENTER; + vertical-align: CENTER; +} + +.nav { + width: 100%; + flex-direction: row; + gap-all: 2; +} + +.nav-item { + width: 64; + flex-direction: column; + gap-all: 0; +} + +.nav-button { + flex: 1; + position: relative; + base-background: empty; + hover-background: sdf(#44ffffff, 4); + pressed-background: sdf(#33000000, 4); +} + +.nav-item--selected .nav-indicator { + height: 1; + width: 100%; + background: sdf(#ff8ecbff, 2); +} + +.nav-img { + width:16; + height:16; + left: 5; + top: 0; + position: absolute; +} + +.nav-label { + width: 100%; + height: 100%; + left: 24; + top: 3; + position: absolute; +} + +.nav-img-weapon { + background: sprite(lzxnoneterraria:textures/ui/nav_weapon_icon.png); +} + +.nav-img-effect { + background: sprite(lzxnoneterraria:textures/ui/nav_effect_icon.png); +} + +.main { + flex: 1; + flex-direction: row; + gap-all: 4; + align-items: center; + background: sdf(#CC141821, 6); +} + +.sidebar { + width: 80; + height: 100%; + padding-all: 8; + gap-all: 4; + flex-direction: column; + background: sdf(#CC141821, 6); +} + +.toggle-scroll { + width: 120; + height: 100%; + padding-all: 4; +} + +.toggle-scroll .__scroller_view_view-port__ { + background: empty; +} + +.toggle-container { + width: 100%; + height: 100%; + flex-direction: column; + gap-all: 2; +} + +.toggle-item { + flex: 1; + position: relative; + base-background: empty; + hover-background: sdf(#44ffffff, 4); + pressed-background: sdf(#33000000, 4); +} + +.toggle-item--selected { + base-background: sdf(#33000000, 4); + hover-background: sdf(#33000000, 4); + pressed-background: sdf(#33000000, 4); +} + +.toggle-item-img { + width:16; + height:16; + left: 5; + top: 0; + position: absolute; +} + +.toggle-item-label { + width: 100%; + height: 100%; + left: 24; + top: 3; + position: absolute; +} + +.main-divider { + width: 1; + height: 100%; + background: sdf(#44ffffff, 4); +} + +.config-divider { + width: 100%; + height: 1; + background: sdf(#44ffffff, 4); +} + +.reset-button { + width: auto; + adaptive-width: true; + base-background: sdf(#ff8ecbff, 2); + hover-background: sdf(#ffffffff, 2); + pressed-background: sdf(#ffaaeeff, 2); +} + +.reset-button .__button_text__ { + text-color: #ff000000; + text-shadow: false; +} + +.config-scroll { + flex: 1; + height: 100%; +} + +.config-scroll .__scroller_view_view-port__ { + background: empty; +} + +.toggle-scroll .__scroller_view_vertical-scroller__ .__scroller_scroll_container__, +.config-scroll .__scroller_view_vertical-scroller__ .__scroller_scroll_container__ { + background: #ff3a3a3a; +} + +.toggle-scroll .__scroller_view_vertical-scroller__ .__scroller_scroll_bar__, +.config-scroll .__scroller_view_vertical-scroller__ .__scroller_scroll_bar__ { + base-background: #ff777777; + hover-background: #ff999999; + pressed-background: #ff555555; +} + +.config-container { + width:100%; + height: 100%; + flex-direction: column; + padding-all: 4; + gap-all: 4; +} + +.config-title { + width:100%; + font-size: 16; + text-bold: true; + margin-bottom: 16; +} + +.config-scroller-container { + width: 100%; + height: 16; + flex-direction: row; + align-items: center; + gap-all: 4; +} + +.config-scroller-label { + width: auto; + adaptive-width: true; + height: 100%; + vertical-align: CENTER; +} + +.config-scroller-textfield { + width: 64px; + height: 100%; + background: sdf(#44ffffff, 4); + focus-overlay: sdf(#33000000, 4); + text-color: #ffffffff; + error-color: #ffff5555; + cursor-color: #ffffffff; +} + +.config-scroller { + flex: 1; + height: 100%; + scroll-bar-size: 16; +} + +.config-scroller .__scroller_scroll_container__ { + background: sdf(#44ffffff, 4); +} + +.config-scroller .__scroller_scroll_bar__ { + base-background: sdf(#ff8ecbff, 2); + hover-background: sdf(#ffffffff, 2); + pressed-background: sdf(#ffaaeeff, 2); +} + +.config-switch-container { + width: 100%; + height: 16; + flex-direction: row; + align-items: center; + gap-all: 4; +} + +.config-switch-label { + flex: 1; + height: 100%; + vertical-align: CENTER; +} + +.config-switch { + width: 32; + height: 100%; + base-background: sdf(#52525a, 5); + pressed-background: sdf(#71a4f4, 5); + unmark-background: sdf(#a1a1a9, 4); + mark-background: sdf(#18181b, 4); +} + +.config-textfield-container { + width: 100%; + height: 16; + flex-direction: row; + align-items: center; + gap-all: 4; +} + +.config-textfield-label { + width: auto; + adaptive-width: true; + height: 100%; + vertical-align: CENTER; +} + +.config-textfield { + flex: 1; + height: 100%; + background: sdf(#44ffffff, 4); + focus-overlay: sdf(#33000000, 4); + text-color: #ffffffff; + error-color: #ffff5555; + cursor-color: #ffffffff; +} + +.footer { + height: auto; + adaptive-height: true; + flex-direction: row; + gap-all: 32; + align-items: center; +} + +.footer-button { + flex: 1; + base-background: sdf(#ff8ecbff, 2); + hover-background: sdf(#ffffffff, 2); + pressed-background: sdf(#ffaaeeff, 2); +} + +.footer-button .__button_text__ { + text-color: #ff000000; + text-shadow: false; +} diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index 1478b28..86c3dbb 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -52,5 +52,11 @@ }, "demon_sword_kill_mode": { "sounds": ["lzxnoneterraria:demon_sword_kill_mode"] + }, + "demon_sword_kill_mode_off_cooldown": { + "sounds": ["lzxnoneterraria:demon_sword_kill_mode_off_cooldown"] + }, + "demon_sword_final_strike": { + "sounds": ["lzxnoneterraria:demon_sword_final_strike"] } } diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/demon_sword_final_strike.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/demon_sword_final_strike.ogg new file mode 100644 index 0000000000000000000000000000000000000000..2a41668677f0bb82327425e0287d1240fbe1ad10 GIT binary patch literal 73302 zcmce-dt6gjz9_zTUL+ylPDn5y>P`rf#DEFHG*GokNMZn`Atp3X@PzP?M{7Z$MW^+K z5FmtrfRR_hh5!-*IAEovXy+uneBc8rV5ieMfVCpFQ)}&=_MG11Z=;<#bI$Mcx%d8c z*JovAt+m%Uz(Ag!P^vQi>$RE|D)h`>%n8elb!c(md4;kwfqsdHUq%+qY|hl@E_q@O?XJMdOc@jDquvUl&xcsnOb7#E`EMQh7yXfp!&$qtGLGhMSg*@FjMTlIedK7~TZeb^1CgrCx85wwD9+Qr zk^Q3W(cO7R-}>E~g^>au`hXn61|U05YSF z#qm9r6UXVXb+V7O*c9uzDSmZ}t$K={X%$TWJ%J;$XaIl#3~WMO*EezbH=_^HL+g&% zqw^Aly|9-hX(^g8{?oS1!)Gs?EjWCW6N2|iL6(aGL<&X)Rkfbz&5TMql2ip9xx(me zKSJa>?M7n66}Ws~#KZ1Wi7^kIU3D>Q>#qSd=Bxj!c6qo+)(VNi^+J8$3 z&({GX?;^nkWI+=A`tWAX*_I>7P%oAR0|sQ7z}^OG+%R=!IOxV4>(wW`B)_P+ow5V! z{Td{cq`&rd_MNv&?!5h8N=wD-qwl4RR=oasMf%?=GU%1R#h>5%%iq@H^QFTeU=NON zy2o)a105^T4z#Iq00m^Ng9IitGC7T1ac6V#&*i=UQEvZ7Z_b?O&73DaZ-P)0X8mmd zdtTew|6j~WY0CaTM^Ww-E+9f+dATU)auG|WVqHGM^Lh^9D*%F1k%~8UBy#W3$je7} zA#rc9^r~&&ji>uI{2dAFXa@k1AZV&6=qdsYRoLw#QLi1{edp-@I|wM&A@aWuWzXpa zSqP&erzzin-&vpW94rQ8Sb8Tumh@sKq=C8fYq)K;?Z+F@zHRsIebo1Fd#cs%hknx6 z^8RxSzHu|)9)e5Gwbm(n>ulT6n{lMJo)@`el=r;``#wYJ0v@#cP6uQl?eacr^XmJP z7U`QZ+xCs~6DpFcw!I%Z@`?Jzc)yWF-@*2qp6F$yNA(x)7kolUM{>Vpwg2@7VZH9Z zlaC0&TgK<~=?)|OUL8(PWt?T4+ERSd_mo|5h10#IwoV@3SFThAg!U90pRXJS02B0_ zivONGC*>DZ+}&v5USofFJz|Epo(xRfjCnLP0mYI82o>|95Gt-6`R2^gbJ2=|o{`1W z?L9VCJg4UcMdC>rx)Rhe@5J6)-Cepxqphceh5mUgdlM)BJ9A< z-5Ry#wYT3)X)gKm#}(IM3Su8SloE$X9=iob!_M_B*F zIc`BvEW%CadHa8SvBuqV2tbQv8~+&r0N}1CB|MiSNvf~~Rn&qiOrzfYzvmd_=|bfG z+mQ%hPXj;z0K^V|lV+kc9#O{6#HGY@9ytB)bF!$XJ}@_$%s5uuXOWJ*PkH8ffPakE>oME?d50s>zU0W|Q{*16a z>(vAM+j80>Z$wr*@+46qH+E|NQ5=uleV{n~>_gYS+a;fz`&RPy?m48`H@5EpQshmX zM&3<(=InakytX`w>_A0cYTF^#-;1|Rd6u)QV@TiDv;9ZXQ!2kb?s)j3xVB#0j%?kt z`wlc!J04MFce2~gdEZ(1uSJ?>p{e!kx2pYrx<7W_JH=n4`KZ;keWxbno3V4G6ddyQ z&x66~`sju_yEXq>#KP(9E9a2n{;2HMzH1S8PG^sv2LJ=;1sDLoYa#@Mpn(klRR{qi zaJoFq+wUi<%S>t8W?@}Dzw1_HM#`B(ZL^UGhvc?BXx+BH^8v&lNV4P6Q$a zV3;am#ogX@>qqHaq~`QJZPVFfXI5L!x?J4#5r5o;bVul>DQkUPM{b*IZER?LqV?*M zbYx%z(k`SjJo3i#5s=D_ZQmSw(egZL*Q?b12Q=xgHLWW!|0N)DIY@}eJi0hEK;xg$ zMcBB-@OOeT2+V@1mW+5rBt^!@aYAg0ctu~gEiP_wWHEx%hX|~Yo(svTGu_>bsRgaJ z`P70z02o4hAwTcV=j+-60LFTiHTpqNl!7zeezcC+P0hR+ol90(1P|Z~i`=P}qmU~8 zwElYZ19nfm;G6cNHq~?sB9@Uk*SjGCahiU#4v~tP*62_GaJoSNcFP-X5adRpPYMC( zMgjDo%jaJ#I}D-zTYj?JYE44pZ-6+B?5u2Ldv$RUjzge@Jacg^XZzNHmG;_msN5;} zPpE*v62TV`VShJJSE!2g*XCY{2VjJ#1UN<(Npgj5qDt_b9*6<}{3S$7(n$i?ky#-? zJrUXLx@?(HeBPkMEO^k}J)c?$W!{X7>l<+jrh{yas)D3UtC-z0Lhp+2D6dx)2;`?@ zycj);daJ5U6(1iqP49{9vDx$k0%Wc6gHzf9+h>cm)SBT%c29A{baKJ18_^H4ti#jo z-he2#5CC2t$|y0Natyl>bfJJ_06vh+oFR!a>-?Tqh z+>YLSuDwM+c&@@Bo8Wp8*$LN+h&Hv}4N*!^>jb_@_PbCzfxEs&2oV|d3ER;+acIbC zB4ZjZPDEZ?gGWGPQmOI>kKK&MGu9V+1KGLpoi_Q!MX zAALhGomzm90wb%YZygN$V}*breyFJOboYnjb4$>e9sy`6Hs4gpAy?Rnql6CtbVv>|n!CKWOfG9HppBuL%59pT>_+rKh`rmW;>&*9$$^PHvxc`^af`+*OU&EZAd^S#gTK0MF zc!k#sVVa7ZT}THI8VGt$bgFC7t3jvg;u8>xV%!fh-HcNpgqTS>Q;uLDm;E{MW~TpZe0gzeAtwK<_+=mY#bXQ$^7fX-@qnzCqkwLg2gt3P>N@h@&`u(3kIX{ z%lT~1NOI;tG%{a(Uoll*Bbe3}_#kAI8ZTIEDY(8Hp(SNs$>;f`-`z<=CSCn9wP1L$ ztzZb5^xeX+kLU%6JcSYB`8@D-YxJF#_4i_A)e5HD5XEqv-1b}!%pCk=amzY={Ux(@ zcrop07y!RC4gy6Ug=CF45g&Yb7Z{6Ctse$p9H7G+%1Vn7C>YUz$Uyt{8gK9m_Te?w zj(>w66E+VA1RUYec1Dw*Dttz?gtv3CFO`DN1)YHe07d=;S8p8~$`cn4O@>N6vR;^%nPE*<>VgR6hrij<{CG|NROcPP8&?GnT zdf?hXT0AqPKVSWtvn&p33Gs{d^C2?C19)FA2mRhqG9K3F+>lh5LuzzV8o4Wx#?n$6 z3^-ac6lYy3#^Zv8lh_X}a1O4(Ar_@~5;y^H6b%=bW2To+ReL{D%cfGLvU!48Bb#)Q z@3}j}$>R3#sWMH!OR-PhQ6qg6X1C}%oKa3qQQqe8!C|I8J+Pf+$Dpsz+F>wr((Le; z4GO&Du~0y+`mB{rm2imyY8$mfU06r+=ac$(7^m+dP zcgzAxFP+SrDr1^aPKiPtP@Cx&P8Vs4QU}ZjG-C36Oc}#~n=C}H?uNiExTnoIUe|N} zA|h%D=zmN25S{bkTQGLuOWJ8QAUb#Y?1`Zkz-*28V7w{#ExlWSsL_Pei>ZAo#DW9p z=vW4~BOZ{;SG==XQbU`!l#?IDGanVo@YSfkCDw+>uZ@y<1SYbhv{4B5{hIPP3C4fW_S^v z=4ju;K=OPT&*b`AOI)s~I5=2cB}rkx1i@UPTH`XmPW z(8im&WgN1dH&L3F%TdzCC>K6X1r@r;klS^eu+!Fv=>zlQnH>Cek~5Fk)0iUE48(#o z@KL0ZRs=hT6Q@$G-rl2=PWyCVsLNu{r%jEioAYJrFx`N6Qj}aaUoouEGe9soK59rL z8_*7O^XEGS%(Zt%Ybfur=ub(7@oIC_;yAt($zl6$|?VU=5K8omS zS(xv=h%*fNsBC0Ky4h@Z4hxD|?Z#EmFHcD5Ju}9PsSW>ZcsAySZUI2$w_C_+zJHO~ zsFPu7X)tUNih*(&5Kt0pjV1k?qQoTb{diR}e>}9}?n6>lji+xzWg_c%KKm(Y8gl$N zeNix%xO(Z7(Qtevt1tlSsELRH^V`XUu01$Ax-zMth!;Z`R*+`joPaTC;6HG0oXp4O zANn6hsKJfOyN2(Q21Va}`)ZwDO1XA!adG|tv7V5j|7f@I#7-Him5b#V4g2#t&+`04 z+a7(E_0?CJ^d2RGGyFCNqs2|)us2L(e`33@93suUO0O*ZIU43wE#K?hMP->W!^pwm z>OMC5@%dkQ*`nyQYZL%(5woz~xL8?V1638VbJIpWqz=Lr32RG)Ly2ii>Y}m8#O=wn z5*Hnt6q;t^uXb?T@{Tt=eF0%#Sq(DdZhht+60W5zjIM1|9RJa6kak|-C z!*?bXRg2Zi*npo77vHV8-MJWI)COAw7PD(auJl?Jbp`BhM;W( zLWck2H#LV|zw_o#i2zY|W8nc=Hl7PH&-KL-V-wBYh`PnPiPC}gF8ti>io-@+DObSIk5WiWB=4m*4IDY zBxk&hDjHKD#Z~u@3OwMJPlRiW8x>k_zqhc*X7ICkx)q`#<}6d?@?Y3Hf)hR zo!3iO%?#f$^1%lMcfJ7>3!4F#!1d!u!BL=l%@=V$+;tld!768v@t_XBEW970D`k&fGO36snnFnI=H?7` z)y%|dToNjfC|8SY;qbG2taO7xYNG zscjU$O~LrYLdPPPxmFxVE>BW+eJJ|0qVOK4^Dten1cZY^k{+T-#h9s4r4=}%Iy5>H za9EV#sixbv%$6MpVghDONh~4CGuMPC1fgVR8-0>^v}8k&AAAzi_}( zHBI6J(}}4V76_3>zf~)-MR@62BaMDJCk(^h&@FZ zO?cBR1*lcQz8jL+T^vzn}(CaZcU^+uku)iyr0SjKOW+d zMdrY4VsuYMn*;@sf6wbs^w74&Wv!cIbE$!}!XU4p2{Jrc_zCY7?X|rkc9qwzUw{2I z&G6*O;|NkhDKOVZN7+HbL|kN>i8X`~?1WpXD%5~D*Fg~NGcy;f={2JlgzfS);ethT zuh^W#zyUojIf~xM@=iWguMENYk;M@S1gAi-UA+)TY}z+zP@7{55mLu$Xiz_Sr5 zMRDcNXHaWWM^?s-X2)9LLnR5X>gdk$NHPD@KkRsHNyCs!X9cmejTZ70*OlKPbWiRx zvObI!s) zgJ>^zcltYh_=uAw>rRe{>(2+J%0kL{}^m=4ZJ2p^ubF1m*3uRmTeqppYP@0C`}OPwh{f zT`hd80le9Ayz5Y5?D%q}@a=&+o4l8xpk!*OZxT%{E=mQYA)= z&y+UbC5&2kGHd5W4_G8JA;iDf-`WWT#a_mDBxu@EiGZeLbnbw*+vYSImqbHO<*GjL z(_Xp{d;xyKFRbtbelr@xBUnJfy3t_Whd>9h`l-(*pAA3z7)i&TjUwsC$p6IMZ+5=^ zJ<#~(Ei3D%{)h{|Twi?IkoD)C!Eyh~Mfx}}UxEQrQG*wWEIgs>7PAcB@Hj_tW&c)# zk5uI4RZzL55R&PiP2kDhn z_j`BkGBHT>N(K;%&q#p`ojkWuMXaQRvnRZiCz>+A$||D)J3%Q-X{xG#2DY_m#lUcC z;V4AD_Zi1%HhXWkIBA0XVOM^TWkinY^`3GvR`ZMvQ;CYA+4`Qhm< zPoNvSqTViVXX>Rzdd3&n6}`bPDiPH1nErgaRJEV4_2{YekAH_N2y>Z7rJ75O<(SxN z4Onhp6ef9v9Pc<)c|fVQYODt|>O)@|q>*PtTW`|8s|1I&RYbhK)H~+#Lzk7do?Y3zS zU6WKKga+ueE}cv|-)Hu-S_ItiT7l!Z-{4NO2`oozKr$kzX~Qm~wo1-AJ~{hvAL$l; z)kp75s{8>$fp;JD|1I*|pa04$Q}zp<{<5~a_R&W#C&2Uhq>BTCi?1)Dbg8;jg&T8b z_k-*(pn6C(crjk%`fUAR4s}BkqnQA&EE_+#|M*GLLCG<~j^*r9I__N?dVJ!tw{P>4 zqEFHc-X{uw7Fx4#0F!BCWpv0r%i~KZEXg-Ge=sSteND{?Xgsa!bBOmdY$O~fZhx-p z9Jj*YNUX8T7c$a?N)Oim(Ku`=SKH5}00Xvo|9DloO9imR@rG8DW!A=^VgOwfjfvl; z_hB(a-B~mRn>G-DHCf2y`5wAJSVWggIu2ht1YD}|^n|*6#e6MoQj6+3srX9teRZ`c zUBC-ZqS45Fh4i(_LX;oDlP6%pj+ODwe2svaNNZ*qjH6PuNU9`z;e9a$b7;X+8>Qn; zin(s-^U*YN@t(?;7K!-8?MCtZl&FJDzqGw_?&ZEaRlk2}`r;*-rAXT)he(FNqKqJm*{GojoHzeH_t3tV?iw>N zSS&!4I9}&lgHJp-x;M2s@Aq)uAHsHi`OB9Li`idnQLGirkX~&#%_RUzss(DWjr5*1 z!XY5BOtEl01#h|@gU@<3FXaGAly&6c;+RHr`Wj*)6-{4Z86_bM484pIQ&!z$YwW?q ziYR!Pzmouh6crKQi1DZ*%CM(&imS#DfuEna9#bZ*wdla!iRI6@6-t+rtX7D-B}5IU z+SX0r%xhW|PLzLWKDFebC@E7mpE?kgSlcb;oMvJD+@yYan8PBJPC?pSrJ|CxtpdIW z@VU&DVqp;6XsiZGDv0Iuc%vmSjzB=wB(*078x8hFx(4vVfoMHOTpQRvi|8a}@3@GT zD1DkSp?%RzT-3=1HN99drl9r!&*4~`tQJfgbWi7*(03Y-o;DeyStxy}@c5@*NnRTJmyV|RHhD#p|>=j`vV zmAB=7xw%qUJQo8Vd~m8+59Iyj>B}*+Z(=^UL`5t9{p?@n`uN|EMg5eOR4KBx_Q|?? zRYaBuk>stX6+XWkA~7v(u;C?d#l??QQj8*A7Z*2nAz76d5m$iRwTp&;GOZEo9k=UU z-u?UcAKYIyoV-tIN(6(J>4}UhbgUt<9uS|$cwe17g3r*7?{ym(q~M;cs}g)831TmU z6A(X*h^nNqT0F*-dRx5>BF2AWYF?&D=p*@V`?O_61^2-9IEt!^$XN!;V<%k+1szPB z_hLpZIdeWwYBd&>S;T`3(P;QcG zVVsOCYxj+Mth1A>5V(<>IE#7yH-VEDf#AfZ82gJl#F}o#}8;K*!(YTS3FA zz{?F|WJoz>A(z0@F5!Zm>0E^>;lN2DhDsg)&=a}4e05o-vMM-#Gn4H=tTdhsb&_m0 z+C$e+d;zHpGm?l#liUC$b7y|huGvWPA0M20^!bj)yggAJsJmxgJ(u~finG7W7ZXcQ zI^+!;P?FQim8x$4&lXt#O10?UDc-Qr?vMaaB=Y?j;4{hM4HC$#xR}taiWh4JiHP*1 z)Xm{3O2l*o0df`p6m_3Uf*8WEJDR~}%AU&XYQ%d*?=cc2@xB@CW@S@^DFZ(tqgVO~ zE8t9wJS13mRmWs1#MiH@kORC*N3S3Rp!Nk&Z?7eW&7IKT49kmL%So}eJ) z5yQ$Oe;>B>XQ$~Olqf6)6C@U4&C6` z1+$Ax^Dt0=FQ}o`z|);;RC1St$hGJu`*7a>hCkyG#HwY3bkek0h*(&hbn+yM?N}3u z$U*GdJZId_u&?mL4`Jj|W~#af#g&s1!6o|if#B(-VoNH%sRox6BD5*p!pzy!oXW^7!JNYbcs=DFsrDp|Rz)4`2eASISt?1^NJR1Cp6 z^{VqZqU1Dffq2kNYtHB4Je`)s~Ka6KO(Y-F%$mZG;y`A)7my6hOQV~oMVw7$jZDXa!rz;dAS8FtGf>2Z& z1GMA%lg0BwXvEIdhbdQ>g7)x@=EPTd{J<5_8~(eh^Y^WmNTGaP6U=w>k4r=oVWQs5 z;$vva;WRS+r^nXt)qvuddrbaZ&MMt|1;)Q=%{3QUQ$v|d2U{0uSpjA%{B}PL4#Q02 zu;ijZagr?E8D)?S-~~&BlCdB^I-Kf-_Sy6EsXsS)mxMk;U0K2Xk0XCR()rh~{{=|- z^4#mMhhC$k;H(N&$B9E1F>sb_wSE*h%>@++B_S{+FXayaUcvap_Sa;5rwegY0T^Zv z3h{Pm38`wHc=F^3-8XiW*Swq&9aQL1dxj-lL8d)p`;Oi1cY z9ncJ*hZFl$Qzl6VcxlL67@EgD(Uur^dL)5v6L z7N?;IbXi=$D3!bdz5d7=!)60(C|WUjcTr5Ary9_Tp{V&yt4zM>bE9yV!>FL<>5pJu#a!@1#qQ?Kxw&ZC4lo&j3nq{ z+PpBJ<6sc%SWFebYki4_JbQ;`-|WZl2iUeuiP?t(B8H& zMwa!<$Gq)(Il$Xq@4w!f^!iKXDoWY@aUbLs81?i@kI8hUt^UX>z?QVJgg#ZDl8Jam zyZeN42c(t)9d5qvXZ(G@b`tH&-cVIhzwU%#$Wol(lO_xwoaa>?;qdMC_&}drdZj`w z0%C+^lZA_yMpNyQk zLOzVKrw}x31=}PU!sMq1s@0nv-1z!7QF@04ZqO=NZ=f{VIqpW*+6AK? zxt;;7F=S~{7dufZOVacw<8@aJZ7@g8LX2WgBf8hJ;x<}zL5U;!G=D4Oi~-@ImEut) zrX~r^^-t2ij$>gy*930r6OdSZY6nXqF=##Icnk;Pz%js;X!We_GF7tzC;0f^&#xN0CC z(94+wdOW@-t+KhQIh&oWHOv5Z>aXwqYEp=eaI0HaNhRhiIx#GIVAOU`{8geTA2q~c zHmS~ADDjl~{Cr8d9KuVCo<{BdtM&UPxfB=`+v%EjrchiGMPC+0+8r;I;49{(r(4W! zZd(#rGNh7erWlJE^D$UjkvXZT&)3VDRG=Y8`96w-^XHjMqIsi!h)GO#3o+7eCg6kx*ZkejlM6Ia={+&C0JAN1~v7#|# zY-oOkiZU@-xJH&GL4{iJ#x04Rq1z}i9bk3kCOMk!9fMpu>IVUTzgj2d)y~_p$B8cq zV7kQ3zi^n88g$ve1Oi0hd|w_eSYkf8#7VQpNQ)n`c`DQ&LKD>_3(9aD{j(YKoB8E1 zvS}e<-TbodAaZpy{6osK%g?SoyZ+4m?CP^w#QbvO+3c2-?mNSm{AFVosHZEA&R$`D zT6ceh{aH_slhx8e z@buP1bbBQ}qN5Hh`_R^N>DRP9;q3c`o=)V;i3lcGYXVzgbR}B|Vtg3VkY&ICZ5iJi zO{!|1$qtAIP!O`6lC~oBa3AppGf;5A)>rUV1`yx;!IM1Gm=fBa(v{OK?};JD)iLmd0omh| zaX}~E%UdN_H@)&f?L`SzIjOzC#ODKNxTjI!I8Nn3)Qx+1QFh?scnuH+=!Uk%XSG6=j| zI+<|mcd6DL#iuFJNA8h#?EZ7E;E%JK_^+?Le7a=&TJ?FW;YKjwW$)9+XRg;v^C0H` z;wqhh!Tew`25I z6C7eTWudgducVD><42A~r#=1wWJn!{bRoCNY(Z2A0nKBW7(f-;*J(1a4App)9bo?~ z^6=jcswDF&bRHfyLD9D|wAg9!^O~;kF3NzUd<(4Y^$?cSLriI#k&$v9#u6A};*h!m z(Kqtq;YK2Z0JG!z&W!`$^>`mwH!9?!s6$vQ=7(!+rwxG^a-2VDR74Gxx6`*18FSmV z6-6(;98f%8+6=_;1?mMr)mWm{0R8%+vV-4O&ebcRu4E-IQEYWNEqJD`12K+=IbdNs zbJ0BoZN5#XM)^kNZ`P^1^5-_K)ZRNBRQWr9$J>lRd$8$$2$*2CSs(6C=ou19!Y=61d!mE-D1p|R0_(J)QQ|OVX(0F z_VDfBUp{B%fudTVk|idFYh(ZxI9Q!^+2+0fYWC{(s!E=daC#$MmPz*6_c=dEMWOv04$ zxtlLvrCRMr=v%Jcnt4(rOuP2#F+v96J~U3L{NR44?Slk79&DcQ3g3}k2G%=^NnJYR zkVuCN=Si<@NJv3llf-XBBrr&!0L=!zEjz&XmHQ8tyWZWkw0!@GUp&y1jrR`6Z?yBk zWt7brJ4#(L8X6%f39*2)M0Dj)8t`k7Zxut*rDPb}a_rS@XJL!|Z~mEU%i0JQW@j0d zm-1m!c5!O)!%sJnu^V;s)w+dhv$u#^Fp%Iz)Ifiafn0^sCe=(-j4EY8@CqL_oiU$^ z38vozYBAMkE2Y2J6d99h%tU4Ac;;x(fw#teI_tnhje6cFE0nLbs6x%y-cy2@9QEcd zC*tc8w3r&x`Lf;byXl9L*i=*_ zvQ{I$q1HPUmw_LaF@W=(q^*NHjTUd^h%q)Pa1L_qJRXH&I?c$t8po6#VFwe~;+lVu z>f6?~(ZxJsSN80=b7Xe@l9JYdelul}DoZl&>-Lr0%8TpXq;?TN-Oj7N1AjE2a%%ws zy8Pn)wQc?TCdaE0jaAWD4{zfrBD}9nEJy4jHBT%X_(79z6=}mKW>hD}pZxF`@t@2V zd+y&`E(DM*#uWRBj?P9L(<`=7Bz*z<)nXmTR8RCFH3i}!vDG7#VsmmJ1q0uG4pc5& ziKnnkMye!^E0N@myBa;DWcp-rS0)BA*mTvyIP&n)g=DImY0*BCiZ(kvLiGT9(F`wk z%G22LNujJ=*D-A|n>B^TQET<%!qxp!yuof@Z3{US<47L#xTaQ6l-snqM^7IM0suOW zJ?8T1vXLbuEA~0n7>XvQ#*J3+AYLr>7Q|qg6 zn^$nB^8pHJ6IzOLyoK8AeerkRC_IW1ad9lZIUalZ@H#8<6h`;tb(GOCsXi%PLq=meBk47=Tb82=LuJ zy3(jgp?uf|kN5^7A7B_KGSriHZNG0J2X$@rE4tMDh0$BSw?i+T${5O@kD)@eVY$^} zKwBqUayw@3|74?UrI@X6IyZc5xJ@KF?fSyND0(pLT7s-D!8BJc+WdNV;c>BaKx2&= zq%+jFbj9-rI%b$pm-&=0oVTOqfA6TtNW+kEU)84R=@{T}?&z52A&zU02K zVMMFdnfEdA@LX;&oWZg-fAIKd!1yi7i7h95H+-PG3K?0ke0SQOChsi=4~Fjmt0JWF zIP%UGn1L+=t4)P5n`6!KIDj2n`g2Nn0}KgOm+4VHvwj87W)Bn`e-35^yF1L!Hi`5-Si7b@hT822@a-Dwq(G=O89q z{b*#6YSbDT_IedJYAEnSmV%%+qPjU`ywsq(N`%B5S{whAv1I`c(JGpNQ>p_uxN*=< z+ge~t50Px}PU=c-HyW6}nn{kGh)yH#F1d$%AmuykubIau@L93Itj%*>$J9Gx&%?_Y zkeq}aW;;{69Bb4Xu5YG??GjprnWN)`uA8!woA{WY=?%v}tsCu(5f6?CHMNM;tXU~8 zGm_n_<~x`9F;G4kF?rjUBPGQb&XnGw&tdBeH!_yVct`p?A9C!R+-vfx1~T_uxNWx^ zT)OI|48^{#E}NV-N6yG)F-Pn_l4}nrmBar1mZ{XFa-k;8t{w0rN6D>3bE*ay;;tFz zK?7zdaud9TNW0xqc9yrAL9DRkT^Akjf6D*ryvlY3*thlVAIYsz0U*pgbzSLvo$yOw zmYM?C6InLRM!+8Ni60t^^PGBJLsRt>Ag=v@$cuED5E#(QwENL-Mbh3 zD~qCJ7n3HgV3rJM0+_>K#1XIV!!dK*HtKaMP|V8bfrb!P!Zu1HKtiJ!B!gtO&BTJTdVGp8p{gW^xpKdiS;{1%b&i>HJw9 zFq4)|Bi7&}Ech$_r(Vcf5T?&t|3`fb`hPk|X zPCgKoKW~BP=@&w+?|(kG5=^# zC$>L$3v)XWRGy_usFtxv_ct0576`f$La`_Is4@Iilp*gV&}ujze?@UM{VR>er8UabRTwfy57*D`JF{c`zJ?0`hInc29Jg z5O?kbkPJongzy>rvbw>2V0=LMglc>ug9E~_7~{`s5eauK9U8U23sZO5Z8NciR}$!w z(&(UrlF>^fcF(VuY!l1Nhf?D4pvZHcv=3phLO@E zQSAh%mtw1kx(@ARUxvDhRy#v6m5iLyNRjhi24tf5d5v75$L??>)7taNfJTgHb^~bo2GT?+>F=H! zjR+=?ux>g)EO0<2Y<`*Y>`%`gJ$s0xOV4g2zlYE6-3_RiY1wWBb>CUXv#--Uz|cX& z5x-$*tRfwfecE8LMU;iV%sWQwCIY#PW`g01Hl`#td>;=ef_KM#oS#l19~(mMu-sC| zS$j?nb9Qzp0!|ez-D8-RpOC|=K6p}gvQ=SJpfC)~D;q*=oxs)|&DgD8)HG;M_$wLi z#}t$Z9s597cw&6!NU1PL3D)Zn9d-y-7SgwD;hPdTc>134C&P&E96~C~ zoj?zX!P~LHi$_l;dL~IFSUO9L*#;0RRht9(OA<|oPy=D})_H zA1af`8t=sr$D+kNR_G)m_nl^QV3mH}$<0ryN|L!zKUnwd`jT1h9hvs3^`>xJczWqP zN$9RfQYVe%2akd!D#~}%8bChGG~c!Wh}tC8YwcuqW-*ILZ%-af0)y`*vZe)z>fyC< z7dMgFRb&-+m~Zzv0J_x-Bm+qs9bBdk9PpkrqO>)dGP#2&a^GDPwsWe}={Fs73kDc3?s8)jxA0DJ}>Li2!}MqUVzfzK{2 zEftR{PhTHEbynjHEg-5Kr185gxJ9+B0yCUtXjPyIOg_lfsZJ-#ic*!^^_Y5{%8QQS zPgu+o?Dbm?F}5Vn$En>Y6j=kYBQ9K2r48_I0;nd7h3QBH3l>7$L?$jFL>wXCROzG` zTTIhgR_S%csAF49$97b30|cl$&l-TwAF93b!;CPUIx^kKMZPECn(4i_1B)2iM{$u0 zFNeurmrccV&}lSA%&zMFFr5ZJR3$@Kn@`K!eJ?_T@LY^i}0=Et?q&~E%-pNG7hMi(4Bv#ZV zUBOQjO)h8te9V*K$%sZA4Yq@Tj@i^$T^g_l_wG{mC}Js`q40SjL8$NzTk*}!*o`D_ z$uH5iP8b6zA4b~ip~^x^C1{6{53xuSN7!f*gu{axSBTIss1&98E2swrQa|>#T0Abyl`>*4o1vSbps-&Vi#K%GQO0wIr{TfLthfzq{aF&@!KrG~v6TK>i3ZaF_t1eUT>jl#w8705M)8LDgVFg@zhnh^0*)REuKvpgmA8 zrBY80t4>~J^ZBYN6T+PmNjB+F_bS*%_pQUL(8_Nck=yo!ahl(^l^(2w=y?R#+Z)|q zoEF}M@xDgZy=P>HHaEltpg#;)mq%uT%Lp-0))&GL_PC8)xU$)pyy{ZSy0eSo3oG5w z>#lqdL%7SH{qy+c-~fSvap(Vr?~pgw?2az7h**4wf$gQfRm_i0<-s6D!6ne-idtfiZz)?XemSULJo}7TIaK!t^Tn@QIzV$ljH3W527HDt`nVWC1Q>GY{1d2G!2H51x z$x(yL{`9GI*P)P&(ViYd&_c!Osf{PtHW#3|{I;RN1;YW5@Ef#5z!1gh>9Ie>=z1eV z9&nS1kpQztK9?AL3K5`#kk(Izw}Iv?eE~=b5JIRwhd)7w1dJY&sGmFmr^J*dyxw=L zBKcTeUI-PCR-8T!ZuO!eiYQajimJB}4JAsEB3;$5C(<`75CqUfu%<-VW^`z0Mld-O zhuKaAmsC)fr)LI1#prlZGolEGpLJK03RS>h521XD)v496uB?{ z%+(^^))ZK~k?xKdhB`e?Pe_nnFjREC6dDwEHOPFTr>R%Rh8HOX=IhIct0GlUs3~ih zj#w)jx*NW$_2Dy^`2=}0_xht}ppNhO`p}j}$O`($2?EAB^uGBe(oJA_w&E9~0oZ6M zx<=qtpZIaZeaoei#)ee())NuIBr&zqH6fg5aGzuP@3UwBsl3F<__ubs@qhd*LMz=SA2)`FISJGI<%$nY1OJeUi=B z!H{k1^LJJyD)GS`;IG*zLJx%#PAw+Cd@!9h%@biu^-8f#~xH zBVoKJD>mdjHLOU;B>sckJyTlSi=AM4c%>8+-gOm7Tf}5MYwYYN=EYLB{1Di%6>8x+#^R z$YGmM6q3V?AEstad1JVebmHXm+ba>=kmnhpf;z^2hpEMN1r0Z$)K5WT`BN6Jjbow? zM{}o|-S%Q&&U~n0N+&)cT_b|*1?WISk|F(fcXOTwif&E}JM36lIS5^#DU=`%DvWRA zU>Pn8kLN2k_sAeJ1WHIk*Q0}U?HfhOZy$?mIGNmIfAalPz|d=NXomz`OQB9zgabV~ zCTr)Q{2>Cts)q!jd1_`bLbD$R+(2`$BPL4;;e(?F-vMyTjSg-Y4c^%3HAF{BAfRXy z*JFTCsVN8tZyw8l8=xpvdNW(KQ|C#pESo~9Mop+8D2iO26d0dTd9NZO(sO-@2pwjE z3nYhv>;F*dqm<~-4XRi-URn-;`#tzUfxpb3)vg`&WWqTkCQs0?z7ZK@m*0q&)y8Kk zy%DPRwTUXy^=xTnvbl0olvtEp8>E5^LWw35pd(;K)X=vzsy8_;oansJBq; zsQL-CHA1?X2&+wjc~i?roTv=d`7G{;tO8tY-6{BMTr{cveE{llQtzP$Ju~a0*=;r0jO{t3eZ)GzkMCprpZNGi98WEJ2n>{ zD|?P}=oAkLb$VGP3t17Vdq4`_O^Cb9*xmlYG$ep%(-FDQB?=%KMcZJCHofMT$rR-7 z-2wG_NGfgPLBS~qfJUxhXq}~V9ir*9Z9R7VgAF(&E2O~&+^7Hy)*8btDkr?275Q$+ z3ooP~A84YpYycQp0Og}?9C=-@Us>w+n%H*GGK;rCqCxL@KhZ5Aant(kXgwmhL_dL( zWFmBRO5X$zikJC^HkFU%@H9GF3k>VI=qR23)&vt26}e-@;3Exk@@Yh9ZMe1zRflfC z6jiJ<#1w#ux=z4@N_T`Vc{N$JO3x@~B#*HB4i;2I6ryX; z-&Nh`UHE(a(4aZzTf>PRGnM9%mu5&UH=6azDJ425$6MpNpw`m6xgU` zZ6OkrcwUqp6%FAByYllBY3r2ipQHSy*>zuCuOA;R-pKXMrOR@u?VY_U9?x(AUJRlwk7>Zy-?A8D}8F6k2 z-d=E-5pCblpMAnI_}1_Dtq)$g!g$#lJgOs#EX2b7JqG#05gL43kW_lD;I#S)^cW9a zA0RE|T&E%`012|!zKE_*36Fbu3W=@P0UTH}k;y{9;fM!OcF1A?NDxV=?fR7chDE&w z=>neT7CebJd;r=54Uh+#sgvArsjdO!~4y6iTN6ib_o1Bvbs5UWpu z7UDs#n8|}8+?O)1Cr?_Ws5)4yo}ir}k`aZ>AuXzY_R$4;;d$aFR3PPmYi(+EG8Z;e z6Hw$QJeCfJ;n7=ak!K(I9>zcuf;dr-Ub|B4?hPAinpigv-P&IOxl8O~ zagGq4B?cCZmR>0eECQYCc-e4>h7y>OTw>yHTLnA?Iv^l?IcW$DJ5 z_Pb=)jPyIGb0Fi!%(S4J?cDZ-Oj5LrVDFwnO7W3}45P|xBs74=>?9PhDTi>5X^ZPX ziW$5g{|UQvgG2E390&oQLg4LZ?RC3;`>im$Fh4uHxvlYRwz{Rm{@ZWwypn4>_d#c8 zOYzwkO|yT_JjT@C3COJuKiije<@hYTZ|&f+s{Q+)O}r6V7}iBe@VK05T#`wl$nnqw z*5Z;mvZ9|HRGoV8q2e2Qahn51E@&{u25>S{b~JSJWl^cb^9hi|r?3D^4d*R)fa?Y)y9j)EW2+hH|{#Dy~#U}xxO$em_4Y?*3IgYpMt@l!Bn zZD$84AS)~klQV-5Q*c*s`y$EEzId1$A9b*ChI3eu-_u7{V9Jowsn4|;)1X5!G;a3* zF_cy#n(TPLvs2IcRFh2n)qeKmX~Zc)2rL09hJnG76olS@qrfnsKRo$C#=O#Fcv{=A zh!R0VeX*2L%Kxk$Y_NsR%eXl!Qyuf^LniJa^Fi=FBDqE+UD_{1b_B-D|Xa zxQ1yr6#)535kB1|rA~Q=u&6LC3L9adglYSg1>%`tRb3!l+*{L6RFPc)d+3+ZgLsUL zX-ZygOpbJ}qo;=A;^|ImXf0yX!gG7ZuDMhE)WFBMCR4TBnHfnKPj-Q603JD)h(#d; zc<%&`KT}{PBoQ9N&Kn_P(kM9Pyukpp@|y9K9!d#Z5hy$g+x`q^WhQ<_h75w%ZCaK9 zG_D#0hN*FP9(Eg;lR45_rw~?QQgF@eS+^=)UgzRD>L&CY-VoHq6S!$A07+GSX`0Sg za%S0#_(%{uw@ctiSXtPy2_;=b6pgLl+@55_d1!RWqmPus5Z)~mz#Wv8CF((CiPF$o zNozE6HhH}sp6!@>{2p%Bozg7g?}=Y4#0=^#7tENbA+V&v=32iP3)oLQ>It!l4-(pA z@7(0>q_m!4#vKjk^mj4jQolcp_9xcZ?pQ;#TUDxyq3gWv5?E@8C;-E854kByMLqz{vk;A zCn-aU!)dX2K^Prqin$W%YQyMl1*H3=DUUWJuEI1kP~(DgIS}k*To!T5sb7=a_N!{CgeO^YK&gz8zP0`DcuT^ju!LKx`>K zmfZlHJ5)y7GZ|cT;GLWD3|;v3KP7c)Y@MCs&(_fPRkkawyQfkD%qb1v7dF41XrYiq zCr=?4v0s>dyP-Pi3xYUv!j4>Cx)hzD#Ge-AG#xN zC|_p;kLP|d7p!a|Yv))w%`%(dAVzjXcqdEoo~&89RlraBE9Sfmj83usG=GOD8}cZM zj~A==QMG*o8TuO2`9L)+^HM-A{Vyhny zfGkbYc(vqNu`qg3d-Yjcb-A(}^rOrDv_){TV>OA8LHQKJIIQ=nkWfU~4o(rk?k zzNEWX;4NIaieLM>VTkf0J?u_SLHfHL65bbhu9LptB<~a?DclHIAJ4nD$(QG2^;&*v zX=Y>UL@#aeU0jkByqsNWf3^lDAnhz9-ArIgrI3v(dW%da=_@Kmaiea{7lSycIKL5? zON?mDzZ~p(n-M(^3;bR`J$(aShhAd9FGsfd3?IN?V$cpTHM_0y&54>9Z)Y(t|4jNU zW8bnc=V-B!*kmHp8^&T-QG9_^D8s~#uP(X6Fb;>BAEpJrwUDjpTmYrm*$QL5DrU`v@wX2X%qty8{AfK z8nMk?EV95rsm@6xICUNY`Lp`JK57dAG8unbb3|jKSIO{kM^|t^1yS~wK%h#gOyl=V zR`u9wB-i1TRLIng4KTncnz6AZh|?TuUa#;>HTETFE2ui*C+Gae33PDSV`)>Ufma;{ zu+6>FZn!SwzJtDq6(srO{fzQ*Po16g*n~610cWsGh|L0yO|?3!3j8Kr>ulBVa(W znrk<#k!ih2fXK5S{M~h#lXR6#{_JV$ z@UMTsZFdhG<^OYiqpskmjV#n;0WhzltsCDiSNwu#*VlHFo8XiS7 z(+#i|x~ReCuhc{H#AurtC<+c{e&WuI#uOLhCeuW;uk8n6;k=IYIe;}B9MBOCa6s%F z!ilNqS)MbRA1bjK%LqOMwd@8>_NBC8q*FI z4^Mu0<5qs527PSgI~~4PwhVd zk`lU&lRy7Vuz-4tG)h0(CS@`pi;EkhR}4>oc&hv0N&MTv?Y(a^+8ZE?+w$5*89^a0 zy9`f$z{Wu!0cZ&Z=XbHe4#IETfH68FPWm{u^`<~&X-QMr_olA#an zL^QZ#y8Q(w#l zQdPrpU?sXC>~MN1?=8d~QWYHNm(W50eEpEz6u_w~$i-MpOFkdEcswIqKfj)M90@G1 zu;Q0jd{Q#KKA_Vq2A!)mFo{8a?MU*m3L5-aezW3Si>Nz{5OoSWVoc#D>J{JN`og@m zNa?B}F~}>I1p$yf$6U@Z0Ge?sT^XYY*HG!SAV-b;D_{f>h;0ci#tQpx&LievWOPe_ zqdp-x8LV-A!J1#xJZ~Vga;9_-sM5%UM|zx41Tu3ESGhBJ2B}rTfFv*=dLnCXgb21c3<>gJc<$j#U;k#%yPiU;3RYvNn zJ5!OnYIfWEeFL^}RdtlolZ1!hfGzqSaQ4>;^K~3_5EiJbM>p!NTpLWRw^JI4@Prgr zf|y2x0Z^nZjX@cMS&IYviR3EwG`ayYqyNR(nwR~LYDUKk>_;xwE3dRV+-NmUqi+3L zCfiSMQo7G+w6c;q$tJByn;zcjxa~CFrt)RY&WkU`sz((3wxJl4#1(^gxLZ2~VqTm56ymh_`OJsEi66$zTB;R!(u>}-bPhmPIDXwDB{mX@7<+l8JEYNBPC`J<4 zHNYt%svVTyO6nq;K|j)o@5|IFpMF&GNP6S{hF{?8ES$u!L|`WQos%mp7c;o70G5u;PsX7kGf(ebFt}GBjnS>$9 zfBB~OSlkQkdbkzGKaF^KI^`Dx&qw(l8po;oCiSeTODa=olBY-}p#Q{>>Uzi1Bd>%G zrvP*2Y$)Nz+f~CWo>S2K9cNEe zr?-idh8L*Xxe8@VTHTy?4W?5xDcT=ZOSm6B|k!_o0NNt6Oju0X-}C?;VgB{T!t5-g%c2O&jRIf6t$6KRwb zj)>&4_b7nrM*zPnySnDQZG3-Ca`m8UJ0Vv6UZ_!VG|)ZZi%Hc;hjLWL*N~=VsI(Or zETZUJHn4m?<>%A;4PXq`3#Sf1{&Wk=jU>j^Ikb{OU`rULeVxyZa>biHDe$Ditr_L3 zgz{XlgdX~2lKsI^F zACauBo#tcqE^|&%eqP=y_OA9q%`wM&-8p#$_O1_JDeC*c`|kGxMIn0+y#B0d-_AEm zH%@DYt$MOg`M}+{gwWKRc(_~)uh+Y0(L5(fmF+K1w>y_czw1X~WI6qF5rV6xE}y(4 zFo>TW6Tv1YBpnQj4jq`n0m<;giQs)iY|-MKBIZB+ggof#T+d zvmGuRdWHc;Qt1Kl_K-eVn)Dc`)=*6on1)R~K(Gmqz; zDmuA|k>VQIHNKiPl*u2zh!Y6<=d^3-#p4%GxZJdxhZ5cc8GGM1CGNppLo-m}047nN zffg}SxjaH$Ai;r@GhreT3640&BcqW9%M29E;}*l-t)G6XI~#x~EcwfmQF}Xlo5-fq zDZE6<_Ts{4vH2g_!{1Buz6<}>!75UO6P0~23#{!)7=M<*s}#2#op+zBlP5{^XNHuE z&fA+OeWD~8SVbQ1JwZ>{92wc+l8k5jbKV=3Mq87~8%l6~=O?0CNOW!>e-?}z3M2r{ z8Cs?h>Pr|CcVpkXnf4b^7r1f@;EB;-=Cg~HX(VsDtX!QnK_cJ0orl(!HVgM4;t z*43{@gI%T_qh~%YIK5S6GBbEasA+WR-? zEL2ibr^_>8n)7An2q8MYa~;+x94I14nLVvYY$s9i2qxUZcgbm_W4plUw`j12B-4oS z?=fH$W5d%Yx`q!nHn3zpj?!6|59mo^1W+YB7zwbKUg`t&t~>v7{{1=UMK4u@aoFqV zbA&SL0>C_9EaqPmCpVgIfeSN#OYk>O^=I3k#&;olQTm&8m#e55SKu?toe0dGnJ4Uf z@9@QR`A+>zO)5rakc>M3^7`{2>o~EU&y-xSYh;qz5XJ;-WBhfYYaXoTGq?MY;s#&4pg3)zp zQ5!r_8;=F=gCcKWUIt^iz|2teb1W@v>G@hi66sxb{%nOlBdRDKu;Az!JGOsweCQ-xz!wy|QRlsik+roQ<8qm*M5yZaf;)QBDtjE`qw?0~BPrE z-0m2wC&y+Ep=DI^f>tJ6B+pB#om3wc+(k1VH#->`*F^@Lj-j5s_{xH|O^gSax0s4$ zc|j&POCxrYpwka=^g7|7?IFi0r|DLh^hPMeh6Q6?NF40ak`0!{W41s2Uf1woxs0Ok zk0KqvtQFf(z5bCUZRi%9vQ|TR?V^%HE{d40{A|F+k1J$7Z6hXVx?M7hgT5C91y-eiMr6T zptAM62<^Q*B@M9XdRpB$wzRAYT4BP;eE=J}v&PzZF09?-A@pU;WN(p$e&@?4IJ>FF z(#u7{K=CFDZX8j}65tpw4+8~42UJuZkbg~i6elX?3(_;kmdKmYK@Mq-*rLvcKw3L>nBVvoq5+0(@ zmyc+ptPO=k#f=1Q4;#$h#}=MCn$}K?izHKf+^NFAZb3ug2+AxJAb`+ayPHjDAm+fk z>Q1tev0z$Ihp91?J3j@d(*PZb?$9IX-96GFr5**#a6uer7ZI%ImyBt~y5;{WwhB$k3!WQ$eAigFMt5*pr`#wO~4V!YX}z zs{xlbqX*-4$q>w2W7My)2g<+kmK5yT}yJw2rIM2AoK1B9dlLWMR)HsM! zrFq2Bt3y`V`By&xu@7x0CW0xI-;^&GVV7yeEF=@v$R8j^Wa!nRDa(vS4nEcEx?2d? z6d2ME6@w|*3^B(-i8-|Jd{;P%nBt*&KO8C%L&&=`j$O$njiS&yp+BvnYE-(1=+WwN zFujoeYIB{>ErlmMJg1T6NBeHx1i2wHHM#y)e8kSdTk}dfby7p^`!F1>oRYh1>`Nil zG*jsX!AIL+gXHdv!Qr0k$%Mj7kIXlAVy>`B_jW??7mn`XUy16`XL^)0mPj_|v<_m%5Y(X#(6xNrC37FIia@9y*zkGb@HM{_ZGSP#@K>$8# z>wt5xm&>_^U^fe0%kx#JYmgYR&1E9GBJ9FhS3tWbCHQ*Aj%}3Nlcd6KEodGy-y&^Z zfCBdH*;(k5sR=(lE=;#=?dXSCleSqS&^TBl!#kewm18#A@SNlhc~~90=q_H{>wEvU z*3BR9Q7VwX@1D?%yJ_^D8fA!YfPtrFnPo$XEC+88aD*tah2k{y%nYmtvt+h0lU4>-CyFnSTV3 zC$cgFjS*vRQDtUJzXd-O)3>Z{GcjU)j0N9amX9&!R=uw5TS8X{B#ncQTj3|2ZEE!# z%b5w=Qxgl(_bek=4xupFNya)AqAIqK9L0|zol7GkkYN-U7mMkbg4y&UA5I^ArRQzC z3z{)qNlX>txyV_rP)Gq@bZYmnzz5JK6xtW{(A-+1|@OI63 zm&Pp{;#QXv1s1doZZ)9w+!&p3_K}hX3nFzard|$C{*|W> zPYZ5ZHfrE#z z8|E|nFpa4*2t>b}mIfrppBhr4LV=9nyj)uC(wxaB&kPeNi@|(B+;L_;yC)!qT@ndy z&1s}tzzug5sLlkv_eKMewmOGeD~r5mekk0+BzsyQ)t4uY_!xNutf&&q4gt)Ez{MQ$ za?Af*@;;8S`eK~fZ4SxM`%WFDTw=HvIg4X)qev(`6}EE^f*mSGgzjmFy`k`Cp5V5ih(llAmP#_k(If zd%J_*$!d~l(Wi&xw5TYJKy43qx(DTJePEoNN&(x%t@=)=tKPZ9#c4gJuTE%O5o(np zGv&B4LDWNn>Lh{e8fr3F$3@ifUCT^E0MOi1!zEhsEf#b>t>1z@aAh5Gszc2am4w%y zeV+e#zL*4RU*fYqM?(r83a`95TI@;g9RaS}^~p)#R$f!^!klm3>ZQ=BMDfYLXK5;q>mT!Hc45 z(`}wclPPk5MW(>7OkHIq;2l2s;DFqf?H>vK>D(Vw@6kI2Wx6HaB0pX5dD^uKu*VOD zb?U)#;#yiTd0q!(6>@szWrVm6@KfZI#2g=vQD-QoAz-^gwq@=Xdf73Om5{F2?sAH*g%5-ZGn z7dA2E7JJ%%N5(ogF9faPY3ohy( z1I|O{m}_`+-I7+lmQ`FOlS$z6Zu2rNQ%Y3a9KESfD3;?{Jc^!wE#537*V=(e`Or12 zEs3Q}M5mevEAh?G9f@EMe!C^i&-R-Xvt<}Q%m`e``~K_Tw!D4cupd0eANef*QS}=i zD%!MU=aMwkYQ-mO!R>jDr2w~dp<3~gFZ*@(zD>VffVY;7y{@Uh&AW4(1!gaK_ZA*h z?|uB~?b|-aa1SJW&+|lWkQbxK;{(VDc6U9K)oi9x3>2izG9yRPM3#7>ES}D^KRx+N z^4m5fmN+H1SQsR5brHkxefO&-Kmx@jq-uiOS0Mc-S3>$3|Naqwz|r(3QS<%aN9)y^ za9+5w+<9G_c?6GPndaQ~g-ohRYxmE&2k(AH7le6Mwc&V&c|xGxv$?nDgzVFvjN^Bl z5#b|gp8*7PthEz-wO|O%l3s|Vl+)YFjA#h}J9X%^8z!_u84zv&ba3UNa-MG!^T3!l z@G~PQa0*9%`2Yiq-zt;jD8Kvs zK&x}WH8j{c&_CjSP!#_i}u7oF?s|oC_ zL%c1l1^{~L2eO@j4wapI8iImrw$kYu8DD@5S*ytCos`U&izSk@Yw>!XYo(H(PccjW z!enfFIp7eSQm&*T2CI>A-XP3l^cG6jWl+YR0iUSIGR%sa7oC3qPpL`-USnS+08m5v z;PwEHPU@LA+SMs4A!P(h!ecx&y=5pk--(66`xKDqAo#(($ioQqdNIvqS%Try6Ky8w zy_-h1KbyjSA;X&`XfXOcs%mHO8BnEiIG-R4$jvnrjw2B-{ud&r{{Ii!vY)X!1AD ze+Fena4ljSl$1Sljel6+lDT0S#5N0~6Tu)*kV||U?dMa3g$H<^r5N3z7PW!dL!vM& z==R;v{Ct{P@bl!xQ*7Ms5M~(sLdHq~sd0R=yxTd=!D?zC+~1_2BX6m-D=2(7+OWeY_2eol>wGeU>nfr!rA&^NbZu&Ma1$@ z^OR08OFWuCf8+2km)9%sU8Pd$>Z+@9!j5jkmje-l1mai?NzaZP02LD|TF<92;1Y9LN06Kl~-> z>NUSmmZNA(S~cEm6ko1~k&2X)WlCr(5iEJZEFhi_%|K8%L=r*|%R)ipQ_--FXd;4- z){DWTHTo&c2M?b95Fh+q^NxT8@`uvM5LJ<&%6|`7I`hw_-|nB8!@uzN{g40p!oSZx zCLO)<)vLKON~Sw~_^dSST93?)C(CM3Qc$ zwM2gYZTwyYF^V3;X5o__>M{mb5IR!$jI9%h2~9*vnOI6tjKn5KfF}bnvP2dgju@o- zul1)D;IjN{{wdmG(7Ov7WQuYqWai8rnC-jDo~df@7wN=bc5R6`b~M((N=RtxlBB!j ztx45jJxMcBK^hw;^A~q_v6KG$Z0UN1~SQthmfuE}cVacD@a~NihG^qjIn;Dy?T?rTH>c|j+ChVpLU%YbC)_6Sv-HH@1k7sUdygFF#<6V z0nC6tSG2Vlni>d8C8%@mQ zX+e=ovr|aYtl`G1$qR1fWBzeaF%YDd$@|F*#tHS{Mek4;W;G&7-M9JCkcyV#2`_u( zcF!fI>B>Y)9gX^aSeD)pkkLy##$%?EBMXcuL_@xfLZC!<7@=S>Vu@!4*s?exC~?XH zdPe|C7FD^L1<5QTi}fk{0x!t9Pt3Zv+2}jjzd(Boj!H(H8PTfE;)9MZo_cTJfOPNT?Vb~NZr`4G))wCM(%!u` zo|D9KuBd5QW%G&rY*4y0D66m$>tP)ED4KUK5j0Z3L(}*$(iA#)9(0{S8N_}d6+E)) z6rujf)0&2q$6JWz$scEY;?MfKr_9x=0;f0neIRRb288p2#1O=M>Xz zVD}`Tl%QB!qZ%EJ@G&%u>m;GLHy$QN)R_bDgBB{R8y?z$(CKtN1&JuG~3 z91_{QQ$8ri38GDBHvN3{yz_+L@3*TJQa`O&Hl%R-l_vMlpwT&}?=mfsAIGR4?{C?; zmQPOT43EE6NHf;yC{Qc7HisHvt;G=9b4hy^Q;d~^yf9zim?Z*Ftkevos#;>8np&h&X@JN!8cBfIm<**yAixVj`WK{2B(8OrDsC{v^V4HluE}ec6&u`Pngy`< z96KR%Bt2WRFSIDbRxPqHR~PFsPR5tH6(fqh+SqZmBFx3`7h_h*k0{PQS0P*yXqLFJ z$=yPy93ymDnZa9FjtofFC@{$r)pNjmo_6CAjMQncr-4bc`CXOIUel;TRlalk6J#g$)wAK>LcA`Uv~3E_2L9wrr4{x_ULRB2-HGE z*)eAV$u<1+KG`D#iH+3t+;SVx`6Zx^xflYf;X!AO%+qbItyJr6@dl(kFM}!dFd{Dh-H?XEw1l zt`loTAIyJfKC@Y@rcF>Kjs%A+$EvwNY;wkEwOWmA;CGSlQDUPT)119Gw1|px8Bje> zTFG~G~nMoT2Wd#)`7#OoMXrplkg69+g3;Cq!+%kO$iNfRUr%o36V0apRJgstm-bGZ!d7CExsTvC-_q zUfW8=HKN+E#6oiXvXsQHyAK0ZR2BC$wS9rv zv4}V1ubuhUjM&MY@^U99&m-@L1P0{3R`|FoJm8A_zkfF+_`@cX)YK@gxy#$gL2Qm( z%3JU~l*4+vXj{z~oS@2JtqAV3K1`OvSL8 z*!51st#~~VV-zlmVwg5sM_nlw>fPvN3ldxN@ zodi7vDb6Q9!GxSbygb}!(Kl{zc7jCZk3HTuxm!AM9{?}i&~C4?h`&dUzM%|syN}WO zlrzfL(`7qWQ5vDFP2DHYe5~v{(XCBy14}HA0JK7}7Th_Z0%^|Bnm?BQ&TH+O?%Qk^ zweKR9m3**=juuDXdc<*pXFS9dPF6$?Dk_*A5JVtMY(vk0fgKzQoH%KVetG)y!&!&k zZR6Q+JRblip@Zp3lke~UJ^2mP`){Kg1X93jdSgpvR?0`esw)3R3@Lx;c!kDM`<4E+ zk%6u*@`CS#N_IprenKjAWfb3;$R7DrtHxEEwBsK--Qu#(UwgKyRSzkhn>$N>>Iefp zXs{qMnM)x-Z2Bxw38^tUXzFR`Lh3K4jnU#TklcmWF2Z*Q9Js@8 zUitNRf4lOf6q_|BSS{lsfPZAq3Z^r^>Vf`OIeyR99p`INzrNhmrTqAM&yr7SS2^gs zaj?LEO0IdN(`VIxkn#&*0a>&&jqyUm;wheb)GoR4pbvDi zxPSP|+g~x;&boeu?th*Z_ZcRGkV4sD9vQnG3>=b`R@+o>)E8K~bug-Osxw^W9aDTY8l-`HrB^W1p0t6n>JoII< z2{ROn>#ynaQ`N0;T48g4U|@BHD3{d5wDcPjYm`x%DrLAS^CCg2b4?HvF)*4+o$e`5 zQf#6CiR&-RuPL`Ktw^feo0!WoixL#a4aS419p|c>*OiLHOkpBAA3XBoU>fTa$pxMk zu`OAm5~N6MFmzM(g}x8_C#oQ1-7QjF(E(lwqmxL==3zr4Bb;$ra%XCmZj$Wx*y^WZhcr0 z(zm_uVhekg$|hA;=Et+~v+~LwlhJXV=HlfjVS@oazTfrX5h&AYv6t;F3&l0{y>>ie zv2^o=(0}a@3opPAlgPBViipp%NdlGs-l$^-!u*|&@ltcoA$Q1a``kb9^rrc?cwp0ixa>7_S=DvFaKfk zWA8ZlKW}zLSJ%~S1O9N6@hbhbpMmv%nw;qvHSN#2;Z{<4-+<;|A=TND=RoLDwhyD; zIy>x(fLMW+Z#x4TNxcZxgEnq!=bX=Ny-GM4huGWs#%F(14P&VAb?rU9 ze7n*$mvZyY4ZSDpEqZ2#CnbqDjp;KU-ktQSZdQJJrX_0C5SEI+`ktwJkn?&noA>7!$Dza3wzIWEj)0XI+ETp@vll;_z)U);#2RD@X){S zBOGjevvj+>=g!of>m|9q&t8m~zFl!T{EwS|%)9Vx|I7dQ;@K6i>Z3pIzO?CZUAIxk zmf!iQ{kQv6lYByYP~(d1RbKt${jYJa|TiWk0pa)O? zV=duG=*09t|9I_y=Hr;ZRlF$p9q0YA*DtY4j5`Lincq+z?acci^sg-r`Cnf;e5AX{ ztUa-O<=Nf8xO2<+zngliUweAM_RSmOv*UNR?R<9fNl|0M)O_=>_cY@>W%va-CJ+d> z^*Br-0G&@qSr?4j?V(&H%fA@ExSS|(I+ky3vvS{mY$<vFZfnHDLzkP|v z62B|{hiP@_UFqwqX=`8Kw!C{;ZH$fj6XFOx{x`?b`dMGpkL~lDJ%0?j^tZg9b|!xh z>CdJG0Fz9IBo?R`)g|O*%otXW7C|@S9&>G( zefPzx$n|P}Q0?i@F)s%`uX&mzjcFq!1?Q5xRC>Dnmi5y~e$(-Y_tIO>KpvpG z;(w&FjOot3fn+tC< zcEfS~iOtzNOsy`|Yz}^K{Po_)t1r|)J6*c&veUJ*+ZP_qUm9?}dE?o|ZfQ zJ$~|QdCdaL^yBJLpNzGa39dU*R1MrUhO_9JZ8hS;{9N%*1|~X2yiW> zMDDt&y#2@}fKo@<*V)mmu$Guz0Gi}>ZY{$Wt&dGjsDKnGj6L0cXz zK)RM{ZpfNA9TNSKTw7VpnC}C&>LmR`h=cLrt=8khD~W!p_x!-*Ehb}APyHtxJ{)fx zOC7vyYC`1ey%MECp44e~Ys)^M+-pl#BEeyrZq|@+_37Sd`{B>#WzZjLY9MMwNiMzLdaJnm+F0AiCs&((I~v@U zt~z6@TH8&2wf+jC)ob!=4LyQ4VVHF$`IfiI`LS0$bzR}sXG?E2WMp0B4y;I>xpApg ztMJpO-{ZPi1U1@(;RM^xOk_VU+#WRaE5qTz@rKeJt=`Ry-k*65_wG-- zY}bNMcq5+LMEgF?GNcTR8#wI$f@;Ubt$f&F`1v}mH*=SCFR{%f#^g`px4e~0Gvez< z_Wya2HyQOv0I91=ud{sc)MCpi>p!bktZ6>Eupy|d-YK#F@8$bXdnY7X580cieQx#a zvHTLU>3gd3ZF#))jum;)gWoSzH8>ZI`A5gx>)YB8R381YNiF`^_07bSSI_R-wfRT3 zcYrH1`n8&As_NXkE8z_L0mWq0naJbF5i4?-$1=%*#O}U|qnh)0@^87|>OYh{F=4wK zp`@b}t=;<{>)pbhRVRJOZ*4r3U{$`| z`Nesf$@~ItEciEgQ~XKeF@@tV?nLh`1E-r8BWFi6?kUH22=~r^Y8;tcSpBDFjcMGxc|>)+Q;wgx`=zI78n@YT9JX?0om_ z@XO%ZW8Lb|gW;FwU@P48*BM<~<5q{$EYBS3xXs$Rcc?SRg#Ur91A&nWZJ1EyKrJbwRrnO>epp2*8h8Ue@D}eiuh&i2nwAD zIx%wT$3Exd%lXgzY)hZtd;a7oX#MM(36n;vHPbfVY4rM-7&3Q>JWAj6BfNdpnV2uo zjXz%=UBxN#%wX8m$Ok5VZ-U)^bu%Th^2q9mR~uqa&x==6f^@-m#c%qT>xaL6bp~U4 z0#&xqGZkPHUFg9+Fgbd_d%Rqy{?p-q8{+O?Kis&<^g-fv$^87mh8^eTFaQ1i&z_{F z8y_QgojsHvsr;RMUA6VZ!N%iC+|eUD9z1$7I!Y_!f$dwqyt@y)CEoE~pT-Vvh?^WL zKl<)^%GZkG=HR!H zx%lB!=0C#eeT`csOW)f+TiKx-Zkb*eOff}-e=_F##G|wJ$4VBy9$Bm%y8V>VXgg3N zKf78y`HzWd{imD9o!3oW{^M8?$>yl$7k_nZsyaUvaOB2IXRUGbxeH&UImHh)DR-`+ z{rhL@g~fqA5~q!SKVz)!d>J>WRc!dY^Xr%8H76v06mQ5VFUYaZ(|QU@82G^^L2F(u zF39`!(b{@n`N`r<8G*x3pT#v>Y+UuD^1i3_cKUqEZUKY+ksl;to_G3*I~;c1Zm-6@ zp_d}m3h@gkwWec*D{l8}_HN|ZCkgPMHs6fgrXG{KW*7a&-w#21U$wSx-MY9Yx9QXO z8|Rl67vEirxp6l1#FLiaALf5Fy;)^?_`|VV@24a;j><#6|CsxfU}$dlbHB;8m2cjs zk?^MH^(s&Od;o6PU&HU@M7sT@RU-M8%XdwtN;h6^FY&6aYO~q0eJwIHJn1~O;`L7x zQ71ugrSfEvvA@*;hH0;DyVH?>#b-O-;EyDHwrP&6`+6ZT{MUn&t~g}cAb5)8=HmquGfCQcGrN|ac1P+bAM0!`L@0<*IKkc zEA3{k_&c>dyxQAwF1cvWF!aK%IC1~T(n8Yr;@VQiwR4cxq{ISGFVpJeo7?OXA=gw| z4Bu^AlhlDZH-;|e)%(@^PNn9`F0nifjRR>hD^1v(xOrNXD8jHgUBt=oSmUw>Hc3^5j!ukFXR%?{BHvtD>cm` z;{IJ+?P*(7J77a7ZIvXCSc}(ASx!T|*yLF(Z zB(w%}wkGQd*Ny-lKJk9Mjd z%A??+$?7V{6)^#sP}O*!3wZg=Rz^qe#X-SoG6hu_@}o<6(`RB*WR`-58?W%6dz z4M_tNXLt42M9;^5zQ-_U!jum~`Etvl$LP9oiEg6Wt%ad6aeG#y!?iheZ>0@T+p_ z!^$hC??z#>pR^inH3)6oEMDRWHGVMn+1$R@ODoE@-qG%Mva&_!;g)0$bb#@^Q1h!`-=v2b zW7d~ha?+S1{GJmx*73He5aAAuA#(lr?*$gxi7Dw$Tr0ggPL{ht>(J0EVByGX~Ag<3hwHRsMiyD zVEMDU6~23|RBz1%-g4b%&)w37^FZxxH~$ZOy71q8;(sR;0GSk29DSe;yR@V{dQ@;E zCE?(u)}^KTr6td$rEN<~+27_eb55#7seQhBj3WD>ehK_z#~y>y!b~`tLhI+8nBB?c zDBk2x`me8A^XjPcOZoYM#-o*z`S7Tq4Q-|;W;g6ui@tH}=>wxt5mF{sZ@_=ZsbB`) zBg7G83AZaT&F?3xN*u&S<)sDXZI=6YTAL4fT#~`@E{BrCKQ(bO3q0++?JU)Lc^mietvjeoLM_S?!3IwzeiUmlx0Z&v~D z|2|~6UhNEO!v1noY254#W;*C6v29w{qJ`V;M!LPX;r4}pg@eH&GouE}+V-|{+M@9q z!xLRBUYvvS3g@PN;ld-8ME7E8-HYYL`{8Tz#P1qJk$%>WWaE|L$Wx{8H-2_CMuQ7% zKw8*ySESY}L?7F9^6VD8xx1|eT4WsIwVkzJ})gWG@~;pn3UPcG|&TE zG&ZJDIEpZ?Ck~3Qb;%}sF-W(0ByL%z%zKTftXNfufKW0R#8T2K{eW%(nK=Hgb-bZH z>0nH5P&d<0P7TeJVekk&9b^i;+W20ro6e$d)vo04n|(A~+>^iizQ`&=Mtb{RtMcuO zmrO}hIM5fZF*araUt1PbTYRBv5K??IBBCG5P6@-%xn(F`l*s2Z?SKR%Du z`35)mU~>8AoZY)4Mg$7EJz@Oo3~ifE3y8)i6C^#xR07UrDt>qC&G9tQe}N;ATg-oX zqcqk8f$&ZA<=dNYxyXq>}RANv=cmsA&QD(Xn&0#g0akY`NS{{7*V-8L(J=$VeB zY}0vMn=hli{bRd)`4G=LO~j{&qE?Q>*WGtX&h(ItN%m|MOi{iYd6XWy3Ow;w>?kNh-CZsr3HhYp%ej z3W&`0uLSS|PaT`G_dNPwJY-WeQuEz9wW9jpGe`~ash}buwWfq=8Ry}X4r-$4VqkiH zMN~Q30UFmdIwNRLH0-s{_wRXRP2NA?Vhy<-1TF!Cn2nfp2&kH)P8^a4AOw5>5yBxE zHYZ$m3eoT>gv%kfqwK>i>~+@dwCAPyX|JxkUSdDfH!b*_Ky-hy!^+e%x2(RnWLC5bZn^auEA0?~EiXPOn0Rls07U__a=_q+GCc5aZAL3>)jJXXtVshcQH^k^xgQDeL7)1 zNBiT`N5Qr~M4kJ6#Aa`n58=E5LpT+TlITD-!^q=gXGwIx5Pyn4wdS%sk50Q0NMqA> z1`Ht;ZKF+9uS=4Xo5#y9$>hmt->6nI>cePd-L7jFM*jA0&cBnBrMcHTKUeZpiQnlM zc~jTwGWlGf{ub|(`7%4{p?dW=FeitR;Mlo6^!2L4klq#Qx~omqTF!i(pSu!uZe8e} z(%vnH4h8n;w$XL^jAUkz%AK*WN_zv&*8p2tn$AMjAkT1mk1DEBX*|D%V@Drs;sn@< zd0Y4Bmq+`&5?qqV=s?(xVYoQ%9<`RBaJuU6zn9%i8;fGEVzN6>(&PwO=LQe-h3{|b zj0%=x2cOAND{C#xoveEtt}ownvAW12KzQBuoI>JPQ3}<0gz#ZP3=jOd{9-~Cmy@)% z=-{eVTOukFtc>M4Iwy8vwTFhL4j8?O+ux{cZwuc1k4U1Zl57tnJx( z?V4BY)G7xJ=Lp{$PmXP1Q%NhhpGvOmc|m`Q+;-riSA=%NfD$sJZyUF~qvU%0k@l(b zxDB5ybi6QqdZEcWniZ?1FA_A1OwP2JiSAVY6PTB5PBc1SG*p91B3PTXuIT-wmTr5Y zt)z>(VpEuwnK@TyJN&fkbx3cf*}jbDcl$J!3rn(tPzmkV&A`+GAndh5xqx;L%!)IE z!<>(x;J_lH<46g*!!;pf(7nAf!QteqNav7ao3z!mP%QQb&am9h(?657ObO6(=Pl%{DtQpsY zOGIm{!Z}*)tzubJ8xg}w!BDaQ_$|?*F~f;UrTfE_yh2W!GQ7&!2b>2;D;ZS!TB?Sd zj_v`Eov7FZqD(s*BFB1IB#-D{#gJwG+&oH)z**w5YL+$MlPXW!Tg6w2+Cyi(C3KW4 zdzmc24Pp*>*xs4RoqSw^5AeS6K*leJ-4PiWev_ zdgxX=WrH=g3D(wi4csyv2@$VEXfNZX5a*!g+ARp}i@t!m7~Y=u1<)MJ#pgt7O)`Ny zrw^;K=G;(T4k{r<-)tdMqouc6S3OPh#W-0VNPI%@W=PPtdA*plG<(pa2^!rEbp5pZ zt@pvV4C0Rbtz1g^p5t4ddcMS9W3$96ss32})puX&T&vbvJzMEsz}~vYFc3pw>w%Lc z1vg6FK8_4#R{AGooc30bn$`q&3k;!06C)*sT3Cds+7;PVpNDhJR&kXVZtXeoI)M1p z(&W#xabj@1<%IO=rl9xVwt8!g#ygz+GkSQ^?tb-m^m33;4?;OjhVEmZ2lWJ6+HQ_M z2sTmbA8P0@eD!K(!QpjSm)D^#vyyPip>|i-5+Lk)s0*-!wE?^~bEg<)C<<9fMVnCQ z8WPB^pM?=Zm>q>iR0TU4^Wv%7w!2RR!PRvZd5pW$Rl8u0oV*!z^zm$+O z#^Kcc_XMeDSF?}{6mfnS%2hBrRHM33jO)T^7CX$B+#5z*V}U=EEDK<5qo2}dGxwYVz=NV{1fmQQQTh>;WyL~s+*IJXg#Dd@ zN1gH5WQpC4P3lhnrk{tb83p-Poq0RG z5nI*Du5TNLsdwErECGRVT3B@)4M=TZ&&j{BR_`#1mm3ni1pH6><) zyz#UWntJiF0coirWb~?pcd;<()LZZS>#sF(w{c0l(ly0tOsyVGzspuSIYPvl;Lk6& zKQHz;KGuUk+&X+FAKRFB-2U2I-1Das{eN2@POT4i2wFV)X&^$|e^nw%xZkqCC((O7 z)81Lf;;NNr)<3Xxb=zQWfXSdPza^)1ovmcZ9CcmKc1XBBJ>2nbc6()j>ycG!SIh#i z%Rfi@mOW&;8R}f@!zp=!)qMj+_R$*#i8ma?gNRH&pLAd2sz^h?b-N#&$9w~I8K^=# z67}}v2P9L*=twO)-YHlqbEN#ghJVGK!D%{oy%`TxhqJP8myHRkSI+^(nF}L%B!_8 zDDI1gI8{2g$=QhRBxkE~6(1lj1vw!$WL(Ge`uu`=Iv2{|sXT(-oW zEHr-sbwVSt(&g*Oi-n>qsC33yiwMKzNC4<`ia-RB>AMn~Yxw4g@37dJS~~;mS0!qr zWLL6bjT+@H{LCD9W5#{_(;oYe$f;pvwK94kbH()QxPNoY?Y6 zBmr2bmkSoncbb2Qx)g91z9Q({IGqe21(rF8e3R`uM2bSs+PIMFiSpQP>c0ouns6E7? z=kw_nb#o%)*eH3)q+mcN?o{@cd0P>1MMIjJgIh&0N<>9%`EVaR z4QrKEL2N_$Ny`n*A7q^*z;(dLv`Zn!dS+gwduXioA|8a|EvDZ9>*f5MEd?mbN=qRX zp5~F%#}SGH0OXOJcYi?lF;jvS7M7r7&7JxYjtgesM>QmRx`FG z2yVAd5eMSOCpm5-b=P75)fSDV``li zJWb&=+bZf0Iz{xw%=d_J`c!KvC%VW_pb|OCf!krGn}SN`))dSkz$l=wMap#t@{QtZ z-U!{{tw?)&f;E9e;28k6;fua40ERp|;oWr`NKb>ERi$rkLS)36E{(aPoD`E0Up9SJ z#8?h~ZpxlzAksx9(1p*iFM9LBL3NB}EAztN0v_SMLadN6@Rs*R>xf>>xWHyI*g`q# z+}C|j6`oeF-WOb*KU3Am8+KsLJ^VR7X^)-Pu5!jv*3D^~2N~3WViMuQv$qBRmke>! z{x28zzjGH&;HT-Yb#s3Gf$6~3yF%eU)AM(H;l&9JiX8NOmT1uMo{W= z7wHjV^5Z6EiV&QDwwy22bN!PTve8I?J^g{sio`1KpG!1uf{Lhj=x*CG@IkuasbJZ(a4%4O+5J@)@2CF|-@nyRR#HW8^Dq1AOmL5?l^~ z1$BgIFF$w){^REl_)wa8!K(zQ;MBrDf`i)GXLsOxVe2Y;rAT)TOK)tKd#H$nj#gda zuxvM6;CRRx2l5@2qD$^0IeG<%215eG<061pqH?>9AqpI~n!{yst!tt3eWWH9qCx57 z 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/ui/nav_effect_icon.png b/src/main/resources/assets/lzxnoneterraria/textures/ui/nav_effect_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8df4802f3bc30233332ce8b5885556777f050884 GIT binary patch literal 1587 zcma)7eKgcr7=C{mw!sa6%vC}!skzq*ABpK|lv*+x8d)6QK-t(S&@B6&(^E~(5WKV{x zp02Sj0O--(oSEpF_ho3~(K)3fmT&$kb z{9M~%pF66)z?;n}luxzaty`rNCZSwe$h~&4A}D`nZ0ifH8lS3w!NjM5afkPS zk44FQKQMHDNi+(d>cs($y`xi?gOCB~3&LntcLoh8B1^Gl*xS}RMJO8fr;Ktu8Co-N z-az8VSHC#6iug8r+G=dm$jo$)V$4ezGe23ws`>Q7T$GwlvU>ROD@5WSQcv`ed_BQ$ zqiK=h&aFmz^As*-MY~d!+tQEpBTug4{=uu(+AWBhJ3hgm;49oQ)}Sq;1t^LM1j)B) z+&JnZOZ}>Lc_xD$ZsO-Cv|HERCjKP;wgh2ku$GFo*!y|P4c36m%LH)xaP&?Y7UL<^ zXA)>|S;oABA@Ri-Hyr?Di@QCrh7YXb#BPMd-ze#Rh+g4ZJRtI6WqiRdv_3EEjptDs zv~8qTfC&9`L|8I7u| z%^Z=Uz!5AjWAuzy^`^%vJ(?Ps$r&DICRq}_iy7?mY;!v&k=1)<}J*wSSEYt_yA-=bzJS<#;dPl_i07{9{I_S?BI zDPRp`8W^AeyP=>r-XBMUMR#(qU>l&VEUAVy#61qCJi=4?f)tOkNU;#=qAcDokfJQw zS?%{in;}t)sVIwd9WfILAL6-JUP{Tl;dWk`@NRd<6n%ly=DQhfNSWM{Roccpn1eNJ zz{y_KfoH7$oC})raq~N%f$>Gny=4Z`jfK3;{@rIpS>K%zbuvokG~V+Q&3ESp%EMHD zRk>%)D}Q;z98!jj7dS8u=muimzGK7Yni7o}VE+6e=p5>By}gT`%M8@}lH@h#zRwDs zyrf`e#|C~-cUg<%vuC=PL$&#i1(iFR7+)lcGb>&SH-gkCJZ(%px)!xvtyw-673lr+ z6;$Z|4^D@l`bMZUC8`pg+6vT`8!zJ+Bal%wsurYe7tx77_W>V~I`a1@oX zA;gVw_tlL0{MsjFPMu;x0HWx3wQpw8|G3z+*rvH=00001bW%=J06^y0W&i*I2}wjj zRCwCO)Ik!1APfaigG3Zkv1+Sr?|;wohef*V4C(Z*SUj900^RrNOMb`NF;m}XWG^+?E98f z97oxWnmpp4PY6#|jy#374CXa!g!ROpw=g#KmKNg8> z|FbRctoJSZoWw2KMiEq#-y?LkI(U#9`ocmZ?mT4Rv4a|^~#au{gImoCP!sI zm~{Hnt?V~b+5>&u@8+${uDeq2$icK>x<}H~TD>Z7@u!UM`*t~=d6BmL;(M7c2A}($ z25Uc_^IEEWD0_an-~M2aM|&S!4(Hk3Gu^8^Y+vNWFY*7`o%vWF2sHftR6BWr?$mcZ zCGwVa%O^b9CweDSVJcrk^^0;YPf3Q}NG;w5Mgs=60}K)j%n1xU$ecfZiYKuML)19H zHU7EI5On3Id#$7^11rcW-4EU<78rUj-K}N+UG8y?-UsVe6^7%CZzl10T%6)n7Er)y z?e@dWR5160b(_*Y-t%=zu}tTeOu8$)u4y`h;Ma@ac9!@%bFTYGF_o!vHo?^%cJ5wt8>*j9=EW?|M ze^NnQ?)_qZiPs;TPoCNAc&2~n@?CE> z*L$Zq%YOKjzRj9z{m*%s_x;VqHbnRLnChSLe8@TbW%`_dyp{8%PHvI*(PRJuPgg&e IbxsLQ03N=MN&o-= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/ui/config.xml b/src/main/resources/assets/lzxnoneterraria/ui/config.xml new file mode 100644 index 0000000..87aaa15 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/ui/config.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +