From af4cfa8f8b1369bdbd80c4b7783826cf0390688a Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Mon, 27 Jul 2026 23:23:11 +0800 Subject: [PATCH] v1.6.0 --- .../ClientStaticSummonRenderBehaviors.java | 13 ++ .../client/item/ammo/ClientBulletAmmo.java | 13 +- .../ModCreativeModeTabs.java | 14 ++ .../terraria/effect/BloodButcheredEffect.java | 7 +- .../terraria/effect/CursedInfernoEffect.java | 85 ++++++++++ .../terraria/effect/EffectLogicHandler.java | 4 +- .../lzxnone/terraria/effect/MidasEffect.java | 50 ++++++ .../lzxnone/terraria/effect/ModEffects.java | 4 + .../entity/summon/StaticSummonBehaviors.java | 29 +++- .../event/EntityDeathEventHandler.java | 8 + .../com/lzxnone/terraria/item/ModItems.java | 33 +++- .../terraria/item/ammo/BasicBulletAmmo.java | 54 +++++++ .../terraria/item/ammo/BulletAmmo.java | 2 +- .../terraria/item/ammo/ChlorophyteBullet.java | 9 ++ .../terraria/item/ammo/CrystalBullet.java | 9 ++ .../terraria/item/ammo/CursedBullet.java | 66 ++++++++ .../item/ammo/EndlessMusketPouch.java | 10 ++ .../terraria/item/ammo/ExplodingBullet.java | 9 ++ .../terraria/item/ammo/GoldenBullet.java | 121 ++++++++++++++ .../item/ammo/HighVelocityBullet.java | 57 +++++++ .../terraria/item/ammo/IchorBullet.java | 9 ++ .../terraria/item/ammo/LuminiteBullet.java | 9 ++ .../terraria/item/ammo/MeteorShot.java | 2 +- .../terraria/item/ammo/MusketBall.java | 2 +- .../terraria/item/ammo/NanoBullet.java | 9 ++ .../terraria/item/ammo/PartyBullet.java | 9 ++ .../terraria/item/ammo/SilverBullet.java | 121 ++++++++++++++ .../terraria/item/ammo/TungstenBullet.java | 104 ++++++++++++ .../terraria/item/ammo/VenomBullet.java | 9 ++ .../projectile/ammo/BulletProjectile.java | 9 -- .../projectile/ammo/MeteorShotProjectile.java | 9 -- .../terraria/item/weapon/RangedWeapon.java | 2 + .../terraria/mixin/HumanoidModelMixin.java | 5 +- .../terraria/ui/config/ConfigList.java | 12 +- .../com/lzxnone/terraria/utils/AmmoUtil.java | 148 +++++++++++++++++- .../lzxnone/terraria/utils/DamageUtil.java | 22 +++ .../assets/lzxnoneterraria/lang/en_us.json | 55 +++++++ .../assets/lzxnoneterraria/lang/zh_cn.json | 55 +++++++ .../lzxnoneterraria/models/item/ammo.json | 26 +++ .../models/item/bullet_projectile.json | 2 +- .../models/item/chlorophyte_bullet.json | 6 + .../item/chlorophyte_bullet_projectile.json | 6 + .../models/item/crystal_bullet.json | 6 + .../item/crystal_bullet_projectile.json | 6 + .../models/item/cursed_bullet.json | 6 + .../models/item/cursed_bullet_projectile.json | 6 + .../models/item/endless_musket_pouch.json | 6 + .../models/item/exploding_bullet.json | 6 + .../item/exploding_bullet_projectile.json | 6 + .../models/item/golden_bullet.json | 6 + .../models/item/golden_bullet_projectile.json | 6 + .../models/item/high_velocity_bullet.json | 6 + .../item/high_velocity_bullet_projectile.json | 6 + .../models/item/ichor_bullet.json | 6 + .../models/item/ichor_bullet_projectile.json | 6 + .../models/item/luminite_bullet.json | 6 + .../item/luminite_bullet_projectile.json | 6 + .../models/item/meteor_shot.json | 2 +- .../models/item/meteor_shot_projectile.json | 2 +- .../models/item/musket_ball.json | 2 +- .../models/item/nano_bullet.json | 6 + .../models/item/nano_bullet_projectile.json | 6 + .../models/item/party_bullet.json | 6 + .../models/item/party_bullet_projectile.json | 6 + .../models/item/silver_bullet.json | 6 + .../models/item/silver_bullet_projectile.json | 6 + .../models/item/tungsten_bullet.json | 6 + .../models/item/venom_bullet.json | 6 + .../models/item/venom_bullet_projectile.json | 6 + .../textures/item/chlorophyte_bullet.png | Bin 0 -> 134 bytes .../textures/item/crystal_bullet.png | Bin 0 -> 162 bytes .../textures/item/cursed_bullet.png | Bin 0 -> 130 bytes .../item/cursed_bullet_projectile.png | Bin 0 -> 101 bytes .../textures/item/endless_musket_pouch.png | Bin 0 -> 277 bytes .../textures/item/exploding_bullet.png | Bin 0 -> 141 bytes .../textures/item/golden_bullet.png | Bin 0 -> 142 bytes .../item/golden_bullet_projectile.png | Bin 0 -> 467 bytes .../textures/item/high_velocity_bullet.png | Bin 0 -> 127 bytes .../item/high_velocity_bullet_projectile.png | Bin 0 -> 139 bytes .../textures/item/ichor_bullet.png | Bin 0 -> 147 bytes .../textures/item/luminite_bullet.png | Bin 0 -> 144 bytes .../textures/item/nano_bullet.png | Bin 0 -> 127 bytes .../textures/item/party_bullet.png | Bin 0 -> 130 bytes .../textures/item/silver_bullet.png | Bin 0 -> 139 bytes .../item/silver_bullet_projectile.png | Bin 0 -> 1391 bytes .../textures/item/tungsten_bullet.png | Bin 0 -> 136 bytes .../textures/item/venom_bullet.png | Bin 0 -> 122 bytes .../textures/mob_effect/cursed_inferno.png | Bin 0 -> 381 bytes .../textures/mob_effect/midas.png | Bin 0 -> 637 bytes .../tags/item/bullet_ammo.json | 16 +- 90 files changed, 1344 insertions(+), 50 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/effect/CursedInfernoEffect.java create mode 100644 src/main/java/com/lzxnone/terraria/effect/MidasEffect.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/BasicBulletAmmo.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/EndlessMusketPouch.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java delete mode 100644 src/main/java/com/lzxnone/terraria/item/projectile/ammo/BulletProjectile.java delete mode 100644 src/main/java/com/lzxnone/terraria/item/projectile/ammo/MeteorShotProjectile.java create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/ammo.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/chlorophyte_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/chlorophyte_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/crystal_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/crystal_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/cursed_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/cursed_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/endless_musket_pouch.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/exploding_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/exploding_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/golden_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/golden_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/high_velocity_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/high_velocity_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/ichor_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/ichor_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/luminite_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/luminite_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/nano_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/nano_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/party_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/party_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/silver_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/silver_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/tungsten_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/venom_bullet.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/venom_bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/chlorophyte_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/crystal_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/cursed_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/cursed_bullet_projectile.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/endless_musket_pouch.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/exploding_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/golden_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/golden_bullet_projectile.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/high_velocity_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/high_velocity_bullet_projectile.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/ichor_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/luminite_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/nano_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/party_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/silver_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/silver_bullet_projectile.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/tungsten_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/venom_bullet.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/mob_effect/cursed_inferno.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/mob_effect/midas.png 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 7f72301..cea9aa2 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 @@ -46,6 +46,19 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.MUSKET_BALL, ClientBulletAmmo.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.METEOR_SHOT, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.SILVER_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.CRYSTAL_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.CURSED_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.CHLOROPHYTE_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.HIGH_VELOCITY_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.ICHOR_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.VENOM_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.PARTY_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.NANO_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.EXPLODING_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.GOLDEN_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.LUMINITE_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.TUNGSTEN_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); } public static IStaticSummonRenderBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java b/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java index 2f16e27..b235882 100644 --- a/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java +++ b/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java @@ -22,8 +22,10 @@ public class ClientBulletAmmo { poseStack.pushPose(); //旋转(方向修正) - poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot()))); - poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot()))); + //poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot()))); + //poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot()))); + poseStack.mulPose(Axis.YP.rotationDegrees(-summon.getYRot())); + poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot())); poseStack.mulPose(Axis.YP.rotationDegrees(-90)); @@ -48,8 +50,11 @@ public class ClientBulletAmmo { poseStack.pushPose(); //旋转(方向修正) - poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot()))); - poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot()))); + //poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot()))); + //poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot()))); + + poseStack.mulPose(Axis.YP.rotationDegrees(-summon.getYRot())); + poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot())); poseStack.mulPose(Axis.ZP.rotationDegrees(90)); poseStack.mulPose(Axis.YP.rotationDegrees(-90)); 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 9f2b910..f851260 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 @@ -62,6 +62,20 @@ public class ModCreativeModeTabs { output.accept(ModItems.SDMG.get()); output.accept(ModItems.MUSKET_BALL.get()); output.accept(ModItems.METEOR_SHOT.get()); + output.accept(ModItems.SILVER_BULLET.get()); + output.accept(ModItems.CRYSTAL_BULLET.get()); + output.accept(ModItems.CURSED_BULLET.get()); + output.accept(ModItems.CHLOROPHYTE_BULLET.get()); + output.accept(ModItems.HIGH_VELOCITY_BULLET.get()); + output.accept(ModItems.ICHOR_BULLET.get()); + output.accept(ModItems.VENOM_BULLET.get()); + output.accept(ModItems.PARTY_BULLET.get()); + output.accept(ModItems.NANO_BULLET.get()); + output.accept(ModItems.EXPLODING_BULLET.get()); + output.accept(ModItems.GOLDEN_BULLET.get()); + output.accept(ModItems.ENDLESS_MUSKET_POUCH.get()); + output.accept(ModItems.LUMINITE_BULLET.get()); + output.accept(ModItems.TUNGSTEN_BULLET.get()); }).build()); public static final DeferredHolder SUMMON_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_summon_0", () -> CreativeModeTab.builder() diff --git a/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java b/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java index d0443f0..c8768eb 100644 --- a/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/BloodButcheredEffect.java @@ -64,11 +64,8 @@ public class BloodButcheredEffect extends MobEffect { @Override public boolean applyEffectTick(LivingEntity entity, int amplifier) { if(entity.level() instanceof ServerLevel serverLevel) { - MobEffectInstance instance = entity.getEffect(ModEffects.BLOOD_BUTCHERED); - if(instance != null) { - if(instance.getDuration() % 20 == 0) { - entity.hurt(entity.damageSources().magic(), (float) getDamagePerLevel() * (amplifier + 1)); - } + if(entity.tickCount % 20 == 0) { + if(entity.hurt(entity.damageSources().magic(), (float) getDamagePerLevel() * (amplifier + 1))) entity.invulnerableTime = 10; } ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/effect/CursedInfernoEffect.java b/src/main/java/com/lzxnone/terraria/effect/CursedInfernoEffect.java new file mode 100644 index 0000000..b34949d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/effect/CursedInfernoEffect.java @@ -0,0 +1,85 @@ +package com.lzxnone.terraria.effect; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.particle.CircleParticleOptions; +import com.lzxnone.terraria.particle.DustParticleOptions; +import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.utils.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.entity.LivingEntity; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +public class CursedInfernoEffect extends MobEffect { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DAMAGE_PER_LEVEL_PATH = "effect.cursed_inferno.damage_per_level"; + public static final float DAMAGE_PER_LEVEL_DEFAULT = 2.0f; + public static final float DAMAGE_PER_LEVEL_MIN = 0.0f; + public static final float DAMAGE_PER_LEVEL_MAX = 8388600.0f; + + public CursedInfernoEffect() { + super(MobEffectCategory.HARMFUL, 0x66FF00); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadFloatConfig(DAMAGE_PER_LEVEL_PATH, configText("cursed_inferno_damage_per_level"), configTooltip("cursed_inferno_damage_per_level"), DAMAGE_PER_LEVEL_DEFAULT, DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static float getDamagePerLevel() { + return Math.clamp(ConfigUtil.readFloat(DAMAGE_PER_LEVEL_PATH, DAMAGE_PER_LEVEL_DEFAULT), DAMAGE_PER_LEVEL_MIN, DAMAGE_PER_LEVEL_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "cursed_inferno", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/cursed_inferno.png"), + Component.translatable("effect.lzxnoneterraria.cursed_inferno"), + CONFIG_DATA + ); + + public static final DustParticleOptions PARTICLE = new DustParticleOptions( + 0.075f, 0.5f, 40, true, new Vector3f[]{ + new Vector3f(0.5F, 1.0F, 0.5F), + new Vector3f(0.0F, 1.0F, 0.2F) + } + ); + + @Override + public boolean shouldApplyEffectTickThisTick(int duration, int amplifier) { + return true; + } + + @Override + public boolean applyEffectTick(LivingEntity entity, int amplifier) { + if(entity.level() instanceof ServerLevel serverLevel) { + if(entity.tickCount % 20 == 0) { + if(entity.hurt(entity.damageSources().magic(), getDamagePerLevel() * (amplifier + 1))) entity.invulnerableTime = 10; + } + ParticleUtil.addParticles( + serverLevel, PARTICLE, + entity.getBoundingBox().getCenter(), new Vec3(0, 0, 0), + 0.1, 1 + ); + } + return true; + } +} diff --git a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java index 057342b..1e26001 100644 --- a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java +++ b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java @@ -87,6 +87,8 @@ public class EffectLogicHandler { return effect == ModEffects.CONFUSED || effect == ModEffects.KILL_MODE - || effect == ModEffects.KILL_MODE_COOLDOWN; + || effect == ModEffects.KILL_MODE_COOLDOWN + || effect == ModEffects.MIDAS + || effect == ModEffects.CURSED_INFERNO; } } diff --git a/src/main/java/com/lzxnone/terraria/effect/MidasEffect.java b/src/main/java/com/lzxnone/terraria/effect/MidasEffect.java new file mode 100644 index 0000000..11ff98f --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/effect/MidasEffect.java @@ -0,0 +1,50 @@ +package com.lzxnone.terraria.effect; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; + +public class MidasEffect extends MobEffect { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String DROP_CHANCE_PATH = "effect.midas.drop_chance"; + public static final float DROP_CHANCE_DEFAULT = 0.25f; + public static final float DROP_CHANCE_MIN = 0.0f; + public static final float DROP_CHANCE_MAX = 1.0f; + + public MidasEffect() { + super(MobEffectCategory.HARMFUL, 0xFFD700); + } + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadFloatConfig(DROP_CHANCE_PATH, configText("midas_drop_chance"), configTooltip("midas_drop_chance"), DROP_CHANCE_DEFAULT, DROP_CHANCE_MIN, DROP_CHANCE_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static float getDropChance() { + return Math.clamp(ConfigUtil.readFloat(DROP_CHANCE_PATH, DROP_CHANCE_DEFAULT), DROP_CHANCE_MIN, DROP_CHANCE_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "midas", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/mob_effect/midas.png"), + Component.translatable("effect.lzxnoneterraria.midas"), + CONFIG_DATA + ); +} diff --git a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java index d6b6544..c4503f9 100644 --- a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java +++ b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java @@ -20,6 +20,10 @@ public class ModEffects { MOB_EFFECTS.register("kill_mode_cooldown", KillModeCooldownEffect::new); public static final DeferredHolder DEMONIC_FLAMES = MOB_EFFECTS.register("demonic_flames", DemonicFlamesEffect::new); + public static final DeferredHolder CURSED_INFERNO = + MOB_EFFECTS.register("cursed_inferno", CursedInfernoEffect::new); public static final DeferredHolder SUMMON = MOB_EFFECTS.register("summon", SummonEffect::new); + public static final DeferredHolder MIDAS = + MOB_EFFECTS.register("midas", MidasEffect::new); } 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 08bb32c..72ff9f9 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -1,7 +1,6 @@ package com.lzxnone.terraria.entity.summon; -import com.lzxnone.terraria.item.ammo.MeteorShot; -import com.lzxnone.terraria.item.ammo.MusketBall; +import com.lzxnone.terraria.item.ammo.*; import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.*; import com.lzxnone.terraria.item.weapon.summon.Terraprisma; @@ -38,6 +37,19 @@ public class StaticSummonBehaviors { //弹药实体 public static final String MUSKET_BALL = "musket_ball"; public static final String METEOR_SHOT = "meteor_shot"; + public static final String SILVER_BULLET = "silver_bullet"; + public static final String CRYSTAL_BULLET = "crystal_bullet"; + public static final String CURSED_BULLET = "cursed_bullet"; + public static final String CHLOROPHYTE_BULLET = "chlorophyte_bullet"; + public static final String HIGH_VELOCITY_BULLET = "high_velocity_bullet"; + public static final String ICHOR_BULLET = "ichor_bullet"; + public static final String VENOM_BULLET = "venom_bullet"; + public static final String PARTY_BULLET = "party_bullet"; + public static final String NANO_BULLET = "nano_bullet"; + public static final String EXPLODING_BULLET = "exploding_bullet"; + public static final String GOLDEN_BULLET = "golden_bullet"; + public static final String LUMINITE_BULLET = "luminite_bullet"; + public static final String TUNGSTEN_BULLET = "tungsten_bullet"; static { BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {}); @@ -64,6 +76,19 @@ public class StaticSummonBehaviors { BEHAVIORS.put(MUSKET_BALL, MusketBall.SUMMON_BEHAVIOR); BEHAVIORS.put(METEOR_SHOT, MeteorShot.SUMMON_BEHAVIOR); + BEHAVIORS.put(SILVER_BULLET, SilverBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(CRYSTAL_BULLET, CrystalBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(CURSED_BULLET, CursedBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(CHLOROPHYTE_BULLET, ChlorophyteBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(HIGH_VELOCITY_BULLET, HighVelocityBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(ICHOR_BULLET, IchorBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(VENOM_BULLET, VenomBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(PARTY_BULLET, PartyBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(NANO_BULLET, NanoBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(EXPLODING_BULLET, ExplodingBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(GOLDEN_BULLET, GoldenBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(LUMINITE_BULLET, LuminiteBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(TUNGSTEN_BULLET, TungstenBullet.SUMMON_BEHAVIOR); } public static IStaticSummonBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/event/EntityDeathEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityDeathEventHandler.java index 4835d12..efe0434 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityDeathEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityDeathEventHandler.java @@ -2,11 +2,15 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.effect.MidasEffect; +import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.living.LivingDeathEvent; @@ -22,6 +26,10 @@ public class EntityDeathEventHandler { //消耗插入的破灭魔王剑 if(livingEntity.level() instanceof ServerLevel serverLevel) { + if(livingEntity.hasEffect(ModEffects.MIDAS) && livingEntity.getRandom().nextFloat() < MidasEffect.getDropChance()) { + livingEntity.spawnAtLocation(new ItemStack(Items.EMERALD)); + } + List stuckList = livingEntity.getData(ModAttachments.STUCK_DEVILS_DEVASTATION_PROJECTILE); while(!stuckList.isEmpty()) { UUID uuid = stuckList.getLast(); diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index fb01704..651600b 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -3,8 +3,6 @@ package com.lzxnone.terraria.item; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.ammo.*; import com.lzxnone.terraria.item.projectile.*; -import com.lzxnone.terraria.item.projectile.ammo.BulletProjectile; -import com.lzxnone.terraria.item.projectile.ammo.MeteorShotProjectile; import com.lzxnone.terraria.item.projectile.first_fractal.*; import com.lzxnone.terraria.item.weapon.magic.*; import com.lzxnone.terraria.item.weapon.melee.*; @@ -52,9 +50,35 @@ public class ModItems { //弹药 public static final DeferredItem MUSKET_BALL = ITEMS.register("musket_ball", MusketBall::new); public static final DeferredItem METEOR_SHOT = ITEMS.register("meteor_shot", MeteorShot::new); + public static final DeferredItem SILVER_BULLET = ITEMS.register("silver_bullet", SilverBullet::new); + public static final DeferredItem CRYSTAL_BULLET = ITEMS.register("crystal_bullet", CrystalBullet::new); + public static final DeferredItem CURSED_BULLET = ITEMS.register("cursed_bullet", CursedBullet::new); + public static final DeferredItem CHLOROPHYTE_BULLET = ITEMS.register("chlorophyte_bullet", ChlorophyteBullet::new); + public static final DeferredItem HIGH_VELOCITY_BULLET = ITEMS.register("high_velocity_bullet", HighVelocityBullet::new); + public static final DeferredItem ICHOR_BULLET = ITEMS.register("ichor_bullet", IchorBullet::new); + public static final DeferredItem VENOM_BULLET = ITEMS.register("venom_bullet", VenomBullet::new); + public static final DeferredItem PARTY_BULLET = ITEMS.register("party_bullet", PartyBullet::new); + public static final DeferredItem NANO_BULLET = ITEMS.register("nano_bullet", NanoBullet::new); + public static final DeferredItem EXPLODING_BULLET = ITEMS.register("exploding_bullet", ExplodingBullet::new); + public static final DeferredItem GOLDEN_BULLET = ITEMS.register("golden_bullet", GoldenBullet::new); + public static final DeferredItem ENDLESS_MUSKET_POUCH = ITEMS.register("endless_musket_pouch", EndlessMusketPouch::new); + public static final DeferredItem LUMINITE_BULLET = ITEMS.register("luminite_bullet", LuminiteBullet::new); + public static final DeferredItem TUNGSTEN_BULLET = ITEMS.register("tungsten_bullet", TungstenBullet::new); - public static final DeferredItem BULLET_PROJECTILE = ITEMS.register("bullet_projectile", BulletProjectile::new); - public static final DeferredItem METEOR_SHOT_PROJECTILE = ITEMS.register("meteor_shot_projectile", MeteorShotProjectile::new); + public static final DeferredItem BULLET_PROJECTILE = ITEMS.register("bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem METEOR_SHOT_PROJECTILE = ITEMS.register("meteor_shot_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem SILVER_BULLET_PROJECTILE = ITEMS.register("silver_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem CRYSTAL_BULLET_PROJECTILE = ITEMS.register("crystal_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem CURSED_BULLET_PROJECTILE = ITEMS.register("cursed_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem CHLOROPHYTE_BULLET_PROJECTILE = ITEMS.register("chlorophyte_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem HIGH_VELOCITY_BULLET_PROJECTILE = ITEMS.register("high_velocity_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem ICHOR_BULLET_PROJECTILE = ITEMS.register("ichor_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem VENOM_BULLET_PROJECTILE = ITEMS.register("venom_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem PARTY_BULLET_PROJECTILE = ITEMS.register("party_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem NANO_BULLET_PROJECTILE = ITEMS.register("nano_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem EXPLODING_BULLET_PROJECTILE = ITEMS.register("exploding_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem GOLDEN_BULLET_PROJECTILE = ITEMS.register("golden_bullet_projectile", () -> new Item(new Item.Properties())); + public static final DeferredItem LUMINITE_BULLET_PROJECTILE = ITEMS.register("luminite_bullet_projectile", () -> new Item(new Item.Properties())); //召唤武器 public static final DeferredItem TERRAPRISMA = ITEMS.register("terraprisma", Terraprisma::new); @@ -85,4 +109,5 @@ public class ModItems { public static final DeferredItem FIRST_FRACTAL_PROJECTILE14 = ITEMS.register("first_fractal_projectile14", FirstFractalProjectile14::new); public static final DeferredItem MACE_PROJECTILE = ITEMS.register("mace_projectile", MaceProjectile::new); public static final DeferredItem TERRAPRISMA_SUMMON = ITEMS.register("terraprisma_summon", TerraprismaSummon::new); + } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/BasicBulletAmmo.java b/src/main/java/com/lzxnone/terraria/item/ammo/BasicBulletAmmo.java new file mode 100644 index 0000000..132778b --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/BasicBulletAmmo.java @@ -0,0 +1,54 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + +public abstract class BasicBulletAmmo extends BulletAmmo { + public static IStaticSummonBehavior createSummonBehavior(float baseDamage, double speed) { + return new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getLookAngle().normalize().scale(speed); + summon.setDeltaMovement(motion); + + AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; + int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; + + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + Entity target = targets.getFirst(); + if(DamageUtil.rangedAttack(summon, target, sourceStack, baseDamage + damage, knockbackScale)) { + target.invulnerableTime = invulnerableTime; + this.onDied(summon); + } + } + + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion)); + if(blockHitResult.getType() != HitResult.Type.MISS) { + this.onDied(summon); + } + } + }; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java b/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java index 0137141..b5de9cc 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java @@ -3,7 +3,7 @@ package com.lzxnone.terraria.item.ammo; import net.minecraft.world.item.Item; public class BulletAmmo extends Item { - public static final int MAX_STACK_SIZE = 99; + public static final int MAX_STACK_SIZE = 9999; public BulletAmmo() { super(new Item.Properties().stacksTo(MAX_STACK_SIZE)); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java new file mode 100644 index 0000000..46223df --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; + +public class ChlorophyteBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 0.8f; + public static final double SPEED = 3.0D; + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java new file mode 100644 index 0000000..b401256 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; + +public class CrystalBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 0.8f; + public static final double SPEED = 3.0D; + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java new file mode 100644 index 0000000..6e52d1d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java @@ -0,0 +1,66 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.effect.ModEffects; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + +public class CursedBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 2.0f; + public static final double SPEED = 3.0D; + public static final int EFFECT_TIME = 140; + + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED); + summon.setDeltaMovement(motion); + + //碰撞检测 + AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; + int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; + + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + Entity target = targets.getFirst(); + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE + damage, knockbackScale)) { + target.invulnerableTime = invulnerableTime; + if(target instanceof LivingEntity livingEntity) { + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.CURSED_INFERNO, EFFECT_TIME, 0); + livingEntity.addEffect(effectInstance); + } + this.onDied(summon); + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion)); + if(blockHitResult.getType() != HitResult.Type.MISS) { + this.onDied(summon); + } + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/EndlessMusketPouch.java b/src/main/java/com/lzxnone/terraria/item/ammo/EndlessMusketPouch.java new file mode 100644 index 0000000..1542d7b --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/EndlessMusketPouch.java @@ -0,0 +1,10 @@ +package com.lzxnone.terraria.item.ammo; + +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Rarity; + +public class EndlessMusketPouch extends Item { + public EndlessMusketPouch() { + super(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java new file mode 100644 index 0000000..2a263ba --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; + +public class ExplodingBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 0.8f; + public static final double SPEED = 3.0D; + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java new file mode 100644 index 0000000..f7725cc --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java @@ -0,0 +1,121 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.effect.ModEffects; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +import net.minecraft.nbt.CompoundTag; +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.LivingEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + +public class GoldenBullet extends BasicBulletAmmo { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String BASE_DAMAGE_PATH = "ammo.golden_bullet.base_damage"; + public static final float BASE_DAMAGE_DEFAULT = 1.5f; + public static final float BASE_DAMAGE_MIN = 0.0f; + public static final float BASE_DAMAGE_MAX = 8388600.0f; + + public static final String SPEED_PATH = "ammo.golden_bullet.speed"; + public static final double SPEED_DEFAULT = 3.0D; + public static final double SPEED_MIN = 0.0D; + public static final double SPEED_MAX = 24.0D; + + public static final String EFFECT_TIME_PATH = "ammo.golden_bullet.effect_time"; + public static final int EFFECT_TIME_DEFAULT = 40; + public static final int EFFECT_TIME_MIN = 0; + public static final int EFFECT_TIME_MAX = 72000; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadFloatConfig(BASE_DAMAGE_PATH, configText("golden_bullet_base_damage"), configTooltip("golden_bullet_base_damage"), BASE_DAMAGE_DEFAULT, BASE_DAMAGE_MIN, BASE_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("golden_bullet_speed"), configTooltip("golden_bullet_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + ConfigFactory.loadIntConfig(EFFECT_TIME_PATH, configText("golden_bullet_effect_time"), configTooltip("golden_bullet_effect_time"), EFFECT_TIME_DEFAULT, EFFECT_TIME_MIN, EFFECT_TIME_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static float getBaseDamage() { + return Math.clamp(ConfigUtil.readFloat(BASE_DAMAGE_PATH, BASE_DAMAGE_DEFAULT), BASE_DAMAGE_MIN, BASE_DAMAGE_MAX); + } + + public static double getSpeed() { + return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX); + } + + public static int getEffectTime() { + return Math.clamp(ConfigUtil.readInt(EFFECT_TIME_PATH, EFFECT_TIME_DEFAULT), EFFECT_TIME_MIN, EFFECT_TIME_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "golden_bullet", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/golden_bullet.png"), + Component.translatable("item.lzxnoneterraria.golden_bullet"), + CONFIG_DATA + ); + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); + summon.setDeltaMovement(motion); + + //碰撞检测 + AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; + int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; + + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + Entity target = targets.getFirst(); + if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + target.invulnerableTime = invulnerableTime; + if(target instanceof LivingEntity livingEntity) { + MobEffectInstance effectInstance = new MobEffectInstance(ModEffects.MIDAS, getEffectTime(), 0); + livingEntity.addEffect(effectInstance); + } + this.onDied(summon); + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion)); + if(blockHitResult.getType() != HitResult.Type.MISS) { + this.onDied(summon); + } + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java new file mode 100644 index 0000000..904c637 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java @@ -0,0 +1,57 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + +public class HighVelocityBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 1.5f; + public static final double SPEED = 3.5D; + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getLookAngle().normalize().scale(SPEED); + summon.setDeltaMovement(motion); + + //碰撞检测 + AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; + int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; + + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + Entity target = targets.getFirst(); + if(DamageUtil.rangedAttack(summon, target, sourceStack, BASE_DAMAGE + damage, knockbackScale)) { + target.invulnerableTime = invulnerableTime; + this.onDied(summon); + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion)); + if(blockHitResult.getType() != HitResult.Type.MISS) { + this.onDied(summon); + } + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java new file mode 100644 index 0000000..ee67a9a --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; + +public class IchorBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 0.8f; + public static final double SPEED = 3.0D; + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java new file mode 100644 index 0000000..0118816 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; + +public class LuminiteBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 0.8f; + public static final double SPEED = 3.0D; + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); +} 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 4793864..8e0ce98 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java @@ -108,7 +108,7 @@ public class MeteorShot extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.summonAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; if(MeteorShot.incrementHit(summon) >= getMaxHit()) { this.onDied(summon); 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 c8b3420..8afef19 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java @@ -88,7 +88,7 @@ public class MusketBall extends BulletAmmo { ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); Entity target = targets.getFirst(); - if(DamageUtil.summonAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { target.invulnerableTime = invulnerableTime; this.onDied(summon); } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java new file mode 100644 index 0000000..c634413 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; + +public class NanoBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 0.8f; + public static final double SPEED = 3.0D; + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java new file mode 100644 index 0000000..c457396 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; + +public class PartyBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 0.8f; + public static final double SPEED = 3.0D; + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java new file mode 100644 index 0000000..6c1f08d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java @@ -0,0 +1,121 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +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.monster.ZombifiedPiglin; +import net.minecraft.world.entity.monster.piglin.Piglin; +import net.minecraft.world.entity.monster.piglin.PiglinBrute; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + +public class SilverBullet extends BasicBulletAmmo { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String BASE_DAMAGE_PATH = "ammo.silver_bullet.base_damage"; + public static final float BASE_DAMAGE_DEFAULT = 1.2f; + public static final float BASE_DAMAGE_MIN = 0.0f; + public static final float BASE_DAMAGE_MAX = 8388600.0f; + + public static final String SPEED_PATH = "ammo.silver_bullet.speed"; + public static final double SPEED_DEFAULT = 3.0D; + public static final double SPEED_MIN = 0.0D; + public static final double SPEED_MAX = 24.0D; + + public static final String PIGLIN_DAMAGE_MULTIPLIER_PATH = "ammo.silver_bullet.piglin_damage_multiplier"; + public static final float PIGLIN_DAMAGE_MULTIPLIER_DEFAULT = 3.0f; + public static final float PIGLIN_DAMAGE_MULTIPLIER_MIN = 0.0f; + public static final float PIGLIN_DAMAGE_MULTIPLIER_MAX = 100.0f; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadFloatConfig(BASE_DAMAGE_PATH, configText("silver_bullet_base_damage"), configTooltip("silver_bullet_base_damage"), BASE_DAMAGE_DEFAULT, BASE_DAMAGE_MIN, BASE_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("silver_bullet_speed"), configTooltip("silver_bullet_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + ConfigFactory.loadFloatConfig(PIGLIN_DAMAGE_MULTIPLIER_PATH, configText("silver_bullet_piglin_damage_multiplier"), configTooltip("silver_bullet_piglin_damage_multiplier"), PIGLIN_DAMAGE_MULTIPLIER_DEFAULT, PIGLIN_DAMAGE_MULTIPLIER_MIN, PIGLIN_DAMAGE_MULTIPLIER_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static float getBaseDamage() { + return Math.clamp(ConfigUtil.readFloat(BASE_DAMAGE_PATH, BASE_DAMAGE_DEFAULT), BASE_DAMAGE_MIN, BASE_DAMAGE_MAX); + } + + public static double getSpeed() { + return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX); + } + + public static float getPiglinDamageMultiplier() { + return Math.clamp(ConfigUtil.readFloat(PIGLIN_DAMAGE_MULTIPLIER_PATH, PIGLIN_DAMAGE_MULTIPLIER_DEFAULT), PIGLIN_DAMAGE_MULTIPLIER_MIN, PIGLIN_DAMAGE_MULTIPLIER_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "silver_bullet", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/silver_bullet.png"), + Component.translatable("item.lzxnoneterraria.silver_bullet"), + CONFIG_DATA + ); + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); + summon.setDeltaMovement(motion); + + //碰撞检测 + AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; + int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; + + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + Entity target = targets.getFirst(); + float finalDamage = getBaseDamage() + damage; + if(target instanceof Piglin || target instanceof PiglinBrute || target instanceof ZombifiedPiglin) { + finalDamage *= getPiglinDamageMultiplier(); + } + if(DamageUtil.rangedAttack(summon, target, sourceStack, finalDamage, knockbackScale)) { + target.invulnerableTime = invulnerableTime; + this.onDied(summon); + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion)); + if(blockHitResult.getType() != HitResult.Type.MISS) { + this.onDied(summon); + } + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java new file mode 100644 index 0000000..7879191 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java @@ -0,0 +1,104 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.ui.config.ConfigFactory; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.ConfigUtil; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +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.item.ItemStack; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + +public class TungstenBullet extends BasicBulletAmmo { + private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; + + public static final String BASE_DAMAGE_PATH = "ammo.tungsten_bullet.base_damage"; + public static final float BASE_DAMAGE_DEFAULT = 1.2f; + public static final float BASE_DAMAGE_MIN = 0.0f; + public static final float BASE_DAMAGE_MAX = 8388600.0f; + + public static final String SPEED_PATH = "ammo.tungsten_bullet.speed"; + public static final double SPEED_DEFAULT = 3.0D; + public static final double SPEED_MIN = 0.0D; + public static final double SPEED_MAX = 24.0D; + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigFactory.loadFloatConfig(BASE_DAMAGE_PATH, configText("tungsten_bullet_base_damage"), configTooltip("tungsten_bullet_base_damage"), BASE_DAMAGE_DEFAULT, BASE_DAMAGE_MIN, BASE_DAMAGE_MAX); + ConfigFactory.loadDoubleConfig(SPEED_PATH, configText("tungsten_bullet_speed"), configTooltip("tungsten_bullet_speed"), SPEED_DEFAULT, SPEED_MIN, SPEED_MAX); + } + }; + + private static Component configText(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key); + } + + private static Component configTooltip(String key) { + return Component.translatable(CONFIG_TRANSLATION_PREFIX + key + ".tooltip"); + } + + public static float getBaseDamage() { + return Math.clamp(ConfigUtil.readFloat(BASE_DAMAGE_PATH, BASE_DAMAGE_DEFAULT), BASE_DAMAGE_MIN, BASE_DAMAGE_MAX); + } + + public static double getSpeed() { + return Math.clamp(ConfigUtil.readDouble(SPEED_PATH, SPEED_DEFAULT), SPEED_MIN, SPEED_MAX); + } + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "tungsten_bullet", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/tungsten_bullet.png"), + Component.translatable("item.lzxnoneterraria.tungsten_bullet"), + CONFIG_DATA + ); + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + Vec3 motion = summon.getLookAngle().normalize().scale(getSpeed()); + summon.setDeltaMovement(motion); + + //碰撞检测 + AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); + List targets = summon.level().getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; + float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; + int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; + + ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); + Entity target = targets.getFirst(); + if(DamageUtil.rangedAttack(summon, target, sourceStack, getBaseDamage() + damage, knockbackScale)) { + target.invulnerableTime = invulnerableTime; + this.onDied(summon); + } + } + + //方块检测 + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion)); + if(blockHitResult.getType() != HitResult.Type.MISS) { + this.onDied(summon); + } + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java new file mode 100644 index 0000000..39d3c0c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; + +public class VenomBullet extends BasicBulletAmmo { + public static final float BASE_DAMAGE = 0.8f; + public static final double SPEED = 3.0D; + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = createSummonBehavior(BASE_DAMAGE, SPEED); +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/ammo/BulletProjectile.java b/src/main/java/com/lzxnone/terraria/item/projectile/ammo/BulletProjectile.java deleted file mode 100644 index 0f30d00..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/ammo/BulletProjectile.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.ammo; - -import net.minecraft.world.item.Item; - -public class BulletProjectile extends Item { - public BulletProjectile() { - super(new Item.Properties()); - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/ammo/MeteorShotProjectile.java b/src/main/java/com/lzxnone/terraria/item/projectile/ammo/MeteorShotProjectile.java deleted file mode 100644 index 86af2cc..0000000 --- a/src/main/java/com/lzxnone/terraria/item/projectile/ammo/MeteorShotProjectile.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.lzxnone.terraria.item.projectile.ammo; - -import net.minecraft.world.item.Item; - -public class MeteorShotProjectile extends Item { - public MeteorShotProjectile() { - super(new Item.Properties()); - } -} 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 b553453..2e1c559 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java @@ -2,6 +2,7 @@ package com.lzxnone.terraria.item.weapon; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.enchantment.ModEnchantments; +import com.lzxnone.terraria.item.ModItems; import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; @@ -90,6 +91,7 @@ public class RangedWeapon extends Weapon { ItemStack ammoStack = getAmmoStack(weaponStack); if(ammoStack.isEmpty() || !canUseAmmo(weaponStack, ammoStack)) return false; + if(ammoStack.is(ModItems.ENDLESS_MUSKET_POUCH.get())) return true; Item ammoItem = ammoStack.getItem(); int available = 0; diff --git a/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java b/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java index fe71ea9..5e8d140 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java @@ -30,11 +30,10 @@ public abstract class HumanoidModelMixin { : player.getMainArm().getOpposite(); if(player.getUseItem().is(ModItems.SDMG.get())) { - float horizontalArmRot = (float) Math.toRadians(-90.0D); if(usedArm == HumanoidArm.RIGHT) { - this.rightArm.xRot = horizontalArmRot; + this.rightArm.xRot = (float) Math.toRadians(player.getXRot() - 90); }else { - this.leftArm.xRot = horizontalArmRot; + this.leftArm.xRot = (float) Math.toRadians(player.getXRot() - 90); } } } 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 b97199b..ce6c86c 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -1,11 +1,16 @@ package com.lzxnone.terraria.ui.config; import com.lzxnone.terraria.effect.BloodButcheredEffect; +import com.lzxnone.terraria.effect.CursedInfernoEffect; import com.lzxnone.terraria.effect.DemonicFlamesEffect; +import com.lzxnone.terraria.effect.MidasEffect; import com.lzxnone.terraria.effect.SummonEffect; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.item.ammo.MeteorShot; import com.lzxnone.terraria.item.ammo.MusketBall; +import com.lzxnone.terraria.item.ammo.GoldenBullet; +import com.lzxnone.terraria.item.ammo.SilverBullet; +import com.lzxnone.terraria.item.ammo.TungstenBullet; import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.BeeKeeper; import com.lzxnone.terraria.item.weapon.melee.BladeOfGrass; @@ -76,11 +81,16 @@ public class ConfigList { ITEMS.put(EFFECT, new ConfigListItem[]{ BloodButcheredEffect.CONFIG_LIST_ITEM, DemonicFlamesEffect.CONFIG_LIST_ITEM, + CursedInfernoEffect.CONFIG_LIST_ITEM, + MidasEffect.CONFIG_LIST_ITEM, SummonEffect.CONFIG_LIST_ITEM }); ITEMS.put(AMMO, new ConfigListItem[]{ MusketBall.CONFIG_LIST_ITEM, - MeteorShot.CONFIG_LIST_ITEM + MeteorShot.CONFIG_LIST_ITEM, + SilverBullet.CONFIG_LIST_ITEM, + GoldenBullet.CONFIG_LIST_ITEM, + TungstenBullet.CONFIG_LIST_ITEM }); ITEMS.put(ENCHANTMENT, new ConfigListItem[]{ ModEnchantmentConfigs.MANA_LEAK_CONFIG_LIST_ITEM, diff --git a/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java b/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java index f333493..170a665 100644 --- a/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java @@ -18,10 +18,6 @@ import org.joml.Vector3f; public class AmmoUtil { public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); - public static StaticSummon createAmmoSummon(Level level, Player player, ItemStack stack) { - return createAmmoSummon(level, player, InteractionHand.MAIN_HAND, stack); - } - public static StaticSummon createAmmoSummon(Level level, Player player, InteractionHand hand, ItemStack stack) { Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); Vec3 eyePos = player.getEyePosition(); @@ -46,6 +42,20 @@ public class AmmoUtil { String ammo = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getString(RangedWeapon.AMMO_KEY); if(ammo.equals("lzxnoneterraria:musket_ball")) setMusketBall(summon); + else if(ammo.equals("lzxnoneterraria:silver_bullet")) setSilverBullet(summon); + else if(ammo.equals("lzxnoneterraria:crystal_bullet")) setCrystalBullet(summon); + else if(ammo.equals("lzxnoneterraria:cursed_bullet")) setCursedBullet(summon); + else if(ammo.equals("lzxnoneterraria:chlorophyte_bullet")) setChlorophyteBullet(summon); + else if(ammo.equals("lzxnoneterraria:high_velocity_bullet")) setHighVelocityBullet(summon); + else if(ammo.equals("lzxnoneterraria:ichor_bullet")) setIchorBullet(summon); + else if(ammo.equals("lzxnoneterraria:venom_bullet")) setVenomBullet(summon); + else if(ammo.equals("lzxnoneterraria:party_bullet")) setPartyBullet(summon); + else if(ammo.equals("lzxnoneterraria:nano_bullet")) setNanoBullet(summon); + else if(ammo.equals("lzxnoneterraria:exploding_bullet")) setExplodingBullet(summon); + else if(ammo.equals("lzxnoneterraria:golden_bullet")) setGoldenBullet(summon); + else if(ammo.equals("lzxnoneterraria:endless_musket_pouch")) setMusketBall(summon); + else if(ammo.equals("lzxnoneterraria:luminite_bullet")) setLuminiteBullet(summon); + else if(ammo.equals("lzxnoneterraria:tungsten_bullet")) setTungstenBullet(summon); else if(ammo.equals("lzxnoneterraria:meteor_shot")) setMeteorShot(summon); return summon; } @@ -68,6 +78,136 @@ public class AmmoUtil { summon.setNoGravity(true); } + public static void setSilverBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.SILVER_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.SILVER_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setCrystalBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.CRYSTAL_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.CRYSTAL_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setCursedBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.CURSED_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.CURSED_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setChlorophyteBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.CHLOROPHYTE_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.CHLOROPHYTE_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setHighVelocityBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.HIGH_VELOCITY_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.HIGH_VELOCITY_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setIchorBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.ICHOR_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.ICHOR_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setVenomBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.VENOM_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.VENOM_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setPartyBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.PARTY_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.PARTY_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setNanoBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.NANO_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.NANO_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setExplodingBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.EXPLODING_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.EXPLODING_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setGoldenBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.GOLDEN_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.GOLDEN_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setLuminiteBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.LUMINITE_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.LUMINITE_BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setTungstenBullet(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.TUNGSTEN_BULLET); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + public static void setMeteorShot(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.METEOR_SHOT); summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.METEOR_SHOT_PROJECTILE.get())); diff --git a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java index 771b796..5e2d4cf 100644 --- a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java @@ -1,12 +1,15 @@ package com.lzxnone.terraria.utils; import com.lzxnone.terraria.damage.ModDamageTypes; +import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; +import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.entity.beam.SwordBeam; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.weapon.MagicWeapon; import com.lzxnone.terraria.item.weapon.SummonWeapon; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.damagesource.DamageSource; @@ -17,6 +20,7 @@ import net.minecraft.world.entity.LivingEntity; 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.enchantment.Enchantment; import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.phys.Vec3; @@ -77,6 +81,8 @@ public class DamageUtil { finalDamage = SummonWeapon.applySummonDamageBonus(itemSource, player, finalDamage); }else if(category == DamageCategory.MAGIC && !itemSource.isEmpty()) { finalDamage = MagicWeapon.applyMagicDamageBonus(itemSource, player, finalDamage); + }else if(category == DamageCategory.RANGED && !itemSource.isEmpty()) { + finalDamage = applyRangedDamageBonus(itemSource, player, finalDamage); } finalDamage = Math.max(0.0F, finalDamage); @@ -124,6 +130,22 @@ public class DamageUtil { return Math.max(0.0F, finalDamage); } + private static float applyRangedDamageBonus(ItemStack stack, LivingEntity entity, float damage) { + double finalDamage = damage; + int gunpowderLevel = getEnchantmentLevel(entity, stack, ModEnchantments.GUNPOWDER); + + finalDamage *= Math.pow(ModEnchantmentConfigs.getGunpowderDamageMultiplier(), gunpowderLevel); + return (float)Math.max(0.0D, finalDamage); + } + + private static int getEnchantmentLevel(LivingEntity entity, ItemStack stack, ResourceKey enchantment) { + return entity.registryAccess() + .lookupOrThrow(Registries.ENCHANTMENT) + .get(enchantment) + .map(stack::getEnchantmentLevel) + .orElse(0); + } + private static Player getAttackOwner(Entity attackEntity) { if(attackEntity instanceof Player player) return player; if(attackEntity instanceof StaticProjectile projectile) return getAttackOwner(projectile.getOwner()); diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index ea23434..cfd83cc 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -35,6 +35,34 @@ "item.lzxnoneterraria.sdmg": "S.D.M.G.", "item.lzxnoneterraria.musket_ball": "Musket Ball", "item.lzxnoneterraria.meteor_shot": "Meteor Shot", + "item.lzxnoneterraria.silver_bullet": "Silver Bullet", + "item.lzxnoneterraria.crystal_bullet": "Crystal Bullet", + "item.lzxnoneterraria.cursed_bullet": "Cursed Bullet", + "item.lzxnoneterraria.chlorophyte_bullet": "Chlorophyte Bullet", + "item.lzxnoneterraria.high_velocity_bullet": "High Velocity Bullet", + "item.lzxnoneterraria.ichor_bullet": "Ichor Bullet", + "item.lzxnoneterraria.venom_bullet": "Venom Bullet", + "item.lzxnoneterraria.party_bullet": "Party Bullet", + "item.lzxnoneterraria.nano_bullet": "Nano Bullet", + "item.lzxnoneterraria.exploding_bullet": "Exploding Bullet", + "item.lzxnoneterraria.golden_bullet": "Golden Bullet", + "item.lzxnoneterraria.endless_musket_pouch": "Endless Musket Pouch", + "item.lzxnoneterraria.luminite_bullet": "Luminite Bullet", + "item.lzxnoneterraria.tungsten_bullet": "Tungsten Bullet", + "item.lzxnoneterraria.silver_bullet_projectile": "Silver Bullet Projectile", + "item.lzxnoneterraria.crystal_bullet_projectile": "Crystal Bullet Projectile", + "item.lzxnoneterraria.cursed_bullet_projectile": "Cursed Bullet Projectile", + "item.lzxnoneterraria.chlorophyte_bullet_projectile": "Chlorophyte Bullet Projectile", + "item.lzxnoneterraria.high_velocity_bullet_projectile": "High Velocity Bullet Projectile", + "item.lzxnoneterraria.ichor_bullet_projectile": "Ichor Bullet Projectile", + "item.lzxnoneterraria.venom_bullet_projectile": "Venom Bullet Projectile", + "item.lzxnoneterraria.party_bullet_projectile": "Party Bullet Projectile", + "item.lzxnoneterraria.nano_bullet_projectile": "Nano Bullet Projectile", + "item.lzxnoneterraria.exploding_bullet_projectile": "Exploding Bullet Projectile", + "item.lzxnoneterraria.golden_bullet_projectile": "Golden Bullet Projectile", + "item.lzxnoneterraria.endless_musket_pouch_projectile": "Endless Musket Pouch Projectile", + "item.lzxnoneterraria.luminite_bullet_projectile": "Luminite Bullet Projectile", + "item.lzxnoneterraria.tungsten_bullet_projectile": "Tungsten Bullet Projectile", "item.lzxnoneterraria.terraprisma": "Terraprisma", "enchantment.lzxnoneterraria.mana_leak": "Mana Leak", @@ -70,6 +98,8 @@ "effect.lzxnoneterraria.kill_mode": "Kill Mode", "effect.lzxnoneterraria.kill_mode_cooldown": "Kill Mode Cooldown", "effect.lzxnoneterraria.demonic_flames": "Demonic Flames", + "effect.lzxnoneterraria.cursed_inferno": "Cursed Inferno", + "effect.lzxnoneterraria.midas": "Midas", "effect.lzxnoneterraria.summon": "Summon", "item.minecraft.potion.effect.summon": "Potion of Summon", "item.minecraft.splash_potion.effect.summon": "Splash Potion of Summon", @@ -118,6 +148,12 @@ "lzxnoneterraria.configuration.blood_butcherer_damage_per_level.tooltip": "Damage dealt per effect level", "lzxnoneterraria.configuration.demonic_flames_damage_per_level": "Demonic Flames Damage Per Level", "lzxnoneterraria.configuration.demonic_flames_damage_per_level.tooltip": "Damage dealt per effect level", + "lzxnoneterraria.configuration.cursed_inferno_settings": "Cursed Inferno Settings", + "lzxnoneterraria.configuration.cursed_inferno_damage_per_level": "Damage Per Level", + "lzxnoneterraria.configuration.cursed_inferno_damage_per_level.tooltip": "Cursed Inferno checks damage once per second; damage dealt per effect level", + "lzxnoneterraria.configuration.midas_settings": "Midas Settings", + "lzxnoneterraria.configuration.midas_drop_chance": "Emerald Drop Chance", + "lzxnoneterraria.configuration.midas_drop_chance.tooltip": "Chance for an entity with Midas to drop one emerald on death, from 0 to 1", "lzxnoneterraria.configuration.summon_settings": "Summon Settings", "lzxnoneterraria.configuration.summon_summon_count_per_level": "Summon Count Per Level", "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "Extra summon count granted by each level of the summon effect", @@ -412,6 +448,25 @@ "lzxnoneterraria.configuration.meteor_shot_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.meteor_shot_max_hit": "Max Hit Count", "lzxnoneterraria.configuration.meteor_shot_max_hit.tooltip": "Block collisions and entity hits both count toward this limit", + "lzxnoneterraria.configuration.silver_bullet_settings": "Silver Bullet Settings", + "lzxnoneterraria.configuration.silver_bullet_base_damage": "Base Damage", + "lzxnoneterraria.configuration.silver_bullet_base_damage.tooltip": "Base damage provided by the ammo", + "lzxnoneterraria.configuration.silver_bullet_speed": "Speed", + "lzxnoneterraria.configuration.silver_bullet_speed.tooltip": "Ammo movement speed per tick", + "lzxnoneterraria.configuration.silver_bullet_piglin_damage_multiplier": "Piglin Damage Multiplier", + "lzxnoneterraria.configuration.silver_bullet_piglin_damage_multiplier.tooltip": "Damage multiplier against piglins, piglin brutes, zombified piglins, and similar piglin entities", + "lzxnoneterraria.configuration.golden_bullet_settings": "Golden Bullet Settings", + "lzxnoneterraria.configuration.golden_bullet_base_damage": "Base Damage", + "lzxnoneterraria.configuration.golden_bullet_base_damage.tooltip": "Base damage provided by the ammo", + "lzxnoneterraria.configuration.golden_bullet_speed": "Speed", + "lzxnoneterraria.configuration.golden_bullet_speed.tooltip": "Ammo movement speed per tick", + "lzxnoneterraria.configuration.golden_bullet_effect_time": "Midas Duration", + "lzxnoneterraria.configuration.golden_bullet_effect_time.tooltip": "Duration of the Midas effect applied by Golden Bullet in ticks", + "lzxnoneterraria.configuration.tungsten_bullet_settings": "Tungsten Bullet Settings", + "lzxnoneterraria.configuration.tungsten_bullet_base_damage": "Base Damage", + "lzxnoneterraria.configuration.tungsten_bullet_base_damage.tooltip": "Base damage provided by the ammo", + "lzxnoneterraria.configuration.tungsten_bullet_speed": "Speed", + "lzxnoneterraria.configuration.tungsten_bullet_speed.tooltip": "Ammo movement speed per tick", "lzxnoneterraria.configuration.sdmg_settings": "S.D.M.G. Settings", "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance": "Ammo Not Consume Chance", "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance.tooltip": "Chance for each shot to avoid consuming ammo, from 0 to 1", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index dda3070..fbc058c 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -35,6 +35,34 @@ "item.lzxnoneterraria.sdmg": "S.D.M.G.", "item.lzxnoneterraria.musket_ball": "火枪子弹", "item.lzxnoneterraria.meteor_shot": "流星弹", + "item.lzxnoneterraria.silver_bullet": "银子弹", + "item.lzxnoneterraria.crystal_bullet": "水晶子弹", + "item.lzxnoneterraria.cursed_bullet": "诅咒弹", + "item.lzxnoneterraria.chlorophyte_bullet": "叶绿弹", + "item.lzxnoneterraria.high_velocity_bullet": "高速子弹", + "item.lzxnoneterraria.ichor_bullet": "灵液弹", + "item.lzxnoneterraria.venom_bullet": "毒液弹", + "item.lzxnoneterraria.party_bullet": "派对弹", + "item.lzxnoneterraria.nano_bullet": "纳米弹", + "item.lzxnoneterraria.exploding_bullet": "爆破弹", + "item.lzxnoneterraria.golden_bullet": "金子弹", + "item.lzxnoneterraria.endless_musket_pouch": "无尽火枪袋", + "item.lzxnoneterraria.luminite_bullet": "夜明弹", + "item.lzxnoneterraria.tungsten_bullet": "钨子弹", + "item.lzxnoneterraria.silver_bullet_projectile": "银子弹弹射物", + "item.lzxnoneterraria.crystal_bullet_projectile": "水晶子弹弹射物", + "item.lzxnoneterraria.cursed_bullet_projectile": "诅咒弹弹射物", + "item.lzxnoneterraria.chlorophyte_bullet_projectile": "叶绿弹弹射物", + "item.lzxnoneterraria.high_velocity_bullet_projectile": "高速子弹弹射物", + "item.lzxnoneterraria.ichor_bullet_projectile": "灵液弹弹射物", + "item.lzxnoneterraria.venom_bullet_projectile": "毒液弹弹射物", + "item.lzxnoneterraria.party_bullet_projectile": "派对弹弹射物", + "item.lzxnoneterraria.nano_bullet_projectile": "纳米弹弹射物", + "item.lzxnoneterraria.exploding_bullet_projectile": "爆破弹弹射物", + "item.lzxnoneterraria.golden_bullet_projectile": "金子弹弹射物", + "item.lzxnoneterraria.endless_musket_pouch_projectile": "无尽火枪袋弹射物", + "item.lzxnoneterraria.luminite_bullet_projectile": "夜明弹弹射物", + "item.lzxnoneterraria.tungsten_bullet_projectile": "钨子弹弹射物", "item.lzxnoneterraria.terraprisma": "泰拉棱镜", "enchantment.lzxnoneterraria.mana_leak": "魔力泄漏", @@ -69,6 +97,8 @@ "effect.lzxnoneterraria.kill_mode": "杀戮模式", "effect.lzxnoneterraria.kill_mode_cooldown": "杀戮模式 冷却", "effect.lzxnoneterraria.demonic_flames": "恶魔之焰", + "effect.lzxnoneterraria.cursed_inferno": "诅咒狱火", + "effect.lzxnoneterraria.midas": "迈达斯", "effect.lzxnoneterraria.summon": "召唤", "item.minecraft.potion.effect.summon": "召唤药水", "item.minecraft.splash_potion.effect.summon": "喷溅型召唤药水", @@ -117,6 +147,12 @@ "lzxnoneterraria.configuration.blood_butcherer_damage_per_level.tooltip": "每级造成的伤害", "lzxnoneterraria.configuration.demonic_flames_damage_per_level": "恶魔之焰效果每级伤害", "lzxnoneterraria.configuration.demonic_flames_damage_per_level.tooltip": "每级造成的伤害", + "lzxnoneterraria.configuration.cursed_inferno_settings": "诅咒狱火 设置", + "lzxnoneterraria.configuration.cursed_inferno_damage_per_level": "每级伤害", + "lzxnoneterraria.configuration.cursed_inferno_damage_per_level.tooltip": "诅咒狱火每秒进行一次伤害判定,每级造成的伤害", + "lzxnoneterraria.configuration.midas_settings": "迈达斯 设置", + "lzxnoneterraria.configuration.midas_drop_chance": "绿宝石掉落概率", + "lzxnoneterraria.configuration.midas_drop_chance.tooltip": "拥有迈达斯效果的生物死亡时掉落一颗绿宝石的概率,范围 0~1", "lzxnoneterraria.configuration.summon_settings": "召唤 设置", "lzxnoneterraria.configuration.summon_summon_count_per_level": "每级召唤数量", "lzxnoneterraria.configuration.summon_summon_count_per_level.tooltip": "召唤效果每级额外增加的召唤物数量", @@ -411,6 +447,25 @@ "lzxnoneterraria.configuration.meteor_shot_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.meteor_shot_max_hit": "最大命中数", "lzxnoneterraria.configuration.meteor_shot_max_hit.tooltip": "碰撞方块和击中生物都会计入命中次数", + "lzxnoneterraria.configuration.silver_bullet_settings": "银子弹 设置", + "lzxnoneterraria.configuration.silver_bullet_base_damage": "基础伤害", + "lzxnoneterraria.configuration.silver_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", + "lzxnoneterraria.configuration.silver_bullet_speed": "速度", + "lzxnoneterraria.configuration.silver_bullet_speed.tooltip": "子弹每刻移动速度", + "lzxnoneterraria.configuration.silver_bullet_piglin_damage_multiplier": "猪人伤害倍率", + "lzxnoneterraria.configuration.silver_bullet_piglin_damage_multiplier.tooltip": "命中猪灵、猪灵蛮兵、僵尸猪灵等猪人生物时的伤害倍率", + "lzxnoneterraria.configuration.golden_bullet_settings": "金子弹 设置", + "lzxnoneterraria.configuration.golden_bullet_base_damage": "基础伤害", + "lzxnoneterraria.configuration.golden_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", + "lzxnoneterraria.configuration.golden_bullet_speed": "速度", + "lzxnoneterraria.configuration.golden_bullet_speed.tooltip": "子弹每刻移动速度", + "lzxnoneterraria.configuration.golden_bullet_effect_time": "迈达斯持续时间", + "lzxnoneterraria.configuration.golden_bullet_effect_time.tooltip": "金子弹命中后施加迈达斯效果的持续时间(刻)", + "lzxnoneterraria.configuration.tungsten_bullet_settings": "钨子弹 设置", + "lzxnoneterraria.configuration.tungsten_bullet_base_damage": "基础伤害", + "lzxnoneterraria.configuration.tungsten_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", + "lzxnoneterraria.configuration.tungsten_bullet_speed": "速度", + "lzxnoneterraria.configuration.tungsten_bullet_speed.tooltip": "子弹每刻移动速度", "lzxnoneterraria.configuration.sdmg_settings": "S.D.M.G. 设置", "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance": "不消耗弹药概率", "lzxnoneterraria.configuration.sdmg_ammo_not_consume_chance.tooltip": "每次射击不消耗弹药的概率,范围 0~1", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/ammo.json b/src/main/resources/assets/lzxnoneterraria/models/item/ammo.json new file mode 100644 index 0000000..57374a2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/ammo.json @@ -0,0 +1,26 @@ +{ + "parent": "minecraft:item/generated", + "display": { + "gui": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 2.0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 13.0, 7.0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } +} + diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/bullet_projectile.json index a6f20fa..1e15759 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/bullet_projectile.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/bullet_projectile.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "lzxnoneterraria:item/ammo", "textures": { "layer0": "lzxnoneterraria:item/bullet_projectile" } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/chlorophyte_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/chlorophyte_bullet.json new file mode 100644 index 0000000..634ff16 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/chlorophyte_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/chlorophyte_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/chlorophyte_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/chlorophyte_bullet_projectile.json new file mode 100644 index 0000000..a9f3e6c --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/chlorophyte_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/chlorophyte_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/crystal_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/crystal_bullet.json new file mode 100644 index 0000000..e9efa6a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/crystal_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/crystal_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/crystal_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/crystal_bullet_projectile.json new file mode 100644 index 0000000..0ccc8b5 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/crystal_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/crystal_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/cursed_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/cursed_bullet.json new file mode 100644 index 0000000..8cceb1a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/cursed_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/cursed_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/cursed_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/cursed_bullet_projectile.json new file mode 100644 index 0000000..7ee96ca --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/cursed_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/cursed_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/endless_musket_pouch.json b/src/main/resources/assets/lzxnoneterraria/models/item/endless_musket_pouch.json new file mode 100644 index 0000000..4792b0d --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/endless_musket_pouch.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/endless_musket_pouch" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/exploding_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/exploding_bullet.json new file mode 100644 index 0000000..b41d30b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/exploding_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/exploding_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/exploding_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/exploding_bullet_projectile.json new file mode 100644 index 0000000..0588734 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/exploding_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/exploding_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/golden_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/golden_bullet.json new file mode 100644 index 0000000..c0e6b67 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/golden_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/golden_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/golden_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/golden_bullet_projectile.json new file mode 100644 index 0000000..77fe428 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/golden_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/golden_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/high_velocity_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/high_velocity_bullet.json new file mode 100644 index 0000000..1fd8de8 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/high_velocity_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/high_velocity_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/high_velocity_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/high_velocity_bullet_projectile.json new file mode 100644 index 0000000..9519055 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/high_velocity_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/high_velocity_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/ichor_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/ichor_bullet.json new file mode 100644 index 0000000..a4adef2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/ichor_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/ichor_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/ichor_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/ichor_bullet_projectile.json new file mode 100644 index 0000000..8e393bd --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/ichor_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/ichor_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/luminite_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/luminite_bullet.json new file mode 100644 index 0000000..9d8f5ed --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/luminite_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/luminite_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/luminite_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/luminite_bullet_projectile.json new file mode 100644 index 0000000..c9f0ec2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/luminite_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/luminite_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot.json b/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot.json index b601b53..1bfb375 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "lzxnoneterraria:item/ammo", "textures": { "layer0": "lzxnoneterraria:item/meteor_shot" } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot_projectile.json index 96bdc6f..45de084 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot_projectile.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot_projectile.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "lzxnoneterraria:item/ammo", "textures": { "layer0": "lzxnoneterraria:item/meteor_shot_projectile" } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/musket_ball.json b/src/main/resources/assets/lzxnoneterraria/models/item/musket_ball.json index 2bab7d7..7b10abb 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/musket_ball.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/musket_ball.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "lzxnoneterraria:item/ammo", "textures": { "layer0": "lzxnoneterraria:item/musket_ball" } diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/nano_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/nano_bullet.json new file mode 100644 index 0000000..43c2e99 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/nano_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/nano_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/nano_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/nano_bullet_projectile.json new file mode 100644 index 0000000..e72f8f0 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/nano_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/nano_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/party_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/party_bullet.json new file mode 100644 index 0000000..325baa5 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/party_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/party_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/party_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/party_bullet_projectile.json new file mode 100644 index 0000000..4596284 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/party_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/party_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/silver_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/silver_bullet.json new file mode 100644 index 0000000..13bb2d0 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/silver_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/silver_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/silver_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/silver_bullet_projectile.json new file mode 100644 index 0000000..ec0a556 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/silver_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/silver_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/tungsten_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/tungsten_bullet.json new file mode 100644 index 0000000..60e2c81 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/tungsten_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/tungsten_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/venom_bullet.json b/src/main/resources/assets/lzxnoneterraria/models/item/venom_bullet.json new file mode 100644 index 0000000..736e49b --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/venom_bullet.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/venom_bullet" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/venom_bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/venom_bullet_projectile.json new file mode 100644 index 0000000..3277ebe --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/venom_bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/ammo", + "textures": { + "layer0": "lzxnoneterraria:item/venom_bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/chlorophyte_bullet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/chlorophyte_bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..08417a0012561b6c6645f995d7d7dcc5dbab4fa9 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kUr!gukcwN$2@cGktdjmuG-OtE z*upl0X}Xx8!MvIqqCJIKDpAZn4)$&QJ&9cMd*XPHNl0m4OEC841M)SmH=Mp~z}&&7 f+9Z`BcA0@+XzfCk7i;u^1~YiN`njxgN@xNA_je|B literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/crystal_bullet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/crystal_bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..45c0171cd4afb41d0282a2f4f1d565d72feac4d1 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nVv3=Ar-fh6BHPZsLV}QN@fdU zyvcUJWJQKb^TzC>J_c&H6gKfTXl^K3$DBOl*rh5CwG4r)ybk6aWo!pn61Wni5*s-l z3vZcO!)y_n)?~2DZIQ4L$bdtp4nGZiERF`AW>{nzaGQZ4qig%m1-9P`ftE6Oy85}S Ib4q9e0R4zHjsO4v literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/cursed_bullet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/cursed_bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..297c849dfbe3651fe03f3290166c9bb7d5fd3925 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kPfr)ekcwN$2@cFsd0zh~8Zs+7 zY+;+x)FSVbu;(W~v&7>o9zcG>PfksPHqAX>rwjKOngp$3yz4n7`@mE28E#DrUAC~z bI%>ioEqTyzg+I>JMyxssjNIuDb*>zWJm93eMS8}$sRh5g^*0|*R&erK zxL-%h{c-h{6?5KZbp_r$QnoL8&H8CaA61>%R4{Fph4Jq0)W%is)=7CNt&?s3_3EqR zjpICjuB<6M@FVdQ&MBb@0I{fT1poj5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/exploding_bullet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/exploding_bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..677ce2d3c2a1638bb31e0c52b8e47073e3a9f0a1 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eK!3HFi66di4sSr;W$B>F!$q5e3r%svupJ>Re z=&*%tM$_!6rU^AJ0USMrSt`-YdOrKuW*pe{wD{nU7w4`f@I3x*GPS`l=CQ&Rhu;BC q*Eei36YJ?_(mgPvN-ASo6yxM0KT}WmRz3il&*16m=d#Wzp$Pz@WinU* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/golden_bullet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/golden_bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..3bc519f6e06705aab24d5672e90413f264bda019 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^AhrMp8<5nmf9C+CLOop^Ln>}1Cpa+I?MwUbIHOTO zVTHi52TyLn9};cK94>5ljtFqWmh~K41E-P_^&%`a+;x@z-3_L3S>+*V6~p! o(flzXphIrn3yJhI4}v%tS|wylBm<^J0xe+hboFyt=akR{00-GG&;S4c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/golden_bullet_projectile.png b/src/main/resources/assets/lzxnoneterraria/textures/item/golden_bullet_projectile.png new file mode 100644 index 0000000000000000000000000000000000000000..425b3b566e85b6042aca84092a2bf8ae87832a1a GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^8bHj%!3HF?PR_FhQjEnx?oJHr&dIz4vLiD?B1$5B zeXNr6bM+Ea@{>~aDsl^esu&n-Dy)Fa+|-gpg^Jvqyke^gTP3gxD1^l#~=$>Fbx5m+O@q>*W`v z>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxD?a#8ycO zWDy)d+*y*DhOjBG80syc2lYWR`i6Q2`f#&>T5Uk0R{lkqsX&`S=Gz(CfK{T1LG7{8 z2U(8f7>G~7qCl_OaoOm@gUyc1=a70NFeEiRT^vIsB$MX^sehc$$hl(G!h(q@D~_97 n&{N8oF=Lus1h25;ROU56h3qVw7N>6i1`2*pS3j3^P6?-mr1w&whU4^$Ygxlk4G^x8phH9L#w0 bAp=ACp`Vq7+mG@9O=R$N^>bP0l+XkK>+vcn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/high_velocity_bullet_projectile.png b/src/main/resources/assets/lzxnoneterraria/textures/item/high_velocity_bullet_projectile.png new file mode 100644 index 0000000000000000000000000000000000000000..bc4e7cbc9b257f862b320c957fb36577f26cefd6 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^9YD;)!2~3EJ~QtIQjEnx?oJHr&dIz4a$G%K978H@ zz3o28#h}39eE-*fe?DG+Cyt=ye7raBIHv|%NLcKY(7p20JItZ0@vi8_11GpS4raf& mo65g=n!(h*??Km zAwbdR;Q#xl4@fL$YvM{|`tQfuVCbXR#x_Y*F8&<PTw8wd9|E#@>(dQ@ s^7ATM4H$$QB0Cp0$o&9tcxfwnMsy85}Sb4q9e0Ibn2U;qFB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/luminite_bullet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/luminite_bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..d6516f7fae85da86a87ba40aabce946e67640d85 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^96&6kqj-@kLCC9od9&e1E*&4=f6X7xE&ZBcW2r3DllZ7bG~hgMx0TXC siRID-S_|&*8Za0O<(XI=Sjxa~^!VSijh_ym09wJ|>FVdQ&MBb@0HAU(HUIzs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/nano_bullet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/nano_bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..33602deee834ef367682e780166c007ed92b9a22 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xaH%}MGkcwN$2?rQ+vakPRPh<;X zJSlba=Z}BQ28aLuPvChT9INcp*xt@Aad-~b~2cEe1E*L+kMy4 aP=@WxPMNB0*e(tw%%F9Nc7x>E2ga;Dp5YDL!s{FU dOju%J#<;rT6zg(310A5D44$rjF6*2UngGmgC*uGB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/silver_bullet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/silver_bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..1543200309953d246968f155053e5a274a2806c4 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a)4AWs*^kcwN$2@cHn?g{>%XvnPS zu!U_#Q}Oe8jfL*VnGDQKwy-3BGF_lu^W%f9#N#U-o7g0nmoc<$&#`1aHYK}(aR!4A mNakH`O9UdB%4+HVOoox#)9&t;ucLK6VqkSqiM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/silver_bullet_projectile.png b/src/main/resources/assets/lzxnoneterraria/textures/item/silver_bullet_projectile.png new file mode 100644 index 0000000000000000000000000000000000000000..e9aed0b9a3d2e8a2eb53de537971cffc170583a4 GIT binary patch literal 1391 zcmbVMJ#W)M795Ek#MQnh?Xta^Chto`;2{Ql8$V! zf{;Kkl!=Ky01}0jAAk`204CTO5U=xLwWv^0OXvG~?s>o82P?}rXQs|i34$=Dr7c!4ebc=JvYJ=d1jvySG3McVYr+Yw#cUapeu7O`Au;kr2ALqOnDj>Vqe z4r0`^r2#L3b#kmq;sC;1wp2(2iW|;~SY#0uEhQrpO*2H(QmmY%;kQf$~{oW)J{7wYtSp8)W!8)#oJCc}+T%#Aj8zu(oRSwWt$TsXy7A>b4`>NyuAb8}gyzTZ zON?}q$d2E;|M~uQZi0*gZ6f@QYutWJ|%Cj?L3?~@woSE_w)3Jm($JN@`d+Lj7F_iTU;+d ZLw)h_*q3j2UOh@$Vr6N$^m?&&|2I@)t%m>r literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/tungsten_bullet.png b/src/main/resources/assets/lzxnoneterraria/textures/item/tungsten_bullet.png new file mode 100644 index 0000000000000000000000000000000000000000..81a701db8c8e550778bd96ed3f170820ea4e2366 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&ke@_?3kcwN$4(zY;r2bDd+-0*< zN`Q;s#)9jZ<>bu=BSM^cdQM(#Soz`Z|9*v@VC9!m3wS1|aJ`GW&wOl3b_3%I1|LSh j)|9LRS2`9>$l+zkOTWaMdD~_)&}arvS3j3^P6$@wb+9t|6LP$E^{?;6(lxsF+{%F VSgXf>sTOD$gQu&X%Q~loCIDo@C&mB( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/cursed_inferno.png b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/cursed_inferno.png new file mode 100644 index 0000000000000000000000000000000000000000..dd9e5fb3c5beb898819e6ea5c7f2dc3f70da3216 GIT binary patch literal 381 zcmV-@0fPRCP)HeWXgI5;*jF)?xpiqQZ700MMUPE-E?<+m_O z0002cNkl&Be-v2e1Gzhzz@rR1whmsbHvMl~omQ`^b zK#YjqJ11A-@;wJ&1IQ^L>iZW*Ya|-g}6r^+q$l7(-4~{ejy4^OQTO!~%nnu{V62*82$Su)0w(T&yxwh4h*ntii zf`BI{zfAYIN>+gAa`Rl*U6%oeXazCqaVgj~1$tOE0PuU@%c4sFfCXIr b-Iw4Cs^BSWZ}lZB00000NkvXXu0mjfWmcUk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/midas.png b/src/main/resources/assets/lzxnoneterraria/textures/mob_effect/midas.png new file mode 100644 index 0000000000000000000000000000000000000000..588b4378f9768821c280dbcab12d2fd38639ca41 GIT binary patch literal 637 zcmV-@0)qXCP)4e-6vuxD35cDQM^ac>Mx$FKHnK(7N-TmJM2pie5Il<{*x1O~sQ3kfg(8iTl1q7v=Fl7}?sZHGLZgU~=LL0GnGsfy`oq$)lNI z28$OOXWTq`>dNDRkZDqR2EY<409?3uNfr0J0qhiPZao=pMi)U#=Yat@IsQA8-naFa zXG7qu&^H@~usyK9y92<irhpkSWzc)(>tJEsBD@cdf@G??7< zU<`nE_Z