From 189572c7b71a63bf900ab8eecce08205b1bae8a7 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Fri, 14 Aug 2026 02:26:04 +0800 Subject: [PATCH] v1.7.4 --- .../terraria/LzxnoneTerrariaClient.java | 3 + .../java/com/lzxnone/terraria/ModSounds.java | 20 ++ .../terraria/attachment/PlayerMana.java | 101 +++--- .../ClientStaticSummonRenderBehaviors.java | 2 + .../client/event/ItemTooltipHandler.java | 60 ++++ .../terraria/client/event/ShaderRegistry.java | 13 + .../client/item/magic/ClientBetsysWrath.java | 103 ++++++ .../ModCreativeModeTabs.java | 3 + .../dynamic_lights/MEntityLuminance.java | 4 +- .../terraria/effect/BetsysCurseEffect.java | 99 ++++++ .../lzxnone/terraria/effect/ModEffects.java | 2 + .../terraria/entity/ModRenderTypes.java | 42 --- .../entity/summon/StaticSummonBehaviors.java | 9 + .../terraria/event/EntityEventHandler.java | 60 +++- .../event/PlayerManaSyncEventHandler.java | 13 +- .../com/lzxnone/terraria/item/ModItems.java | 4 + .../com/lzxnone/terraria/item/ammo/Ammo.java | 5 + .../terraria/item/ammo/ChlorophyteBullet.java | 5 + .../terraria/item/ammo/CrystalBullet.java | 5 + .../terraria/item/ammo/CursedBullet.java | 5 + .../terraria/item/ammo/ExplodingBullet.java | 5 + .../terraria/item/ammo/GoldenBullet.java | 5 + .../item/ammo/HighVelocityBullet.java | 5 + .../terraria/item/ammo/IchorBullet.java | 5 + .../terraria/item/ammo/LuminiteBullet.java | 5 + .../terraria/item/ammo/MeteorShot.java | 5 + .../terraria/item/ammo/MusketBall.java | 5 + .../terraria/item/ammo/NanoBullet.java | 5 + .../terraria/item/ammo/PartyBullet.java | 5 + .../terraria/item/ammo/SilverBullet.java | 5 + .../terraria/item/ammo/TungstenBullet.java | 5 + .../terraria/item/ammo/VenomBullet.java | 5 + .../terraria/item/ammo/WoodenArrow.java | 5 + .../terraria/item/food/ManaCrystal.java | 12 +- .../terraria/item/normal/ManaStar.java | 8 +- .../item/potion/AbstractManaPotion.java | 8 +- .../terraria/item/weapon/MagicWeapon.java | 211 +++++++++---- .../terraria/item/weapon/MeleeWeapon.java | 73 +++++ .../terraria/item/weapon/RangedWeapon.java | 26 +- .../terraria/item/weapon/SummonWeapon.java | 7 + .../lzxnone/terraria/item/weapon/Weapon.java | 18 +- .../item/weapon/magic/BetsyWrath.java | 298 ++++++++++++++++++ .../terraria/item/weapon/magic/BubbleGun.java | 204 ++++++++++++ .../terraria/item/weapon/magic/LastPrism.java | 59 ++-- .../item/weapon/magic/LunarFlare.java | 250 +++++++++++++++ .../terraria/item/weapon/melee/BeeKeeper.java | 38 +-- .../item/weapon/melee/BladeOfGrass.java | 38 +-- .../item/weapon/melee/BloodButcherer.java | 39 ++- .../item/weapon/melee/CopperShortsword.java | 35 +- .../item/weapon/melee/DevilsDevastation.java | 37 +-- .../item/weapon/melee/EnchantedSword.java | 40 +-- .../terraria/item/weapon/melee/Excalibur.java | 38 +-- .../item/weapon/melee/FirstFractal.java | 38 +-- .../item/weapon/melee/InfluxWaver.java | 38 +-- .../item/weapon/melee/LightsBane.java | 40 ++- .../terraria/item/weapon/melee/Mace.java | 38 +-- .../terraria/item/weapon/melee/Meowmere.java | 38 +-- .../terraria/item/weapon/melee/Muramasa.java | 38 +-- .../item/weapon/melee/NightsEdge.java | 38 +-- .../terraria/item/weapon/melee/Seedler.java | 38 +-- .../terraria/item/weapon/melee/StarWrath.java | 38 +-- .../terraria/item/weapon/melee/Starfury.java | 38 +-- .../item/weapon/melee/TerraBlade.java | 38 +-- .../terraria/item/weapon/melee/Terragrim.java | 38 +-- .../item/weapon/melee/TheHorsemansBlade.java | 38 +-- .../weapon/melee/TrueCopperShortsword.java | 34 +- .../item/weapon/melee/TrueExcalibur.java | 38 +-- .../item/weapon/melee/TrueNightsEdge.java | 38 +-- .../terraria/item/weapon/melee/Volcano.java | 38 +-- .../terraria/item/weapon/melee/Zenith.java | 38 +-- .../item/weapon/ranged/ElfMelter.java | 6 + .../item/weapon/ranged/Flamethrower.java | 6 + .../item/weapon/ranged/SnowballCannon.java | 6 + .../item/weapon/ranged/StarCannon.java | 6 + .../item/weapon/ranged/SuperStarShooter.java | 6 + .../terraria/item/weapon/ranged/bow/Bow.java | 13 + .../weapon/ranged/bow/DaedalusStormbow.java | 14 +- .../terraria/item/weapon/ranged/gun/Gun.java | 32 +- .../item/weapon/ranged/gun/SniperRifle.java | 5 + .../terraria/item/weapon/ranged/gun/Uzi.java | 5 + .../item/weapon/ranged/gun/VenusMagnum.java | 5 + .../summon/minion/StardustDragonStaff.java | 14 + .../weapon/summon/minion/Terraprisma.java | 7 + .../item/weapon/summon/whip/Whip.java | 7 + .../terraria/mixin/ItemEntityMixin.java | 64 ---- .../lzxnone/terraria/mixin/UseSpeedMixin.java | 3 +- .../terraria/particle/CircleParticle.java | 13 +- .../DevilsDevastationRuneParticle.java | 13 +- .../DevilsDevastationRuneParticle2.java | 13 +- .../terraria/particle/DustParticle.java | 9 +- .../particle/EmissiveBloomParticle.java | 77 ----- .../terraria/particle/IronSparkParticle.java | 11 +- .../particle/LunarFlareExplosionParticle.java | 66 ++++ .../particle/ModParticleRenderTypes.java | 16 +- .../terraria/particle/ModParticles.java | 2 + .../terraria/ui/config/ConfigList.java | 12 + .../lzxnone/terraria/utils/DamageUtil.java | 7 +- .../assets/lzxnoneterraria/lang/en_us.json | 47 ++- .../assets/lzxnoneterraria/lang/zh_cn.json | 47 ++- .../models/item/betsys_wrath.json | 6 + .../lzxnoneterraria/models/item/book.json | 25 ++ .../models/item/bubble_gun.json | 6 + .../models/item/bubble_gun_projectile.json | 6 + .../models/item/lunar_flare.json | 6 + .../lunar_flare_explosion_particle.json | 11 + .../shaders/core/particle_bloom.fsh | 24 ++ .../shaders/core/particle_bloom.json | 16 + .../shaders/core/particle_bloom.vsh | 26 ++ .../assets/lzxnoneterraria/sounds.json | 23 ++ .../sounds/betsys_fireball_collide.ogg | Bin 0 -> 19537 bytes .../sounds/betsys_fireball_collide2.ogg | Bin 0 -> 11118 bytes .../sounds/betsys_fireball_collide3.ogg | Bin 0 -> 11709 bytes .../sounds/betsys_fireball_shoot.ogg | Bin 0 -> 11598 bytes .../sounds/betsys_fireball_shoot2.ogg | Bin 0 -> 12011 bytes .../sounds/betsys_fireball_shoot3.ogg | Bin 0 -> 12719 bytes .../lzxnoneterraria/sounds/bow_shot.wav | Bin 51244 -> 0 bytes .../assets/lzxnoneterraria/sounds/bubble.ogg | Bin 0 -> 6162 bytes .../lzxnoneterraria/sounds/bubble_break.ogg | Bin 0 -> 6391 bytes .../lzxnoneterraria/sounds/magic_shoot.ogg | Bin 0 -> 12143 bytes .../textures/item/betsys_curse.png | Bin 0 -> 191 bytes .../textures/item/betsys_wrath.png | Bin 0 -> 523 bytes .../textures/item/bubble_gun.png | Bin 0 -> 256 bytes .../textures/item/bubble_gun_projectile.png | Bin 0 -> 384 bytes .../textures/item/lunar_flare.png | Bin 0 -> 238 bytes .../textures/mob_effect/betsys_curse.png | Bin 0 -> 191 bytes .../lunar_flare_explosion_particle.gif | Bin 0 -> 4285 bytes .../lunar_flare_explosion_particle0.png | Bin 0 -> 541 bytes .../lunar_flare_explosion_particle1.png | Bin 0 -> 787 bytes .../lunar_flare_explosion_particle2.png | Bin 0 -> 1119 bytes .../lunar_flare_explosion_particle3.png | Bin 0 -> 1497 bytes .../lunar_flare_explosion_particle4.png | Bin 0 -> 1264 bytes .../lunar_flare_explosion_particle5.png | Bin 0 -> 1024 bytes .../lunar_flare_explosion_particle6.png | Bin 0 -> 678 bytes .../textures/vfx/betsys_fireball.png | Bin 0 -> 575 bytes .../textures/vfx/normal_wave.png | Bin 0 -> 1680 bytes .../tags/item/magic_weapons.json | 5 +- .../tags/item/spread_ranged_weapons.json | 3 +- .../resources/lzxnoneterraria.mixins.json | 1 - 138 files changed, 2503 insertions(+), 931 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/client/item/magic/ClientBetsysWrath.java create mode 100644 src/main/java/com/lzxnone/terraria/effect/BetsysCurseEffect.java create mode 100644 src/main/java/com/lzxnone/terraria/item/weapon/magic/BetsyWrath.java create mode 100644 src/main/java/com/lzxnone/terraria/item/weapon/magic/BubbleGun.java create mode 100644 src/main/java/com/lzxnone/terraria/item/weapon/magic/LunarFlare.java delete mode 100644 src/main/java/com/lzxnone/terraria/mixin/ItemEntityMixin.java delete mode 100644 src/main/java/com/lzxnone/terraria/particle/EmissiveBloomParticle.java create mode 100644 src/main/java/com/lzxnone/terraria/particle/LunarFlareExplosionParticle.java create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/betsys_wrath.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/book.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/bubble_gun.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/bubble_gun_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/lunar_flare.json create mode 100644 src/main/resources/assets/lzxnoneterraria/particles/lunar_flare_explosion_particle.json create mode 100644 src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.fsh create mode 100644 src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.json create mode 100644 src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.vsh create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_collide.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_collide2.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_collide3.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_shoot.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_shoot2.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_shoot3.ogg delete mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/bow_shot.wav create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/bubble.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/bubble_break.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/magic_shoot.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/betsys_curse.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/betsys_wrath.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/bubble_gun.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/bubble_gun_projectile.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/lunar_flare.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/mob_effect/betsys_curse.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle.gif create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle0.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle1.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle2.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle3.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle4.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle5.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle6.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/vfx/betsys_fireball.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/vfx/normal_wave.png diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java index de719d1..daf5973 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java @@ -83,6 +83,9 @@ public class LzxnoneTerrariaClient { modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { event.registerSpriteSet(ModParticles.SOLAR_EXPLOSION_PARTICLE.get(), SolarExplosionParticle.Provider::new); }); + modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { + event.registerSpriteSet(ModParticles.LUNAR_FLARE_EXPLOSION_PARTICLE.get(), LunarFlareExplosionParticle.Provider::new); + }); modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { event.registerSpriteSet(ModParticles.CRYSTAL_FRAGMENT_PARTICLE.get(), CrystalFragmentParticle.Provider::new); }); diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index c97feee..c3dec7b 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -19,6 +19,26 @@ public class ModSounds { SOUND_EVENTS.register("beam2", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "beam2"))); + public static final Supplier BETSYS_FIREBALL_SHOOT = + SOUND_EVENTS.register("betsys_fireball_shoot", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "betsys_fireball_shoot"))); + public static final Supplier BETSYS_FIREBALL_COLLIDE = + SOUND_EVENTS.register("betsys_fireball_collide", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "betsys_fireball_collide"))); + public static final Supplier MAGIC_SHOOT = + SOUND_EVENTS.register("magic_shoot", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "magic_shoot"))); + public static final Supplier BUBBLE = + SOUND_EVENTS.register("bubble", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "bubble"))); + public static final Supplier BUBBLE_BREAK = + SOUND_EVENTS.register("bubble_break", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "bubble_break"))); public static final Supplier MAX_MANA = SOUND_EVENTS.register("max_mana", () -> SoundEvent.createVariableRangeEvent( diff --git a/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java b/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java index c12fdb2..eb2ed53 100644 --- a/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java +++ b/src/main/java/com/lzxnone/terraria/attachment/PlayerMana.java @@ -1,7 +1,9 @@ package com.lzxnone.terraria.attachment; +import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; public class PlayerMana { @@ -79,26 +81,63 @@ public class PlayerMana { return recoverDelay; } - public boolean hasMana() { - return mana > 0; + public static boolean recoverMana(ServerPlayer player, double amount) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int oldMana = mana.getMana(); + if(!mana.recoverMana(amount)) return false; + + player.setData(ModAttachments.PLAYER_MANA, mana); + if(mana.getMana() != oldMana) { + PlayerManaSyncEventHandler.playMaxManaSoundIfRecovered(player, oldMana, mana); + PlayerManaSyncEventHandler.sync(player); + } + return true; } - //通过魔力水晶增加基础最大魔力 - public int increaseBaseMaxMana(int amount) { - if(amount <= 0 || baseMaxMana >= MAX_BASE_MANA) return 0; + public static boolean consumeMana(ServerPlayer player, double amount) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int oldMana = mana.getMana(); + if(!mana.consumeMana(amount)) return false; - int oldBaseMaxMana = baseMaxMana; - setBaseMaxMana(Math.min(baseMaxMana + amount, MAX_BASE_MANA)); - int increase = baseMaxMana - oldBaseMaxMana; - setMana(mana + increase); - return increase; + mana.applyRecoverDelay(); + player.setData(ModAttachments.PLAYER_MANA, mana); + if(mana.getMana() != oldMana) { + PlayerManaSyncEventHandler.sync(player); + } + return true; + } + + public static boolean setBaseMaxMana(ServerPlayer player, int baseMaxMana) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int oldMana = mana.getMana(); + int oldBaseMaxMana = mana.getBaseMaxMana(); + mana.setBaseMaxMana(Mth.clamp(baseMaxMana, 0, MAX_BASE_MANA)); + if(oldMana == mana.getMana() && oldBaseMaxMana == mana.getBaseMaxMana()) return false; + + player.setData(ModAttachments.PLAYER_MANA, mana); + PlayerManaSyncEventHandler.sync(player); + return true; + } + + public static boolean setBonusMaxMana(ServerPlayer player, int bonusMaxMana) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int oldMana = mana.getMana(); + int oldBonusMaxMana = mana.getBonusMaxMana(); + mana.setBonusMaxMana(bonusMaxMana); + if(oldMana == mana.getMana() && oldBonusMaxMana == mana.getBonusMaxMana()) return false; + + player.setData(ModAttachments.PLAYER_MANA, mana); + PlayerManaSyncEventHandler.sync(player); + return true; } //通过累加计数器恢复魔力 - public boolean recoverMana(double amount) { + private boolean recoverMana(double amount) { if(amount <= 0.0D || mana >= getMaxMana()) return false; - int recoverAmount = addManaProgress(false, amount); + double progress = recoverProgress + amount; + int recoverAmount = (int)Math.floor(progress); + recoverProgress = progress - recoverAmount; if(recoverAmount <= 0) return true; int oldMana = mana; @@ -106,27 +145,16 @@ public class PlayerMana { return mana != oldMana; } - //直接恢复指定值的魔力 - public boolean recoverManaImmediately(int amount) { - if(amount <= 0 || mana >= getMaxMana()) return false; - - int oldMana = mana; - setMana(mana + amount); - return mana != oldMana; - } - //通过累加计数器消耗魔力 - public boolean consumeMana(double amount) { + private boolean consumeMana(double amount) { if(amount <= 0.0D) return true; if(mana <= 0) return false; + if(mana < (int)Math.floor(consumeProgress + amount)) return false; - int consumeAmount = addManaProgress(true, amount); - if(consumeAmount <= 0) return mana > 0; - - if(consumeAmount >= mana) { - mana = 0; - return false; - } + double progress = consumeProgress + amount; + int consumeAmount = (int)Math.floor(progress); + consumeProgress = progress - consumeAmount; + if(consumeAmount <= 0) return true; mana -= consumeAmount; return true; @@ -137,7 +165,7 @@ public class PlayerMana { if(getMaxMana() <= 0) return; double emptyRatio = 1.0D - (double) mana / getMaxMana(); - recoverDelay = Math.max(recoverDelay, (int) Math.ceil(0.7D * (emptyRatio * 240.0D + 45.0D))); + recoverDelay = Math.max(recoverDelay, (int) Math.ceil(0.7D * (emptyRatio * 240.0D + 45.0D) / 3.0D)); recoverProgress = 0.0D; } @@ -150,17 +178,4 @@ public class PlayerMana { return recoverDelay > 0; } - //累计计数器 - private int addManaProgress(boolean consume, double amount) { - double progress = (consume ? consumeProgress : recoverProgress) + amount; - int wholeAmount = (int)Math.floor(progress); - double nextProgress = progress - wholeAmount; - - if(consume) { - consumeProgress = nextProgress; - }else { - recoverProgress = nextProgress; - } - return wholeAmount; - } } diff --git a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java index c07d52d..18ed3d6 100644 --- a/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/client/entity/summon/ClientStaticSummonRenderBehaviors.java @@ -4,6 +4,7 @@ import com.lzxnone.terraria.client.item.normal.ClientDropFallenStar; import com.lzxnone.terraria.client.item.normal.ClientManaStar; import com.lzxnone.terraria.client.item.ranged.ClientArrowAmmo; import com.lzxnone.terraria.client.item.ranged.ClientBulletAmmo; +import com.lzxnone.terraria.client.item.magic.ClientBetsysWrath; import com.lzxnone.terraria.client.item.magic.ClientLastPrism; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; import com.lzxnone.terraria.client.item.melee.ClientFirstFractal; @@ -53,6 +54,7 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.DEVILS_DEVASTATION_MARK_LIGHTNING, ClientDevilsDevastation.SUMMON_BEHAVIOR4); BEHAVIORS.put(StaticSummonBehaviors.LAST_PRISM_TRI, ClientLastPrism.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.LAST_PRISM_BEAM, ClientLastPrism.SUMMON_BEHAVIOR2); + BEHAVIORS.put(StaticSummonBehaviors.BETSY_WRATH, ClientBetsysWrath.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.TERRAPRISMA, ClientTerraprisma.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.POSSESSION, ClientWhip.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.POSSESSION_VISION, DEFAULT_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/client/event/ItemTooltipHandler.java b/src/main/java/com/lzxnone/terraria/client/event/ItemTooltipHandler.java index 76ef0da..7e4918c 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/ItemTooltipHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/ItemTooltipHandler.java @@ -1,6 +1,9 @@ package com.lzxnone.terraria.client.event; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.weapon.MagicWeapon; +import com.lzxnone.terraria.item.weapon.RangedWeapon; +import com.lzxnone.terraria.item.weapon.SummonWeapon; import com.lzxnone.terraria.item.weapon.summon.minion.MinionWeapon; import net.minecraft.ChatFormatting; import net.minecraft.core.Holder; @@ -26,6 +29,9 @@ public class ItemTooltipHandler { public static void onItemTooltip(ItemTooltipEvent event) { addEnchantedBookTooltip(event); addMinionWeaponTooltip(event); + addRangedWeaponTooltip(event); + addSummonWeaponTooltip(event); + addMagicWeaponTooltip(event); } private static void addEnchantedBookTooltip(ItemTooltipEvent event) { @@ -68,4 +74,58 @@ public class ItemTooltipHandler { } } } + + private static void addMagicWeaponTooltip(ItemTooltipEvent event) { + ItemStack stack = event.getItemStack(); + if(stack.getItem() instanceof MagicWeapon magicWeapon) { + Player player = event.getEntity(); + if(player != null) { + float damage = magicWeapon.getTooltipDamage(stack, player); + if(damage > 0.0F) { + event.getToolTip().add( + Component.translatable( + "tooltip.lzxnoneterraria.magic_weapon_damage", + damage == Math.rint(damage) ? String.valueOf((int) damage) : String.format("%.2f", damage) + ).withStyle(ChatFormatting.RED) + ); + } + } + } + } + + private static void addRangedWeaponTooltip(ItemTooltipEvent event) { + ItemStack stack = event.getItemStack(); + if(stack.getItem() instanceof RangedWeapon rangedWeapon) { + Player player = event.getEntity(); + if(player != null) { + float damage = rangedWeapon.getTooltipDamage(stack, player); + if(damage > 0.0F) { + event.getToolTip().add( + Component.translatable( + "tooltip.lzxnoneterraria.ranged_weapon_damage", + damage == Math.rint(damage) ? String.valueOf((int) damage) : String.format("%.2f", damage) + ).withStyle(ChatFormatting.RED) + ); + } + } + } + } + + private static void addSummonWeaponTooltip(ItemTooltipEvent event) { + ItemStack stack = event.getItemStack(); + if(stack.getItem() instanceof SummonWeapon summonWeapon) { + Player player = event.getEntity(); + if(player != null) { + float damage = summonWeapon.getTooltipDamage(stack, player); + if(damage > 0.0F) { + event.getToolTip().add( + Component.translatable( + "tooltip.lzxnoneterraria.summon_weapon_damage", + damage == Math.rint(damage) ? String.valueOf((int) damage) : String.format("%.2f", damage) + ).withStyle(ChatFormatting.RED) + ); + } + } + } + } } diff --git a/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java b/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java index c9b636b..4e996ab 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java +++ b/src/main/java/com/lzxnone/terraria/client/event/ShaderRegistry.java @@ -16,6 +16,7 @@ public class ShaderRegistry { private static ShaderInstance blur; private static ShaderInstance composite; private static ShaderInstance outline; + private static ShaderInstance particleBloom; public static ShaderInstance getBlur() { return blur; @@ -29,6 +30,10 @@ public class ShaderRegistry { return outline; } + public static ShaderInstance getParticleBloom() { + return particleBloom; + } + @SubscribeEvent public static void registerShaders(RegisterShadersEvent event) { try { @@ -56,6 +61,14 @@ public class ShaderRegistry { ), shader -> outline = shader ); + event.registerShader( + new ShaderInstance( + event.getResourceProvider(), + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "particle_bloom"), + DefaultVertexFormat.PARTICLE + ), + shader -> particleBloom = shader + ); } catch (IOException e) { throw new RuntimeException("Shader load error", e); } diff --git a/src/main/java/com/lzxnone/terraria/client/item/magic/ClientBetsysWrath.java b/src/main/java/com/lzxnone/terraria/client/item/magic/ClientBetsysWrath.java new file mode 100644 index 0000000..3a717f7 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/magic/ClientBetsysWrath.java @@ -0,0 +1,103 @@ +package com.lzxnone.terraria.client.item.magic; + +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.entity.ModRenderTypes; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.utils.MathUtil; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.phys.Vec3; +import org.joml.Matrix4f; +import org.joml.Quaternionf; + +import java.util.LinkedList; + +public class ClientBetsysWrath { + private static final ResourceLocation RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/normal_wave.png"); + private static final int POINTS_PER_SECTION = 2; + private static final float[] PLANE_ROTATIONS = new float[]{0.0F, 60.0F, 120.0F}; + private static final double SCALE = 2.0D; + private static final float TAIL_COLOR_START = 0.1F; + private static final float BODY_RED = 1.0F; + private static final float BODY_GREEN = 0.85F; + private static final float BODY_BLUE = 0.12F; + private static final float TAIL_RED = 0.65F; + private static final float TAIL_GREEN = 0.0F; + private static final float TAIL_BLUE = 0.0F; + + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + LinkedList positions = summon.trailPositions; + if(positions.size() < POINTS_PER_SECTION * 2) return; + + VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES)); + Matrix4f matrix = poseStack.last().pose(); + Vec3 renderOrigin = summon.getPosition(partialTick); + int sectionCount = positions.size() / POINTS_PER_SECTION; + + for(float rotationDegrees : PLANE_ROTATIONS) { + for(int i = 0; i < sectionCount - 1; i++) { + Vec3 sectionRight0 = positions.get(i * POINTS_PER_SECTION); + Vec3 sectionLeft0 = positions.get(i * POINTS_PER_SECTION + 1); + Vec3 sectionRight1 = positions.get((i + 1) * POINTS_PER_SECTION); + Vec3 sectionLeft1 = positions.get((i + 1) * POINTS_PER_SECTION + 1); + + Vec3 center0 = sectionRight0.add(sectionLeft0).scale(0.5D); + Vec3 center1 = sectionRight1.add(sectionLeft1).scale(0.5D); + Vec3 half0 = sectionRight0.subtract(sectionLeft0).scale(0.5D * SCALE); + Vec3 half1 = sectionRight1.subtract(sectionLeft1).scale(0.5D * SCALE); + Vec3 direction = center1.subtract(center0); + + if(direction.lengthSqr() > 1.0E-7D) { + Quaternionf rotation = new Quaternionf().fromAxisAngleRad(direction.normalize().toVector3f(), (float) Math.toRadians(rotationDegrees)); + half0 = MathUtil.toVec3(half0.toVector3f().rotate(rotation)); + half1 = MathUtil.toVec3(half1.toVector3f().rotate(rotation)); + } + + Vec3 right0 = center0.add(half0).subtract(renderOrigin); + Vec3 left0 = center0.subtract(half0).subtract(renderOrigin); + Vec3 right1 = center1.add(half1).subtract(renderOrigin); + Vec3 left1 = center1.subtract(half1).subtract(renderOrigin); + + float v0 = i / (float) (sectionCount - 1); + float v1 = (i + 1) / (float) (sectionCount - 1); + float u0 = 1.0F - v0; + float u1 = 1.0F - v1; + float tail0 = Math.max(0.0F, Math.min(1.0F, (v0 - TAIL_COLOR_START) / (1.0F - TAIL_COLOR_START))); + float tail1 = Math.max(0.0F, Math.min(1.0F, (v1 - TAIL_COLOR_START) / (1.0F - TAIL_COLOR_START))); + for(int layer = 0; layer < 2; layer++) { + boolean tailLayer = layer == 1; + float red0 = tailLayer ? TAIL_RED : BODY_RED; + float green0 = tailLayer ? TAIL_GREEN : BODY_GREEN; + float blue0 = tailLayer ? TAIL_BLUE : BODY_BLUE; + float alpha0 = tailLayer ? tail0 : 1.0F - tail0; + float red1 = tailLayer ? TAIL_RED : BODY_RED; + float green1 = tailLayer ? TAIL_GREEN : BODY_GREEN; + float blue1 = tailLayer ? TAIL_BLUE : BODY_BLUE; + float alpha1 = tailLayer ? tail1 : 1.0F - tail1; + + consumer.addVertex(matrix, (float) left0.x, (float) left0.y, (float) left0.z) + .setColor(red0, green0, blue0, alpha0).setUv(u0, 0.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(matrix, (float) right0.x, (float) right0.y, (float) right0.z) + .setColor(red0, green0, blue0, alpha0).setUv(u0, 1.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(matrix, (float) right1.x, (float) right1.y, (float) right1.z) + .setColor(red1, green1, blue1, alpha1).setUv(u1, 1.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(matrix, (float) left1.x, (float) left1.y, (float) left1.z) + .setColor(red1, green1, blue1, alpha1).setUv(u1, 0.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + } + } + } + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java index ee8eb40..c85fc3d 100644 --- a/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java +++ b/src/main/java/com/lzxnone/terraria/creative_mode_tab/ModCreativeModeTabs.java @@ -53,6 +53,9 @@ public class ModCreativeModeTabs { .icon(() -> ModItems.LAST_PRISM.get().getDefaultInstance()) .displayItems((parameters, output) -> { output.accept(ModItems.LAST_PRISM.get()); + output.accept(ModItems.BETSY_WRATH.get()); + output.accept(ModItems.LUNAR_FLARE.get()); + output.accept(ModItems.BUBBLE_GUN.get()); output.accept(ModItems.MANA_CRYSTAL.get()); output.accept(ModItems.LESSER_MANA_POTION.get()); output.accept(ModItems.MANA_POTION.get()); diff --git a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java index 6a386d4..e534106 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -60,6 +60,7 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.DEVILS_DEVASTATION_MARK_LIGHTNING, StaticSummonBehaviors.LAST_PRISM_TRI, StaticSummonBehaviors.LAST_PRISM_BEAM, + StaticSummonBehaviors.LUNAR_FLARE, StaticSummonBehaviors.TERRAPRISMA, StaticSummonBehaviors.FLAMETHROWER_FLAME, StaticSummonBehaviors.ELF_MELTER_FLAME, @@ -67,7 +68,8 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.FALLEN_STAR, StaticSummonBehaviors.FALLEN_STAR_SUPER, StaticSummonBehaviors.DROP_FALLEN_STAR, - StaticSummonBehaviors.MANA_STAR -> { + StaticSummonBehaviors.MANA_STAR, + StaticSummonBehaviors.BETSY_WRATH -> { return 15; } case StaticSummonBehaviors.CHLOROPHYTE_BULLET, diff --git a/src/main/java/com/lzxnone/terraria/effect/BetsysCurseEffect.java b/src/main/java/com/lzxnone/terraria/effect/BetsysCurseEffect.java new file mode 100644 index 0000000..ae3bb11 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/effect/BetsysCurseEffect.java @@ -0,0 +1,99 @@ +package com.lzxnone.terraria.effect; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.particle.DustParticleOptions; +import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +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; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.AttributeInstance; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +public class BetsysCurseEffect extends MobEffect { + public static final ConfigFloat ARMOR_REDUCTION_PER_LEVEL = new ConfigFloat("effect.betsys_curse.armor_reduction_per_level", "betsys_curse_armor_reduction_per_level", 15.0f, 0.0f, 1024.0f); + private static final ResourceLocation ARMOR_REDUCTION_ID = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "betsys_curse_armor_reduction"); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(ARMOR_REDUCTION_PER_LEVEL); + } + }; + + public static float getArmorReductionPerLevel() { + return ARMOR_REDUCTION_PER_LEVEL.get(); + } + + public static void applyArmorReduction(LivingEntity entity) { + removeArmorReduction(entity); + + MobEffectInstance instance = entity.getEffect(ModEffects.BETSYS_CURSE); + if(instance == null) return; + + double reduction = getArmorReductionPerLevel() * (instance.getAmplifier() + 1); + if(reduction <= 0.0D) return; + + AttributeInstance armor = entity.getAttribute(Attributes.ARMOR); + if(armor != null) { + armor.addTransientModifier(new AttributeModifier( + ARMOR_REDUCTION_ID, + -reduction, + AttributeModifier.Operation.ADD_VALUE + )); + } + } + + public static void removeArmorReduction(LivingEntity entity) { + AttributeInstance armor = entity.getAttribute(Attributes.ARMOR); + if(armor != null) armor.removeModifier(ARMOR_REDUCTION_ID); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "betsys_curse", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/betsys_curse.png"), + Component.translatable("effect.lzxnoneterraria.betsys_curse"), + CONFIG_DATA + ); + + public BetsysCurseEffect() { + super(MobEffectCategory.HARMFUL, 0x8A2BE2); + } + + public static final DustParticleOptions PARTICLE = new DustParticleOptions( + 0.08f, 0.5f, 40, true, new Vector3f[]{ + new Vector3f(0.85F, 0.25F, 1.0F), + new Vector3f(0.6F, 0.0F, 0.85F), + new Vector3f(0.35F, 0.0F, 0.55F), + new Vector3f(0.2F, 0.0F, 0.35F), + } + ); + + @Override + public boolean shouldApplyEffectTickThisTick(int duration, int amplifier) { + return true; + } + + @Override + public boolean applyEffectTick(LivingEntity entity, int amplifier) { + if(entity.level() instanceof ServerLevel serverLevel) { + ParticleUtil.addParticles( + serverLevel, PARTICLE, + entity.getBoundingBox().getCenter(), new Vec3(0, 0, 0), + 0.25, 1 + ); + } + return true; + } +} diff --git a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java index bb06465..a0d9da5 100644 --- a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java +++ b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java @@ -24,6 +24,8 @@ public class ModEffects { MOB_EFFECTS.register("cursed_inferno", CursedInfernoEffect::new); public static final DeferredHolder ICHOR = MOB_EFFECTS.register("ichor", IchorEffect::new); + public static final DeferredHolder BETSYS_CURSE = + MOB_EFFECTS.register("betsys_curse", BetsysCurseEffect::new); public static final DeferredHolder ACID_VENOM = MOB_EFFECTS.register("acid_venom", AcidVenomEffect::new); public static final DeferredHolder SUMMON = diff --git a/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java b/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java index 708b95a..a461035 100644 --- a/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java +++ b/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java @@ -40,27 +40,6 @@ public class ModRenderTypes { ); } - public static RenderType entityTranslucentEmissiveTriangles(ResourceLocation texture) { - return RenderType.create( - "m_entity_translucent_emissive_triangles", - DefaultVertexFormat.NEW_ENTITY, - VertexFormat.Mode.TRIANGLES, - 1536, - false, - false, - RenderType.CompositeState.builder() - .setShaderState(RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_EMISSIVE_SHADER) - .setTextureState(new RenderStateShard.TextureStateShard(texture, false, false)) - .setTransparencyState(RenderStateShard.TRANSLUCENT_TRANSPARENCY) - .setCullState(RenderStateShard.NO_CULL) - .setLightmapState(RenderStateShard.NO_LIGHTMAP) - .setOverlayState(RenderStateShard.OVERLAY) - .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST) - .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE) - .createCompositeState(true) - ); - } - public static RenderType entitySolidEmissiveTriangles(ResourceLocation texture) { return RenderType.create( "m_entity_solid_emissive_triangles", @@ -103,27 +82,6 @@ public class ModRenderTypes { ); } - public static RenderType entityAdditiveEmissiveTriangles(ResourceLocation texture) { - return RenderType.create( - "m_entity_additive_emissive_triangles", - DefaultVertexFormat.NEW_ENTITY, - VertexFormat.Mode.TRIANGLES, - 1536, - false, - false, - RenderType.CompositeState.builder() - .setShaderState(RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_EMISSIVE_SHADER) - .setTextureState(new RenderStateShard.TextureStateShard(texture, false, false)) - .setTransparencyState(ADDITIVE_TRANSPARENCY) - .setCullState(RenderStateShard.NO_CULL) - .setLightmapState(RenderStateShard.NO_LIGHTMAP) - .setOverlayState(RenderStateShard.OVERLAY) - .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST) - .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE) - .createCompositeState(true) - ); - } - public static RenderType entityTranslucent(ResourceLocation texture) { return RenderType.create( "m_entity_translucent", diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java index a6ad88e..bb4a960 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -3,6 +3,9 @@ package com.lzxnone.terraria.entity.summon; import com.lzxnone.terraria.item.ammo.*; import com.lzxnone.terraria.item.normal.FallenStar; import com.lzxnone.terraria.item.normal.ManaStar; +import com.lzxnone.terraria.item.weapon.magic.BetsyWrath; +import com.lzxnone.terraria.item.weapon.magic.BubbleGun; +import com.lzxnone.terraria.item.weapon.magic.LunarFlare; import com.lzxnone.terraria.item.weapon.ranged.ElfMelter; import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.*; @@ -46,6 +49,9 @@ public class StaticSummonBehaviors { public static final String DEVILS_DEVASTATION_MARK_LIGHTNING = "devils_devastation_mark_lightning"; public static final String LAST_PRISM_TRI = "last_prism_tri"; public static final String LAST_PRISM_BEAM = "last_prism_beam"; + public static final String BETSY_WRATH = "betsys_wrath"; + public static final String LUNAR_FLARE = "lunar_flare"; + public static final String BUBBLE = "bubble"; public static final String TERRAPRISMA = "terraprisma"; public static final String STARDUST_DRAGON_STAFF = "stardust_dragon_staff"; public static final String POSSESSION = "possession"; @@ -100,6 +106,9 @@ public class StaticSummonBehaviors { BEHAVIORS.put(DEVILS_DEVASTATION_MARK_LIGHTNING, DevilsDevastation.SUMMON_BEHAVIOR4); BEHAVIORS.put(LAST_PRISM_TRI, LastPrism.SUMMON_BEHAVIOR); BEHAVIORS.put(LAST_PRISM_BEAM, LastPrism.SUMMON_BEHAVIOR2); + BEHAVIORS.put(BETSY_WRATH, BetsyWrath.SUMMON_BEHAVIOR); + BEHAVIORS.put(LUNAR_FLARE, LunarFlare.SUMMON_BEHAVIOR); + BEHAVIORS.put(BUBBLE, BubbleGun.SUMMON_BEHAVIOR); BEHAVIORS.put(TERRAPRISMA, Terraprisma.SUMMON_BEHAVIOR); BEHAVIORS.put(STARDUST_DRAGON_STAFF, StardustDragonStaff.SUMMON_BEHAVIOR); BEHAVIORS.put(POSSESSION, Whip.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index 0b83073..dc29458 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -7,6 +7,7 @@ import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.effect.BetsysCurseEffect; import com.lzxnone.terraria.effect.IchorEffect; import com.lzxnone.terraria.effect.MidasEffect; import com.lzxnone.terraria.effect.ModEffects; @@ -24,10 +25,12 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.DamageTypeTags; +import net.minecraft.util.Mth; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.monster.Enemy; import net.minecraft.world.entity.monster.Monster; import net.minecraft.world.entity.boss.enderdragon.EnderDragon; @@ -37,11 +40,13 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.phys.Vec3; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.living.LivingDamageEvent; import net.neoforged.neoforge.event.entity.living.LivingDeathEvent; import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent; +import net.neoforged.neoforge.event.tick.EntityTickEvent; import net.neoforged.neoforge.event.tick.PlayerTickEvent; import java.util.List; @@ -53,6 +58,53 @@ public class EntityEventHandler { //魔力星掉落概率 private static final double MANA_STAR_DROP_CHANCE = 1.0D / 9.0D; + //吸引掉落物 + private static final double ITEM_PICKUP_PROBE_RANGE = 16.0D; + private static final double ITEM_ATTRACT_MIN_SPEED = 0.08D; + private static final double ITEM_ATTRACT_MAX_SPEED = 0.6D; + private static final double ITEM_ATTRACT_SPEED_SCALE = 0.18D; + private static final double ITEM_ATTRACT_EXISTING_MOTION_SCALE = 0.6D; + private static final double ITEM_PICKUP_TOUCH_RANGE_SQR = 1.2D * 1.2D; + + @SubscribeEvent + public static void onEntityTick(EntityTickEvent.Post event) { + if(!(event.getEntity() instanceof ItemEntity itemEntity)) return; + if(!(itemEntity.level() instanceof ServerLevel serverLevel)) return; + if(!itemEntity.isAlive() || itemEntity.getItem().isEmpty() || itemEntity.hasPickUpDelay()) return; + + ServerPlayer target = null; + double bestScore = Double.MAX_VALUE; + List players = serverLevel.getEntitiesOfClass( + ServerPlayer.class, + itemEntity.getBoundingBox().inflate(ITEM_PICKUP_PROBE_RANGE), + player -> player.isAlive() && !player.isSpectator() + ); + for(ServerPlayer player : players) { + double range = AccessoryUtil.getEffectivePickupRange(player, itemEntity.getItem().getItem()); + if(range <= 0.0D) continue; + double distanceSqr = itemEntity.distanceToSqr(player); + if(distanceSqr > range * range) continue; + if(distanceSqr < bestScore) { + bestScore = distanceSqr; + target = player; + } + } + if(target == null) return; + + if(itemEntity.distanceToSqr(target) <= ITEM_PICKUP_TOUCH_RANGE_SQR) { + itemEntity.playerTouch(target); + return; + } + + Vec3 toPlayer = target.getEyePosition().subtract(itemEntity.position()); + double distance = toPlayer.length(); + if(distance < 1.0E-4D) return; + double speed = Mth.clamp(distance * ITEM_ATTRACT_SPEED_SCALE, ITEM_ATTRACT_MIN_SPEED, ITEM_ATTRACT_MAX_SPEED); + Vec3 attractMotion = toPlayer.scale(speed / distance); + itemEntity.setDeltaMovement(itemEntity.getDeltaMovement().scale(ITEM_ATTRACT_EXISTING_MOTION_SCALE).add(attractMotion)); + itemEntity.hasImpulse = true; + } + @SubscribeEvent public static void onLivingIncomingDamage(LivingIncomingDamageEvent event) { LivingEntity entity = event.getEntity(); @@ -87,6 +139,7 @@ public class EntityEventHandler { if(!source.is(DamageTypeTags.BYPASSES_ARMOR)) { if(attacker instanceof LivingEntity livingEntity) AccessoryUtil.applyTargetArmorModifiers(livingEntity, entity); IchorEffect.applyArmorReduction(entity); + BetsysCurseEffect.applyArmorReduction(entity); } //近战攻击命中时点燃目标 if(attacker instanceof LivingEntity livingAttacker && livingAttacker != entity) { @@ -100,12 +153,8 @@ public class EntityEventHandler { || source.is(DamageTypes.ON_FIRE) || source.is(DamageTypes.IN_FIRE) || source.is(DamageTypes.WITHER); double manaMultiplier = AccessoryUtil.getManaOnHurtMultiplier(player); if(!isDebuffDamage && manaMultiplier > 0.0D) { - PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); int recover = (int) Math.round(event.getAmount() * manaMultiplier); - if(recover > 0 && mana.recoverManaImmediately(recover)) { - player.setData(ModAttachments.PLAYER_MANA, mana); - PlayerManaSyncEventHandler.sync((ServerPlayer) player); - } + if(recover > 0 && player instanceof ServerPlayer serverPlayer) PlayerMana.recoverMana(serverPlayer, recover); } } } @@ -128,6 +177,7 @@ public class EntityEventHandler { //移除饰品加成护甲穿透 AccessoryUtil.removeTargetArmorModifiers(event.getEntity()); IchorEffect.removeArmorReduction(event.getEntity()); + BetsysCurseEffect.removeArmorReduction(event.getEntity()); //暴击 if(attacker instanceof LivingEntity livingEntity && attacker != target) { double critChance = AccessoryUtil.getCritChance(livingEntity); diff --git a/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java b/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java index a235abc..2809bea 100644 --- a/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java @@ -48,9 +48,7 @@ public class PlayerManaSyncEventHandler { PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); int bonus = AccessoryUtil.getMaxManaBonus(player); if(mana.getBonusMaxMana() != bonus) { - mana.setBonusMaxMana(bonus); - player.setData(ModAttachments.PLAYER_MANA, mana); - sync(player); + PlayerMana.setBonusMaxMana(player, bonus); } } @@ -63,15 +61,8 @@ public class PlayerManaSyncEventHandler { return; } - int oldMana = mana.getMana(); double regenBonus = AccessoryUtil.getManaRegenBonus(player, mana.getMana(), mana.getMaxMana()); - if(!mana.recoverMana(PlayerMana.DEFAULT_RECOVER_RATE + regenBonus)) return; - - player.setData(ModAttachments.PLAYER_MANA, mana); - if(mana.getMana() != oldMana) { - playMaxManaSoundIfRecovered(player, oldMana, mana); - sync(player); - } + PlayerMana.recoverMana(player, PlayerMana.DEFAULT_RECOVER_RATE + regenBonus); } public static void sync(ServerPlayer player) { diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 7b6afc1..4e1acec 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -55,6 +55,9 @@ public class ModItems { //魔法武器 public static final DeferredItem LAST_PRISM = ITEMS.register("last_prism", LastPrism::new); + public static final DeferredItem BETSY_WRATH = ITEMS.register("betsys_wrath", BetsyWrath::new); + public static final DeferredItem LUNAR_FLARE = ITEMS.register("lunar_flare", LunarFlare::new); + public static final DeferredItem BUBBLE_GUN = ITEMS.register("bubble_gun", BubbleGun::new); //远程武器 public static final DeferredItem MUSKET = ITEMS.register("musket", Musket::new); @@ -244,6 +247,7 @@ public class ModItems { public static final DeferredItem LUMINITE_BULLET_PROJECTILE = ITEMS.register("luminite_bullet_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem WHITE_STAR = ITEMS.register("white_star", () -> new Item(new Item.Properties())); public static final DeferredItem MANA_STAR = ITEMS.register("mana_star", () -> new Item(new Item.Properties())); + public static final DeferredItem BUBBLE_GUN_PROJECTILE = ITEMS.register("bubble_gun_projectile", () -> new Item(new Item.Properties())); public static final DeferredItem ENCHANTED_SWORD_BEAM = ITEMS.register("enchanted_sword_beam", () -> new Item(new Item.Properties())); public static final DeferredItem STARFURY_STAR = ITEMS.register("starfury_star", () -> new Item(new Item.Properties())); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/Ammo.java b/src/main/java/com/lzxnone/terraria/item/ammo/Ammo.java index 8345bfb..6db9e0b 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/Ammo.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/Ammo.java @@ -7,6 +7,7 @@ import net.minecraft.core.particles.BlockParticleOption; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; @@ -18,6 +19,10 @@ public class Ammo extends Item { super(new Item.Properties().stacksTo(MAX_STACK_SIZE)); } + public float getBaseDamage(ItemStack stack) { + return 0.0F; + } + public static void playBlockHitEffects(ServerLevel level, BlockHitResult blockHitResult) { BlockState hitState = level.getBlockState(blockHitResult.getBlockPos()); ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java index dcee3ee..c6af89f 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java @@ -254,4 +254,9 @@ public class ChlorophyteBullet extends BulletAmmo { summon.xRotO = xyRot[0]; summon.yRotO = xyRot[1]; } + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java index 4c9f730..2c9058d 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java @@ -179,4 +179,9 @@ public class CrystalBullet extends BulletAmmo { projectile.setDeltaMovement(MathUtil.toVec3(dirs[0])); summon.level().addFreshEntity(projectile); } + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java index cb96057..b562a3d 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java @@ -100,4 +100,9 @@ public class CursedBullet extends BulletAmmo { summon.setPos(end); } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java index a0647c4..1b087a8 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java @@ -135,4 +135,9 @@ public class ExplodingBullet extends BulletAmmo { summon.setPos(end); } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java index 068e14a..fbc913d 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java @@ -100,4 +100,9 @@ public class GoldenBullet extends BulletAmmo { summon.setPos(end); } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java index 9858877..54f1b08 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java @@ -107,4 +107,9 @@ public class HighVelocityBullet extends BulletAmmo { summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); return hit; } + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java index 752651b..bc67eda 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java @@ -100,4 +100,9 @@ public class IchorBullet extends BulletAmmo { summon.setPos(end); } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java index 0b7121a..5cbf36b 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java @@ -118,4 +118,9 @@ public class LuminiteBullet extends BulletAmmo { summon.setPos(end); } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java index cd178b2..c2b9b4e 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java @@ -129,4 +129,9 @@ public class MeteorShot extends BulletAmmo { summon.setYRot(xyRot[1]); summon.yRotO = xyRot[1]; } + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java index 49d8a2d..d625c07 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java @@ -90,4 +90,9 @@ public class MusketBall extends BulletAmmo { summon.setPos(end); } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java index 3abcecb..a49d68d 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java @@ -136,4 +136,9 @@ public class NanoBullet extends BulletAmmo { summon.setYRot(xyRot[1]); summon.yRotO = xyRot[1]; } + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java index 47f7d21..c50e477 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java @@ -106,4 +106,9 @@ public class PartyBullet extends BulletAmmo { } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java index 55b9dd3..224ddec 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java @@ -99,4 +99,9 @@ public class SilverBullet extends BulletAmmo { summon.setPos(end); } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java index a54c161..afd8bbf 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java @@ -90,4 +90,9 @@ public class TungstenBullet extends BulletAmmo { summon.setPos(end); } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java index b5d4283..aa6dcff 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java @@ -100,4 +100,9 @@ public class VenomBullet extends BulletAmmo { summon.setPos(end); } }; + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/WoodenArrow.java b/src/main/java/com/lzxnone/terraria/item/ammo/WoodenArrow.java index e7d0c90..11a2866 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/WoodenArrow.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/WoodenArrow.java @@ -109,4 +109,9 @@ public class WoodenArrow extends ArrowAmmo { summon.setXRot(xyRot[0]); summon.setYRot(xyRot[1]); } + @Override + public float getBaseDamage(ItemStack stack) { + return BASE_DAMAGE.get(); + } + } diff --git a/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java b/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java index ede71bc..de6b4be 100644 --- a/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java +++ b/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java @@ -3,7 +3,6 @@ package com.lzxnone.terraria.item.food; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.PlayerMana; -import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; @@ -33,14 +32,13 @@ public class ManaCrystal extends Food { @Override protected boolean onEat(Level level, Player player, ItemStack stack) { + if(!(player instanceof ServerPlayer serverPlayer)) return false; PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); - if(mana.increaseBaseMaxMana(MANA_INCREASE) <= 0) return false; + int baseMaxMana = mana.getBaseMaxMana(); + if(baseMaxMana >= PlayerMana.MAX_BASE_MANA) return false; + if(!PlayerMana.setBaseMaxMana(serverPlayer, Math.min(baseMaxMana + MANA_INCREASE, PlayerMana.MAX_BASE_MANA))) return false; - player.setData(ModAttachments.PLAYER_MANA, mana); - if(player instanceof ServerPlayer serverPlayer) { - PlayerManaSyncEventHandler.sync(serverPlayer); - SoundUtil.playServerSound(player, ModSounds.GET_MANA.get(), 0.5f, 1.0f); - } + player.playNotifySound(ModSounds.GET_MANA.get(), SoundSource.PLAYERS, 4.0F, 1.0F); return true; } diff --git a/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java b/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java index 7a8f946..452cbaf 100644 --- a/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java +++ b/src/main/java/com/lzxnone/terraria/item/normal/ManaStar.java @@ -1,10 +1,8 @@ package com.lzxnone.terraria.item.normal; -import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; import com.lzxnone.terraria.entity.summon.StaticSummon; -import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; @@ -71,13 +69,9 @@ public class ManaStar extends Item { summon.setDeltaMovement(dir.scale(ATTRACT_SPEED)); } if(dist <= PICKUP_RADIUS) { - PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); int amount = customData.contains("mana") ? customData.getInt("mana") : 0; - if(mana.recoverManaImmediately(amount)) { - player.setData(ModAttachments.PLAYER_MANA, mana); - PlayerManaSyncEventHandler.sync(player); - } + PlayerMana.recoverMana(player, amount); onDied(summon); return true; } diff --git a/src/main/java/com/lzxnone/terraria/item/potion/AbstractManaPotion.java b/src/main/java/com/lzxnone/terraria/item/potion/AbstractManaPotion.java index 9834f3c..c0c8deb 100644 --- a/src/main/java/com/lzxnone/terraria/item/potion/AbstractManaPotion.java +++ b/src/main/java/com/lzxnone/terraria/item/potion/AbstractManaPotion.java @@ -3,7 +3,6 @@ package com.lzxnone.terraria.item.potion; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.effect.ManaSicknessEffect; -import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -20,14 +19,9 @@ public abstract class AbstractManaPotion extends Potion { @Override protected boolean onDrink(ServerPlayer player, ItemStack stack) { - PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); - int oldMana = mana.getMana(); - if(!mana.recoverManaImmediately(getRecoverAmount())) return false; + if(!PlayerMana.recoverMana(player, getRecoverAmount())) return false; ManaSicknessEffect.applyTo(player); - player.setData(ModAttachments.PLAYER_MANA, mana); - PlayerManaSyncEventHandler.playMaxManaSoundIfRecovered(player, oldMana, mana); - PlayerManaSyncEventHandler.sync(player); return true; } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java index 97f1b96..5b59d87 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java @@ -1,53 +1,136 @@ package com.lzxnone.terraria.item.weapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; -import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; import com.lzxnone.terraria.effect.ManaSicknessEffect; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.effect.AutoManaPotionUser; import com.lzxnone.terraria.item.effect.MagicDamageModifier; import com.lzxnone.terraria.item.effect.ManaCostModifier; -import com.lzxnone.terraria.item.effect.SummonDamageModifier; import com.lzxnone.terraria.item.potion.AbstractManaPotion; +import com.lzxnone.terraria.utils.DamageUtil; +import net.minecraft.ChatFormatting; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.chat.Component; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.Level; +import org.jspecify.annotations.NonNull; + +import java.util.List; public class MagicWeapon extends Weapon { public MagicWeapon(Tier tier, Properties properties) { super(tier, properties); } + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + ItemStack stack = player.getItemInHand(hand); + if(player.getCooldowns().isOnCooldown(stack.getItem())) return InteractionResultHolder.fail(stack); + player.startUsingItem(hand); + + if(level.isClientSide()) return InteractionResultHolder.consume(stack); + if(!tryShoot(level, player, hand, stack)) return InteractionResultHolder.fail(stack); + player.getCooldowns().addCooldown(stack.getItem(), Math.max(1, getUseTime(stack, player) / 3)); + return InteractionResultHolder.consume(stack); + } + + public boolean shouldShootThisTick(ItemStack weaponStack, LivingEntity entity, int remainingUseTicks) { + int useTime = Math.max(1, getUseTime(weaponStack, entity)); + int elapsedMinecraftTicks = getUseDuration(weaponStack, entity) - remainingUseTicks; + if(elapsedMinecraftTicks <= 0) return false; + + int currentShot = elapsedMinecraftTicks * 3 / useTime; + int previousShot = (elapsedMinecraftTicks - 1) * 3 / useTime; + return currentShot > previousShot; + } + @Override public void onUseTick(Level level, LivingEntity entity, ItemStack stack, int count) { - if(!canUseMagic(stack, entity)) { - entity.stopUsingItem(); - return; - } + if(level.isClientSide()) return; + if(!(entity instanceof Player player)) return; + if(!shouldShootThisTick(stack, entity, count)) return; - if(!level.isClientSide()) { - if(!tryConsumeMana(level, entity, stack, getFinalManaConsumeRate(stack, entity))) { - entity.stopUsingItem(); - return; - } + if(!tryShoot(level, player, player.getUsedItemHand(), stack)) { + player.stopUsingItem(); } + } - onMagicUseTick(level, entity, stack, count); + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return 72000; + } + + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, 0.0F) : 0.0F; + return applyMagicDamageBonus(weaponStack, entity, damage); + } + + @Override + public @NonNull UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.BLOCK; + } + + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 1; + } + + public boolean tryShoot(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + double manaConsume = getFinalManaConsumeRate(weaponStack, player); + if(!tryConsumeMana(player, manaConsume)) return false; + + shoot(level, player, hand, weaponStack); + return true; + } + + //尝试消耗魔力 + protected boolean tryConsumeMana(Player player, double amount) { + //创造模式 + if(amount <= 0.0D || player.hasInfiniteMaterials()) return true; + if(!(player instanceof ServerPlayer serverPlayer)) return false; + //直接消耗 + if(PlayerMana.consumeMana(serverPlayer, amount)) return true; + + //自动喝药 + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + double targetMana = Math.max(1.0D, Math.floor(mana.getConsumeProgress() + amount)); + if(!tryAutoUseManaPotionToReachTarget(player, targetMana)) return false; + return PlayerMana.consumeMana(serverPlayer, amount); } //使用魔法武器时 - protected void onMagicUseTick(Level level, LivingEntity entity, ItemStack stack, int count) {} + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) {} //提供基础魔力消耗 protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { return 0.0D; } + protected double getManaTooltipValue(ItemStack stack) { + return getManaConsumeRate(stack, null); + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, + List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + double mana = getManaTooltipValue(stack); + if(mana > 0.0D) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.magic_weapon_mana", + mana == Math.rint(mana) ? String.valueOf((int) mana) : String.format("%.2f", mana) + ).withStyle(ChatFormatting.BLUE)); + } + } + //获取最终魔力消耗 protected double getFinalManaConsumeRate(ItemStack stack, LivingEntity entity) { double rate = getManaConsumeRate(stack, entity); @@ -87,61 +170,65 @@ public class MagicWeapon extends Weapon { return (float) Math.max(0.0D, finalDamage); } - //是否可以继续使用魔法武器 - protected boolean canUseMagic(ItemStack stack, LivingEntity entity) { - if(entity.hasInfiniteMaterials()) return true; - if(entity instanceof Player player) { - if(player.getData(ModAttachments.PLAYER_MANA).hasMana()) return true; - if(player instanceof ServerPlayer serverPlayer) return tryAutoUseManaPotion(serverPlayer); - return canAutoUseManaPotion(player) && findManaPotionSlot(player) >= 0; - } - return false; - } - - //进行魔力消耗 - protected boolean tryConsumeMana(Level level, LivingEntity entity, ItemStack stack, double amount) { - if(amount <= 0.0D || entity.hasInfiniteMaterials()) return true; - if(!(entity instanceof ServerPlayer player)) return true; - + protected static boolean tryAutoUseManaPotionToReachTarget(Player player, double targetMana) { PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); - int oldMana = mana.getMana(); - boolean canContinue = mana.consumeMana(amount); - mana.applyRecoverDelay(); - player.setData(ModAttachments.PLAYER_MANA, mana); - if(mana.getMana() != oldMana) { - PlayerManaSyncEventHandler.sync(player); - } - if(canContinue) return true; - return tryAutoUseManaPotion(player); - } + if(targetMana <= 0.0D || mana.getMana() >= targetMana) return true; + if(mana.getMaxMana() < targetMana) return false; - private static int findManaPotionSlot(Player player) { - for(int i = 0; i < player.getInventory().getContainerSize(); i++) { - ItemStack stack = player.getInventory().getItem(i); - if(stack.getItem() instanceof AbstractManaPotion potion) { - if(potion.getRecoverAmount() > 0) return i; - } - } - return -1; - } - - private static boolean canAutoUseManaPotion(LivingEntity entity) { boolean[] result = {false}; - AccessoryUtil.forEachAccessory(entity, (accessory, stack) -> { - if(accessory instanceof AutoManaPotionUser autoUser && autoUser.canAutoUseManaPotion(stack, entity)) { + AccessoryUtil.forEachAccessory(player, (accessory, stack) -> { + if(accessory instanceof AutoManaPotionUser autoUser && autoUser.canAutoUseManaPotion(stack, player)) { result[0] = true; } }); - return result[0]; - } + if(!result[0]) return false; - private static boolean tryAutoUseManaPotion(ServerPlayer player) { - if(!canAutoUseManaPotion(player)) return false; - int slot = findManaPotionSlot(player); - if(slot < 0) return false; - ItemStack stack = player.getInventory().getItem(slot); - if(!(stack.getItem() instanceof AbstractManaPotion potion)) return false; - return potion.tryDrink(player, stack); + if(!(player instanceof ServerPlayer serverPlayer)) { + int simulatedMana = mana.getMana(); + for(int i = 0; i < player.getInventory().getContainerSize() && simulatedMana < targetMana; i++) { + ItemStack stack = player.getInventory().getItem(i); + if(!(stack.getItem() instanceof AbstractManaPotion potion)) continue; + int recoverAmount = potion.getRecoverAmount(); + if(recoverAmount <= 0) continue; + for(int j = 0; j < stack.getCount() && simulatedMana < targetMana; j++) { + simulatedMana = Math.min(mana.getMaxMana(), simulatedMana + recoverAmount); + } + } + return simulatedMana >= targetMana; + } + + while(serverPlayer.getData(ModAttachments.PLAYER_MANA).getMana() < targetMana) { + mana = serverPlayer.getData(ModAttachments.PLAYER_MANA); + int bestSlot = -1; + int bestRecoverAmount = 0; + int smallestSufficientRecoverAmount = Integer.MAX_VALUE; + for(int i = 0; i < serverPlayer.getInventory().getContainerSize(); i++) { + ItemStack stack = serverPlayer.getInventory().getItem(i); + if(!(stack.getItem() instanceof AbstractManaPotion potion)) continue; + int recoverAmount = potion.getRecoverAmount(); + if(recoverAmount <= 0) continue; + int manaAfterDrink = Math.min(mana.getMaxMana(), mana.getMana() + recoverAmount); + if(manaAfterDrink <= mana.getMana()) continue; + if(manaAfterDrink >= targetMana) { + if(recoverAmount < smallestSufficientRecoverAmount) { + bestSlot = i; + bestRecoverAmount = recoverAmount; + smallestSufficientRecoverAmount = recoverAmount; + } + }else if(smallestSufficientRecoverAmount == Integer.MAX_VALUE && recoverAmount > bestRecoverAmount) { + bestSlot = i; + bestRecoverAmount = recoverAmount; + } + } + if(bestSlot < 0) return false; + + ItemStack stack = serverPlayer.getInventory().getItem(bestSlot); + if(!(stack.getItem() instanceof AbstractManaPotion potion)) return false; + int oldMana = mana.getMana(); + if(!potion.tryDrink(serverPlayer, stack)) return false; + if(serverPlayer.getData(ModAttachments.PLAYER_MANA).getMana() <= oldMana) return false; + } + return true; } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java index ff69484..d5a2cf6 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MeleeWeapon.java @@ -1,13 +1,32 @@ package com.lzxnone.terraria.item.weapon; +import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.effect.MeleeDamageModifier; import com.lzxnone.terraria.item.effect.MeleeKnockbackModifier; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +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.item.ItemStack; import net.minecraft.world.item.Tier; +import net.minecraft.world.item.component.ItemAttributeModifiers; +import net.minecraft.world.item.enchantment.EnchantmentHelper; public class MeleeWeapon extends Weapon { + private static final float BASE_MELEE_DAMAGE_MIN = 0.0F; + private static final float BASE_MELEE_DAMAGE_MAX = 8388600.0F; + private static final float BASE_MELEE_ATTACK_SPEED_MIN = -100.0F; + private static final float BASE_MELEE_ATTACK_SPEED_MAX = 100.0F; + private static final ResourceLocation BASE_MELEE_DAMAGE_ID = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_melee_damage"); + private static final ResourceLocation BASE_MELEE_ATTACK_SPEED_ID = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_melee_attack_speed"); + public MeleeWeapon(Tier tier, Properties properties) { super(tier, properties); } @@ -16,6 +35,60 @@ public class MeleeWeapon extends Weapon { super(properties); } + public static ConfigFloat createBaseMeleeDamageConfig(String id, float damageDefault) { + return new ConfigFloat(baseMeleeDamagePath(id), "base_melee_damage", damageDefault, BASE_MELEE_DAMAGE_MIN, BASE_MELEE_DAMAGE_MAX); + } + + public static ConfigFloat createBaseMeleeAttackSpeedConfig(String id, float attackSpeedDefault) { + return new ConfigFloat(baseMeleeAttackSpeedPath(id), "base_melee_attack_speed", attackSpeedDefault, BASE_MELEE_ATTACK_SPEED_MIN, BASE_MELEE_ATTACK_SPEED_MAX); + } + + public static IConfigData createConfigData(ConfigStruct... configs) { + return new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(configs); + } + }; + } + + public static ConfigListItem createConfigListItem(String id, IConfigData configData) { + return new ConfigListItem( + id, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + id + ".png"), + Component.translatable("item.lzxnoneterraria." + id), + configData + ); + } + + private static String baseMeleeDamagePath(String id) { + return "weapon." + id + ".base_melee_damage"; + } + + private static String baseMeleeAttackSpeedPath(String id) { + return "weapon." + id + ".base_melee_attack_speed"; + } + + protected float getBaseMeleeDamage(ItemStack stack) { + return 0.0F; + } + + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return -2.4F; + } + + @Override + public ItemAttributeModifiers getDefaultAttributeModifiers(ItemStack stack) { + return ItemAttributeModifiers.builder() + .add(Attributes.ATTACK_DAMAGE, + new AttributeModifier(BASE_MELEE_DAMAGE_ID, getBaseMeleeDamage(stack), AttributeModifier.Operation.ADD_VALUE), + EquipmentSlotGroup.MAINHAND) + .add(Attributes.ATTACK_SPEED, + new AttributeModifier(BASE_MELEE_ATTACK_SPEED_ID, getBaseMeleeAttackSpeed(stack), AttributeModifier.Operation.ADD_VALUE), + EquipmentSlotGroup.MAINHAND) + .build(); + } + public static float applyMeleeDamageBonus(ItemStack stack, LivingEntity entity, float damage) { double finalDamage = damage; //饰品 diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java index 60f4df3..1ecb81c 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java @@ -2,11 +2,13 @@ package com.lzxnone.terraria.item.weapon; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.enchantment.ModEnchantments; +import com.lzxnone.terraria.item.ammo.Ammo; import com.lzxnone.terraria.item.ModItemTags; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.effect.RangedDamageModifier; -import com.lzxnone.terraria.item.effect.SummonDamageModifier; +import com.lzxnone.terraria.item.weapon.ranged.bow.Bow; +import com.lzxnone.terraria.utils.DamageUtil; import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; @@ -55,12 +57,23 @@ public class RangedWeapon extends Weapon { return null; } + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, 0.0F) : 0.0F; + return applyRangedDamageBonus(weaponStack, entity, damage); + } + + protected float getAmmoBaseDamage(ItemStack ammoStack) { + return ammoStack.getItem() instanceof Ammo ammo ? ammo.getBaseDamage(ammoStack) : 0.0F; + } + public static float applyRangedDamageBonus(ItemStack stack, LivingEntity entity, float damage) { double finalDamage = damage; //力量 - int powerLevel = getEnchantmentLevel(entity, stack, Enchantments.POWER); - if(powerLevel > 0) { - finalDamage *= 1.0D + 0.2D * powerLevel; + if(stack.getItem() instanceof Bow) { + int powerLevel = getEnchantmentLevel(entity, stack, Enchantments.POWER); + if (powerLevel > 0) { + finalDamage *= 1.0D + 0.2D * powerLevel; + } } //火药 if(stack.is(ModItemTags.GUNPOWDER_WEAPONS)) { @@ -172,11 +185,6 @@ public class RangedWeapon extends Weapon { return ItemStack.EMPTY; } - public boolean isSelectedAmmo(ItemStack weaponStack, ItemStack ammoStack) { - ItemStack selectedAmmo = getAmmoStack(weaponStack); - return isAmmoStack(selectedAmmo, ammoStack); - } - protected ItemStack findAmmoItem(Player player, ItemStack ammoStack) { if(ammoStack.isEmpty()) return ItemStack.EMPTY; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java index 196aa94..51a7a3f 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/SummonWeapon.java @@ -4,7 +4,9 @@ import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.effect.SummonDamageModifier; +import com.lzxnone.terraria.utils.DamageUtil; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; @@ -13,6 +15,11 @@ public class SummonWeapon extends Weapon { super(tier, properties); } + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, 0.0F) : 0.0F; + return applySummonDamageBonus(weaponStack, entity, damage); + } + public static float applySummonDamageBonus(ItemStack stack, LivingEntity entity, float damage) { double finalDamage = damage; //召唤增幅 diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/Weapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/Weapon.java index 98d5623..64db874 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/Weapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/Weapon.java @@ -2,19 +2,24 @@ package com.lzxnone.terraria.item.weapon; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.effect.DamageModifier; -import com.lzxnone.terraria.item.effect.MeleeDamageModifier; +import com.lzxnone.terraria.item.ModItemTags; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.Registries; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceKey; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; +import java.util.List; + public class Weapon extends Item { private final int enchantmentValue; @@ -56,6 +61,17 @@ public class Weapon extends Item { return enchantmentValue; } + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, + List tooltipComponents, TooltipFlag tooltipFlag) { + if(stack.is(ModItemTags.SPREAD_RANGED_WEAPONS)) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.spread_ranged_weapon" + ).withStyle(ChatFormatting.GRAY)); + } + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + } + public static int getEnchantmentLevel(LivingEntity entity, ItemStack stack, ResourceKey enchantment) { return entity.registryAccess() .lookupOrThrow(Registries.ENCHANTMENT) diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/BetsyWrath.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/BetsyWrath.java new file mode 100644 index 0000000..db50d17 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/BetsyWrath.java @@ -0,0 +1,298 @@ +package com.lzxnone.terraria.item.weapon.magic; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.ModEntities; +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.effect.ModEffects; +import com.lzxnone.terraria.item.ammo.Ammo; +import com.lzxnone.terraria.particle.DustParticleOptions; +import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.item.weapon.MagicWeapon; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigInt; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +import com.lzxnone.terraria.utils.MathUtil; +import com.lzxnone.terraria.utils.ParticleUtil; +import com.lzxnone.terraria.utils.SoundUtil; +import net.minecraft.core.particles.ParticleTypes; +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.sounds.SoundSource; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.EntityHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +public class BetsyWrath extends MagicWeapon { + public static final double SIDE_ANGLE = 5.0D; + public static final double SPEED = 2.4D; + public static final double GRAVITY = 0.05D; + public static final double MAX_GRAVITY = 0.22D; + public static final double MIN_TICKS_TO_TARGET = 8.0D; + public static final double MIN_ARC_HEIGHT = 1.25D; + public static final double MAX_ARC_HEIGHT = 6.0D; + public static final double ARC_HEIGHT_PER_BLOCK = 0.12D; + public static final double HITBOX_INFLATE = 0.5D; + + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.betsys_wrath.damage", "betsys_wrath_damage", 10.0F, 0.0F, 8388600.0F); + public static final ConfigDouble RANGE = new ConfigDouble("weapon.betsys_wrath.range", "betsys_wrath_range", 64.0D, 0.0D, 512.0D); + public static final ConfigDouble EXPLOSION_RANGE = new ConfigDouble("weapon.betsys_wrath.explosion_range", "betsys_wrath_explosion_range", 3.5D, 0.0D, 64.0D); + public static final ConfigDouble MANA_CONSUME = new ConfigDouble("weapon.betsys_wrath.mana_consume", "betsys_wrath_mana_consume", 14.0D, 0.0D, 10000.0D); + public static final ConfigInt BUFF_DURATION = new ConfigInt("weapon.betsys_wrath.buff_duration", "betsys_wrath_buff_duration", 200, 0, 72000); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE, RANGE, EXPLOSION_RANGE, MANA_CONSUME, BUFF_DURATION); + } + }; + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "betsys_wrath", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/betsys_wrath.png"), + Component.translatable("item.lzxnoneterraria.betsys_wrath"), + CONFIG_DATA + ); + + //黄 + public static final DustParticleOptions PARTICLE = new DustParticleOptions( + 0.08f, 0.5f, 40, true, new Vector3f[]{ + new Vector3f(1.0F, 1.0F, 0.6F), + new Vector3f(1.0F, 0.9F, 0.0F), + new Vector3f(1.0F, 0.8F, 0.5F), + new Vector3f(1.0F, 0.5F, 0.0F), + } + ); + + //红 + public static final DustParticleOptions PARTICLE2 = new DustParticleOptions( + 0.08f, 0.5f, 40, true, new Vector3f[]{ + new Vector3f(0.75F, 0.0F, 0.0F), + new Vector3f(0.55F, 0.0F, 0.0F), + new Vector3f(0.35F, 0.0F, 0.0F), + new Vector3f(0.2F, 0.0F, 0.0F), + } + ); + + //紫 + public static final DustParticleOptions PARTICLE3 = new DustParticleOptions( + 0.08f, 0.5f, 40, true, new Vector3f[]{ + new Vector3f(0.85F, 0.25F, 1.0F), + new Vector3f(0.6F, 0.0F, 0.85F), + new Vector3f(0.35F, 0.0F, 0.55F), + new Vector3f(0.2F, 0.0F, 0.35F), + } + ); + + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyMagicDamageBonus(weaponStack, entity, damage); + } + + @Override + protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { + return MANA_CONSUME.get(); + } + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + checkBeforeTick(summon); + + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + double gravity = customData.contains("gravity") ? customData.getDouble("gravity") : GRAVITY; + Vec3 motion = summon.getDeltaMovement().add(0.0D, -gravity, 0.0D); + if(motion.lengthSqr() < 1.0E-7D) { + onDied(summon); + return; + } + + Vec3 nextPos = summon.position().add(motion); + + float[] xyRot = MathUtil.computeXYRot(motion.toVector3f()); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + + if(summon.level().isClientSide()) { + summon.setDeltaMovement(motion); + Vector3f[] dirs = MathUtil.computeCoordinateSystem(motion.toVector3f(), 0); + Vec3 right = MathUtil.toVec3(dirs[2]).normalize(); + summon.trailPositions.addFirst(summon.position().add(right.scale(0.25))); + summon.trailPositions.addFirst(summon.position().add(right.scale(-0.25))); + while(summon.trailPositions.size() > 12) summon.trailPositions.removeLast(); + ParticleUtil.addParticles( + summon.level(), PARTICLE, + summon.position(), 2, + new Vec3(0, 0, 0), 0.25, + 3 + ); + ParticleUtil.addParticles( + summon.level(), PARTICLE2, + summon.position(), 2, + new Vec3(0, 0, 0), 0.25, + 3 + ); + return; + } + + EntityHitResult entityHitResult = CollisionUtil.checkEntityHit(summon, nextPos, HITBOX_INFLATE); + if(entityHitResult != null) { + if(summon.level() instanceof ServerLevel serverLevel) { + ParticleUtil.addParticles( + serverLevel, PARTICLE3, + summon.position(), new Vec3(0.0D, 0.0D, 0.0D), + 0.4D, 25 + ); + } + onDied(summon); + return; + } + + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, nextPos); + if(blockHitResult.getType() != HitResult.Type.MISS) { + onDied(summon); + return; + } + + summon.setDeltaMovement(motion); + } + + @Override + public AABB getBoundingBoxForCulling(StaticSummon summon) { + return summon.getBoundingBox().inflate(8.0D); + } + + @Override + public void onDied(StaticSummon summon) { + if(!(summon.level() instanceof ServerLevel serverLevel)) return; + + Vec3 pos = summon.position(); + + SoundUtil.playServerSound(serverLevel, ModSounds.BETSYS_FIREBALL_COLLIDE.get(), pos); + ParticleUtil.addParticles( + serverLevel, ParticleTypes.EXPLOSION, + pos, new Vec3(0.0D, 0.0D, 0.0D), + 0.0D, 1 + ); + ParticleUtil.addParticles( + serverLevel, PARTICLE, + pos, new Vec3(0.0D, 0.0D, 0.0D), + 0.4D, 25 + ); + ParticleUtil.addParticles( + serverLevel, PARTICLE2, + pos, new Vec3(0.0D, 0.0D, 0.0D), + 0.4D, 25 + ); + + double explosionRange = EXPLOSION_RANGE.get(); + if(explosionRange > 0.0D) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + for(LivingEntity target : serverLevel.getEntitiesOfClass( + LivingEntity.class, + AABB.ofSize(pos, explosionRange * 2.0D, explosionRange * 2.0D, explosionRange * 2.0D), + FilterUtil.createLivingTargetFilter(summon, summon.getOwner()) + )) { + if(target.distanceToSqr(pos) > explosionRange * explosionRange) continue; + if(DamageUtil.magicAttack(summon, target, sourceStack, DAMAGE.get(), 0.6F)) { + target.invulnerableTime = 10; + if(BUFF_DURATION.get() > 0) target.addEffect(new MobEffectInstance(ModEffects.BETSYS_CURSE, BUFF_DURATION.get(), 0)); + } + } + } + + summon.discard(); + } + }; + + public BetsyWrath() { + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 20; + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + if(level.isClientSide()) return; + player.playNotifySound(ModSounds.BETSYS_FIREBALL_SHOOT.get(), SoundSource.PLAYERS, 4.0F, 1.0F); + if(level instanceof ServerLevel serverLevel) { + ParticleUtil.addParticles( + serverLevel, PARTICLE, + player.getBoundingBox().getCenter(), new Vec3(0, 0, 0), 0.25, + 25 + ); + } + Vec3 start = player.getBoundingBox().getCenter(); + Vec3 target = MathUtil.getCrosshairPos(player, level, RANGE.get()); + double[] angles = new double[]{SIDE_ANGLE, 0.0D, -SIDE_ANGLE}; + for(int i = 0; i < angles.length; i++) { + Vec3 offset = target.subtract(start); + double radians = Math.toRadians(angles[i]); + double cos = Math.cos(radians); + double sin = Math.sin(radians); + Vec3 angledTarget = start.add( + offset.x * cos - offset.z * sin, + offset.y, + offset.x * sin + offset.z * cos + ); + Vec3 toTarget = angledTarget.subtract(start); + double horizontalDistance = toTarget.horizontalDistance(); + double ticksToTarget = Math.max(MIN_TICKS_TO_TARGET, horizontalDistance / SPEED); + double arcHeight = Math.min(MAX_ARC_HEIGHT, Math.max(MIN_ARC_HEIGHT, horizontalDistance * ARC_HEIGHT_PER_BLOCK)); + double gravity = Math.min(MAX_GRAVITY, Math.max(GRAVITY, 8.0D * arcHeight / (ticksToTarget * ticksToTarget))); + Vec3 initialMovement = new Vec3( + toTarget.x / ticksToTarget, + (toTarget.y + gravity * ticksToTarget * (ticksToTarget + 1.0D) * 0.5D) / ticksToTarget, + toTarget.z / ticksToTarget + ); + + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); + summon.setOwner(player); + summon.setPos(start); + summon.setDeltaMovement(initialMovement); + summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy()); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.BETSY_WRATH); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.LIFETIME, 1200); + summon.getEntityData().set(StaticSummon.GLOW, true); + summon.setNoGravity(true); + summon.noPhysics = true; + + float[] initialXyRot = MathUtil.computeXYRot(initialMovement.toVector3f()); + summon.setXRot(initialXyRot[0]); + summon.setYRot(initialXyRot[1]); + summon.xRotO = summon.getXRot(); + summon.yRotO = summon.getYRot(); + + CompoundTag customData = new CompoundTag(); + customData.putDouble("gravity", gravity); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + level.addFreshEntity(summon); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/BubbleGun.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/BubbleGun.java new file mode 100644 index 0000000..47d880c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/BubbleGun.java @@ -0,0 +1,204 @@ +package com.lzxnone.terraria.item.weapon.magic; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; +import com.lzxnone.terraria.enchantment.ModEnchantments; +import com.lzxnone.terraria.entity.ModEntities; +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.item.ModItems; +import com.lzxnone.terraria.item.weapon.MagicWeapon; +import com.lzxnone.terraria.particle.CircleParticleOptions; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.MathUtil; +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.sounds.SoundSource; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.EntityHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +public class BubbleGun extends MagicWeapon { + public static final Vector3f OFFSET = new Vector3f(-0.25F, -0.1F, 1.2F); + public static final double SPRINT_SPREAD_MULTIPLIER = 2.0D; + public static final double WALK_SPREAD_MULTIPLIER = 1.5D; + public static final double CROUCH_SPREAD_MULTIPLIER = 0.5D; + public static final double HITBOX_INFLATE = 0.35D; + public static final double BREAK_SPEED = 0.05D; + public static final float SPREAD = 10.0F; + + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.bubble_gun.damage", "bubble_gun_damage", 10.0F, 0.0F, 8388600.0F); + public static final ConfigDouble SPEED = new ConfigDouble("weapon.bubble_gun.speed", "bubble_gun_speed", 1.2D, 0.0D, 10.0D); + public static final ConfigDouble DRAG = new ConfigDouble("weapon.bubble_gun.drag", "bubble_gun_drag", 0.94D, 0.0D, 1.0D); + public static final ConfigDouble MANA_CONSUME = new ConfigDouble("weapon.bubble_gun.mana_consume", "bubble_gun_mana_consume", 5.0D, 0.0D, 10000.0D); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE, SPEED, DRAG, MANA_CONSUME); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "bubble_gun", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/bubble_gun.png"), + Component.translatable("item.lzxnoneterraria.bubble_gun"), + CONFIG_DATA + ); + + public static final CircleParticleOptions PARTICLE = new CircleParticleOptions( + 0.04F, 16, new Vector3f(0.0F, 0.12F, 0.65F) + ); + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + checkBeforeTick(summon); + + Vec3 motion = summon.getDeltaMovement().scale(DRAG.get()); + if(motion.lengthSqr() <= BREAK_SPEED * BREAK_SPEED) { + onDied(summon); + return; + } + + Vec3 nextPos = summon.position().add(motion); + summon.setDeltaMovement(motion); + + if(summon.level().isClientSide()) return; + + EntityHitResult entityHitResult = CollisionUtil.checkEntityHit(summon, nextPos, HITBOX_INFLATE); + if(entityHitResult != null) { + if(DamageUtil.magicAttack(summon, entityHitResult.getEntity(), summon.getEntityData().get(StaticSummon.STACK_SOURCE), DAMAGE.get(), 0.2F)) { + entityHitResult.getEntity().invulnerableTime = 5; + } + onDied(summon); + return; + } + + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, nextPos); + if(blockHitResult.getType() != HitResult.Type.MISS) { + onDied(summon); + } + } + + @Override + public void onDied(StaticSummon summon) { + if(!(summon.level() instanceof ServerLevel serverLevel)) return; + + ParticleUtil.addParticles( + serverLevel, PARTICLE, + summon.position(), new Vec3(0.18D, 0.18D, 0.18D), + 0.12D, 12 + ); + SoundUtil.playServerSound(serverLevel, ModSounds.BUBBLE_BREAK.get(), summon.position()); + summon.discard(); + } + }; + + public BubbleGun() { + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 6; + } + + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyMagicDamageBonus(weaponStack, entity, damage); + } + + @Override + protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { + return MANA_CONSUME.get(); + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + if(level.isClientSide()) return; + + player.playNotifySound(ModSounds.BUBBLE.get(), SoundSource.PLAYERS, 2.0F, 1.0F); + + Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); + Vec3 forward = MathUtil.toVec3(dirs[0]).normalize(); + Vec3 up = MathUtil.toVec3(dirs[1]).normalize(); + Vec3 right = MathUtil.toVec3(dirs[2]).normalize(); + + double spread = SPREAD; + if(player.isSprinting()) { + spread *= SPRINT_SPREAD_MULTIPLIER; + }else if(player.getDeltaMovement().horizontalDistanceSqr() > 1.0E-4D) { + spread *= WALK_SPREAD_MULTIPLIER; + } + if(player.isShiftKeyDown()) spread *= CROUCH_SPREAD_MULTIPLIER; + + int steadyBreathLevel = getEnchantmentLevel(player, stack, ModEnchantments.STEADY_BREATH); + if(steadyBreathLevel > 0) { + spread *= Math.pow(ModEnchantmentConfigs.getSteadyBreathSpreadMultiplier(), steadyBreathLevel); + } + + double yaw = Math.toRadians((player.getRandom().nextFloat() * 2.0F - 1.0F) * spread); + double pitch = Math.toRadians((player.getRandom().nextFloat() * 2.0F - 1.0F) * spread); + Vec3 direction = forward + .add(right.scale(Math.tan(yaw))) + .add(up.scale(Math.tan(pitch))) + .normalize(); + + Vector3f offset = new Vector3f( + hand == InteractionHand.OFF_HAND ? -OFFSET.x : OFFSET.x, + OFFSET.y, + OFFSET.z + ); + Vec3 eyePos = player.getEyePosition(); + Vec3 pos = new Vec3( + eyePos.x + dirs[0].x * offset.z + dirs[1].x * offset.y + dirs[2].x * offset.x, + eyePos.y + dirs[0].y * offset.z + dirs[1].y * offset.y + dirs[2].y * offset.x, + eyePos.z + dirs[0].z * offset.z + dirs[1].z * offset.y + dirs[2].z * offset.x + ); + + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); + summon.setOwner(player); + summon.setPos(pos); + summon.setDeltaMovement(direction.scale(SPEED.get())); + summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy()); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.BUBBLE); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "item"); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.BUBBLE_GUN_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 1200); + summon.getEntityData().set(StaticSummon.SCALE_X, 0.5F); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.5F); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.5F); + summon.setNoGravity(true); + summon.noPhysics = true; + + float[] xyRot = MathUtil.computeXYRot(direction.toVector3f()); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + summon.xRotO = xyRot[0]; + summon.yRotO = xyRot[1]; + level.addFreshEntity(summon); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java index 9af3a0a..ba019a4 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java @@ -2,13 +2,13 @@ package com.lzxnone.terraria.item.weapon.magic; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.entity.ModEntities; 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.item.ModItems; import com.lzxnone.terraria.item.weapon.MagicWeapon; -import com.lzxnone.terraria.item.weapon.melee.Mace; import com.lzxnone.terraria.particle.DustParticleOptions; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; @@ -20,12 +20,11 @@ import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; import com.lzxnone.terraria.utils.ParticleUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import com.mojang.math.Axis; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.core.component.DataComponents; import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -38,7 +37,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.component.CustomData; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.UseAnim; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; @@ -47,7 +45,6 @@ import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; import org.joml.Quaternionf; import org.joml.Vector3f; -import org.jspecify.annotations.NonNull; import java.util.List; import java.util.Optional; @@ -88,7 +85,7 @@ public class LastPrism extends MagicWeapon { "last_prism_mana_consume_rate", 144, 0, - 72000 + 10000 ); public LastPrism() { super( @@ -118,14 +115,25 @@ public class LastPrism extends MagicWeapon { return MAX_RANGE.get(); } + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyMagicDamageBonus(weaponStack, entity, damage); + } + @Override protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { long startGameTime = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) .copyTag() .getLong(USE_START_GAME_TIME_KEY); long elapsedTime = Math.max(0L, entity.level().getGameTime() - startGameTime); - double useRatio = Mth.clamp(elapsedTime / (double)MAX_USE_TIME.get(), 0.0D, 1.0D); - return MANA_CONSUME_RATE.get() * useRatio; + double useRatio = Mth.clamp(elapsedTime / (double)CHARGE_TIME.get(), 0.0D, 1.0D); + return MANA_CONSUME_RATE.get() * useRatio / 20.0D; + } + + @Override + protected double getManaTooltipValue(ItemStack stack) { + return MANA_CONSUME_RATE.get(); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( @@ -310,9 +318,11 @@ public class LastPrism extends MagicWeapon { @Override public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - if(!canUseMagic(stack, player)) return InteractionResultHolder.fail(stack); + player.startUsingItem(hand); + if(level.isClientSide()) return InteractionResultHolder.consume(stack); + if(!canStartUsingPrism(player)) return InteractionResultHolder.fail(stack); - if(stack.is(ModItems.LAST_PRISM.get()) && !player.level().isClientSide()) { + if(stack.is(ModItems.LAST_PRISM.get())) { CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> tag.putLong(USE_START_GAME_TIME_KEY, level.getGameTime())); Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); @@ -359,28 +369,25 @@ public class LastPrism extends MagicWeapon { level.addFreshEntity(beam); } - - player.startUsingItem(hand); - return InteractionResultHolder.consume(stack); } - return InteractionResultHolder.pass(stack); + return InteractionResultHolder.consume(stack); } @Override - public @NonNull UseAnim getUseAnimation(ItemStack stack) { - return UseAnim.BLOCK; - } - - @Override - protected void onMagicUseTick(Level level, LivingEntity livingEntity, ItemStack stack, int count) { - if(!(livingEntity instanceof Player player)) return; - if(player.tickCount % 10 == 0) { - SoundUtil.playClientSound(player, ModSounds.BEAM2.get()); + public void onUseTick(Level level, LivingEntity entity, ItemStack stack, int count) { + if(level.isClientSide()) return; + if(!(entity instanceof Player player)) return; + if(entity.tickCount % 10 == 0) { + player.playNotifySound(ModSounds.BEAM2.get(), SoundSource.PLAYERS, 4.0F, 1.0F); + } + if(!tryConsumeMana(player, getFinalManaConsumeRate(stack, player))) { + player.stopUsingItem(); } } - @Override - public int getUseDuration(ItemStack stack, LivingEntity entity) { - return 72000; + private boolean canStartUsingPrism(Player player) { + if(player.hasInfiniteMaterials()) return true; + if(player.getData(ModAttachments.PLAYER_MANA).getMana() > 0) return true; + return tryAutoUseManaPotionToReachTarget(player, 1.0D); } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LunarFlare.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LunarFlare.java new file mode 100644 index 0000000..563a49d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LunarFlare.java @@ -0,0 +1,250 @@ +package com.lzxnone.terraria.item.weapon.magic; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.ModEntities; +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.item.weapon.MagicWeapon; +import com.lzxnone.terraria.particle.DustParticleOptions; +import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +import com.lzxnone.terraria.utils.MathUtil; +import com.lzxnone.terraria.utils.ParticleUtil; +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.sounds.SoundSource; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.EntityHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +public class LunarFlare extends MagicWeapon { + public static final double HITBOX_INFLATE = 0.75D; + public static final double SPAWN_HEIGHT = 20.0D; + public static final double DELTA_HEIGHT = 10.0D; + public static final double SPAWN_OFFSET = 10.0D; + public static final double HIT_OFFSET = 1.5D; + + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.lunar_flare.damage", "lunar_flare_damage", 5.0F, 0.0F, 8388600.0F); + public static final ConfigDouble RANGE = new ConfigDouble("weapon.lunar_flare.range", "lunar_flare_range", 64.0D, 0.0D, 512.0D); + public static final ConfigDouble SPEED = new ConfigDouble("weapon.lunar_flare.speed", "lunar_flare_speed", 2.5D, 0.0D, 10.0D); + public static final ConfigDouble EXPLOSION_RANGE = new ConfigDouble("weapon.lunar_flare.explosion_range", "lunar_flare_explosion_range", 3.0D, 0.0D, 64.0D); + public static final ConfigDouble MANA_CONSUME = new ConfigDouble("weapon.lunar_flare.mana_consume", "lunar_flare_mana_consume", 9.0D, 0.0D, 10000.0D); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE, RANGE, SPEED, EXPLOSION_RANGE, MANA_CONSUME); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "lunar_flare", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/lunar_flare.png"), + Component.translatable("item.lzxnoneterraria.lunar_flare"), + CONFIG_DATA + ); + + public static final DustParticleOptions PARTICLE = new DustParticleOptions( + 0.04F, 0.35F, 24, true, new Vector3f[]{ + new Vector3f(0.15F, 0.45F, 1.0F), + new Vector3f(0.0F, 0.9F, 1.0F) + } + ); + + public static final DustParticleOptions PARTICLE2 = new DustParticleOptions( + 0.12F, 0.5F, 44, true, new Vector3f[]{ + new Vector3f(0.05F, 0.25F, 1.0F), + new Vector3f(0.0F, 0.8F, 1.0F), + new Vector3f(0.45F, 1.0F, 1.0F) + } + ); + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + checkBeforeTick(summon); + + Vec3 motion = summon.getDeltaMovement(); + if(motion.lengthSqr() < 1.0E-7D) { + onDied(summon); + return; + } + + Vec3 start = summon.position(); + Vec3 nextPos = start.add(motion); + + float[] xyRot = MathUtil.computeXYRot(motion.toVector3f()); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + + if(summon.level().isClientSide()) { + double length = motion.length(); + int count = Math.max(4, (int) Math.ceil(length / 0.25D)); + for(int i = 0; i <= count; i++) { + double ratio = i / (double) count; + Vec3 pos = start.add(motion.scale(ratio)); + ParticleUtil.addParticle( + summon.level(), PARTICLE, + pos, 0.02D, + new Vec3(0.0D, 0.0D, 0.0D), 0.01D + ); + } + return; + } + + EntityHitResult entityHitResult = CollisionUtil.checkEntityHit(summon, nextPos, HITBOX_INFLATE); + if(entityHitResult != null) { + onDied(summon); + return; + } + + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, nextPos); + if(blockHitResult.getType() != HitResult.Type.MISS) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + int targetLifetime = customData.getInt("targetLifetime"); + int age = summon.getEntityData().get(StaticSummon.AGE); + if(age >= targetLifetime && !summon.level().getBlockState(blockHitResult.getBlockPos()).getCollisionShape(summon.level(), blockHitResult.getBlockPos()).isEmpty()) { + onDied(summon); + return; + } + } + } + + @Override + public AABB getBoundingBoxForCulling(StaticSummon summon) { + return summon.getBoundingBox().inflate(8.0D); + } + + @Override + public void onDied(StaticSummon summon) { + if(!(summon.level() instanceof ServerLevel serverLevel)) return; + + Vec3 pos = summon.position(); + ParticleUtil.addParticles( + serverLevel, ModParticles.LUNAR_FLARE_EXPLOSION_PARTICLE.get(), + pos, new Vec3(0.0D, 0.0D, 0.0D), + 0.0D, 1 + ); + ParticleUtil.addParticles( + serverLevel, PARTICLE2, + pos, new Vec3(0.7D, 0.7D, 0.7D), + 0.35D, 45 + ); + ParticleUtil.addParticles( + serverLevel, PARTICLE, + pos, new Vec3(0.45D, 0.45D, 0.45D), + 0.25D, 25 + ); + + double explosionRange = EXPLOSION_RANGE.get(); + if(explosionRange > 0.0D) { + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + for(LivingEntity target : serverLevel.getEntitiesOfClass( + LivingEntity.class, + AABB.ofSize(pos, explosionRange * 2.0D, explosionRange * 2.0D, explosionRange * 2.0D), + FilterUtil.createLivingTargetFilter(summon, summon.getOwner()) + )) { + if(target.distanceToSqr(pos) > explosionRange * explosionRange) continue; + if(DamageUtil.magicAttack(summon, target, sourceStack, DAMAGE.get(), 0.4F)) { + target.invulnerableTime = 10; + } + } + } + + summon.discard(); + } + }; + + public LunarFlare() { + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); + } + + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyMagicDamageBonus(weaponStack, entity, damage); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 10; + } + + @Override + protected double getManaConsumeRate(ItemStack stack, LivingEntity entity) { + return MANA_CONSUME.get(); + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { + if(level.isClientSide()) return; + + player.playNotifySound(ModSounds.MAGIC_SHOOT.get(), SoundSource.PLAYERS, 4.0F, 1.0F); + + int count = 2 + player.getRandom().nextInt(3); + for(int i = 0; i < count; i++) { + Vec3 target = MathUtil.getCrosshairPos(player, level, RANGE.get()); + + Vec3 spawnPos = new Vec3( + target.x + SPAWN_OFFSET * (player.getRandom().nextDouble() * 2.0D - 1.0D), + target.y + SPAWN_HEIGHT + i * DELTA_HEIGHT, + target.z + SPAWN_OFFSET * (player.getRandom().nextDouble() * 2.0D - 1.0D) + ); + + Vec3 hitPos = new Vec3( + target.x + HIT_OFFSET * (player.getRandom().nextDouble() * 2.0D - 1.0D), + target.y, + target.z + HIT_OFFSET * (player.getRandom().nextDouble() * 2.0D - 1.0D) + ); + + Vec3 toTarget = hitPos.subtract(spawnPos); + if(toTarget.lengthSqr() < 1.0E-7D) continue; + + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); + summon.setOwner(player); + summon.setPos(spawnPos); + summon.setDeltaMovement(toTarget.normalize().scale(SPEED.get())); + summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy()); + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.LUNAR_FLARE); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.LIFETIME, 1200); + summon.getEntityData().set(StaticSummon.GLOW, true); + summon.setNoGravity(true); + summon.noPhysics = true; + + CompoundTag customData = new CompoundTag(); + customData.putInt("targetLifetime", (int) Math.round(target.distanceTo(spawnPos) / SPEED.get())); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + + float[] xyRot = MathUtil.computeXYRot(summon.getDeltaMovement().toVector3f()); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + summon.xRotO = xyRot[0]; + summon.yRotO = xyRot[1]; + + level.addFreshEntity(summon); + } + } +} 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 668f5f3..00c5e23 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.BeeSummon; @@ -13,23 +12,21 @@ import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; -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; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; public class BeeKeeper extends MeleeWeapon { + public static final String ID = "bee_keeper"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 5F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigInt MAX_BEES = new ConfigInt( "weapon.bee_keeper.max_bees", "bee_keeper_max_bees", @@ -52,21 +49,25 @@ public class BeeKeeper extends MeleeWeapon { 8388600.0f ); public BeeKeeper() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 5, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.IRON, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, MAX_BEES, CONFUSION_DURATION, BEE_DAMAGE @@ -74,12 +75,7 @@ public class BeeKeeper extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final IItemWaveBehavior ITEM_WAVE_BEHAVIOR = new IItemWaveBehavior() { @Override 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 aed8aee..c2eb08c 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; import com.lzxnone.terraria.entity.projectile.StaticProjectile; @@ -19,15 +18,11 @@ import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; 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; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; @@ -41,12 +36,14 @@ import com.lzxnone.terraria.ui.config.struct.ConfigDouble; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; import java.util.Comparator; import java.util.List; public class BladeOfGrass extends MeleeWeapon { + public static final String ID = "blade_of_grass"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 3F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigFloat PROJECTILE_DAMAGE = new ConfigFloat( "weapon.blade_of_grass.projectile_damage", "blade_of_grass_projectile_damage", @@ -100,6 +97,8 @@ public class BladeOfGrass extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, PROJECTILE_DAMAGE, EFFECT_DURATION, TARGET_RANGE, @@ -111,23 +110,20 @@ public class BladeOfGrass extends MeleeWeapon { } }; - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public BladeOfGrass() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 3, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.IRON, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { 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 014bc0a..680372c 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,7 +1,7 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.item.IItemWaveBehavior; import com.lzxnone.terraria.particle.ModParticles; @@ -11,24 +11,22 @@ import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; -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; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; public class BloodButcherer extends MeleeWeapon { + public static final String ID = "blood_butcherer"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 3.5F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -1.5F); public static final ConfigInt EFFECT_DURATION = new ConfigInt( "weapon.blood_butcherer.effect_duration", "blood_butcherer_effect_duration", @@ -44,33 +42,32 @@ public class BloodButcherer extends MeleeWeapon { 255 ); public BloodButcherer() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 3.5, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -1.5, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.IRON, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, EFFECT_DURATION, MAX_LEVEL ); } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final IItemWaveBehavior ITEM_WAVE_BEHAVIOR = new IItemWaveBehavior() { @Override diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/CopperShortsword.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/CopperShortsword.java index c429553..95dc0bd 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/CopperShortsword.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/CopperShortsword.java @@ -1,25 +1,32 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.EquipmentSlotGroup; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.Item; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.component.ItemAttributeModifiers; +import net.minecraft.world.item.ItemStack; public class CopperShortsword extends MeleeWeapon { + public static final String ID = "copper_shortsword"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 2F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -1F); + + public static final IConfigData CONFIG_DATA = createConfigData(BASE_MELEE_DAMAGE, BASE_MELEE_ATTACK_SPEED); + public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public CopperShortsword() { - super(Tiers.STONE, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 2, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -1, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.STONE, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } } 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 2078096..7f02566 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.effect.ModEffects; @@ -29,13 +28,9 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.effect.MobEffectInstance; 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; import net.minecraft.world.item.*; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; @@ -58,6 +53,9 @@ import java.util.*; public class DevilsDevastation extends MeleeWeapon { + public static final String ID = "devils_devastation"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 30F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigInt KILL_MODE_TIME = new ConfigInt( "weapon.devils_devastation.kill_mode_time", "devils_devastation_kill_mode_time", @@ -181,6 +179,8 @@ public class DevilsDevastation extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, KILL_MODE_TIME, KILL_MODE_COOLDOWN_TIME, PROJECTILE_DAMAGE, @@ -213,23 +213,20 @@ public class DevilsDevastation extends MeleeWeapon { return KILL_MODE_PROJECTILE_CYCLE.get(); } - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public DevilsDevastation() { - super(Tiers.NETHERITE, new Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 30, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).fireResistant().rarity(Rarity.EPIC)); + super(Tiers.NETHERITE, new Properties().fireResistant().rarity(Rarity.EPIC)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } @Override 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 4857a8d..96b5cfb 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; @@ -17,7 +16,6 @@ import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -25,16 +23,12 @@ import net.minecraft.sounds.SoundSource; 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; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Item; import net.minecraft.world.item.Tiers; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; @@ -42,6 +36,9 @@ import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; public class EnchantedSword extends MeleeWeapon { + public static final String ID = "enchanted_sword"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 4F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigFloat DAMAGE = new ConfigFloat( "weapon.enchanted_sword.damage", "enchanted_sword_damage", @@ -64,23 +61,25 @@ public class EnchantedSword extends MeleeWeapon { 10.0 ); public EnchantedSword() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 4, - AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, - AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.IRON, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, DAMAGE, LIFETIME, SPEED @@ -88,12 +87,7 @@ public class EnchantedSword extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { @Override 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 319b257..bfbda78 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.beam.ISwordBeamBehavior; import com.lzxnone.terraria.entity.beam.SwordBeam; @@ -21,12 +20,8 @@ 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.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.Vec3; @@ -39,9 +34,11 @@ import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; public class Excalibur extends MeleeWeapon { + public static final String ID = "excalibur"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 7.0F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -1.0F); public static final ConfigInt ROTATE_RANGE = new ConfigInt( "weapon.excalibur.rotate_range", "excalibur_rotate_range", @@ -67,6 +64,8 @@ public class Excalibur extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, ROTATE_RANGE, MAX_HIT_COUNT, DAMAGE @@ -74,23 +73,20 @@ public class Excalibur extends MeleeWeapon { } }; - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public Excalibur() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 7.0, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -1.0, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.UNCOMMON)); + super(Tiers.IRON, new Item.Properties().rarity(Rarity.UNCOMMON)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final CompoundTag BEAM_DATA = Util.make(new CompoundTag(), tag -> { 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 5b4f510..1e49116 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.*; @@ -15,14 +14,10 @@ import net.minecraft.util.FastColor; 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; import net.minecraft.world.item.*; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; @@ -35,12 +30,14 @@ import com.lzxnone.terraria.ui.config.struct.ConfigDouble; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; import java.util.List; import java.util.UUID; public class FirstFractal extends MeleeWeapon { + public static final String ID = "first_fractal"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 20.0F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigFloat PROJECTILE_DAMAGE = new ConfigFloat( "weapon.first_fractal.projectile_damage", "first_fractal_projectile_damage", @@ -99,6 +96,8 @@ public class FirstFractal extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, PROJECTILE_DAMAGE, BOUNDING_BOX_SIZE, PROJECTILE_SPEED, @@ -123,23 +122,20 @@ public class FirstFractal extends MeleeWeapon { return MAX_RANGE.get(); } - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public FirstFractal() { - super(Tiers.NETHERITE, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 20.0, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).fireResistant().rarity(Rarity.EPIC)); + super(Tiers.NETHERITE, new Item.Properties().fireResistant().rarity(Rarity.EPIC)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } private static ItemStack[] weapons; 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 54d3bae..0cd14f9 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; @@ -21,15 +20,11 @@ import net.minecraft.sounds.SoundSource; 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.ai.targeting.TargetingConditions; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.*; @@ -41,13 +36,15 @@ import com.lzxnone.terraria.ui.config.struct.ConfigDouble; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; import java.util.Comparator; import java.util.List; import java.util.Locale; public class InfluxWaver extends MeleeWeapon { + public static final String ID = "influx_waver"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 11F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigFloat DAMAGE = new ConfigFloat( "weapon.influx_waver.damage", "influx_waver_damage", @@ -87,6 +84,8 @@ public class InfluxWaver extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, DAMAGE, MAX_COUNT, SPEED, @@ -96,23 +95,20 @@ public class InfluxWaver extends MeleeWeapon { } }; - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public InfluxWaver() { - super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 11, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.RARE)); + super(Tiers.DIAMOND, new Item.Properties().rarity(Rarity.RARE)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final float FADE_OUT = 0.1f; 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 f7227f1..cc40d1e 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,7 +1,7 @@ package com.lzxnone.terraria.item.weapon.melee; -import com.lzxnone.terraria.item.weapon.MeleeWeapon; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.weapon.MeleeWeapon; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.beam.SwordBeam; import com.lzxnone.terraria.entity.projectile.StaticProjectile; @@ -21,19 +21,14 @@ import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.ParticleUtil; import com.mojang.math.Axis; 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; 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; import net.minecraft.world.entity.projectile.Projectile; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; @@ -43,6 +38,9 @@ import java.util.Comparator; import java.util.List; public class LightsBane extends MeleeWeapon { + public static final String ID = "lights_bane"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 3F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -1.0F); public static final ConfigFloat BIG_DAMAGE = new ConfigFloat( "weapon.lights_bane.big_damage", "lights_bane_big_damage", @@ -65,21 +63,25 @@ public class LightsBane extends MeleeWeapon { 64.0 ); public LightsBane() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 3, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -1.0, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.IRON, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, BIG_DAMAGE, SMALL_DAMAGE, TARGET_RANGE @@ -87,12 +89,7 @@ public class LightsBane extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.075f, 0.5f, 40, true, new Vector3f[]{ @@ -207,4 +204,3 @@ public class LightsBane extends MeleeWeapon { } }; } - 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 c005765..4dddcb0 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; @@ -23,14 +22,10 @@ import net.minecraft.util.Mth; 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; import net.minecraft.world.item.*; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.*; @@ -42,11 +37,13 @@ import com.lzxnone.terraria.ui.config.struct.ConfigDouble; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; import java.util.List; public class Mace extends MeleeWeapon { + public static final String ID = "mace"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 3F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigDouble PROJECTILE_SPEED = new ConfigDouble( "weapon.mace.projectile_speed", "mace_projectile_speed", @@ -86,6 +83,8 @@ public class Mace extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, PROJECTILE_SPEED, GRAVITY, DAMAGE, @@ -95,23 +94,20 @@ public class Mace extends MeleeWeapon { } }; - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public Mace() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 3, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.IRON, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public enum State { 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 88bf597..c030014 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; @@ -17,19 +16,14 @@ import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.*; 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; 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; import net.minecraft.world.item.*; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.*; import org.joml.Vector3f; @@ -37,6 +31,9 @@ import org.joml.Vector3f; import java.util.List; public class Meowmere extends MeleeWeapon { + public static final String ID = "meowmere"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 19F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigFloat DAMAGE = new ConfigFloat( "weapon.meowmere.damage", "meowmere_damage", @@ -59,21 +56,25 @@ public class Meowmere extends MeleeWeapon { 10.0 ); public Meowmere() { - super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 19, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.RARE)); + super(Tiers.DIAMOND, new Item.Properties().rarity(Rarity.RARE)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, DAMAGE, GRAVITY, INITIAL_SPEED @@ -81,12 +82,7 @@ public class Meowmere extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.05f, 0.5f, 40, true, new Vector3f[]{ 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 3eae85a..955c5dd 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; import com.lzxnone.terraria.entity.projectile.StaticProjectile; @@ -15,15 +14,11 @@ import com.lzxnone.terraria.utils.MathUtil; import com.lzxnone.terraria.utils.ParticleUtil; import net.minecraft.resources.ResourceLocation; 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; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; @@ -33,9 +28,11 @@ import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; public class Muramasa extends MeleeWeapon { + public static final String ID = "muramasa"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 4F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -1.5F); public static final ConfigFloat BEAM_DAMAGE = new ConfigFloat( "weapon.muramasa.beam_damage", "muramasa_beam_damage", @@ -47,28 +44,27 @@ public class Muramasa extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, BEAM_DAMAGE ); } }; - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public Muramasa() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -1.5, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.IRON, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final DustParticleOptions PARTICLE = new DustParticleOptions( 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 3ffd59b..c3b3b72 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.beam.ISwordBeamBehavior; @@ -23,13 +22,9 @@ 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; 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.phys.*; @@ -45,11 +40,13 @@ import com.lzxnone.terraria.ui.config.struct.ConfigDouble; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; import java.util.List; public class NightsEdge extends MeleeWeapon { + public static final String ID = "nights_edge"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 6.0F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -1.5F); public static final ConfigBoolean PROJECTILE_ALIGN_TO_BLADE = new ConfigBoolean( "weapon.nights_edge.projectile_align_to_blade", "nights_edge_projectile_align_to_blade", @@ -122,6 +119,8 @@ public class NightsEdge extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, PROJECTILE_ALIGN_TO_BLADE, ROTATE_RANGE, PROJECTILE_ROTATE_RANGE, @@ -136,23 +135,20 @@ public class NightsEdge extends MeleeWeapon { } }; - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public NightsEdge() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 6.0, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -1.5, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.UNCOMMON)); + super(Tiers.IRON, new Item.Properties().rarity(Rarity.UNCOMMON)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final CompoundTag BEAM_DATA = Util.make(new CompoundTag(), tag -> { 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 1935dc4..1410e62 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; @@ -21,19 +20,14 @@ import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; 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; import net.minecraft.world.item.*; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.*; import org.joml.Vector3f; @@ -42,6 +36,9 @@ import java.util.Comparator; import java.util.List; public class Seedler extends MeleeWeapon { + public static final String ID = "seedler"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 7F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigDouble NUT_GRAVITY = new ConfigDouble( "weapon.seedler.nut_gravity", "seedler_nut_gravity", @@ -85,21 +82,25 @@ public class Seedler extends MeleeWeapon { 10.0 ); public Seedler() { - super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 7, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.UNCOMMON)); + super(Tiers.DIAMOND, new Item.Properties().rarity(Rarity.UNCOMMON)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, NUT_GRAVITY, NUT_BOUNCE, NUT_INITIAL_SPEED, @@ -110,12 +111,7 @@ public class Seedler extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.025f, 0.5f, 40, true, new Vector3f[]{ 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 45daaff..42e04b0 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; @@ -18,25 +17,23 @@ import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; 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; import net.minecraft.world.item.*; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.*; import org.joml.Vector3f; public class StarWrath extends MeleeWeapon { + public static final String ID = "star_wrath"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 15F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigFloat DAMAGE = new ConfigFloat( "weapon.star_wrath.damage", "star_wrath_damage", @@ -59,21 +56,25 @@ public class StarWrath extends MeleeWeapon { 1024.0 ); public StarWrath() { - super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 15, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.RARE)); + super(Tiers.DIAMOND, new Item.Properties().rarity(Rarity.RARE)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, DAMAGE, SPEED, MAX_RANGE @@ -81,12 +82,7 @@ public class StarWrath extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.05f, 0.5f, 40, true, new Vector3f[]{ 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 f98cc65..28acf87 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; @@ -17,7 +16,6 @@ import com.lzxnone.terraria.ui.config.struct.ConfigStruct; 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; @@ -25,21 +23,20 @@ import net.minecraft.sounds.SoundSource; 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; import net.minecraft.world.entity.projectile.ProjectileUtil; import net.minecraft.world.item.*; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; import net.minecraft.world.phys.*; import org.joml.Vector3f; public class Starfury extends MeleeWeapon { + public static final String ID = "starfury"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 5F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigFloat DAMAGE = new ConfigFloat( "weapon.starfury.damage", "starfury_damage", @@ -62,21 +59,25 @@ public class Starfury extends MeleeWeapon { 10.0 ); public Starfury() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 5, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.IRON, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, DAMAGE, MAX_RANGE, SPEED @@ -84,12 +85,7 @@ public class Starfury extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final IStaticProjectileBehavior PROJECTILE_BEHAVIOR = new IStaticProjectileBehavior() { @Override 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 a226ce4..ff0f3e6 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.beam.ISwordBeamBehavior; @@ -25,18 +24,13 @@ import com.lzxnone.terraria.utils.*; import com.mojang.math.Axis; import net.minecraft.Util; 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.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; 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.phys.*; @@ -49,6 +43,9 @@ import org.joml.Vector3f; import java.util.List; public class TerraBlade extends MeleeWeapon { + public static final String ID = "terra_blade"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 10F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -1.0F); public static final ConfigBoolean PROJECTILE_ALIGN_TO_SWORD_BEAM = new ConfigBoolean( "weapon.terra_blade.projectile_align_to_sword_beam", "terra_projectile_align_to_blade", @@ -112,21 +109,25 @@ public class TerraBlade extends MeleeWeapon { ); public TerraBlade() { - super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 10, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -1.0, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.RARE)); + super(Tiers.DIAMOND, new Item.Properties().rarity(Rarity.RARE)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, PROJECTILE_ALIGN_TO_SWORD_BEAM, SWORD_BEAM_ROTATE_RANGE, PROJECTILE_ROTATE_RANGE, @@ -140,12 +141,7 @@ public class TerraBlade extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final CompoundTag BEAM_DATA = Util.make(new CompoundTag(), tag -> { tag.putString("behavior", "terra_blade"); 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 a67f806..ef4cde1 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; @@ -20,20 +19,15 @@ import com.lzxnone.terraria.utils.SoundUtil; import com.mojang.math.Axis; 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; 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.AttributeInstance; -import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; @@ -44,6 +38,9 @@ import org.jspecify.annotations.NonNull; import java.util.List; public class Terragrim extends MeleeWeapon { + public static final String ID = "terragrim"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 3F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -0.5F); public static final ConfigDouble HIT_RANGE = new ConfigDouble( "weapon.terragrim.hit_range", "terragrim_hit_range", @@ -66,21 +63,25 @@ public class Terragrim extends MeleeWeapon { 90 ); public Terragrim() { - super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 3, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -0.5, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.RARE)); + super(Tiers.DIAMOND, new Item.Properties().rarity(Rarity.RARE)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, HIT_RANGE, DAMAGE, ROTATE_RANGE @@ -88,12 +89,7 @@ public class Terragrim extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final ResourceLocation[] RES = { ResourceLocation.parse("lzxnoneterraria:textures/vfx/terragrim_beam0.png"), 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 4bc6903..fda23ce 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.beam.ISwordBeamBehavior; @@ -24,14 +23,10 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.damagesource.DamageTypes; 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.ai.targeting.TargetingConditions; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.AABB; @@ -47,12 +42,14 @@ import com.lzxnone.terraria.ui.config.struct.ConfigDouble; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; import java.util.Comparator; import java.util.List; public class TheHorsemansBlade extends MeleeWeapon { + public static final String ID = "the_horsemans_blade"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 14F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigInt BLADE_ROTATE_RANGE = new ConfigInt( "weapon.the_horsemans_blade.blade_rotate_range", "horsemans_blade_rotate_range", @@ -106,6 +103,8 @@ public class TheHorsemansBlade extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, BLADE_ROTATE_RANGE, BLADE_MAX_HIT_COUNT, BLADE_DAMAGE, @@ -117,23 +116,20 @@ public class TheHorsemansBlade extends MeleeWeapon { } }; - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public TheHorsemansBlade() { - super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 14, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.RARE)); + super(Tiers.DIAMOND, new Item.Properties().rarity(Rarity.RARE)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final CompoundTag BEAM_DATA = Util.make(new CompoundTag(), tag -> { 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 c1ac8e7..f097e76 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,7 +1,9 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.StaticProjectile; @@ -14,30 +16,34 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; -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; import net.minecraft.world.item.*; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; import org.jspecify.annotations.NonNull; public class TrueCopperShortsword extends MeleeWeapon { + public static final String ID = "true_copper_shortsword"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 20F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); + + public static final IConfigData CONFIG_DATA = createConfigData(BASE_MELEE_DAMAGE, BASE_MELEE_ATTACK_SPEED); + public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public TrueCopperShortsword() { - super(Tiers.NETHERITE, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 20, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).fireResistant().rarity(Rarity.EPIC)); + super(Tiers.NETHERITE, new Item.Properties().fireResistant().rarity(Rarity.EPIC)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static void summon(Player player, double deltaDist) { 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 90d48a7..6e386d0 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.beam.ISwordBeamBehavior; import com.lzxnone.terraria.entity.beam.SwordBeam; @@ -19,12 +18,8 @@ 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.ai.attributes.AttributeModifier; -import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.Vec3; @@ -37,9 +32,11 @@ import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; public class TrueExcalibur extends MeleeWeapon { + public static final String ID = "true_excalibur"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 7.0F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -1.0F); public static final ConfigInt ROTATE_RANGE = new ConfigInt( "weapon.true_excalibur.rotate_range", "true_excalibur_rotate_range", @@ -65,6 +62,8 @@ public class TrueExcalibur extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, ROTATE_RANGE, MAX_HIT_COUNT, DAMAGE @@ -72,23 +71,20 @@ public class TrueExcalibur extends MeleeWeapon { } }; - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public TrueExcalibur() { - super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 7.0f, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -1.0, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.RARE)); + super(Tiers.DIAMOND, new Item.Properties().rarity(Rarity.RARE)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final CompoundTag BEAM_DATA = Util.make(new CompoundTag(), tag -> { 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 4d17482..5849e2b 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.beam.ISwordBeamBehavior; @@ -23,13 +22,9 @@ 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; 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.phys.*; @@ -45,11 +40,13 @@ import com.lzxnone.terraria.ui.config.struct.ConfigDouble; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; import java.util.List; public class TrueNightsEdge extends MeleeWeapon { + public static final String ID = "true_nights_edge"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 7.0F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigBoolean PROJECTILE_ALIGN_TO_BLADE = new ConfigBoolean( "weapon.true_nights_edge.projectile_align_to_blade", "true_nights_edge_projectile_align_to_blade", @@ -129,6 +126,8 @@ public class TrueNightsEdge extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, PROJECTILE_ALIGN_TO_BLADE, ROTATE_RANGE, PROJECTILE_ROTATE_RANGE, @@ -144,23 +143,20 @@ public class TrueNightsEdge extends MeleeWeapon { } }; - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public TrueNightsEdge() { - super(Tiers.DIAMOND, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 7.0f, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).rarity(Rarity.RARE)); + super(Tiers.DIAMOND, new Item.Properties().rarity(Rarity.RARE)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final CompoundTag BEAM_DATA = Util.make(new CompoundTag(), tag -> { 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 275b3a3..3f6d539 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; @@ -20,19 +19,14 @@ 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; -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; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.neoforged.neoforge.event.entity.player.AttackEntityEvent; @@ -43,6 +37,9 @@ import java.util.Comparator; import java.util.List; public class Volcano extends MeleeWeapon { + public static final String ID = "volcano"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 6F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigDouble EXPLOSION_RANGE = new ConfigDouble( "weapon.volcano.explosion_range", "volcano_explosion_range", @@ -72,21 +69,25 @@ public class Volcano extends MeleeWeapon { 60 ); public Volcano() { - super(Tiers.IRON, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 6, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - )); + super(Tiers.IRON, new Item.Properties()); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, EXPLOSION_RANGE, EXPLOSION_DAMAGE, EXPLOSION_MAX_HIT_COUNT, @@ -95,12 +96,7 @@ public class Volcano extends MeleeWeapon { } }; - 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 ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.075f, 0.5f, 40, true, new Vector3f[]{ 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 baf2f01..b9fae6e 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,7 +1,6 @@ package com.lzxnone.terraria.item.weapon.melee; import com.lzxnone.terraria.item.weapon.MeleeWeapon; -import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.IStaticProjectileBehavior; @@ -17,14 +16,10 @@ import net.minecraft.resources.ResourceLocation; 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; import net.minecraft.world.item.*; import net.minecraft.world.item.component.CustomData; -import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.EntityHitResult; @@ -39,11 +34,13 @@ import com.lzxnone.terraria.ui.config.struct.ConfigDouble; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigInt; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import net.minecraft.network.chat.Component; import java.util.List; public class Zenith extends MeleeWeapon { + public static final String ID = "zenith"; + public static final ConfigFloat BASE_MELEE_DAMAGE = createBaseMeleeDamageConfig(ID, 20F); + public static final ConfigFloat BASE_MELEE_ATTACK_SPEED = createBaseMeleeAttackSpeedConfig(ID, -2.4F); public static final ConfigFloat DAMAGE = new ConfigFloat( "weapon.zenith.damage", "zenith_damage", @@ -130,6 +127,8 @@ public class Zenith extends MeleeWeapon { @Override public void onConfigLoad() { ConfigStruct.loadAll( + BASE_MELEE_DAMAGE, + BASE_MELEE_ATTACK_SPEED, DAMAGE, MAX_RANGE, DISTANCE_MODE, @@ -185,23 +184,20 @@ public class Zenith extends MeleeWeapon { return TRAIL_ALPHA.get(); } - 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 static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public Zenith() { - super(Tiers.NETHERITE, new Item.Properties().attributes(ItemAttributeModifiers.builder() - .add(Attributes.ATTACK_DAMAGE, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_damage"), 20, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .add(Attributes.ATTACK_SPEED, - new AttributeModifier(ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "base_attack_speed"), -2.4, AttributeModifier.Operation.ADD_VALUE), - EquipmentSlotGroup.MAINHAND) - .build() - ).fireResistant().rarity(Rarity.EPIC)); + super(Tiers.NETHERITE, new Item.Properties().fireResistant().rarity(Rarity.EPIC)); + } + + @Override + protected float getBaseMeleeDamage(ItemStack stack) { + return BASE_MELEE_DAMAGE.get(); + } + + @Override + protected float getBaseMeleeAttackSpeed(ItemStack stack) { + return BASE_MELEE_ATTACK_SPEED.get(); } private static ItemStack[] weapons; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java index 4f2b725..1cad5c8 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/ElfMelter.java @@ -139,6 +139,12 @@ public class ElfMelter extends RangedWeapon { return 15; } + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyRangedDamageBonus(weaponStack, entity, damage); + } + @Override protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { SoundUtil.playClientSound(player, ModSounds.SHOT9.get()); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java index 8472374..045a2a8 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java @@ -161,6 +161,12 @@ public class Flamethrower extends RangedWeapon { return 15; } + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyRangedDamageBonus(weaponStack, entity, damage); + } + @Override protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { SoundUtil.playClientSound(player, ModSounds.SHOT9.get()); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SnowballCannon.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SnowballCannon.java index 7c0eab3..b2b284c 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SnowballCannon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SnowballCannon.java @@ -127,6 +127,12 @@ public class SnowballCannon extends RangedWeapon { return 19; } + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyRangedDamageBonus(weaponStack, entity, damage); + } + @Override protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { SoundUtil.playClientSound(player, ModSounds.SHOT2.get()); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/StarCannon.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/StarCannon.java index 5a9dcec..79b1af9 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/StarCannon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/StarCannon.java @@ -113,6 +113,12 @@ public class StarCannon extends RangedWeapon { return 12; } + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyRangedDamageBonus(weaponStack, entity, damage); + } + @Override protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { SoundUtil.playClientSound(player, ModSounds.STAR_FALL.get()); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SuperStarShooter.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SuperStarShooter.java index 069bbc7..a89d176 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SuperStarShooter.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SuperStarShooter.java @@ -152,6 +152,12 @@ public class SuperStarShooter extends RangedWeapon { return 18; } + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applyRangedDamageBonus(weaponStack, entity, damage); + } + @Override protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { SoundUtil.playClientSound(player, ModSounds.STAR_FALL.get()); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/Bow.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/Bow.java index a41bfa7..9a86e3c 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/Bow.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/Bow.java @@ -6,6 +6,7 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.ModItemTags; import com.lzxnone.terraria.item.weapon.RangedWeapon; import com.lzxnone.terraria.utils.AmmoUtil; +import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -69,6 +70,18 @@ public class Bow extends RangedWeapon { return 0; } + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + ItemStack ammoStack = getTooltipAmmoStack(weaponStack, entity); + float damage = getDamage(weaponStack, entity, ammoStack) + getAmmoBaseDamage(ammoStack); + if(entity instanceof Player player) damage = DamageUtil.applyPlayerDamageEffects(player, damage); + return applyRangedDamageBonus(weaponStack, entity, damage); + } + + protected ItemStack getTooltipAmmoStack(ItemStack weaponStack, LivingEntity entity) { + return getAmmoStack(weaponStack); + } + protected float getKnockbackScale(ItemStack weaponStack, LivingEntity entity, ItemStack ammoStack) { return 1.0f; } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/DaedalusStormbow.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/DaedalusStormbow.java index a361b6c..22f10ea 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/DaedalusStormbow.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/DaedalusStormbow.java @@ -6,6 +6,7 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.MathUtil; @@ -24,25 +25,24 @@ import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; public class DaedalusStormbow extends Bow { - public static final String ID = "daedalus_stormbow"; public static final int USE_TIME = 19; public static final int ARROW_COUNT = 3; - public static final double RANGE = 64.0D; public static final double SPAWN_HEIGHT = 20.0D; public static final double SPAWN_OFFSET = 6.0D; public static final double HIT_OFFSET = 2D; public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.daedalus_stormbow.damage", "daedalus_stormbow_damage", 4.0F, 0.0F, 8388600.0F); + public static final ConfigDouble RANGE = new ConfigDouble("weapon.daedalus_stormbow.range", "daedalus_stormbow_range", 64.0D, 0.0D, 1024.0D); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigStruct.loadAll(DAMAGE); + ConfigStruct.loadAll(DAMAGE, RANGE); } }; public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( - ID, - ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), - Component.translatable("item.lzxnoneterraria." + ID), + "daedalus_stormbow", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/daedalus_stormbow.png"), + Component.translatable("item.lzxnoneterraria.daedalus_stormbow"), CONFIG_DATA ); @@ -77,7 +77,7 @@ public class DaedalusStormbow extends Bow { for(int i = 0; i < ARROW_COUNT; i++) { StaticSummon summon = createArrowSummon(level, player, hand, weaponStack); - Vec3 targetPos = MathUtil.getCrosshairPos(player, level, RANGE); + Vec3 targetPos = MathUtil.getCrosshairPos(player, level, RANGE.get()); Vec3 spawnPos = targetPos.add( (level.random.nextDouble() * 2.0D - 1.0D) * SPAWN_OFFSET, SPAWN_HEIGHT + i * 1.5D, diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java index 3297eee..a2cfa47 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java @@ -6,15 +6,16 @@ import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.ModItemTags; +import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.RangedWeapon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.AmmoUtil; +import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.MathUtil; import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -22,16 +23,12 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; -import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -import java.util.List; - public class Gun extends RangedWeapon { private static final float DAMAGE_MIN = 0.0f; private static final float DAMAGE_MAX = 8388600.0f; @@ -117,6 +114,21 @@ public class Gun extends RangedWeapon { return 0.0f; } + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + Player player = entity instanceof Player playerEntity ? playerEntity : null; + ItemStack ammoStack = getTooltipAmmoStack(weaponStack, entity); + float damage = getDamage(weaponStack, player) + getAmmoBaseDamage(ammoStack); + if(player != null) damage = DamageUtil.applyPlayerDamageEffects(player, damage); + return applyRangedDamageBonus(weaponStack, entity, damage); + } + + protected ItemStack getTooltipAmmoStack(ItemStack weaponStack, LivingEntity entity) { + ItemStack ammoStack = getAmmoStack(weaponStack); + if(ammoStack.is(ModItems.ENDLESS_MUSKET_POUCH.get())) return ModItems.MUSKET_BALL.get().getDefaultInstance(); + return ammoStack; + } + protected float getAmmoNotConsumeChance(ItemStack stack, LivingEntity entity) { return 0.0f; } @@ -220,15 +232,5 @@ public class Gun extends RangedWeapon { } } - @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, - List tooltipComponents, TooltipFlag tooltipFlag) { - if(stack.is(ModItemTags.SPREAD_RANGED_WEAPONS)) { - tooltipComponents.add(Component.translatable( - "tooltip.lzxnoneterraria.spread_ranged_weapon" - ).withStyle(ChatFormatting.GRAY)); - } - super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); - } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java index f542655..44a6801 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java @@ -87,6 +87,11 @@ public class SniperRifle extends Gun implements ScopeZoomModifier { @Override protected ItemStack getBulletAmmoStack(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + return getTooltipAmmoStack(weaponStack, player); + } + + @Override + protected ItemStack getTooltipAmmoStack(ItemStack weaponStack, LivingEntity entity) { ItemStack ammoStack = RangedWeapon.getAmmoStack(weaponStack); if(ammoStack.is(ModItems.MUSKET_BALL.get()) || ammoStack.is(ModItems.TUNGSTEN_BULLET.get()) || ammoStack.is(ModItems.ENDLESS_MUSKET_POUCH.get())) { return ModItems.HIGH_VELOCITY_BULLET.get().getDefaultInstance(); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java index 5439cc7..a0bf56b 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java @@ -53,6 +53,11 @@ public class Uzi extends Gun { @Override protected ItemStack getBulletAmmoStack(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + return getTooltipAmmoStack(weaponStack, player); + } + + @Override + protected ItemStack getTooltipAmmoStack(ItemStack weaponStack, LivingEntity entity) { ItemStack ammoStack = RangedWeapon.getAmmoStack(weaponStack); if(ammoStack.is(ModItems.MUSKET_BALL.get()) || ammoStack.is(ModItems.TUNGSTEN_BULLET.get()) || ammoStack.is(ModItems.ENDLESS_MUSKET_POUCH.get())) { return ModItems.HIGH_VELOCITY_BULLET.get().getDefaultInstance(); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java index 29d3825..876fbcc 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java @@ -53,6 +53,11 @@ public class VenusMagnum extends Gun { @Override protected ItemStack getBulletAmmoStack(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + return getTooltipAmmoStack(weaponStack, player); + } + + @Override + protected ItemStack getTooltipAmmoStack(ItemStack weaponStack, LivingEntity entity) { ItemStack ammoStack = RangedWeapon.getAmmoStack(weaponStack); if(ammoStack.is(ModItems.MUSKET_BALL.get()) || ammoStack.is(ModItems.TUNGSTEN_BULLET.get()) || ammoStack.is(ModItems.ENDLESS_MUSKET_POUCH.get())) { return ModItems.HIGH_VELOCITY_BULLET.get().getDefaultInstance(); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java index 6c106c0..f180a81 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java @@ -25,6 +25,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; @@ -89,6 +90,19 @@ public class StardustDragonStaff extends MinionWeapon { CONFIG_DATA ); + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + int stardustDragonSlotCount = 0; + if(entity instanceof Player player) { + for(PlayerSummon.SummonSlot slot : player.getData(ModAttachments.PLAYER_SUMMON).getMinionSlots()) { + if(slot.getId().equals(StaticSummonBehaviors.STARDUST_DRAGON_STAFF)) stardustDragonSlotCount++; + } + } + float damage = DAMAGE.get() + ADD_DAMAGE.get() * Math.max(0, stardustDragonSlotCount - 1); + if(entity instanceof Player player) damage = DamageUtil.applyPlayerDamageEffects(player, damage); + return applySummonDamageBonus(weaponStack, entity, damage); + } + public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.1f, 0.5f, 40, true, new Vector3f[]{ new Vector3f(0.0F, 1.0F, 1.0F), diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java index b9d7e14..340d9de 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java @@ -25,6 +25,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; @@ -142,6 +143,12 @@ public class Terraprisma extends MinionWeapon { CONFIG_DATA ); + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, DAMAGE.get()) : DAMAGE.get(); + return applySummonDamageBonus(weaponStack, entity, damage); + } + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { @Override public void tick(StaticSummon summon) { diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java index a765f85..25c9f01 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Whip.java @@ -15,6 +15,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -44,6 +45,12 @@ public abstract class Whip extends SummonWeapon { protected abstract float getDamage(); + @Override + public float getTooltipDamage(ItemStack weaponStack, LivingEntity entity) { + float damage = entity instanceof Player player ? DamageUtil.applyPlayerDamageEffects(player, getDamage()) : getDamage(); + return applySummonDamageBonus(weaponStack, entity, damage); + } + protected abstract int getLifetime(); protected double getHeight() { diff --git a/src/main/java/com/lzxnone/terraria/mixin/ItemEntityMixin.java b/src/main/java/com/lzxnone/terraria/mixin/ItemEntityMixin.java deleted file mode 100644 index 74e6408..0000000 --- a/src/main/java/com/lzxnone/terraria/mixin/ItemEntityMixin.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.lzxnone.terraria.mixin; - -import com.lzxnone.terraria.item.accessory.AccessoryUtil; -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; -import net.minecraft.world.phys.Vec3; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(ItemEntity.class) -public class ItemEntityMixin { - @Unique - private static final double lzxnoneterraria$PICKUP_PROBE_RANGE = 16.0D; - - @Unique - private static final double lzxnoneterraria$ATTRACT_SPEED = 0.25D; - - @Unique - private boolean lzxnoneterraria$attracting = false; - - @Shadow - private int pickupDelay; - - @WrapOperation( - method = "tick", - at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/item/ItemEntity;applyGravity()V") - ) - private void lzxnoneterraria$wrapGravityWhileAttracted(ItemEntity self, Operation original) { - if(!lzxnoneterraria$attracting) { - original.call(self); - } - } - - @Inject(method = "tick", at = @At("TAIL")) - private void lzxnoneterraria$attractToPlayer(CallbackInfo ci) { - ItemEntity self = (ItemEntity)(Object) this; - boolean attracting = false; - if(this.pickupDelay == 0) { - Player player = self.level().getNearestPlayer( - self.getX(), self.getY(), self.getZ(), lzxnoneterraria$PICKUP_PROBE_RANGE, false - ); - if(player != null && self.getOwner() != player) { - Item item = self.getItem().getItem(); - double range = AccessoryUtil.getEffectivePickupRange(player, item); - if(range > 0.0D) { - double distanceSqr = self.distanceToSqr(player); - if(distanceSqr <= range * range) { - attracting = true; - Vec3 toPlayer = player.position().subtract(self.position()).normalize(); - self.setDeltaMovement(toPlayer.scale(lzxnoneterraria$ATTRACT_SPEED)); - } - } - } - } - lzxnoneterraria$attracting = attracting; - } -} diff --git a/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java b/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java index fb5ac6c..9118bb4 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java @@ -3,6 +3,7 @@ package com.lzxnone.terraria.mixin; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.item.weapon.MagicWeapon; import com.lzxnone.terraria.item.weapon.RangedWeapon; import net.minecraft.client.player.LocalPlayer; import net.minecraft.world.item.ItemStack; @@ -20,7 +21,7 @@ public abstract class UseSpeedMixin { || usingItem.is(ModItems.FIRST_FRACTAL.get()) || usingItem.is(ModItems.TERRAGRIM.get()) || usingItem.is(ModItems.MACE.get()) - || usingItem.is(ModItems.LAST_PRISM.get()) + || usingItem.getItem() instanceof MagicWeapon || usingItem.getItem() instanceof RangedWeapon; } diff --git a/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java b/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java index e99f9ef..a4a8a42 100644 --- a/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/CircleParticle.java @@ -4,9 +4,10 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.*; +import net.minecraft.client.renderer.LightTexture; import net.minecraft.core.particles.ParticleOptions; -public class CircleParticle extends EmissiveBloomParticle { +public class CircleParticle extends TextureSheetParticle { private final float baseSize; protected CircleParticle(ClientLevel level, double x, double y, double z, @@ -48,6 +49,16 @@ public class CircleParticle extends EmissiveBloomParticle { for(int i = 0;i < 10;i++) super.render(buffer, camera, partialTick); } + @Override + public int getLightColor(float partialTick) { + return LightTexture.FULL_BRIGHT; + } + + @Override + public ParticleRenderType getRenderType() { + return ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; + } + public static class Provider implements ParticleProvider { private final SpriteSet spriteSet; diff --git a/src/main/java/com/lzxnone/terraria/particle/DevilsDevastationRuneParticle.java b/src/main/java/com/lzxnone/terraria/particle/DevilsDevastationRuneParticle.java index 8625099..f41ef97 100644 --- a/src/main/java/com/lzxnone/terraria/particle/DevilsDevastationRuneParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/DevilsDevastationRuneParticle.java @@ -2,9 +2,10 @@ package com.lzxnone.terraria.particle; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.*; +import net.minecraft.client.renderer.LightTexture; import net.minecraft.core.particles.SimpleParticleType; -public class DevilsDevastationRuneParticle extends EmissiveBloomParticle { +public class DevilsDevastationRuneParticle extends TextureSheetParticle { private final float baseSize; protected DevilsDevastationRuneParticle(ClientLevel level, double x, double y, double z, @@ -49,6 +50,16 @@ public class DevilsDevastationRuneParticle extends EmissiveBloomParticle { this.alpha = 1.0F - lifeRatio; } + @Override + public int getLightColor(float partialTick) { + return LightTexture.FULL_BRIGHT; + } + + @Override + public ParticleRenderType getRenderType() { + return ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; + } + public static class Provider implements ParticleProvider { private final SpriteSet spriteSet; diff --git a/src/main/java/com/lzxnone/terraria/particle/DevilsDevastationRuneParticle2.java b/src/main/java/com/lzxnone/terraria/particle/DevilsDevastationRuneParticle2.java index c18059b..1c346dc 100644 --- a/src/main/java/com/lzxnone/terraria/particle/DevilsDevastationRuneParticle2.java +++ b/src/main/java/com/lzxnone/terraria/particle/DevilsDevastationRuneParticle2.java @@ -2,9 +2,10 @@ package com.lzxnone.terraria.particle; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.*; +import net.minecraft.client.renderer.LightTexture; import net.minecraft.core.particles.SimpleParticleType; -public class DevilsDevastationRuneParticle2 extends EmissiveBloomParticle { +public class DevilsDevastationRuneParticle2 extends TextureSheetParticle { private final float baseSize; protected DevilsDevastationRuneParticle2(ClientLevel level, double x, double y, double z, @@ -43,6 +44,16 @@ public class DevilsDevastationRuneParticle2 extends EmissiveBloomParticle { this.alpha = 1.0F - lifeRatio; } + @Override + public int getLightColor(float partialTick) { + return LightTexture.FULL_BRIGHT; + } + + @Override + public ParticleRenderType getRenderType() { + return ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; + } + public static class Provider implements ParticleProvider { private final SpriteSet spriteSet; diff --git a/src/main/java/com/lzxnone/terraria/particle/DustParticle.java b/src/main/java/com/lzxnone/terraria/particle/DustParticle.java index f7a8303..4ae9f04 100644 --- a/src/main/java/com/lzxnone/terraria/particle/DustParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/DustParticle.java @@ -5,7 +5,6 @@ import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.*; import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.util.Mth; import org.joml.Quaternionf; import org.joml.Vector3f; @@ -141,11 +140,9 @@ public class DustParticle extends TextureSheetParticle { vertex.add(x, y, z); buffer.addVertex(vertex.x(), vertex.y(), vertex.z()) - .setColor(this.rCol, this.gCol, this.bCol, this.alpha) .setUv(uvs[i][0], uvs[i][1]) - .setOverlay(OverlayTexture.NO_OVERLAY) - .setLight(LightTexture.FULL_BRIGHT) - .setNormal(0.0F, 0.0F, 1.0F); + .setColor(this.rCol, this.gCol, this.bCol, this.alpha) + .setLight(LightTexture.FULL_BRIGHT); } } @@ -156,7 +153,7 @@ public class DustParticle extends TextureSheetParticle { @Override public ParticleRenderType getRenderType() { - return glow ? ModParticleRenderTypes.EMISSIVE_BLOOM : ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT; + return glow ? ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE : ParticleRenderType.PARTICLE_SHEET_OPAQUE; } public static class Provider implements ParticleProvider { diff --git a/src/main/java/com/lzxnone/terraria/particle/EmissiveBloomParticle.java b/src/main/java/com/lzxnone/terraria/particle/EmissiveBloomParticle.java deleted file mode 100644 index dbae635..0000000 --- a/src/main/java/com/lzxnone/terraria/particle/EmissiveBloomParticle.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.lzxnone.terraria.particle; - -import com.mojang.blaze3d.vertex.VertexConsumer; -import net.minecraft.client.Camera; -import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.client.particle.ParticleRenderType; -import net.minecraft.client.particle.TextureSheetParticle; -import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.util.Mth; -import org.joml.Quaternionf; -import org.joml.Vector3f; - -public class EmissiveBloomParticle extends TextureSheetParticle { - - protected EmissiveBloomParticle(ClientLevel level, double x, double y, double z, - double xSpeed, double ySpeed, double zSpeed) { - super(level, x, y, z, xSpeed, ySpeed, zSpeed); - } - - @Override - public void render(VertexConsumer buffer, Camera camera, float partialTick) { - if (this.alpha <= 0.01F) return; - - float f = (float) (Mth.lerp(partialTick, this.xo, this.x) - camera.getPosition().x); - float f1 = (float) (Mth.lerp(partialTick, this.yo, this.y) - camera.getPosition().y); - float f2 = (float) (Mth.lerp(partialTick, this.zo, this.z) - camera.getPosition().z); - - Quaternionf quaternion = new Quaternionf(camera.rotation()); - quaternion.rotateZ(Mth.lerp(partialTick, this.oRoll, this.roll)); - - float size = this.quadSize; - - float u0 = this.getU0(); - float u1 = this.getU1(); - float v0 = this.getV0(); - float v1 = this.getV1(); - - float[][] uvs = { - {u1, v1}, - {u1, v0}, - {u0, v0}, - {u0, v1} - }; - - Vector3f[] corners = { - new Vector3f(1.0F, -1.0F, 0.0F), - new Vector3f(1.0F, 1.0F, 0.0F), - new Vector3f(-1.0F, 1.0F, 0.0F), - new Vector3f(-1.0F, -1.0F, 0.0F) - }; - - for (int i = 0; i < 4; i++) { - Vector3f vertex = corners[i]; - vertex.rotate(quaternion); - vertex.mul(size); - vertex.add(f, f1, f2); - - buffer.addVertex(vertex.x(), vertex.y(), vertex.z()) - .setColor(this.rCol, this.gCol, this.bCol, this.alpha) - .setUv(uvs[i][0], uvs[i][1]) - .setOverlay(OverlayTexture.NO_OVERLAY) - .setLight(LightTexture.FULL_BRIGHT) - .setNormal(0.0F, 0.0F, 1.0F); - } - } - - @Override - public int getLightColor(float partialTick) { - return LightTexture.FULL_BRIGHT; - } - - @Override - public ParticleRenderType getRenderType() { - return ModParticleRenderTypes.EMISSIVE_BLOOM; - } -} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java b/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java index 46fe84d..02d24b2 100644 --- a/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java @@ -5,7 +5,6 @@ import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.*; import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.util.Mth; import org.joml.Vector3f; @@ -14,7 +13,6 @@ public class IronSparkParticle extends TextureSheetParticle { private final float sparkLength; private final Vector3f dir; private final Vector3f right; - private final Vector3f normal; protected IronSparkParticle(ClientLevel level, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed, @@ -37,7 +35,6 @@ public class IronSparkParticle extends TextureSheetParticle { this.dir = new Vector3f(options.dir).normalize(); this.right = new Vector3f(options.right).normalize(); - this.normal = new Vector3f(this.dir).cross(this.right).normalize(); this.xd = dir.x; this.yd = dir.y; @@ -89,11 +86,9 @@ public class IronSparkParticle extends TextureSheetParticle { for(int j = 0; j < 4; j++) { float[] v = verts[j]; buffer.addVertex(v[0], v[1], v[2]) - .setColor(this.rCol, this.gCol, this.bCol, this.alpha) .setUv(v[3], v[4]) - .setOverlay(OverlayTexture.NO_OVERLAY) - .setLight(LightTexture.FULL_BRIGHT) - .setNormal(this.normal.x(), this.normal.y(), this.normal.z()); + .setColor(this.rCol, this.gCol, this.bCol, this.alpha) + .setLight(LightTexture.FULL_BRIGHT); } } } @@ -105,7 +100,7 @@ public class IronSparkParticle extends TextureSheetParticle { @Override public ParticleRenderType getRenderType() { - return ModParticleRenderTypes.EMISSIVE_BLOOM; + return ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; } public static class Provider implements ParticleProvider { diff --git a/src/main/java/com/lzxnone/terraria/particle/LunarFlareExplosionParticle.java b/src/main/java/com/lzxnone/terraria/particle/LunarFlareExplosionParticle.java new file mode 100644 index 0000000..1618452 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/particle/LunarFlareExplosionParticle.java @@ -0,0 +1,66 @@ +package com.lzxnone.terraria.particle; + +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleProvider; +import net.minecraft.client.particle.ParticleRenderType; +import net.minecraft.client.particle.SpriteSet; +import net.minecraft.client.particle.TextureSheetParticle; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.core.particles.SimpleParticleType; + +public class LunarFlareExplosionParticle extends TextureSheetParticle { + private final SpriteSet spriteSet; + private final float baseSize; + + protected LunarFlareExplosionParticle(ClientLevel level, double x, double y, double z, + double xSpeed, double ySpeed, double zSpeed, SpriteSet spriteSet) { + super(level, x, y, z, xSpeed, ySpeed, zSpeed); + this.hasPhysics = false; + this.friction = 0.9F; + this.gravity = 0.0F; + this.xd = xSpeed; + this.yd = ySpeed; + this.zd = zSpeed; + this.baseSize = 1.25F; + this.quadSize = this.baseSize; + this.lifetime = 14; + this.spriteSet = spriteSet; + this.setSpriteFromAge(this.spriteSet); + } + + @Override + public void tick() { + super.tick(); + + float lifeRatio = (float) this.age / (float) this.lifetime; + this.quadSize = this.baseSize * (1.0F + lifeRatio * 0.2F); + this.alpha = 1.0F - lifeRatio; + this.setSpriteFromAge(this.spriteSet); + } + + @Override + public int getLightColor(float partialTick) { + return LightTexture.FULL_BRIGHT; + } + + @Override + public ParticleRenderType getRenderType() { + return ParticleRenderType.PARTICLE_SHEET_OPAQUE; + } + + public static class Provider implements ParticleProvider { + private final SpriteSet spriteSet; + + public Provider(SpriteSet spriteSet) { + this.spriteSet = spriteSet; + } + + @Override + public Particle createParticle(SimpleParticleType type, ClientLevel level, + double x, double y, double z, + double xSpeed, double ySpeed, double zSpeed) { + return new LunarFlareExplosionParticle(level, x, y, z, xSpeed, ySpeed, zSpeed, this.spriteSet); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java b/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java index 8087c62..b6dde1b 100644 --- a/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java +++ b/src/main/java/com/lzxnone/terraria/particle/ModParticleRenderTypes.java @@ -6,6 +6,7 @@ import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexFormat; +import com.lzxnone.terraria.client.event.ShaderRegistry; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.ParticleRenderType; import net.minecraft.client.renderer.GameRenderer; @@ -13,28 +14,25 @@ import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.renderer.texture.TextureManager; public final class ModParticleRenderTypes { - public static final ParticleRenderType EMISSIVE_BLOOM = new ParticleRenderType() { + public static final ParticleRenderType EMISSIVE_BLOOM_PARTICLE = new ParticleRenderType() { @Override public BufferBuilder begin(Tesselator tesselator, TextureManager textureManager) { - Minecraft.getInstance().gameRenderer.lightTexture().turnOnLightLayer(); RenderSystem.enableBlend(); - RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE); RenderSystem.depthMask(true); - RenderSystem.disableCull(); - RenderSystem.enableDepthTest(); - RenderSystem.setShader(GameRenderer::getRendertypeEntityTranslucentEmissiveShader); + RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE); + RenderSystem.setShader(ShaderRegistry::getParticleBloom); RenderSystem.setShaderTexture(0, TextureAtlas.LOCATION_PARTICLES); - return tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.NEW_ENTITY); + return tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.PARTICLE); } @Override public String toString() { - return "lzxnoneterraria:emissive_bloom"; + return "lzxnoneterraria:emissive_bloom_particle"; } @Override public boolean isTranslucent() { - return true; + return false; } }; diff --git a/src/main/java/com/lzxnone/terraria/particle/ModParticles.java b/src/main/java/com/lzxnone/terraria/particle/ModParticles.java index 206dfe8..c88223b 100644 --- a/src/main/java/com/lzxnone/terraria/particle/ModParticles.java +++ b/src/main/java/com/lzxnone/terraria/particle/ModParticles.java @@ -106,6 +106,8 @@ public class ModParticles { PARTICLE_TYPES.register("leaf_particle", () -> new SimpleParticleType(true)); public static final Supplier SOLAR_EXPLOSION_PARTICLE = PARTICLE_TYPES.register("solar_explosion_particle", () -> new SimpleParticleType(true)); + public static final Supplier LUNAR_FLARE_EXPLOSION_PARTICLE = + PARTICLE_TYPES.register("lunar_flare_explosion_particle", () -> new SimpleParticleType(true)); public static final Supplier CRYSTAL_FRAGMENT_PARTICLE = PARTICLE_TYPES.register("crystal_fragment_particle", () -> new SimpleParticleType(true)); public static final Supplier DEVILS_DEVASTATION_RUNE_PARTICLE = diff --git a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java index fdf22b5..3856d98 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -4,6 +4,7 @@ import com.lzxnone.terraria.effect.BloodButcheredEffect; import com.lzxnone.terraria.effect.AcidVenomEffect; import com.lzxnone.terraria.effect.CursedInfernoEffect; import com.lzxnone.terraria.effect.DemonicFlamesEffect; +import com.lzxnone.terraria.effect.BetsysCurseEffect; import com.lzxnone.terraria.effect.IchorEffect; import com.lzxnone.terraria.effect.ManaSicknessEffect; import com.lzxnone.terraria.effect.MidasEffect; @@ -92,10 +93,14 @@ import com.lzxnone.terraria.item.accessory.PutridScent; import com.lzxnone.terraria.item.accessory.Shackle; import com.lzxnone.terraria.item.accessory.SniperScope; import com.lzxnone.terraria.item.accessory.ReconScope; +import com.lzxnone.terraria.item.weapon.magic.BetsyWrath; +import com.lzxnone.terraria.item.weapon.magic.BubbleGun; import com.lzxnone.terraria.item.weapon.magic.LastPrism; +import com.lzxnone.terraria.item.weapon.magic.LunarFlare; 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.CopperShortsword; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; import com.lzxnone.terraria.item.weapon.melee.EnchantedSword; import com.lzxnone.terraria.item.weapon.melee.Excalibur; @@ -112,6 +117,7 @@ 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.TrueCopperShortsword; import com.lzxnone.terraria.item.weapon.melee.TrueExcalibur; import com.lzxnone.terraria.item.weapon.melee.TrueNightsEdge; import com.lzxnone.terraria.item.weapon.melee.Volcano; @@ -142,6 +148,7 @@ public class ConfigList { static { ITEMS.put(WEAPON, new ConfigListItem[]{ + CopperShortsword.CONFIG_LIST_ITEM, EnchantedSword.CONFIG_LIST_ITEM, BeeKeeper.CONFIG_LIST_ITEM, Starfury.CONFIG_LIST_ITEM, @@ -156,6 +163,7 @@ public class ConfigList { NightsEdge.CONFIG_LIST_ITEM, TrueExcalibur.CONFIG_LIST_ITEM, TrueNightsEdge.CONFIG_LIST_ITEM, + TrueCopperShortsword.CONFIG_LIST_ITEM, LightsBane.CONFIG_LIST_ITEM, BloodButcherer.CONFIG_LIST_ITEM, Muramasa.CONFIG_LIST_ITEM, @@ -169,6 +177,9 @@ public class ConfigList { StardustDragonStaff.CONFIG_LIST_ITEM, Possession.CONFIG_LIST_ITEM, LastPrism.CONFIG_LIST_ITEM, + BetsyWrath.CONFIG_LIST_ITEM, + LunarFlare.CONFIG_LIST_ITEM, + BubbleGun.CONFIG_LIST_ITEM, Minishark.CONFIG_LIST_ITEM, FlintlockPistol.CONFIG_LIST_ITEM, Boomstick.CONFIG_LIST_ITEM, @@ -201,6 +212,7 @@ public class ConfigList { DemonicFlamesEffect.CONFIG_LIST_ITEM, CursedInfernoEffect.CONFIG_LIST_ITEM, IchorEffect.CONFIG_LIST_ITEM, + BetsysCurseEffect.CONFIG_LIST_ITEM, AcidVenomEffect.CONFIG_LIST_ITEM, MidasEffect.CONFIG_LIST_ITEM, ManaSicknessEffect.CONFIG_LIST_ITEM, diff --git a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java index 4e7a130..3204507 100644 --- a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java @@ -140,7 +140,10 @@ public class DamageUtil { extraKnockback = livingTarget.getDeltaMovement().subtract(beforeHurtMovement); } - livingTarget.setDeltaMovement(beforeHurtMovement.add(hurtKnockback.add(extraKnockback).scale(knockbackScale))); + Vec3 knockback = hurtKnockback.add(extraKnockback); + double scaledY = knockback.y * Math.min(knockbackScale, 1.0F); + Vec3 scaledKnockback = new Vec3(knockback.x * knockbackScale, scaledY, knockback.z * knockbackScale); + livingTarget.setDeltaMovement(beforeHurtMovement.add(scaledKnockback)); } DamageSource postSource = attackEntity == player ? source @@ -151,7 +154,7 @@ public class DamageUtil { return hasHurt; } - private static float applyPlayerDamageEffects(Player player, float damage) { + public static float applyPlayerDamageEffects(Player player, float damage) { float finalDamage = damage; //力量 if(player.hasEffect(MobEffects.DAMAGE_BOOST) && player.getEffect(MobEffects.DAMAGE_BOOST) != null) { diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index aefc322..75a5410 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -40,6 +40,10 @@ "item.lzxnoneterraria.mace": "Mace", "item.lzxnoneterraria.devils_devastation": "Devil's Devastation", "item.lzxnoneterraria.last_prism": "Last Prism", + "item.lzxnoneterraria.betsys_wrath": "Betsy's Wrath", + "item.lzxnoneterraria.lunar_flare": "Lunar Flare", + "item.lzxnoneterraria.bubble_gun": "Bubble Gun", + "item.lzxnoneterraria.bubble_gun_projectile": "Bubble", "item.lzxnoneterraria.terraprisma": "Terraprisma", "item.lzxnoneterraria.stardust_dragon_staff": "Stardust Dragon Staff", "item.lzxnoneterraria.possession": "Possession", @@ -346,6 +350,10 @@ "tooltip.lzxnoneterraria.melee_knockback_bonus": "Melee Knockback +%s", "tooltip.lzxnoneterraria.attack_speed_bonus": "Attack Speed +%s%%", "tooltip.lzxnoneterraria.ignite_on_hit": "Melee attacks inflict fire damage", + "lzxnoneterraria.configuration.base_melee_damage": "Base Melee Damage", + "lzxnoneterraria.configuration.base_melee_damage.tooltip": "Base damage dealt by the weapon's direct melee attack", + "lzxnoneterraria.configuration.base_melee_attack_speed": "Base Melee Attack Speed", + "lzxnoneterraria.configuration.base_melee_attack_speed.tooltip": "Attack speed attribute modifier for the weapon's direct melee attack", "lzxnoneterraria.configuration.melee_damage_multiplier": "Melee Damage Multiplier", "lzxnoneterraria.configuration.melee_damage_multiplier.tooltip": "Melee damage is multiplied by this value while equipped", "lzxnoneterraria.configuration.melee_knockback": "Melee Knockback", @@ -357,12 +365,15 @@ "tooltip.lzxnoneterraria.ranged_damage_increase": "+%s%% ranged damage", "tooltip.lzxnoneterraria.ranged_damage_decrease": "-%s%% ranged damage", + "tooltip.lzxnoneterraria.ranged_weapon_damage": "Ranged Damage: %s", "tooltip.lzxnoneterraria.rifle_scope": "Scroll wheel adjusts zoom while using firearms", "tooltip.lzxnoneterraria.spread_ranged_weapon": "Standing still or sneaking reduces spread", "tooltip.lzxnoneterraria.sniper_rifle": "Scroll wheel adjusts zoom", "lzxnoneterraria.configuration.ranged_damage_multiplier": "Ranged Damage Multiplier", "lzxnoneterraria.configuration.ranged_damage_multiplier.tooltip": "Ranged damage is multiplied by this value while equipped", + "tooltip.lzxnoneterraria.magic_weapon_mana": "Mana: %s", + "tooltip.lzxnoneterraria.magic_weapon_damage": "Magic Damage: %s", "tooltip.lzxnoneterraria.magic_damage_increase": "+%s%% magic damage", "tooltip.lzxnoneterraria.magic_damage_decrease": "-%s%% magic damage", "tooltip.lzxnoneterraria.mana_cost_increase": "+%s%% mana cost", @@ -388,6 +399,7 @@ "tooltip.lzxnoneterraria.summon_damage_increase": "+%s%% summon damage", "tooltip.lzxnoneterraria.summon_damage_decrease": "-%s%% summon damage", + "tooltip.lzxnoneterraria.summon_weapon_damage": "Summon Damage: %s", "tooltip.lzxnoneterraria.minion_knockback_increase": "+%s%% minion knockback", "tooltip.lzxnoneterraria.minion_knockback_decrease": "-%s%% minion knockback", "tooltip.lzxnoneterraria.minion_slot_add": "+%s minion capacity", @@ -454,6 +466,7 @@ "effect.lzxnoneterraria.demonic_flames": "Demonic Flames", "effect.lzxnoneterraria.cursed_inferno": "Cursed Inferno", "effect.lzxnoneterraria.ichor": "Ichor", + "effect.lzxnoneterraria.betsys_curse": "Betsy's Curse", "effect.lzxnoneterraria.acid_venom": "Acid Venom", "effect.lzxnoneterraria.midas": "Midas", "effect.lzxnoneterraria.paladins_shield": "Paladin's Shield", @@ -523,6 +536,8 @@ "lzxnoneterraria.configuration.cursed_inferno_damage_per_level.tooltip": "Cursed Inferno checks damage once per second; damage dealt per effect level", "lzxnoneterraria.configuration.ichor_armor_reduction_per_level": "Armor Reduction Per Level", "lzxnoneterraria.configuration.ichor_armor_reduction_per_level.tooltip": "Armor reduced per Ichor level on the target", + "lzxnoneterraria.configuration.betsys_curse_armor_reduction_per_level": "Armor Reduction Per Level", + "lzxnoneterraria.configuration.betsys_curse_armor_reduction_per_level.tooltip": "Armor reduced per Betsy's Curse level on the target", "lzxnoneterraria.configuration.acid_venom_damage_per_level": "Damage Per Level", "lzxnoneterraria.configuration.acid_venom_damage_per_level.tooltip": "Acid Venom checks damage once per second; damage dealt per effect level", "lzxnoneterraria.configuration.midas_drop_chance": "Emerald Drop Chance", @@ -824,7 +839,7 @@ "lzxnoneterraria.configuration.last_prism_max_range": "Max Range", "lzxnoneterraria.configuration.last_prism_max_range.tooltip": "Maximum beam range", "lzxnoneterraria.configuration.last_prism_mana_consume_rate": "Mana Consume Rate", - "lzxnoneterraria.configuration.last_prism_mana_consume_rate.tooltip": "Mana consumed per tick while using", + "lzxnoneterraria.configuration.last_prism_mana_consume_rate.tooltip": "Mana consumed per second at full power", "lzxnoneterraria.configuration.musket_ball_base_damage": "Base Damage", "lzxnoneterraria.configuration.musket_ball_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.musket_ball_speed": "Speed", @@ -1015,6 +1030,36 @@ "lzxnoneterraria.configuration.elf_melter_freeze_ticks.tooltip": "Frozen time applied on hit, in ticks", "lzxnoneterraria.configuration.daedalus_stormbow_damage": "Damage", "lzxnoneterraria.configuration.daedalus_stormbow_damage.tooltip": "Damage per hit", + "lzxnoneterraria.configuration.daedalus_stormbow_range": "Range", + "lzxnoneterraria.configuration.daedalus_stormbow_range.tooltip": "Maximum distance for selecting the crosshair target point", + "lzxnoneterraria.configuration.betsys_wrath_damage": "Damage", + "lzxnoneterraria.configuration.betsys_wrath_damage.tooltip": "Magic damage dealt to each target in the explosion radius", + "lzxnoneterraria.configuration.betsys_wrath_range": "Range", + "lzxnoneterraria.configuration.betsys_wrath_range.tooltip": "Maximum distance for selecting the crosshair target point", + "lzxnoneterraria.configuration.betsys_wrath_explosion_range": "Explosion Range", + "lzxnoneterraria.configuration.betsys_wrath_explosion_range.tooltip": "Radius for damage and effect after projectile collision", + "lzxnoneterraria.configuration.betsys_wrath_mana_consume": "Mana Cost", + "lzxnoneterraria.configuration.betsys_wrath_mana_consume.tooltip": "Mana consumed per shot", + "lzxnoneterraria.configuration.betsys_wrath_buff_duration": "Effect Duration", + "lzxnoneterraria.configuration.betsys_wrath_buff_duration.tooltip": "Duration of Betsy's Curse applied on explosion hit, in ticks", + "lzxnoneterraria.configuration.lunar_flare_damage": "Damage", + "lzxnoneterraria.configuration.lunar_flare_damage.tooltip": "Magic damage dealt to each target in the explosion radius", + "lzxnoneterraria.configuration.lunar_flare_range": "Range", + "lzxnoneterraria.configuration.lunar_flare_range.tooltip": "Maximum distance for selecting the crosshair target point", + "lzxnoneterraria.configuration.lunar_flare_speed": "Speed", + "lzxnoneterraria.configuration.lunar_flare_speed.tooltip": "Lunar Flare projectile movement speed", + "lzxnoneterraria.configuration.lunar_flare_explosion_range": "Explosion Range", + "lzxnoneterraria.configuration.lunar_flare_explosion_range.tooltip": "Radius for damage after projectile explosion", + "lzxnoneterraria.configuration.lunar_flare_mana_consume": "Mana Cost", + "lzxnoneterraria.configuration.lunar_flare_mana_consume.tooltip": "Mana consumed per shot", + "lzxnoneterraria.configuration.bubble_gun_damage": "Damage", + "lzxnoneterraria.configuration.bubble_gun_damage.tooltip": "Magic damage dealt by each bubble hit", + "lzxnoneterraria.configuration.bubble_gun_speed": "Speed", + "lzxnoneterraria.configuration.bubble_gun_speed.tooltip": "Initial bubble movement speed", + "lzxnoneterraria.configuration.bubble_gun_drag": "Drag", + "lzxnoneterraria.configuration.bubble_gun_drag.tooltip": "Velocity multiplier retained by the bubble each tick", + "lzxnoneterraria.configuration.bubble_gun_mana_consume": "Mana Cost", + "lzxnoneterraria.configuration.bubble_gun_mana_consume.tooltip": "Mana consumed per shot", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "Kill Mode Duration", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "Kill Mode duration in ticks", "lzxnoneterraria.configuration.devils_devastation_kill_mode_cooldown_time": "Kill Mode Cooldown", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index b8c9dc1..0e8a0e1 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -40,6 +40,10 @@ "item.lzxnoneterraria.mace": "链锤", "item.lzxnoneterraria.devils_devastation": "破灭魔王剑", "item.lzxnoneterraria.last_prism": "终极棱镜", + "item.lzxnoneterraria.betsys_wrath": "双足翼龙怒气", + "item.lzxnoneterraria.lunar_flare": "月耀", + "item.lzxnoneterraria.bubble_gun": "泡泡枪", + "item.lzxnoneterraria.bubble_gun_projectile": "泡泡", "item.lzxnoneterraria.terraprisma": "泰拉棱镜", "item.lzxnoneterraria.stardust_dragon_staff": "星尘之龙法杖", "item.lzxnoneterraria.possession": "支配之鞭", @@ -346,6 +350,10 @@ "tooltip.lzxnoneterraria.melee_knockback_bonus": "近战击退 +%s", "tooltip.lzxnoneterraria.attack_speed_bonus": "攻击速度 +%s%%", "tooltip.lzxnoneterraria.ignite_on_hit": "近战攻击造成火焰伤害", + "lzxnoneterraria.configuration.base_melee_damage": "基础近战伤害", + "lzxnoneterraria.configuration.base_melee_damage.tooltip": "武器本体近战攻击造成的基础伤害", + "lzxnoneterraria.configuration.base_melee_attack_speed": "基础近战攻击速度", + "lzxnoneterraria.configuration.base_melee_attack_speed.tooltip": "武器本体近战攻击速度属性修饰值", "lzxnoneterraria.configuration.melee_damage_multiplier": "近战武器伤害倍率", "lzxnoneterraria.configuration.melee_damage_multiplier.tooltip": "佩戴后近战伤害乘以该倍率", "lzxnoneterraria.configuration.melee_knockback": "近战击退", @@ -357,12 +365,15 @@ "tooltip.lzxnoneterraria.ranged_damage_increase": "远程伤害 +%s%%", "tooltip.lzxnoneterraria.ranged_damage_decrease": "远程伤害 -%s%%", + "tooltip.lzxnoneterraria.ranged_weapon_damage": "远程伤害: %s", "tooltip.lzxnoneterraria.rifle_scope": "使用枪械时,滚轮可以调节放大倍率", "tooltip.lzxnoneterraria.spread_ranged_weapon": "静止或者潜行可以减低散射幅度", "tooltip.lzxnoneterraria.sniper_rifle": "滚轮可以调节放大倍率", "lzxnoneterraria.configuration.ranged_damage_multiplier": "远程伤害倍率", "lzxnoneterraria.configuration.ranged_damage_multiplier.tooltip": "佩戴后远程伤害乘以该倍率", + "tooltip.lzxnoneterraria.magic_weapon_mana": "魔力: %s", + "tooltip.lzxnoneterraria.magic_weapon_damage": "魔法伤害: %s", "tooltip.lzxnoneterraria.magic_damage_increase": "魔法伤害 +%s%%", "tooltip.lzxnoneterraria.magic_damage_decrease": "魔法伤害 -%s%%", "tooltip.lzxnoneterraria.mana_cost_increase": "魔力花费 +%s%%", @@ -388,6 +399,7 @@ "tooltip.lzxnoneterraria.summon_damage_increase": "召唤伤害 +%s%%", "tooltip.lzxnoneterraria.summon_damage_decrease": "召唤伤害 -%s%%", + "tooltip.lzxnoneterraria.summon_weapon_damage": "召唤伤害: %s", "tooltip.lzxnoneterraria.minion_knockback_increase": "仆从击退 +%s%%", "tooltip.lzxnoneterraria.minion_knockback_decrease": "仆从击退 -%s%%", "tooltip.lzxnoneterraria.minion_slot_add": "仆从数量上限 +%s", @@ -454,6 +466,7 @@ "effect.lzxnoneterraria.demonic_flames": "恶魔之焰", "effect.lzxnoneterraria.cursed_inferno": "诅咒狱火", "effect.lzxnoneterraria.ichor": "灵液", + "effect.lzxnoneterraria.betsys_curse": "双足翼龙诅咒", "effect.lzxnoneterraria.acid_venom": "酸性毒液", "effect.lzxnoneterraria.midas": "迈达斯", "effect.lzxnoneterraria.paladins_shield": "圣骑士护盾", @@ -523,6 +536,8 @@ "lzxnoneterraria.configuration.cursed_inferno_damage_per_level.tooltip": "诅咒狱火每秒进行一次伤害判定,每级造成的伤害", "lzxnoneterraria.configuration.ichor_armor_reduction_per_level": "每级护甲降低", "lzxnoneterraria.configuration.ichor_armor_reduction_per_level.tooltip": "目标拥有灵液效果时,每级降低的护甲值", + "lzxnoneterraria.configuration.betsys_curse_armor_reduction_per_level": "每级护甲降低", + "lzxnoneterraria.configuration.betsys_curse_armor_reduction_per_level.tooltip": "目标拥有双足翼龙诅咒效果时,每级降低的护甲值", "lzxnoneterraria.configuration.acid_venom_damage_per_level": "每级伤害", "lzxnoneterraria.configuration.acid_venom_damage_per_level.tooltip": "酸性毒液每秒进行一次伤害判定,每级造成的伤害", "lzxnoneterraria.configuration.midas_drop_chance": "绿宝石掉落概率", @@ -824,7 +839,7 @@ "lzxnoneterraria.configuration.last_prism_max_range": "最大范围", "lzxnoneterraria.configuration.last_prism_max_range.tooltip": "激光最大射程", "lzxnoneterraria.configuration.last_prism_mana_consume_rate": "魔力消耗速率", - "lzxnoneterraria.configuration.last_prism_mana_consume_rate.tooltip": "使用时每刻消耗的魔力值", + "lzxnoneterraria.configuration.last_prism_mana_consume_rate.tooltip": "满功率时每秒消耗的魔力值", "lzxnoneterraria.configuration.musket_ball_base_damage": "基础伤害", "lzxnoneterraria.configuration.musket_ball_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.musket_ball_speed": "速度", @@ -1015,6 +1030,36 @@ "lzxnoneterraria.configuration.elf_melter_freeze_ticks.tooltip": "命中后施加的冻结时间(刻)", "lzxnoneterraria.configuration.daedalus_stormbow_damage": "伤害", "lzxnoneterraria.configuration.daedalus_stormbow_damage.tooltip": "每次命中伤害", + "lzxnoneterraria.configuration.daedalus_stormbow_range": "射程", + "lzxnoneterraria.configuration.daedalus_stormbow_range.tooltip": "选择准星目标点的最大距离", + "lzxnoneterraria.configuration.betsys_wrath_damage": "伤害", + "lzxnoneterraria.configuration.betsys_wrath_damage.tooltip": "爆炸范围内每个目标受到的魔法伤害", + "lzxnoneterraria.configuration.betsys_wrath_range": "射程", + "lzxnoneterraria.configuration.betsys_wrath_range.tooltip": "选择准星目标点的最大距离", + "lzxnoneterraria.configuration.betsys_wrath_explosion_range": "爆炸范围", + "lzxnoneterraria.configuration.betsys_wrath_explosion_range.tooltip": "飞弹碰撞后造成伤害和效果的半径", + "lzxnoneterraria.configuration.betsys_wrath_mana_consume": "魔力消耗", + "lzxnoneterraria.configuration.betsys_wrath_mana_consume.tooltip": "每次发射消耗的魔力", + "lzxnoneterraria.configuration.betsys_wrath_buff_duration": "效果持续时间", + "lzxnoneterraria.configuration.betsys_wrath_buff_duration.tooltip": "爆炸命中后造成双足翼龙诅咒的持续时间(刻)", + "lzxnoneterraria.configuration.lunar_flare_damage": "伤害", + "lzxnoneterraria.configuration.lunar_flare_damage.tooltip": "爆炸范围内每个目标受到的魔法伤害", + "lzxnoneterraria.configuration.lunar_flare_range": "射程", + "lzxnoneterraria.configuration.lunar_flare_range.tooltip": "选择准星目标点的最大距离", + "lzxnoneterraria.configuration.lunar_flare_speed": "速度", + "lzxnoneterraria.configuration.lunar_flare_speed.tooltip": "月耀弹射物移动速度", + "lzxnoneterraria.configuration.lunar_flare_explosion_range": "爆炸范围", + "lzxnoneterraria.configuration.lunar_flare_explosion_range.tooltip": "弹射物爆炸后造成伤害的半径", + "lzxnoneterraria.configuration.lunar_flare_mana_consume": "魔力消耗", + "lzxnoneterraria.configuration.lunar_flare_mana_consume.tooltip": "每次发射消耗的魔力", + "lzxnoneterraria.configuration.bubble_gun_damage": "伤害", + "lzxnoneterraria.configuration.bubble_gun_damage.tooltip": "每个泡泡命中造成的魔法伤害", + "lzxnoneterraria.configuration.bubble_gun_speed": "速度", + "lzxnoneterraria.configuration.bubble_gun_speed.tooltip": "泡泡初始移动速度", + "lzxnoneterraria.configuration.bubble_gun_drag": "阻力", + "lzxnoneterraria.configuration.bubble_gun_drag.tooltip": "泡泡每刻保留的速度比例", + "lzxnoneterraria.configuration.bubble_gun_mana_consume": "魔力消耗", + "lzxnoneterraria.configuration.bubble_gun_mana_consume.tooltip": "每次发射消耗的魔力", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "杀戮模式持续时间", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "杀戮模式持续时间(刻)", "lzxnoneterraria.configuration.devils_devastation_kill_mode_cooldown_time": "杀戮模式冷却时间", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/betsys_wrath.json b/src/main/resources/assets/lzxnoneterraria/models/item/betsys_wrath.json new file mode 100644 index 0000000..714db7d --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/betsys_wrath.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/sword3", + "textures": { + "layer0": "lzxnoneterraria:item/betsys_wrath" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/book.json b/src/main/resources/assets/lzxnoneterraria/models/item/book.json new file mode 100644 index 0000000..cc3d1ae --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/book.json @@ -0,0 +1,25 @@ +{ + "parent": "item/handheld", + "display": { + "thirdperson_righthand": { + "rotation": [0, 90, 55], + "translation": [0, 4.0, 3.0], + "scale": [0.85, 0.85, 0.85] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, -55], + "translation": [0, 4.0, 3.0], + "scale": [0.85, 0.85, 0.85] + }, + "firstperson_righthand": { + "rotation": [0, 90, 25], + "translation": [1.13, 6.2, 0.0], + "scale": [0.68, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, -90, -25], + "translation": [1.13, 6.2, 0.0], + "scale": [0.68, 0.68, 0.68] + } + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/bubble_gun.json b/src/main/resources/assets/lzxnoneterraria/models/item/bubble_gun.json new file mode 100644 index 0000000..9f7c06d --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/bubble_gun.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/gun3", + "textures": { + "layer0": "lzxnoneterraria:item/bubble_gun" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/bubble_gun_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/bubble_gun_projectile.json new file mode 100644 index 0000000..2139fcf --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/bubble_gun_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/bubble_gun_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/lunar_flare.json b/src/main/resources/assets/lzxnoneterraria/models/item/lunar_flare.json new file mode 100644 index 0000000..c11de55 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/lunar_flare.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/book", + "textures": { + "layer0": "lzxnoneterraria:item/lunar_flare" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/particles/lunar_flare_explosion_particle.json b/src/main/resources/assets/lzxnoneterraria/particles/lunar_flare_explosion_particle.json new file mode 100644 index 0000000..bacbf9a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/particles/lunar_flare_explosion_particle.json @@ -0,0 +1,11 @@ +{ + "textures": [ + "lzxnoneterraria:lunar_flare_explosion_particle0", + "lzxnoneterraria:lunar_flare_explosion_particle1", + "lzxnoneterraria:lunar_flare_explosion_particle2", + "lzxnoneterraria:lunar_flare_explosion_particle3", + "lzxnoneterraria:lunar_flare_explosion_particle4", + "lzxnoneterraria:lunar_flare_explosion_particle5", + "lzxnoneterraria:lunar_flare_explosion_particle6" + ] +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.fsh new file mode 100644 index 0000000..893b6a5 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.fsh @@ -0,0 +1,24 @@ +#version 150 + +#moj_import + +uniform sampler2D Sampler0; + +uniform vec4 ColorModulator; +uniform float FogStart; +uniform float FogEnd; + +in float vertexDistance; +in vec2 texCoord0; +in vec4 vertexColor; + +out vec4 fragColor; + +void main() { + vec4 color = texture(Sampler0, texCoord0); + if (color.a < 0.1) { + discard; + } + color *= vertexColor * ColorModulator; + fragColor = color * linear_fog_fade(vertexDistance, FogStart, FogEnd); +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.json b/src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.json new file mode 100644 index 0000000..0f487c2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.json @@ -0,0 +1,16 @@ +{ + "vertex": "lzxnoneterraria:particle_bloom", + "fragment": "lzxnoneterraria:particle_bloom", + "samplers": [ + { "name": "Sampler0" }, + { "name": "Sampler2" } + ], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }, + { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] }, + { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] }, + { "name": "FogShape", "type": "int", "count": 1, "values": [ 0 ] } + ] +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.vsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.vsh new file mode 100644 index 0000000..a2ae56b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/particle_bloom.vsh @@ -0,0 +1,26 @@ +#version 150 + +#moj_import + +in vec3 Position; +in vec2 UV0; +in vec4 Color; +in ivec2 UV2; + +uniform sampler2D Sampler2; + +uniform mat4 ModelViewMat; +uniform mat4 ProjMat; +uniform int FogShape; + +out float vertexDistance; +out vec2 texCoord0; +out vec4 vertexColor; + +void main() { + gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); + + vertexDistance = fog_distance(Position, FogShape); + texCoord0 = UV0; + vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0); +} diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index e0e0e2c..81cba22 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -23,6 +23,29 @@ "beam2": { "sounds": ["lzxnoneterraria:beam2"] }, + "betsys_fireball_shoot": { + "sounds": [ + "lzxnoneterraria:betsys_fireball_shoot", + "lzxnoneterraria:betsys_fireball_shoot2", + "lzxnoneterraria:betsys_fireball_shoot3" + ] + }, + "betsys_fireball_collide": { + "sounds": [ + "lzxnoneterraria:betsys_fireball_collide", + "lzxnoneterraria:betsys_fireball_collide2", + "lzxnoneterraria:betsys_fireball_collide3" + ] + }, + "magic_shoot": { + "sounds": ["lzxnoneterraria:magic_shoot"] + }, + "bubble": { + "sounds": ["lzxnoneterraria:bubble"] + }, + "bubble_break": { + "sounds": ["lzxnoneterraria:bubble_break"] + }, "star_fall": { "sounds": ["lzxnoneterraria:star_fall"] }, diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_collide.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_collide.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e04f2a3ef5c00e186164ba63473c6ca4c15b2314 GIT binary patch literal 19537 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_collide3.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_collide3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..36d0deb0468d68793a46618a217fe5ec21e6b93c GIT binary patch literal 11709 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 z zIoW2a82!rq>@v;YfR305FR{km1y~DrBqkHH^;@|bFEHOb6v#ydE;W;03Rj4r3ePw+ zlYX$qiUg-j$M|UYq)*0XR56s8;>~2t${xv9cS~Wal(k>$mdDL16=&;@*FyI1t6;|K z1bC0%YI91$jhNeSRiwHBmpw4fi)UEa&@60j=*7-bA^6ilc_mXWEI+0}|DAfTSADf` zjJT_CdY8z_Lk51R6m(u#U>C=&m%(9N-?(EN2}0HD^>05KZOBRxjwF6Pi}z^1(#oY* z9)R@?#l3$sw>Yw}dhX=I^RL_10*5_cgl@$E?HH_21gB^oIxRr_0hPI+>1nS(tVCUr z_K;KH667mSgu!q`q_?*=_z_G8Vq7pgG?VVm`@Ee)jvI=KO3!G3L z^s^t~yCHg(D=ABhrvZ5iz)d3zN>UzPp?6*tWj`%a5vkDB7OBQ%CtDH|a<4yZV%spe zP{CWs3!?Bb&u?I?>|9Y>Ipty58!;a5Hm#A7N7>EG7GG|z7;oPuoIe}D{Hio;N1Cj( zF|%MB7k~k{;~C0)Fu)2fvVC7j02>CIy#juBKY|TM%(6SSTR1es{b|4|(Qr zea<~)z7j+h?I>xg>CDbj=tRM_<&VbCrYBa1zl9w49815Q(icm6v5W&ixGnQO-Ldd0u?-HDmDO$&^iId@aB?7YF- zkMY_SWwUM99^&lmNHptOw}+_`IDE>q?f{L??2sGj0uburRvIA=e* xzf=@cUQ{`4e*R~or~cIw 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_shoot2.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_shoot2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..05f3e18e622241435dd465900123491914dfb5da GIT binary patch literal 12011 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 b-u+Ct&lL4(&z0Eo*O7OCp9;YG&-A|lFz#BC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_shoot3.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/betsys_fireball_shoot3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3705a3cb94d4312daafeaf99991681b6270b2d4e GIT binary patch literal 12719 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/bow_shot.wav b/src/main/resources/assets/lzxnoneterraria/sounds/bow_shot.wav deleted file mode 100644 index c804c2d74b2961bdee0eb8b2f3c3a2ce2214ebf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51244 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 diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/bubble.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/bubble.ogg new file mode 100644 index 0000000000000000000000000000000000000000..449584d43b73ec11eae7a160193c896a53ea2722 GIT binary patch literal 6162 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/magic_shoot.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/magic_shoot.ogg new file mode 100644 index 0000000000000000000000000000000000000000..dd07e921369a935cc6d060af8e093fd79207d414 GIT binary patch literal 12143 zcmaiaWmr{B*YKthkOpb#Mrk;7cOE!&HBxKC?zf3B_%C&=#XwC1eE#?-p~EK z@B8bUYtHPoSIx|dnYFL$s9IZV0Pw(nS|{}Q?g> zc1Oe#N;pAeoJ#s5bgmz$3iBl*^cmlO{{R7=1j5C=@I#`+QK>@cgmn^w8H8a_1PF$+ zeZpZ&{5wd4Y+zJzRPvBbc7BZDZT=gw5NVJOHVn5%8GXxJpRXuvlBz!p=-AACzTlt4CALxzs} zTo(!E2LKhuCl^&H7q=ysNUNJj_qXpvma&f1{_UK9#pM7%O&vq}Ek4R$IST+l&F7CQ z(updviQ0{bLk$V5fCmBr01-9~x1@%UY_imZCSA1^#g1ffjCj@eS!ZPIgm&J^V73R&|3CpzAk2_LJf#KTdu)7F)OMCw43cZKD3j~ zF%E-1W$R*O!uWQx`|@?s{(%^3yuW8MKjGev@0(=f48S1zO79Puu?;W?snRwsQ?UjH z$+dWcvlO3ju1~7|4hQ}FWZ8I6ub(?wQnSAI!ywgx{nc#j|FZn$`)g#_e#NlEVojHs zP^WfnC}nWWNI3V!ulLxWkpyQ;98B)n6ebIx(xtowD=_?HaCkrrl`0e;EcfqV7C{w8 zAM_4Ce@I-RR#z;HaVwQxJor4_lI@vJb4`zysB>I|1!x2G?up*;O`x z6_|>W!DxT&M+vjN1TwM32lXe-W)Vy!*)C|zpZ_r@<&$dwK=qt#5{LYM`We{-4xKtK ztg}sX@=R+;L)Nwhl{jN?5S}vk|5NBG*yS z9&IxAzuSa46mZ6u{TpxcwX}*;v}04Osu$dV_zPw}=Y>0*N$CiPTJqoBVOK@?tjMm;o{5r;Lo+V2s=3 zPo$Mkq_a)5_D=nrk-49d%Ut%C1;Bn{d1_I`UQwl9QJ=ly_97B(GEzU6X0i+yAGKB; z{{K4q-vFlt05@7$7g|{`tuz=0{IzZ%#*=l)dO2vNU06q^xc}MXB%UzLpxSQ#92);| z003YNeZe1@BvZzvn+3B$G}var(z6y}3 z*=(F?_XBtsv_obV1uDrl9|tk!BoBiaa*}YFieRryyV=R(@;li{Q}T?k_~?d%{UjK< zEu;Z#24LNpOgV{L8J|uWPg)hW4gx=_C*Xs9vN z@9XEXR>$G0s`A>3+uB#Rt;dJS^3zIB3!0TuhbU_|IB2*#=;KMx5kO{Br8V4PTKtUN zEf?mbCf%hWDV9%DrdS$!T531JL>wRt){_{?fk-OxWwDqshsY<=CD;w6Jn@s zxo{29zVd@D;>VTW8WCjf8fNma+0-1xRj%8sYW=>`%NVxK0DZGjz!DmB}gdKE4G^L7p`zcO9Fmp15WD78GTss%~c^`s;C zJ8b9uY6>xx4SM=9pz!}p9@PL-Wmj_rBfwNCD)2NC*~Rf(W$Kl~2zGC3b~0U0Id|k@~!Bp))&0)n40w(Nupih1e%X|2zyho%`;6VN;9>K9&$c@UelbsyJu}fJ9 z=GY+%0dwwBCMSZQATU}{VItV>V=@^0rV^I-@K1S9%1uXz0!v#u-~$?9;!HMjE~L&4 zS@2*Tx{#XWhGiD{Ukoh!97g`ZxVx|X<$<^x8eU7O^S}Za7U04#DHulg%5PfpFQzfn zm>Z%E!=zfS=@>roG`i~(Y0W-i9Q66Z^yl1Hu0u^h0!@yGt*5tN&jben;3pyqkPlC) zCCkr5g3kJPRj|Sh=38+&s$gu`Ra%4%R)C$2M9#3Xg#9B1K1nSu5CMx-)CAZS8Jqlc zPd-6K$+-Wm&HkrK`#%s8aHGl(+=$NSGu7~meWYT63xp}{CMrsI!4P=H#1jKT{+OH$ zvy^EJ2WnB_jGkhOE4G4sX~Vo(MRu?nSfR3?#2gk=P`!#8Xr>@6ZVBxwK=Wh@wrm4B zuHzloAHa4TP(9bvjx?xQ1<&qsF!tAaeDkW7t99Q~rba!xG2t7^5Ve|FJ=dR4#bh+c z^>Xk}Sb=E}1KOns`PqYF3ILwL2!K>jELR0>4nZ99i>KY9J_9JR&0r4BhUFn_+c0i2 z*yYSf2mXu0lt87k_!n1{9PBj!!CAg zL;w|L0(LPqb_4(e6I%pDoI%XF9#-8-ScJ)Ovm%D0qyRV^1OP2P;}*PFXutGgKav~q zdeEyA0c;8EAnd*k08OsD=NX^SSs26eI%3WzFv`>S1OW3s761$)VdG4a$%G9c%Z3l4 z$ib>%So;QaqX6Ah@KRFT;RzpWdM1CI!QsM+l>anDM8v-kEDixg#J^uRi2r`|Jbm3f z;TtwTpvzFvP*c-VQByLrGPAzw>+WqG?d)nBrlp~zp{0Jw$jUr2*xo%(OGigb$;>$1 z^{unLbFi!aYhPDqcXM6y*OuD4FRcwV=@_D{aF?HR;ZVgF1>(5nli+t$0;EZAh4E^N0N2S8?tO0h9BQU^@La2U z>N>>f@s|#s)d}x6+d}^B=;J$eRlUt+AqrsVq5c{`6>rTmJYQ(<2Cd0DlFnO`E;Jq_ zu!aZ$`29Ol)bB<#n8Xl&1~~SuLVX0@YF`oJW%(1vRD5zk!j}(!KPC#;esBaf^L~iHN^$ z6pXuox}whNkqX9>)Mj_nd~1ql}(dS~5BZx6mq>j`Z}&kHx3eDlUZ zNmHXZz4BC4mNoMGH+Xcda=|x=PEA!EIDQ_TgJ;E#9JLSvhCY9votf-ixL~+HOpy11 zAC@r?wf&dc;|6Izc~E&?M-(&=kW{EQbW zr;>@kE$eY=lN*|@c(R`D=7^iqU&jGg&NO@Nza*8bW|UlA8zheiIJs<<&xo(d2H3DE zzYa~M%&JXp5#HybMH$)6-b?R(z=z;OR~^|93kCh~zYu}DopO7rDjvV^s)2+j{bK5h zJEd+7eFRG{>vvpjuA<_uP`n9(YEb2LYFdxaqk73b7hJS1!fH8rEaF^v$6nyc05aoD zjl1F`F=3$@XRi`IKBN2ZmAMxBfSmpIfb2ZsqOV6`#Y1?YdMv(=Y$Q|}ou*eWd9^_4 zgSHLSQ|EDYH(ILot!xYr8`0_7rKCNb5*e9@cOEg><h*qx=OZgau$0s`%8-#^@P z31?%t*5I9*-81f~vd?5i!e2!GG)9?Yh#7cJS#Sm^?rx)b7_rneRVHJ*54)g#Gh*-K z9%1Uzd0~yE*@&`QUMY>>6O8D#lwHGj$R3t#8kRx-DJ0(@HNty3SMfYiy;!$NC03}j zV*5m^H4@}B7k=R$dc=71I}&0@J*nKa{zE!_PR5})P-%H_qOO!@iX_L|Kvi9vcEydq z;=yB)OOJ=oLYpQt(}R1#-*g=iM3PS0a{v4%;YFGQAnXCgs+@`F{VMk z6D{tBH%VR>=%hZf+T=m-t>--1$f<>${M~MH+MhR=hg~n_XB>%Ug&)dSXo9h^f-!sD zL|qPfoL1_Ta1wYiSGpN9G7>(LF-oQnaa!?@(Y6(ssBE5)zpyV<(Roeb9YG&*&Ly$lB&jdh02zPJ8qhXx zh2#C&TtzGbeoxJfzDs_`TeUw@?@DAiS`&$D=R!CC^=M^k)$GBrO?}Sf1hwz@0_Xf3 zTBCabTS%?6e*I!Zq^+uTkE~2eC$ZptBVcrtQ-WHL!kvE$^+hB- zsdFz$;EtwMwDRGh!PoHxtxOg3)HDf^n5JW&G+m=fB>ljz*=RiXD|8H@p%eo6Da zqlo$A88ylr6SBYLb(BJ^$lSOr>iKW0)WH_#+L(bn$ z8uOD{Xf;w^>I?~NxOL@c`-x#NzW-2#$Cn*y524-Y&7zt7eE#L|vlTUe*HOz3PRs9s zykLSxVdE-n?1phN)6EEr2xE;-QU5#PR)h@{Vw>0I)SPcR-e_3^=sx?ppCsk;vrDM3 z?&~7Y_3n;xPUxM}O6y)Y;L+!UHwP+Gk}AZLb5~=UNS7mW z8lfKVH3~+jUc?gGqC2B9JJr3oG@0Lq%A$K&1gG+66yZ>NlRS%N!raYzr8uA-NAq3v zw1GZoYk?sy_nodVj+Bj~kn~`Q)dEHB8O2XaIpRxw)YB2YY9-RQJ5+NGYpHe{bm122 zW_&94aJd+(<``)2;T{gNrxj#r`0%(X>&A&f)$o&lU29xb&61s$_$fV}|0E4JaH_i= z7`5W9;9r$VFL~}2WkJ|-LCs*ZN8?59ORN5ioWcyp(oa~Dt@iV4%jvn5O*3}^ce-~z z-}YQeRwRD$Ne|wsxA$}iM6{F3r*B6MXUFL?Yi1l#afcY6L#8pdQ!6#?RMMmkW{PBd z5G@$#vW5?_!dNDc(mTMU(&%BmlC@@674Y{&PJM)D0F))J2u0k4yV<{bBJ+G_ zXqewDuhM4r0|`~id)?UzR1U5j%b*bq*zyG`Rec@z3cvg*LQS`g78;Ey5AUo zv6~-2c)!l*Vbn!7QR8vJL{@xql8&z{yeP$Ox?+GdU{l>O!&QQdDft6)gW2TL{k4=! z!Un;qL4#ujPP6$WIQ2*R*{L%J?M_+<)=e|k9H!DzlM%<86qyxE8Z-M_U<{RT_N-!T zOn_M^W34fV9izitrTW3nbrM22OmW#K=X!CMXAihp$Cfrz07&rjpmo{l=Ma`!`rKbQ zxt|a83}-2A<~1$-Q{gOre8??Bp+sG0dlof>k$k3R#Er9Z3?K!wE@WrXX4#<=!MT~c zv>tT%U=g9_ldZghOfJ%n(}txs3oM{@j4?{l0-EY?WW-Kqx8%eE1A(6hwq+>r=PHAj zL+b@4I@i(U6e{7*+>FU79{~(F6O??=W<@hwvdhjM3s>l?$+-iFL>!|*Rd+TJvS~rF ze6LMSfsN?=Hnqn-9&-w%_ne^Z$7_h7e&_z^>fz=!=70-3eBFKtur!c9UBmG2)}!UkPH{-+r1Ok zF3J)UIe(R~No=h9-MpIEH`qRO#XLKvp6K@oYpZ_TTTJkKgex@QJ84^8B(eaP#{n1@ zX~g9dxebCtC7*i<8?SHK{vQ?Z!g@6yotr<$PL{U2cd?<#ZBo$Q2oUb}mKJN{ndx8oeL-3Kz8P$U1i@m{oUPRDR!NhuX+t)-C#a%JA4 zb-pd)LEB;7|7+$`>6cxkXE77FWBTFmF^!aScj-{!%sE}VI1=jeX}BaBz2opJ=`w`P zlP!pnM?Uga6W?=Bl9aU5z4CazTdskk{wU^YJI>bE!!*0`J+wRRK#;FDS0j&uCNBsv zpEy-JtGU@qxE4{)T!Lhy65WtEbdM6t8tk#^_KTq@<~z?MoU2GJOJsoC#Nwr5rPP}? zuy|XVto|C?O^#Ozd1TVd!Gftd*`vPGz39m7iJ$NWEYrr7j=itj7^tnNDqor|3%2V& z@(2aZUMCGAJS)k`{I(U5f+kWa@(0%*&Z+xqQO1mqJj?cLV&Z4>FQBv>)>UckPWQ01 z>Ft>S|BAgk&v9n6mE=gh1pm)I8uCQW4RQhYtJBhB^W4=Xt^ReQY|hRGkO zyVH3r8xPoAw5AfQXl1CHSW}sBQb@+m-5~^)jH}q~^H$a)D{nE^O011(eyfhu4uyJs zd7Yv`-?yigs_y79}m9CC``ZH#d(XL8!$G$D-n@LiyhPyQ~`0*Ru95E~NcP$32}8IWjbCf-&Ub+bs%9`yuI4 z17nRoXw^rHe46JNKQrekRrkvj9h>r&UW6b|Tu#j%iD@$dS1fT3OfIGQ!aaAT2dcL$ zDcYUMIM;)UGAbf(^x!k-u9Q;o<{xWHIJ_shC!8O*UJWfAu0;;!bJh93^=Px9yki*S zeW+9D8yRzVr{hTc1s8_5nph?>J~Q%hxan=SvH2Nz?h8YK|0afCE{I5Zd2Ow!YJW=H zol^8hW?uR8ICEK$w6@^B50)3T?Gz4^Yecl_Y&h;ji6PQ}@*Hw$UWye@F!U@ZfwY$L zWQB#-aX!%@dX+&nQ?M{CQ@WKR!=-<76AB);*uQtY&clDVYvFJYFv0`w@S-e(4Mizd z@1S}1o<9~Qgsf-u+q1jB3B7+=kRq+ppEh?aNZ!_TwRw2yFXZ|9=2Tg+AMuakiEWh$np&VY62LDZP%ABW z$(Yoc^r>5-ZJAe$B!H{@arZ`pT#(D9X{m8_&UjE+(ANCrex5V);DD@#G%X|_T;{CItJKN^3n?wAh-MRB@xDw^JXI< z6)1+qK}QG9)D+~vPBoD)I>fXPvi#dM3EM_quR-2>;_O#<##oH_`zkq+MMqwcZfg7S z9a7Ec%uO2oB2%6Iy5~vj)xkzf47G%d9I#zQ^k>Z-Ci4NFD^0lIt+mI$Bl8k~=?irOwM(I`*l^l;8>Rzo#M8XxS*R2lp&$MW7&M8z&&U&fLQ zBDT%EdEb$MXEjsmfLG+2cu)#9C3iKwo*)^;3b;Fw{5^y?QOHUtu78yUd9|5%zN{A@ zYPZaG#_qqldaS#8;y2xDpv;4wJPkg)!1f4! zPwafTcClqA<08hcGkdkMArK0z?+V5e^B#>Hz)DY#BVHm78N9Xx939gu7GFuBIP6rM zyq#qMHsh`_RPZc!ZrXKu(uqcckL8<}fg z5{%6AJFC6rekZz~8vZ1&Jmu^BT0?V&RrCPZsSz&{uu_WV8a2^!NLEEi9gtaZZaeZcy%yOsHJ26L;Sx3%3g)`R9+8iT&*Es~|w%{4DI z!TIgQS;oM;a=@)qn|kBjiI_)xM)SOt?7Wj@c`}Wqbg65h7|?0Z*}$P@4=k7STXlfx z)kh*$fV}}u`8bz>_qr2@E~isF-?!2(!=M)iKAbk@+`m3L25)ig33Lw#iv$e1afo*1 zy_QWbUx{qeH0v3-&WX=%>zFbZZzvI1Js`9H!Cph+YH!%r#>G3hksbAZ$JO3CKnu^Z!rErQPqTIR9kHnRSF zKm0Afv|8QUmlXsw^0lWE@M!)RtHmIraiH5Tf&iP!%yab{KH|4gZl*{y`}^VpTAhKnWG3fL32gwg6&DE+$9=4*sPvQvsbEEe`IEn~MP^ayouPvXxD`7Tj zPmEVLiEA$k>)I6MC7pJrlku@}&ewDM(bP(%Bz?9vho85wDmRQk2m)6Opz)uhk{b=83F-&{Of^DBe&AE4%LQ@FBcvlVu)e zkSD{eKn}*6`D0J;j0z1*JYDF%MLIXa#;UfKm9;R=X1V=f8@#;Lx;AAO>D>Ez?z2ki z_cqH%oui*AWQ9N&nd3N-f&_yLgD5%n$cU#wuEj>Ae$u#Bc^v!Q584 zt8l4V-G&J7+gg=y56{{KQEQw70mJXNb~_!GJI|5oTU62f*)5#1@>WQtU8sCbuKqkD zTyt@D_Mh?a^iAxT&`F=5mKd4Mn_PI1Aas58d)JIxA7p5o)r|a$>a?WTQjEszionfD z#R$W{o~iN$BjCIHERkODYA?eSLn8|Q_R`qEJu0_g72UY0Q;R6lVgFa=PJuSXd0G5y z(at@b?>DT9{Mh20oV#wJj8&ERGCj(Q=AZeY-r6UxSu4yrrxU9bFp(r_NunJRIoHK) zce{TMF&RBKlabncvDWxa$5t~WqK|78BXEE>YiFEMV%hwaU{GP0@XX;P6QZJnavUw$ z)`<4$#G=!feSLMg&S2E2`}Pgm_H58FbLqM#2rZb+B9qYF1EC-Op-fm=k-G#)_gqlt z6OUKn^es+HL~MLqquhO|r!rA`QFsym*tF^F)XrUK$4Gj-eMCl*PN>KA3FAm&-%?eG zbg_)%^@WtCC zx0a7`g^tMW6F}&Ls~(tk4tG0#pU9%?UxTc}RSpGKk6U$O!%C_`bXY$2UTut*8r!c8 ze#ny_%WIJId6{JE`5JNzake_O@{jyRNfePV%WaWna6d3VNZ!=sF7=4U6U9(rOJCL$;g| z`)U}QCtJ~ygsdS&pG!CHtT47{$K`IYsj+4T(dvQ~SY@ZP<8N0Bj@ZjR9;uE`>>m!V z?P!yxwfz!Q-_PZlT^EtHPr11%@+P?wB6K!*m~>U}qI*P;;B003lnm>Uin7V!&TK`z zG0mE4+%qN!m45XWzBBrM*-i{F>3Bu&iz#R!PzwdyiD4an8DfkK%IJ#acr>Z*iJ@)T zOs4HPBL{b_UG1k)vQ}W!jlVx(4gp!7JD%~?kI-}tjrgK9JG$wtU7Pk#PH~Q~XsqKU zzIiqIo_1$Ug3^PxDQS>6tY_#wv9G3aWfQszh-Gt^IxoBCr?`(2{WFa>rzhleZO^%4 zpW{lAf|j6fn=-Sq_A}sy?*a=d6Ko?qqLT1t;kJ8|JZ%c!=hXPH=`q5@TK zA9HMlkSFo6xn{n|j4=^5^|on(uGUso);B<@nq(f4ADBBP=-f~O-JLA%M_mKy2H0r` z@ZC&u>30(zujV-C!9` z3IE%XPuw$lJb(oBHk2P$vQNcX+fm+OeVzN}PiaJesV~bDAhc?s{*H_GxQ zrJq$pXPUDvLMN;5=3HinvL-cRh9XU?{~(101wQkzP0M_7wZh@aju?&6Reo%-E-96* zMpSR>=9meMyV0m?FxBk~Ht-5_y2Kwo?QKe;pW1Z(VQFI5aDlYwq=n=-`n7H{Yay;^ zvCqcQO2{84%*99md%oIUo3g9GFp}FeKDcr2b#zexoIi!s?oHD_i5wf)ofP! zs@=Yp3t-XYb3e2QjigT_;+u5%xaBM@g=ZHTc~q`b`r2^PD8O5aq%9r4VI~{cy6V(u zdNpE{DLf$X(o2q5Hp>HiQ!qM^v9BYbbcE*lGZ`?rLWs_xCuV({KUUK25mUZq@!G*@ zoZG7CLC|n&f>gp(#L>*&nTJ((U&ZUr%AZ~Cz1b0@>pN1t2urkiE9)6LMvNqs_K-}| z<{5jyrGwLTG_kC((hGX`jgJi;)6I@GE!upqoXtx(-#t9iQVV8n_YAhjfizs$9H36my&mkjVP1l#;>w+UPvUz z5nw)F;M+n~!+Jmd@nj*(z-2oE4U6U=h*;{)pm=ZyrXt}!TMfdci02Acfr#42YY%>OnN`k+*SS)278)1#(A67?)$fjtj!JqO-?fAKJ%`VZd2w;3#28W11B>usRuUGr2y$#e{bmq4IB9S zL;Jbl*iVA^sqhBb3x$GWJme{oT3!MTYk3_Sk|BigStBa`gEQ{mGVr|z<;Q_252@mn zpn)2$a3r~m4|Os6wW?&SVAKvFtYa(aPLrDnW>_sIK~Ki^m%NupNOUor+^!}Gcn=GA zvxA!az?Y`^%snM0CT`zhiEo%k{Edd-Ecy}N!J3QBkqIBSj>Yw~^p2L2z`gY-FXunI zkS|3}s7Vb;vrSvMXRD*Dv2PgKq9vSR8cdf>+9{Y|FzJ@ zXv*Z-15`Q4h%ZVP51UQvaA!>l@rRRtioe4f~`hJF=uya^o{#qLpI-weng2jB^<->^fLpYNS`9te-CLF}jEZ>byL&70a%vn#`VFf^mxA;J=3N>$e?c%n z5ghTBD{Ot){6>AO2-RcsZ9O}@f^s0q(cHcLT44f0!r@9|yYsYZs^a>Wn)uieWuI)C zGd%?eibSf)luK3z3zzTP_fxfo5@QD<#zh)tpUb?AujbqG4C|GtVjL2 zlDGFSvId!-$KGe3SRyr;;a{|n(Sk9{r*<6+SmaCMjPf) zHZ5AA!)b=`Iw5=M{s6qn7JPBCSZRP z=fyZp@Yy5g9GEhv5)()s!cP_}-97Jc%l0r*y&2=at=MnKE#3XxV`;g6eNs@lRK3TD zGyGnItT@JZ@k?H4TK!nX?N=(NjK)h};~>2Zh+H*lO4{Tpv~krKzdb?(6^Jm`UDC#Kz8#-m9!4Xi^YVC%>lHI4@Ghbm}*Z Sk-Fd$fV#xoq|85}{Qm$>r(&!C literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/betsys_curse.png b/src/main/resources/assets/lzxnoneterraria/textures/item/betsys_curse.png new file mode 100644 index 0000000000000000000000000000000000000000..9eb218e8b947a3f2ef77db9c0e043f094fdad5fc GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0K&E$awbczgf5bx$OSS z)P3u7TC)sLl&K`hFZe&h)9nUcKwgxmi(^Q|t+^LZa~?3@VGdY7L3B$~*axm#^;46A zJiKLCJ}Mr3|0ura$I%X6rYS1t#4j?;^kn+{-l6l9_k>rC70v7qn6?G{oW%EmHKuX> mBkQl1fA#)c`}_3G*Y>&>ybHZ93t2T(6jPLSwpuPJkWNlf4UEtQ1h!pkY(8Tn*d%sIrS02n3aeb}9_!4__lGdmc33{IVJ&yb8A~28# z)Sq){Ac-;O$@=HXv)v*^oQ?Z(lE8YKad#~JtJteej_FN|6P)Y_uw^YN(FqAv&g3@|k$aDPtV%$N41)EamUcZ$3? zG%>>#8pwTVtev=$>0r)dN$e-OxZzwX#c**`I0S4sivy%}_vWp`Q0*i6jq_7%+>2%>8iZaz7d38s~8jaK^JZNe(=X{{d$}CjH&99u@!q N002ovPDHLkV1h}x>jwY; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/bubble_gun.png b/src/main/resources/assets/lzxnoneterraria/textures/item/bubble_gun.png new file mode 100644 index 0000000000000000000000000000000000000000..06d5f58250389e41d2e380cfc93f69043d96c9b9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^Za^%;!VDx2xrKQHDa8Pv5LY05=GDxFH?qr*+o|r@ zAU|W1WW`pIfGNU06NEf^coed$iyA9|iWp0R{DK)Ap4~_Ta(X>o978H@%{}kPd&Gdp zB{0~abzuV6(gZH&L`@ymV2LT(+g~jU)erlB)a#4T$+TtZW%(&bVnpxUUHJK}o!YXK z+fFexaCmZkpC>Wv&Zi*P$x1&<6}sf-&w8SI(AG;=AfeyIn*MKlAz3Pk|U`?CNXnLH)Uj!-pIGPTwAgm_*h z@FM5%Zcg%cB`-)892uc%S8t0Zezj+jsa0BC06y>gLUAO3XuW*^u!HpsGa%IWRY`N{lZHlDFR(UU1}us^z9`o2pE}*>Ta_kZ!7GN;bZ2lO)yI^b%WI eyZP&a|Fthlf^n=Kb#nax0000bnMn!OM4B*btI6UE<&x`$gPxD(V82Df5 zY7X&An-pX^d704S3}K5|4Qo!%o3QBP%sEo?CM?skJRM?hG41+usfQ12bBj#!EoW&? j`sZ?KuF^}vx}Qv+?5E5>A=9J^w3@-w)z4*}Q$iB}HAh%n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/betsys_curse.png b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/betsys_curse.png new file mode 100644 index 0000000000000000000000000000000000000000..9eb218e8b947a3f2ef77db9c0e043f094fdad5fc GIT binary patch literal 191 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle1.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle1.png new file mode 100644 index 0000000000000000000000000000000000000000..228d04b0d1a2dd127b12180f0fa1cd4474144433 GIT binary patch literal 787 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#&H|6fVjv9yj0`Q6;y@15QBN1g zkcv5PXWRN6b`WUgEnFDZS;*s7*373bp7=kXe&qh% zy|dPxWfHzyesR*1-P@msMsHWhnf=7~#Lp+Yn)caMJ#Fn|ySOvMGw7~L?tRZm|0;_r z{(QBx%DcaQX5*45=afZzJFb~-3^NU}znI(o}9#J&3Zjuhet7{@{jA^7XB*wdo5d zopq_6fA46Tyj10)+oH8{e_L*Rtyb_c>3FipImJ$w^NMNd?WnccwX4cMP3o58dggLI zRJT{vVB5EhQr?SmGS)x2cK?mO@?8g=m%rv(uY4Nb{X72r^SCbo2HIACHd{~l7h&JH z?AV%&{29WrZ(sJ-{;ex}b$`nY;kTm2iw@75oc`2Y_nAxe(ViEp7C%|K?ktdfyyr!N zO65D(>ULmq`4Zs5{(S4ro)-%p5QzqBN)nly_=9E3U-67H+X|L}lD4O-pUXO@geCyo C-h1=_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle2.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle2.png new file mode 100644 index 0000000000000000000000000000000000000000..63aaa9b1c837114f56de40b134d29b3f3db60bcc GIT binary patch literal 1119 zcmV-l1fctgP);6JQ)_jFpF@Ahvpu_W8`=eyPJ-kox`+wHp0{OTP(Bh-@7 z!`Dv-Lw9>|b>{i`%^1D3`c??uym|Ndb9H`xaNLXRYK<;U%@}?C(WR-MJ4P;5iIt`x`qYh1t;7aqM3AKG zts^HY!&Zsb5=qDDd?H&Co=+nIvjpjTNcRZ*ewP5M8>_M2B$LRczbxj#QtVzqwo$rLE8ig6Nt2Dnn2khpvD+#x7L&vgvHx09Wr?y@ zzMO(+Crvh5+p}1~@7h^tA{i?`Yixfy56I@SD0*GHW>3n?gJ>sZGg?db$dD<;U{q?B zf@E_&6C|FKw!#deOPygsaosv?pIIxs9!G$caIQ;8pMxWBYHuWnc9Lkcv{sF~Db`b5P zerb}|&>w#GI(L4e=E`y;1<|D&js0dMjmTNLA}d8fbg4$C&YavS^IfkP%Jo#Dd)L~W zAxAPtB9b$9|0juizg)2$yMwr%BYGXJ%^BiK9_xDJt#QXJeIAW~%U7?voa?5&NG3(r z;iO(m7)Nd{61Ga>r3zH)`f-)$+zO(XHhS)uH5j{NxGRj?mxv<|vm|Yv9^JbWm3!zI zlq=*pJzLMbkF~TbO1o3ndT)recPFCaZ-#?Fl(Yvt*S%&c*~J@Oi;6XR5LQN6_xV|6 z-F0=cM%N}cqX*^grd$MZ?;B5`sa(Z}j&0@&HT7BlQ=d0oywSDD-RKRo637~xt=DmT zYP|lNMG)cTFmGbJTGqP{{ax|Ix3Mn(WBG8zS0yix;CS)VZB8wB$I;ZT8#Ft l^h#9_?W8c;Nnv#7qd!maq-lGagg*cP002ovPDHLkV1nqLBB=lX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle3.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle3.png new file mode 100644 index 0000000000000000000000000000000000000000..0d7f6b3ed3971307790c3d697d8a5a3b1639ad08 GIT binary patch literal 1497 zcmV;~1t$85P)g4)ZsHByzd8`gV49X2`oZ z9*<24ZT|S}&V~-pf4*oI5c+fR^y>Eg%dek}zW?Q~Kdbhyt#Ogi3#YY?4G`vM9wDB<|~r>&5Jva?+(8oYmyyAS5onT1`!|z zw(*ciGDuV3TkR>5`Fr$pZUxbmG}}O1M0ss2gqeZw71`Ex`8*uId3*PoP)b2`CAGP$ zKa^^F4|F_}e0=-<_I3OGo6&LG&5KccT{E_=-hOz!4A^e;$LsB2|G+!XAi9#=1FdYQ z*9*81=bzcujjul-&3ilu<(LPg`fv4{&r|++5M4>h1I$H{sXNrEVzPtiO3EJSr7|bEO7&7olO04?Qmb}=Of1`K z?96gk=gt{5%Wc2(44j%14WcWl&D{x|e&J0X$^GW1FCO>q(}&UVUc%K(nHo*x_&B^6 z@6I@guB0~ChIyk|>`(Rv$;B`%X57x0P>yA6uO5%uQ|GCETQeKi z@$QU+=t`P>ph42jKqhQ2h_wWgxh_KydVP60x(*Y_=XtZ|D*AVdp){XkC`v)}eb0g` zFJM0q+I$92k_{qZYqx`K$LDD0_4|KEGv?Gj5$^4;60bEXuB{YAS5oWU32{!(B7uMT zJ(0#_PZio@Zv!&`Hh$_(6X#_pM5`wNml;2 z@;X@7--W-&8x;(qmx|uGE99Lq4kj6re)Q#--0%MRyZO>8ul#1dj=ElIcHdj?!3v@) z$sB0jk$I)6HMhc+Dp~%jve`_!BHCM3noBYiL|0N?6+GxLoeB> zl~k-CdZ~D{+7VjuSuZKqgFowy-dSXy`T4@j=?<@4(Z9LsrGw~7IvZ$JzkGT>{L*UG zMGRnjHLh>=+T^J^Wj=^(MZQw1R}mSO`&N5bN_)c_@a_ba7qXNhdbbi4TMRk=%&U4Y zG8C3ARWraMTeWY+rFjQfYG#Mmv2;8-_ZPHwV!e@j z=%uSkA(b&nRVP+)uNPotMA$F4GCh_`M=^uwN=hE+shNhI)8>2cIZ?LP8{e*_AbRQA zJH%Z%JDqzEOJC@@8@c{CRQn0-P!PRz&Je%6y2p9#&s5saT*;Jr2S5;ANphe|5u1BI zVqfS?iIxtt|FjisyAabfTxmv%Adbo<(*lfu$8* z$Jz!u^(kAq@$4hjC42AdON}y4^*&N(ZV+8b?tz{=Rsp4wg&DxH8MgIP>oTS)h<+#o zZQ0I_$V<&OTTw?=ZdO}8=`ms*D^oSo@lx1MXlmVriaN4akb50@ywfWR8~srJL#KL{ z=dMr%km`rjLjPSOh`#U7CY{Sx-d6?DO&$FYsIDTNkr?uo00000NkvXXu0mjfqjTeE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle4.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle4.png new file mode 100644 index 0000000000000000000000000000000000000000..04e0a93892278448da86738ccbb4c7e5bf999d71 GIT binary patch literal 1264 zcmVSYPn3E zHf;i=$_;b~S5lo5815KA;t0@}C%dydJ1aW#8^;K>T#X(-XJ<$BY#4?{Q{DHkZw|P- zf1EWJpjz{5OAhWb2=wgcdjE6Syr>YDN*<0!^CHpw=(tj3JJCie7U*1(XPM;nyKiyF zHHYJ*^OeepHj;Xvk)V+0qKM>e_i##LCmZkV^^8iBOmd=))RxXaWAEZS<>O*S<4LbP zshnsd1p`f=bglf;O5FS@dx`aYyfSE9C)!BSfhK~FpS&;&s3jtDJ-^-mzWVdKkq{bt z9OwD;(}^}xo9kh@-rNg4P%0W1$u2D<+le+(Fwmv5iESa0Lu4 zbG(wYygc{ysVijnXd@j1ow~x4lGcyMKiz%V|GxbB)-Jlf?PrJj(dK6J^bVD^mVah zFE=kL^>cimp`98h+DK-BUNLoG%&U=LB$>t`ah^yzTValU9HqpO?L-@?E#3P@8YsVn zof-6SBA3WUlG(hSSy5WAAW6P5yp&o;uwzK+6Q04!4ZSy%FNegi8fLj?1tR@ zdv{l=8B?D|&*jKQujD+R{y(-J9;?*%??fA^t<`ha1F=Np^Zeksv1A`LdM20e*8XOK z6Fs#+ONm*-N{-u2POY|KJzLwWrE;RD7U)=#2g*aoU2O8=+8$b3PV`g)EhTXWUQD~+ zNTF0eH>glP^Cvl>umPc!=kIY(9?*Sw!$*Ip=b)su` z{MROXD|`}TXm>q##fKz&fArM)qjSkl-TRXg8R~dS&5yO8obDd|UY>|<{hW;+vJl$A zkxKg>W_m53YInlMdNjXV9mg|wz*4exZ zohMaJ^i%>}Dw`N!=f>*Ei@EQcy9YVZM#>I!sl0fHSx_O*OSLM#wzqwGbehg9sk>1P ajs60-V{pvlN{fmB0000n2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle5.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/lunar_flare_explosion_particle5.png new file mode 100644 index 0000000000000000000000000000000000000000..6a21986bbcdb0081f51c2f82daca34e7fb817842 GIT binary patch literal 1024 zcmV+b1poVqP)KoG`#$i?YuiYqA4x}wSx|OSe&majyncK zGl|XUwkK2F97vLujac71&m|Deq>`}Fv(4I=YeP@)xIRhj$u-=U4Q7f zOn*Q$lblA|VshyurCsSp=e)baF;FeKqjS`eOg{X7%X5q+(`Rm`;x9 zHgIO^tCKTYN_B3rQy02|LfMHa%nav7v{^IJ7Gj6k8EFNDTjqG^4yEyD6FTOuWJc3} z^6m2%<9t<>kw3?pNm5-KL^COw(cfOa+J8R%`DOpPQCCNiK!5jRw;TO_`}=zpl9kXi zVCWNBU+5HM+pY^lGbx$TM5JpbrV^9vBHMMRg$jAJG|{o@uSBAa7-eK7M6#7&Rd&q- zFIc8)^ytdAH|>SWj6DTb1s}?o$xWq-aK)o%7Ol;7#HgAL-ccQxMIhnx2{z zYkXrhJ@uu#Ok1Hg=QCHs&FsSW&WR-uotx1vVng?{+XTi;*Ljcq#zE|Hl0Y<* zf{iY{HZrxU=Q~~y%_JDzD|PQ7jAl}Fqf1|*NwpgTh-Ok9yQ-FJr&1HRABbFmM7!*P~>M&I>r z0-yT6S&{F!@Yae#Ri}!fME2Rrs0VvK^`-hTVhLFX_jg!w*H&otI+j2*ld?BjWj4c{ ztAss)^V*c_b$LFGz&U4 zPAVB_&EyD;2Em{~Z2^M@F?(B}_G`4PAM593r7j)QZC`X3I7|v+v)LR-Z=w7G^Iv5{mmddXtXz##+4jV_BaliEM z+R2qOo)3)%F{2EYf|+su)6?^L`|bDV;&E!1t2MlPXWi&%%;Di~wJn7@Ebf2&{+d?% zhd$-11?y<*M(=$xNz(sUHu&0d)q-_&Z=-8n@m~Gk0P4N$h5hJWL0cJ#m599;E$2m} zLAVQAl>Q>!1+A62cWXQfG#Uhht^{XTlrXbyu0ttDRvp&wb+9+HhDKYx*U@VxLpwBj zlo^&$pwS@Q&9G>NMuTuW!=eou4Z?lUA=BoddqwVp)`I(>C1Wyr^XG9|KmXAR8f|3-n!RQQa2=U7IeiYhF*MrB3N(Ao6!6`>^!s9+j2;2gXzfAY zYNmjV>U|G~Mq3HGw<%iSlS)cp)o~+R+b9MNf}gFN;Bg_z&9px)|Ea zL8H+@*S_MV^*IE*x8hHI08q0yE5?YT8k88nESgTD6pXi+-z(&~+28a-k71Lv!3wP=g)Z~y=R M07*qoM6N<$f@~lJ%=P);3$l z8P7TyhD4_A{rA#e>U^uz6LS+SMEkF0e0rY_;(~Y zP+|j}K#t=w@z?uvULmCkgkarZ^}>9C`TWau#jhhmkS$tlAdp2eAFC_=9jT2!A;0N2 zQ^4%;=ZHYpmQ1kh@#6@_hA1uN3_2m#_v489Na-`I6&CuEd_oG-g&?yKsc@J@(qYYg zg%&Fi8>~aa>-lr!ukj;}<)xB6P2)`RR(us+ZD%NpiH?$wv|A^u`S z-msn(vxipNBN!Vj``YPQ1?x_a6>UDhj<8iYwwKi^X|U^HnzaH!Kf;KuE85e4d;25o zUJ6)Gw6&$ZooB3c)=Fy~XY;pHS!?4@2#e~|JsqNUlq6PI%(YiXtXO+fjq7nF7ygA{ zRAcmG1!dhi`)n3c8}&QA*zfpL=kxDKZTt(-VnfD1UpJ;crv0p`&GiV$^^DxEBN+Xs zZhgNvUQ9?SdW;~+zszH?@PB@pSDJQ(SXbrZLQ2tvAYBO3g&uMffU3`DB!{Jz66$&<>xfKokj@!_C_ROg)npPU27R%wdbFDpAIC>7; z=WrBVP{PfyS$Kk%bk!-!dIUH#s)5iBhktv<5TyiwSOmlrEr4G5+~!^w_*Maj|fx%MJ%HxHH*&#@Ek9X*7i1uV>t*+1n@FjAl59@ zVdc6BFwRL65=AkXmveF+juL&|Qp`oU+$6=2l!u@>o_6u*JpbTGoGC~7hG1o082Sp} zaR?2bB-81%GtD@4Ge*)J$B~qabh!wGAgp!`iWx$)HY_m&fhC!W0To@tY(_Dnr(gg_ zsxI1~8U(kEf_bsG!SA zw0&8qmv?(_fTEm{MJV1BEK7V;H&qcCtf*oPkcJk+v4R`QH%k*PmZb=WW?e+Y=V1uWExY9?BSxZ3;eJq;Qg&pQ?#uu4 zeyypX(h`%m%wrdvof3RVu~4wu^A*tu+VZQUg5|P+7bQEp1Gr>|707sgTe)QqEYhaq z0FnMjxEEoT9))Sq1Z6Sgt(&G3iIgYpI$X4a{HKYzv+HVh362_py)3jK^igPHKtr9& zL@jFU{Jp3*t_W2H%fj*J=BMbv=c!c{_1pu8`hf6$UGrL^WGmLa@Nm!M`Ib$UpO2lT z+Xiab6YEPpTR;BQVCjo5P555<<&UdJ#y)xbjZ5$OtMyaQ^v4e$eUv!4rmJhL!B=s6 z>47*K-ZVw6!tufE-1ywi{zmxeHs@5&NdM56t#5Ap`NPn)5$}$xtZ;XtOACLzZvNo$ zf$y?&{^5nh?3LjJF}Z(l^cg;^&0aY@s-B(6?f{LjZ`b6^=8vYby~hW> zA1eJ}e-cq#eimk7=iD^$)W&a%yM@Vp)tCKEuYDaWn%Vrp)V29{e(LQ8jlZ94t86;4 zuB7xr-@&$rO4#1ir6cEte{6@M|JA!5TwsdMb-wU)!>@lv>)#FZO}=$8b!boOp6LPO z@X;_a@%rBC^3IhzN1n{>B)*6YO&lwl+cH{T+lv2H``b72Ui+U>RZ$bnKDKMm-$eXL Aw*UYD literal 0 HcmV?d00001 diff --git a/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json b/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json index 51cb703..0523090 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/magic_weapons.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ - "lzxnoneterraria:last_prism" + "lzxnoneterraria:last_prism", + "lzxnoneterraria:betsys_wrath", + "lzxnoneterraria:lunar_flare", + "lzxnoneterraria:bubble_gun" ] } diff --git a/src/main/resources/data/lzxnoneterraria/tags/item/spread_ranged_weapons.json b/src/main/resources/data/lzxnoneterraria/tags/item/spread_ranged_weapons.json index a9fda34..58886de 100644 --- a/src/main/resources/data/lzxnoneterraria/tags/item/spread_ranged_weapons.json +++ b/src/main/resources/data/lzxnoneterraria/tags/item/spread_ranged_weapons.json @@ -6,6 +6,7 @@ "lzxnoneterraria:gatligator", "lzxnoneterraria:shotgun", "lzxnoneterraria:tactical_shotgun", - "lzxnoneterraria:chain_gun" + "lzxnoneterraria:chain_gun", + "lzxnoneterraria:bubble_gun" ] } diff --git a/src/main/resources/lzxnoneterraria.mixins.json b/src/main/resources/lzxnoneterraria.mixins.json index 59aebca..ccd802d 100644 --- a/src/main/resources/lzxnoneterraria.mixins.json +++ b/src/main/resources/lzxnoneterraria.mixins.json @@ -5,7 +5,6 @@ "compatibilityLevel": "JAVA_21", "mixins": [ "LivingEntityVisibilityMixin", - "ItemEntityMixin", "VillagerMixin" ], "client": [