From 609b69b460819fef0bd63ad5ac2d51497171f1f1 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Thu, 13 Aug 2026 02:38:33 +0800 Subject: [PATCH] v1.7.3 --- gradle.properties | 2 +- .../java/com/lzxnone/terraria/ModSounds.java | 4 + .../ClientStaticSummonRenderBehaviors.java | 2 + .../client/item/ranged/ClientArrowAmmo.java | 56 ++++++ .../ModCreativeModeTabs.java | 2 + .../lzxnone/terraria/effect/IchorEffect.java | 38 +++- .../lzxnone/terraria/entity/ModEntities.java | 1 - .../terraria/entity/summon/StaticSummon.java | 16 ++ .../entity/summon/StaticSummonBehaviors.java | 2 + .../terraria/event/EntityEventHandler.java | 14 ++ .../jei/LzxnoneTerrariaJeiPlugin.java | 4 + .../lzxnone/terraria/item/ModItemTags.java | 3 + .../com/lzxnone/terraria/item/ModItems.java | 3 + .../com/lzxnone/terraria/item/ammo/Ammo.java | 33 +++ .../lzxnone/terraria/item/ammo/ArrowAmmo.java | 7 + .../terraria/item/ammo/BulletAmmo.java | 8 +- .../terraria/item/ammo/ChlorophyteBullet.java | 2 + .../terraria/item/ammo/CrystalBullet.java | 1 + .../terraria/item/ammo/CursedBullet.java | 2 + .../terraria/item/ammo/ExplodingBullet.java | 1 + .../terraria/item/ammo/GoldenBullet.java | 2 + .../item/ammo/HighVelocityBullet.java | 2 + .../terraria/item/ammo/IchorBullet.java | 2 + .../terraria/item/ammo/LuminiteBullet.java | 1 + .../terraria/item/ammo/MeteorShot.java | 2 + .../terraria/item/ammo/MusketBall.java | 2 + .../terraria/item/ammo/NanoBullet.java | 2 + .../terraria/item/ammo/PartyBullet.java | 1 + .../terraria/item/ammo/SilverBullet.java | 2 + .../terraria/item/ammo/TungstenBullet.java | 2 + .../terraria/item/ammo/VenomBullet.java | 2 + .../terraria/item/ammo/WoodenArrow.java | 112 +++++++++++ .../terraria/item/weapon/RangedWeapon.java | 76 +++++-- .../terraria/item/weapon/ranged/bow/Bow.java | 91 +++++++++ .../weapon/ranged/bow/DaedalusStormbow.java | 102 ++++++++++ .../item/weapon/ranged/gun/Boomstick.java | 82 ++++---- .../item/weapon/ranged/gun/ChainGun.java | 75 ++++--- .../ranged/gun/ClockworkAssaultRifle.java | 64 +++--- .../weapon/ranged/gun/FlintlockPistol.java | 38 +++- .../item/weapon/ranged/gun/Gatligator.java | 72 +++---- .../terraria/item/weapon/ranged/gun/Gun.java | 190 +++++++++++------- .../item/weapon/ranged/gun/Handgun.java | 38 +++- .../item/weapon/ranged/gun/Megashark.java | 44 +++- .../item/weapon/ranged/gun/Minishark.java | 44 +++- .../item/weapon/ranged/gun/Musket.java | 38 +++- .../weapon/ranged/gun/PhoenixBlaster.java | 38 +++- .../weapon/ranged/gun/QuadBarrelShotgun.java | 82 ++++---- .../item/weapon/ranged/gun/RedRyder.java | 42 +++- .../item/weapon/ranged/gun/Revolver.java | 42 +++- .../terraria/item/weapon/ranged/gun/SDMG.java | 44 +++- .../item/weapon/ranged/gun/Shotgun.java | 76 ++++--- .../item/weapon/ranged/gun/SniperRifle.java | 81 +++++--- .../weapon/ranged/gun/TacticalShotgun.java | 75 ++++--- .../item/weapon/ranged/gun/TheUndertaker.java | 38 +++- .../terraria/item/weapon/ranged/gun/Uzi.java | 57 ++++-- .../item/weapon/ranged/gun/VenusMagnum.java | 57 ++++-- .../terraria/mixin/HumanoidModelMixin.java | 11 +- .../terraria/ui/config/ConfigList.java | 7 +- .../com/lzxnone/terraria/utils/AmmoUtil.java | 20 +- .../lzxnone/terraria/utils/DamageUtil.java | 18 +- .../assets/lzxnoneterraria/lang/en_us.json | 19 +- .../assets/lzxnoneterraria/lang/zh_cn.json | 19 +- .../lzxnoneterraria/models/item/bow.json | 45 +++++ .../models/item/daedalus_stormbow.json | 6 + .../models/item/wooden_arrow.json | 6 + .../assets/lzxnoneterraria/sounds.json | 3 + .../lzxnoneterraria/sounds/bow_shoot.ogg | Bin 0 -> 8658 bytes .../lzxnoneterraria/sounds/bow_shot.wav | Bin 0 -> 51244 bytes .../textures/item/daedalus_stormbow.png | Bin 0 -> 343 bytes .../textures/item/wooden_arrow.png | Bin 0 -> 246 bytes .../enchantment/gunpowder.json | 4 +- .../loot_modifiers/entities/ender_dragon.json | 10 + .../loot_table/entities/ender_dragon.json | 19 ++ .../lzxnoneterraria/recipe/wooden_arrow.json | 13 ++ .../data/lzxnoneterraria/tags/item/ammo.json | 1 + .../lzxnoneterraria/tags/item/arrow_ammo.json | 6 + .../tags/item/gunpowder_weapons.json | 30 +++ .../tags/item/ranged_weapons.json | 3 +- .../minecraft/tags/item/enchantable/bow.json | 6 + .../loot_modifiers/global_loot_modifiers.json | 1 + 80 files changed, 1645 insertions(+), 521 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/client/item/ranged/ClientArrowAmmo.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/Ammo.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/ArrowAmmo.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/WoodenArrow.java create mode 100644 src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/Bow.java create mode 100644 src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/DaedalusStormbow.java create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/bow.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/daedalus_stormbow.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/wooden_arrow.json create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/bow_shoot.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/bow_shot.wav create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/daedalus_stormbow.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/wooden_arrow.png create mode 100644 src/main/resources/data/lzxnoneterraria/loot_modifiers/entities/ender_dragon.json create mode 100644 src/main/resources/data/lzxnoneterraria/loot_table/entities/ender_dragon.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/wooden_arrow.json create mode 100644 src/main/resources/data/lzxnoneterraria/tags/item/arrow_ammo.json create mode 100644 src/main/resources/data/lzxnoneterraria/tags/item/gunpowder_weapons.json create mode 100644 src/main/resources/data/minecraft/tags/item/enchantable/bow.json diff --git a/gradle.properties b/gradle.properties index b693bb9..4a5c522 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ mod_name=Lzxnone Terraria # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=1.7.2 +mod_version=1.7.3 ## The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index b365043..c97feee 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -71,6 +71,10 @@ public class ModSounds { SOUND_EVENTS.register("whip", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "whip"))); + public static final Supplier BOW_SHOOT = + SOUND_EVENTS.register("bow_shoot", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "bow_shoot"))); public static final Supplier SHOT = SOUND_EVENTS.register("shot", () -> SoundEvent.createVariableRangeEvent( 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 9e6824d..c07d52d 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 @@ -2,6 +2,7 @@ package com.lzxnone.terraria.client.entity.summon; import com.lzxnone.terraria.client.item.normal.ClientDropFallenStar; import com.lzxnone.terraria.client.item.normal.ClientManaStar; +import com.lzxnone.terraria.client.item.ranged.ClientArrowAmmo; import com.lzxnone.terraria.client.item.ranged.ClientBulletAmmo; import com.lzxnone.terraria.client.item.magic.ClientLastPrism; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; @@ -72,6 +73,7 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.GOLDEN_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.LUMINITE_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.TUNGSTEN_BULLET, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.WOODEN_ARROW, ClientArrowAmmo.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.SNOWBALL, DEFAULT_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.FALLEN_STAR, ClientStarCannon.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientArrowAmmo.java b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientArrowAmmo.java new file mode 100644 index 0000000..9cfec90 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientArrowAmmo.java @@ -0,0 +1,56 @@ +package com.lzxnone.terraria.client.item.ranged; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; + +public class ClientArrowAmmo { + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + ItemStack itemStack = summon.getEntityData().get(StaticSummon.ITEM); + if(itemStack == ItemStack.EMPTY) return; + + renderArrowPlane(entity, summon, poseStack, bufferSource, packedLight, 0.0F); + renderArrowPlane(entity, summon, poseStack, bufferSource, packedLight, 90.0F); + } + + private void renderArrowPlane(Entity entity, StaticSummon summon, PoseStack poseStack, + MultiBufferSource bufferSource, int packedLight, float roll) { + poseStack.pushPose(); + + poseStack.mulPose(Axis.YP.rotationDegrees(-summon.getYRot())); + poseStack.mulPose(Axis.XP.rotationDegrees(summon.getXRot())); + poseStack.mulPose(Axis.ZP.rotationDegrees(roll)); + poseStack.mulPose(Axis.XP.rotationDegrees(-90)); + + poseStack.scale( + summon.getEntityData().get(StaticSummon.SCALE_X), + summon.getEntityData().get(StaticSummon.SCALE_Y), + summon.getEntityData().get(StaticSummon.SCALE_Z) + ); + + Minecraft.getInstance().getItemRenderer().renderStatic( + summon.getEntityData().get(StaticSummon.ITEM), + ItemDisplayContext.NONE, + summon.getEntityData().get(StaticSummon.GLOW) ? LightTexture.FULL_BRIGHT : packedLight, + OverlayTexture.NO_OVERLAY, + poseStack, + bufferSource, + entity.level(), + 0 + ); + poseStack.popPose(); + } + }; +} 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 42a9304..ee8eb40 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 @@ -201,6 +201,7 @@ public class ModCreativeModeTabs { output.accept(ModItems.SUPER_STAR_SHOOTER.get()); output.accept(ModItems.FLAMETHROWER.get()); output.accept(ModItems.ELF_MELTER.get()); + output.accept(ModItems.DAEDALUS_STORMBOW.get()); output.accept(ModItems.MUSKET_BALL.get()); output.accept(ModItems.METEOR_SHOT.get()); output.accept(ModItems.SILVER_BULLET.get()); @@ -217,6 +218,7 @@ public class ModCreativeModeTabs { output.accept(ModItems.ENDLESS_MUSKET_POUCH.get()); output.accept(ModItems.LUMINITE_BULLET.get()); output.accept(ModItems.TUNGSTEN_BULLET.get()); + output.accept(ModItems.WOODEN_ARROW.get()); output.accept(ModItems.FALLEN_STAR.get()); }).build()); diff --git a/src/main/java/com/lzxnone/terraria/effect/IchorEffect.java b/src/main/java/com/lzxnone/terraria/effect/IchorEffect.java index 17e0927..ec503c7 100644 --- a/src/main/java/com/lzxnone/terraria/effect/IchorEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/IchorEffect.java @@ -9,20 +9,50 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.AttributeInstance; +import net.minecraft.world.entity.ai.attributes.AttributeModifier; +import net.minecraft.world.entity.ai.attributes.Attributes; public class IchorEffect extends MobEffect { - public static final ConfigFloat DAMAGE_BONUS_PER_LEVEL = new ConfigFloat("effect.ichor.damage_bonus_per_level", "ichor_damage_bonus_per_level", 0.15f, 0.0f, 10.0f); + public static final ConfigFloat ARMOR_REDUCTION_PER_LEVEL = new ConfigFloat("effect.ichor.armor_reduction_per_level", "ichor_armor_reduction_per_level", 6.0f, 0.0f, 1024.0f); + private static final ResourceLocation ARMOR_REDUCTION_ID = ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "ichor_armor_reduction"); public static final IConfigData CONFIG_DATA = new IConfigData() { @Override public void onConfigLoad() { - ConfigStruct.loadAll(DAMAGE_BONUS_PER_LEVEL); + ConfigStruct.loadAll(ARMOR_REDUCTION_PER_LEVEL); } }; - public static float getDamageBonusPerLevel() { - return DAMAGE_BONUS_PER_LEVEL.get(); + public static float getArmorReductionPerLevel() { + return ARMOR_REDUCTION_PER_LEVEL.get(); + } + + public static void applyArmorReduction(LivingEntity entity) { + removeArmorReduction(entity); + + MobEffectInstance instance = entity.getEffect(ModEffects.ICHOR); + if(instance == null) return; + + double reduction = getArmorReductionPerLevel() * (instance.getAmplifier() + 1); + if(reduction <= 0.0D) return; + + AttributeInstance armor = entity.getAttribute(Attributes.ARMOR); + if(armor != null) { + armor.addTransientModifier(new AttributeModifier( + ARMOR_REDUCTION_ID, + -reduction, + AttributeModifier.Operation.ADD_VALUE + )); + } + } + + public static void removeArmorReduction(LivingEntity entity) { + AttributeInstance armor = entity.getAttribute(Attributes.ARMOR); + if(armor != null) armor.removeModifier(ARMOR_REDUCTION_ID); } public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( diff --git a/src/main/java/com/lzxnone/terraria/entity/ModEntities.java b/src/main/java/com/lzxnone/terraria/entity/ModEntities.java index 56ef81d..9d25e8d 100644 --- a/src/main/java/com/lzxnone/terraria/entity/ModEntities.java +++ b/src/main/java/com/lzxnone/terraria/entity/ModEntities.java @@ -32,7 +32,6 @@ public class ModEntities { .sized(1.0f, 1.0f) .clientTrackingRange(1024) .updateInterval(1) - .fireImmune() .build("static_summon") ); diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java index 9d34c57..8e5c3ae 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java @@ -22,6 +22,7 @@ import java.util.*; public class StaticSummon extends Entity { public static final int INFINITE_LIFETIME = -114514; + public static final String HIT_TARGET_IGNITE_TICKS_KEY = "hitTargetIgniteTicks"; public static final EntityDataAccessor BEHAVIOR = SynchedEntityData.defineId(StaticSummon.class, EntityDataSerializers.STRING); @@ -148,6 +149,21 @@ public class StaticSummon extends Entity { this.move(MoverType.SELF, this.getDeltaMovement()); } + @Override + public boolean fireImmune() { + return !this.entityData.get(CUSTOM_DATA).contains(HIT_TARGET_IGNITE_TICKS_KEY); + } + + @Override + public boolean isOnFire() { + return super.isOnFire() || this.entityData.get(CUSTOM_DATA).contains(HIT_TARGET_IGNITE_TICKS_KEY); + } + + @Override + public boolean displayFireAnimation() { + return super.displayFireAnimation() || this.entityData.get(CUSTOM_DATA).contains(HIT_TARGET_IGNITE_TICKS_KEY); + } + @Override public void addAdditionalSaveData(CompoundTag tag) { tag.putString("behavior", this.entityData.get(BEHAVIOR)); 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 59ff893..a6ad88e 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -67,6 +67,7 @@ public class StaticSummonBehaviors { public static final String GOLDEN_BULLET = "golden_bullet"; public static final String LUMINITE_BULLET = "luminite_bullet"; public static final String TUNGSTEN_BULLET = "tungsten_bullet"; + public static final String WOODEN_ARROW = "wooden_arrow"; //特殊子弹实体 public static final String SNOWBALL = "snowball"; @@ -119,6 +120,7 @@ public class StaticSummonBehaviors { BEHAVIORS.put(GOLDEN_BULLET, GoldenBullet.SUMMON_BEHAVIOR); BEHAVIORS.put(LUMINITE_BULLET, LuminiteBullet.SUMMON_BEHAVIOR); BEHAVIORS.put(TUNGSTEN_BULLET, TungstenBullet.SUMMON_BEHAVIOR); + BEHAVIORS.put(WOODEN_ARROW, WoodenArrow.SUMMON_BEHAVIOR); BEHAVIORS.put(SNOWBALL, SnowballCannon.SUMMON_BEHAVIOR); BEHAVIORS.put(FALLEN_STAR, StarCannon.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java index 5549103..0b83073 100644 --- a/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/EntityEventHandler.java @@ -7,6 +7,7 @@ import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.effect.IchorEffect; import com.lzxnone.terraria.effect.MidasEffect; import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.effect.PaladinsShieldEffect; @@ -15,6 +16,8 @@ import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.accessory.PanicNecklace; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.accessory.AccessoryUtil; +import com.lzxnone.terraria.item.weapon.RangedWeapon; +import com.lzxnone.terraria.item.weapon.Weapon; import com.lzxnone.terraria.item.weapon.melee.DevilsDevastation; import com.lzxnone.terraria.item.weapon.summon.whip.Possession; import net.minecraft.nbt.CompoundTag; @@ -83,6 +86,7 @@ public class EntityEventHandler { //进行护甲穿透 if(!source.is(DamageTypeTags.BYPASSES_ARMOR)) { if(attacker instanceof LivingEntity livingEntity) AccessoryUtil.applyTargetArmorModifiers(livingEntity, entity); + IchorEffect.applyArmorReduction(entity); } //近战攻击命中时点燃目标 if(attacker instanceof LivingEntity livingAttacker && livingAttacker != entity) { @@ -112,8 +116,18 @@ public class EntityEventHandler { if(!(target.level() instanceof ServerLevel serverLevel)) return; DamageSource source = event.getSource(); Entity attacker = source.getEntity(); + //原版的箭伤害 + if(source.is(DamageTypes.ARROW) && attacker instanceof LivingEntity livingAttacker) { + ItemStack weaponStack = source.getWeaponItem(); + if(weaponStack != null && !weaponStack.isEmpty()) { + float finalDamage = Weapon.applyDamageBonus(weaponStack, livingAttacker, event.getNewDamage()); + finalDamage = RangedWeapon.applyRangedDamageBonus(weaponStack, livingAttacker, finalDamage); + event.setNewDamage(finalDamage); + } + } //移除饰品加成护甲穿透 AccessoryUtil.removeTargetArmorModifiers(event.getEntity()); + IchorEffect.removeArmorReduction(event.getEntity()); //暴击 if(attacker instanceof LivingEntity livingEntity && attacker != target) { double critChance = AccessoryUtil.getCritChance(livingEntity); diff --git a/src/main/java/com/lzxnone/terraria/integration/jei/LzxnoneTerrariaJeiPlugin.java b/src/main/java/com/lzxnone/terraria/integration/jei/LzxnoneTerrariaJeiPlugin.java index fae19f7..787c031 100644 --- a/src/main/java/com/lzxnone/terraria/integration/jei/LzxnoneTerrariaJeiPlugin.java +++ b/src/main/java/com/lzxnone/terraria/integration/jei/LzxnoneTerrariaJeiPlugin.java @@ -252,5 +252,9 @@ public class LzxnoneTerrariaJeiPlugin implements IModPlugin { new ItemStack(ModItems.SORCERER_EMBLEM.get()), Component.translatable("jei.lzxnoneterraria.info.sorcerer_emblem") ); + registration.addItemStackInfo( + new ItemStack(ModItems.DAEDALUS_STORMBOW.get()), + Component.translatable("jei.lzxnoneterraria.info.daedalus_stormbow") + ); } } diff --git a/src/main/java/com/lzxnone/terraria/item/ModItemTags.java b/src/main/java/com/lzxnone/terraria/item/ModItemTags.java index 1ce0813..4f4bd40 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItemTags.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItemTags.java @@ -9,6 +9,9 @@ import net.minecraft.world.item.Item; public class ModItemTags { public static final TagKey AMMO = create("ammo"); public static final TagKey BULLET_AMMO = create("bullet_ammo"); + public static final TagKey ARROW_AMMO = create("arrow_ammo"); + public static final TagKey GUNPOWDER_WEAPONS = create("gunpowder_weapons"); + public static final TagKey SPREAD_RANGED_WEAPONS = create("spread_ranged_weapons"); private static TagKey create(String name) { return TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, name)); diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 901b55e..7b6afc1 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -14,6 +14,7 @@ import com.lzxnone.terraria.item.weapon.ranged.Flamethrower; import com.lzxnone.terraria.item.weapon.ranged.SnowballCannon; import com.lzxnone.terraria.item.weapon.ranged.StarCannon; import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; +import com.lzxnone.terraria.item.weapon.ranged.bow.DaedalusStormbow; import com.lzxnone.terraria.item.weapon.ranged.gun.*; import com.lzxnone.terraria.item.weapon.summon.minion.StardustDragonStaff; import com.lzxnone.terraria.item.weapon.summon.minion.Terraprisma; @@ -81,6 +82,7 @@ public class ModItems { public static final DeferredItem SUPER_STAR_SHOOTER = ITEMS.register("super_star_shooter", SuperStarShooter::new); public static final DeferredItem FLAMETHROWER = ITEMS.register("flamethrower", Flamethrower::new); public static final DeferredItem ELF_MELTER = ITEMS.register("elf_melter", ElfMelter::new); + public static final DeferredItem DAEDALUS_STORMBOW = ITEMS.register("daedalus_stormbow", DaedalusStormbow::new); //召唤武器 public static final DeferredItem TERRAPRISMA = ITEMS.register("terraprisma", Terraprisma::new); @@ -107,6 +109,7 @@ public class ModItems { 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 WOODEN_ARROW = ITEMS.register("wooden_arrow", WoodenArrow::new); public static final DeferredItem FALLEN_STAR = ITEMS.register("fallen_star", FallenStar::new); //饰品 diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/Ammo.java b/src/main/java/com/lzxnone/terraria/item/ammo/Ammo.java new file mode 100644 index 0000000..8345bfb --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/Ammo.java @@ -0,0 +1,33 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.utils.ParticleUtil; +import com.lzxnone.terraria.utils.SoundUtil; +import net.minecraft.core.particles.BlockParticleOption; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.Vec3; + +public class Ammo extends Item { + public static final int MAX_STACK_SIZE = 99; + + public Ammo() { + super(new Item.Properties().stacksTo(MAX_STACK_SIZE)); + } + + public static void playBlockHitEffects(ServerLevel level, BlockHitResult blockHitResult) { + BlockState hitState = level.getBlockState(blockHitResult.getBlockPos()); + ParticleUtil.addParticles( + level, + new BlockParticleOption(ParticleTypes.BLOCK, hitState), + blockHitResult.getLocation(), + Vec3.ZERO, + 0.2, + 25 + ); + SoundUtil.playServerSound(level, ModSounds.DIG.get(), blockHitResult.getLocation(), 1.0f, 1.0f); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ArrowAmmo.java b/src/main/java/com/lzxnone/terraria/item/ammo/ArrowAmmo.java new file mode 100644 index 0000000..2cccf1d --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ArrowAmmo.java @@ -0,0 +1,7 @@ +package com.lzxnone.terraria.item.ammo; + +public class ArrowAmmo extends Ammo { + public ArrowAmmo() { + super(); + } +} 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..c9cd3e4 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java @@ -1,11 +1,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 class BulletAmmo extends Ammo { public BulletAmmo() { - super(new Item.Properties().stacksTo(MAX_STACK_SIZE)); + super(); } } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java index 4f75870..dcee3ee 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java @@ -14,6 +14,7 @@ import com.lzxnone.terraria.utils.*; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ClipContext; @@ -152,6 +153,7 @@ public class ChlorophyteBullet extends BulletAmmo { } BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(oldMotion)); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java index ce2022b..4c9f730 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java @@ -102,6 +102,7 @@ public class CrystalBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); summon.setPos(blockHitResult.getLocation()); CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java index 1a042b0..cb96057 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java @@ -17,6 +17,7 @@ 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.server.level.ServerLevel; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -91,6 +92,7 @@ public class CursedBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java index e379e91..a0647c4 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java @@ -115,6 +115,7 @@ public class ExplodingBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); summon.setPos(blockHitResult.getLocation()); SoundUtil.playServerSound(summon.level(), ModSounds.BOOM.get(), summon.position()); ParticleUtil.addParticles( diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java index e60b1ad..068e14a 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java @@ -17,6 +17,7 @@ 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.server.level.ServerLevel; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -91,6 +92,7 @@ public class GoldenBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java index ef76370..9858877 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java @@ -16,6 +16,7 @@ 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.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.AABB; @@ -90,6 +91,7 @@ public class HighVelocityBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java index c0803b2..752651b 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java @@ -17,6 +17,7 @@ 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.server.level.ServerLevel; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -91,6 +92,7 @@ public class IchorBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java index 4f2da71..0b7121a 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java @@ -104,6 +104,7 @@ public class LuminiteBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); summon.setPos(blockHitResult.getLocation()); ParticleUtil.addParticles( (ServerLevel) summon.level(), PARTICLE, 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 2b4c5ea..cd178b2 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java @@ -18,6 +18,7 @@ import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.AABB; @@ -92,6 +93,7 @@ public class MeteorShot extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); if(MeteorShot.incrementHit(summon) >= MAX_HIT.get()) { this.onDied(summon); return; 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 bd39dc6..49d8a2d 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java @@ -15,6 +15,7 @@ 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.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.AABB; @@ -81,6 +82,7 @@ public class MusketBall extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java index 8716506..3abcecb 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java @@ -19,6 +19,7 @@ import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -99,6 +100,7 @@ public class NanoBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); if(incrementHit(summon) >= MAX_HIT.get()) { this.onDied(summon); return; diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java index 58a84e0..47f7d21 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java @@ -91,6 +91,7 @@ public class PartyBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); summon.setPos(blockHitResult.getLocation()); ParticleUtil.addParticles( (ServerLevel) summon.level(), ModParticles.PARTY_PARTICLE.get(), diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java index 7d5759a..55b9dd3 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java @@ -15,6 +15,7 @@ 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.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.monster.ZombifiedPiglin; import net.minecraft.world.entity.monster.piglin.Piglin; @@ -90,6 +91,7 @@ public class SilverBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java index 7193c05..a54c161 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java @@ -15,6 +15,7 @@ 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.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.AABB; @@ -81,6 +82,7 @@ public class TungstenBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java index ef4e02c..b5d4283 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java @@ -17,6 +17,7 @@ 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.server.level.ServerLevel; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -91,6 +92,7 @@ public class VenomBullet extends BulletAmmo { //方块检测 BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); this.onDied(summon); return; } diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/WoodenArrow.java b/src/main/java/com/lzxnone/terraria/item/ammo/WoodenArrow.java new file mode 100644 index 0000000..e7d0c90 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/WoodenArrow.java @@ -0,0 +1,112 @@ +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.item.weapon.ranged.bow.Bow; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigDouble; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.CollisionUtil; +import com.lzxnone.terraria.utils.DamageUtil; +import com.lzxnone.terraria.utils.FilterUtil; +import com.lzxnone.terraria.utils.MathUtil; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +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 WoodenArrow extends ArrowAmmo { + public static final ConfigFloat BASE_DAMAGE = new ConfigFloat("ammo.wooden_arrow.base_damage", "wooden_arrow_base_damage", 2.0f, 0.0f, 8388600.0f); + public static final ConfigDouble SPEED = new ConfigDouble("ammo.wooden_arrow.speed", "wooden_arrow_speed", 3.0D, 0.0D, 24.0D); + public static final ConfigDouble GRAVITY = new ConfigDouble("ammo.wooden_arrow.gravity", "wooden_arrow_gravity", 0.05D, 0.0D, 10.0D); + + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(BASE_DAMAGE, SPEED, GRAVITY); + } + }; + + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + "wooden_arrow", + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/wooden_arrow.png"), + Component.translatable("item.lzxnoneterraria.wooden_arrow"), + CONFIG_DATA + ); + + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + Vec3 motion = summon.getDeltaMovement(); + if(motion.lengthSqr() < 1.0E-7D) { + motion = summon.getLookAngle().normalize().scale(SPEED.get()); + } + motion = motion.add(0.0D, -GRAVITY.get(), 0.0D); + + Vec3 start = summon.position(); + Vec3 end = start.add(motion); + + updateRotation(summon, motion); + + if(summon.level().isClientSide()) { + summon.setDeltaMovement(motion); + return; + } + + AABB hitBox = new AABB(start, end).inflate(0.25D); + Level level = summon.level(); + List targets = level.getEntitiesOfClass( + Entity.class, + hitBox, + FilterUtil.createTargetFilter(summon, summon.getOwner()) + ); + if(!targets.isEmpty()) { + float damage = customData.contains("damage") ? customData.getFloat("damage") : 0.0f; + 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.get() + damage, knockbackScale)) { + if(customData.contains(StaticSummon.HIT_TARGET_IGNITE_TICKS_KEY)) { + target.igniteForTicks(customData.getInt(StaticSummon.HIT_TARGET_IGNITE_TICKS_KEY)); + } + target.invulnerableTime = invulnerableTime; + this.onDied(summon); + return; + } + } + + BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, end); + if(blockHitResult.getType() != HitResult.Type.MISS) { + if(summon.level() instanceof ServerLevel serverLevel) Ammo.playBlockHitEffects(serverLevel, blockHitResult); + this.onDied(summon); + return; + } + + summon.setDeltaMovement(motion); + } + }; + + public static void updateRotation(StaticSummon summon, Vec3 direction) { + if(direction.lengthSqr() < 1.0E-7D) return; + float[] xyRot = MathUtil.computeXYRot(direction.toVector3f()); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + } +} 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 0062ecb..60f4df3 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.ModItemTags; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.effect.RangedDamageModifier; @@ -26,6 +27,7 @@ import net.minecraft.world.item.Tier; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.CustomData; import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.Level; import java.util.List; @@ -55,9 +57,16 @@ public class RangedWeapon extends Weapon { public static float applyRangedDamageBonus(ItemStack stack, LivingEntity entity, float damage) { double finalDamage = damage; + //力量 + int powerLevel = getEnchantmentLevel(entity, stack, Enchantments.POWER); + if(powerLevel > 0) { + finalDamage *= 1.0D + 0.2D * powerLevel; + } //火药 - int gunpowderLevel = getEnchantmentLevel(entity, stack, ModEnchantments.GUNPOWDER); - finalDamage *= Math.pow(ModEnchantmentConfigs.getGunpowderDamageMultiplier(), gunpowderLevel); + if(stack.is(ModItemTags.GUNPOWDER_WEAPONS)) { + int gunpowderLevel = getEnchantmentLevel(entity, stack, ModEnchantments.GUNPOWDER); + finalDamage *= Math.pow(ModEnchantmentConfigs.getGunpowderDamageMultiplier(), gunpowderLevel); + } //饰品 double[] multiplier = {1.0D}; AccessoryUtil.forEachAccessory(entity, (accessory, accessoryStack) -> { @@ -95,25 +104,19 @@ public class RangedWeapon extends Weapon { } public boolean canShoot(ItemStack weaponStack, Player player) { - ItemStack ammoStack = getAmmoStack(weaponStack); - if(ammoStack.isEmpty() || !canUseAmmo(weaponStack, ammoStack)) return false; - if(player.hasInfiniteMaterials()) return true; - - Item ammoItem = ammoStack.getItem(); - for(ItemStack inventoryStack : player.getInventory().items) { - if(inventoryStack.is(ammoItem)) return true; - } - return false; + return !findAmmo(weaponStack, player).isEmpty(); } public int getAmmoCount(ItemStack weaponStack, Player player) { ItemStack ammoStack = getAmmoStack(weaponStack); if(ammoStack.isEmpty() || !canUseAmmo(weaponStack, ammoStack)) return 0; - Item ammoItem = ammoStack.getItem(); int count = 0; + ItemStack offhandStack = player.getItemInHand(InteractionHand.OFF_HAND); + if(isAmmoStack(ammoStack, offhandStack)) count += offhandStack.getCount(); + for(ItemStack inventoryStack : player.getInventory().items) { - if(inventoryStack.is(ammoItem)) count += inventoryStack.getCount(); + if(isAmmoStack(ammoStack, inventoryStack)) count += inventoryStack.getCount(); } return count; } @@ -129,10 +132,12 @@ public class RangedWeapon extends Weapon { 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; + ItemStack offhandStack = player.getItemInHand(InteractionHand.OFF_HAND); + if(isAmmoStack(ammoStack, offhandStack)) available += offhandStack.getCount(); + for(ItemStack inventoryStack : player.getInventory().items) { - if(inventoryStack.is(ammoItem)) { + if(isAmmoStack(ammoStack, inventoryStack)) { available += inventoryStack.getCount(); if(available >= amount) break; } @@ -140,8 +145,15 @@ public class RangedWeapon extends Weapon { if(available < amount) return false; int remaining = amount; + if(isAmmoStack(ammoStack, offhandStack)) { + int consumed = Math.min(remaining, offhandStack.getCount()); + offhandStack.shrink(consumed); + remaining -= consumed; + if(remaining <= 0) return true; + } + for(ItemStack inventoryStack : player.getInventory().items) { - if(!inventoryStack.is(ammoItem)) continue; + if(!isAmmoStack(ammoStack, inventoryStack)) continue; int consumed = Math.min(remaining, inventoryStack.getCount()); inventoryStack.shrink(consumed); @@ -152,6 +164,38 @@ public class RangedWeapon extends Weapon { return false; } + public ItemStack findAmmo(ItemStack weaponStack, Player player) { + ItemStack ammoStack = getAmmoStack(weaponStack); + ItemStack inventoryAmmo = findAmmoItem(player, ammoStack); + if(!inventoryAmmo.isEmpty()) return inventoryAmmo; + if(player.hasInfiniteMaterials() && canUseAmmo(weaponStack, ammoStack)) return ammoStack.copy(); + return ItemStack.EMPTY; + } + + public boolean isSelectedAmmo(ItemStack weaponStack, ItemStack ammoStack) { + ItemStack selectedAmmo = getAmmoStack(weaponStack); + return isAmmoStack(selectedAmmo, ammoStack); + } + + protected ItemStack findAmmoItem(Player player, ItemStack ammoStack) { + if(ammoStack.isEmpty()) return ItemStack.EMPTY; + + ItemStack offhandStack = player.getItemInHand(InteractionHand.OFF_HAND); + if(isAmmoStack(ammoStack, offhandStack)) return offhandStack; + + ItemStack mainhandStack = player.getItemInHand(InteractionHand.MAIN_HAND); + if(isAmmoStack(ammoStack, mainhandStack)) return mainhandStack; + + for(ItemStack inventoryStack : player.getInventory().items) { + if(isAmmoStack(ammoStack, inventoryStack)) return inventoryStack; + } + return ItemStack.EMPTY; + } + + protected boolean isAmmoStack(ItemStack selectedAmmo, ItemStack ammoStack) { + return !selectedAmmo.isEmpty() && !ammoStack.isEmpty() && ammoStack.is(selectedAmmo.getItem()); + } + public boolean tryShoot(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { if(!canShoot(weaponStack, player)) return false; if(!level.isClientSide() && !consumeAmmo(weaponStack, player, getAmmoConsumeAmount(weaponStack, player))) return false; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/Bow.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/Bow.java new file mode 100644 index 0000000..f6d4cb0 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/Bow.java @@ -0,0 +1,91 @@ +package com.lzxnone.terraria.item.weapon.ranged.bow; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.item.ModItemTags; +import com.lzxnone.terraria.item.weapon.RangedWeapon; +import com.lzxnone.terraria.utils.AmmoUtil; +import com.lzxnone.terraria.utils.SoundUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.level.Level; +import org.joml.Vector3f; + +public class Bow extends RangedWeapon { + public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); + public static final int USE_TIME = 20; + public static final int FLAME_ARROW_FIRE_TICKS = 20 * 60 * 60; + public static final int FLAME_TARGET_IGNITE_TICKS = 100; + + public Bow(Tier tier, Properties properties) { + super(tier, properties); + } + + @Override + public boolean canUseAmmo(ItemStack weaponStack, ItemStack ammoStack) { + return ammoStack.is(ModItemTags.ARROW_AMMO); + } + + @Override + protected ResourceLocation getDefaultAmmo(ItemStack weaponStack) { + return ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "wooden_arrow"); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return USE_TIME; + } + + @Override + public boolean consumeAmmo(ItemStack weaponStack, Player player, int amount) { + if(hasInfinity(weaponStack, player) && getAmmoCount(weaponStack, player) > 0) return true; + return super.consumeAmmo(weaponStack, player, amount); + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + SoundUtil.playClientSound(player, ModSounds.BOW_SHOOT.get()); + if(level.isClientSide()) return; + + StaticSummon summon = createArrowSummon(level, player, hand, weaponStack); + level.addFreshEntity(summon); + } + + protected float getDamage(ItemStack weaponStack, LivingEntity entity, ItemStack ammoStack) { + return 0; + } + + protected float getKnockbackScale(ItemStack weaponStack, LivingEntity entity, ItemStack ammoStack) { + return 1.0f; + } + + protected int getInvulnerableTime(ItemStack weaponStack, LivingEntity entity, ItemStack ammoStack) { + return 20; + } + + protected boolean hasInfinity(ItemStack weaponStack, LivingEntity entity) { + return getEnchantmentLevel(entity, weaponStack, Enchantments.INFINITY) > 0; + } + + protected StaticSummon createArrowSummon(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, weaponStack, OFFSET); + ItemStack ammoStack = getAmmoStack(weaponStack); + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA).copy(); + customData.putFloat("damage", getDamage(weaponStack, player, ammoStack)); + customData.putFloat("knockbackScale", getKnockbackScale(weaponStack, player, ammoStack)); + customData.putInt("invulnerableTime", getInvulnerableTime(weaponStack, player, ammoStack)); + if(getEnchantmentLevel(player, weaponStack, Enchantments.FLAME) > 0) { + customData.putInt(StaticSummon.HIT_TARGET_IGNITE_TICKS_KEY, FLAME_TARGET_IGNITE_TICKS); + summon.igniteForTicks(FLAME_ARROW_FIRE_TICKS); + } + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + return summon; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/DaedalusStormbow.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/DaedalusStormbow.java new file mode 100644 index 0000000..a361b6c --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/bow/DaedalusStormbow.java @@ -0,0 +1,102 @@ +package com.lzxnone.terraria.item.weapon.ranged.bow; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.ui.config.ConfigListItem; +import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import com.lzxnone.terraria.ui.config.struct.ConfigStruct; +import com.lzxnone.terraria.utils.MathUtil; +import com.lzxnone.terraria.utils.SoundUtil; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; + +public class DaedalusStormbow extends Bow { + public static final String ID = "daedalus_stormbow"; + public static final int USE_TIME = 19; + public static final int ARROW_COUNT = 3; + public static final double RANGE = 64.0D; + public static final double SPAWN_HEIGHT = 20.0D; + public static final double SPAWN_OFFSET = 6.0D; + public static final double HIT_OFFSET = 2D; + + public static final ConfigFloat DAMAGE = new ConfigFloat("weapon.daedalus_stormbow.damage", "daedalus_stormbow_damage", 4.0F, 0.0F, 8388600.0F); + public static final IConfigData CONFIG_DATA = new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(DAMAGE); + } + }; + public static final ConfigListItem CONFIG_LIST_ITEM = new ConfigListItem( + ID, + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "textures/item/" + ID + ".png"), + Component.translatable("item.lzxnoneterraria." + ID), + CONFIG_DATA + ); + + public DaedalusStormbow() { + super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return USE_TIME; + } + + @Override + protected float getDamage(ItemStack weaponStack, LivingEntity entity, ItemStack ammoStack) { + return DAMAGE.get(); + } + + @Override + protected float getKnockbackScale(ItemStack weaponStack, LivingEntity entity, ItemStack ammoStack) { + return 1.0f; + } + + @Override + protected int getInvulnerableTime(ItemStack weaponStack, LivingEntity entity, ItemStack ammoStack) { + return 10; + } + + @Override + protected void shoot(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + SoundUtil.playClientSound(player, ModSounds.BOW_SHOOT.get()); + if(level.isClientSide()) return; + + for(int i = 0; i < ARROW_COUNT; i++) { + StaticSummon summon = createArrowSummon(level, player, hand, weaponStack); + Vec3 targetPos = MathUtil.getCrosshairPos(player, level, RANGE); + Vec3 spawnPos = targetPos.add( + (level.random.nextDouble() * 2.0D - 1.0D) * SPAWN_OFFSET, + SPAWN_HEIGHT + i * 1.5D, + (level.random.nextDouble() * 2.0D - 1.0D) * SPAWN_OFFSET + ); + Vec3 hitPos = targetPos.add( + (level.random.nextDouble() * 2.0D - 1.0D) * HIT_OFFSET, + 0.0D, + (level.random.nextDouble() * 2.0D - 1.0D) * HIT_OFFSET + ); + Vec3 direction = hitPos.subtract(spawnPos).normalize(); + + summon.setPos(spawnPos); + float[] xyRot = MathUtil.computeXYRot(direction.toVector3f()); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + summon.xRotO = summon.getXRot(); + summon.yRotO = summon.getYRot(); + level.addFreshEntity(summon); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Boomstick.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Boomstick.java index f5e5436..28c1132 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Boomstick.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Boomstick.java @@ -1,71 +1,61 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; -import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.MathUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; - public class Boomstick extends Gun { public static final String ID = "boomstick"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 2.0f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final int PROJECTILE_COUNT = 3; public static final float MAX_SPREAD_DEGREES = 8.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public Boomstick() { - super(Tiers.IRON, new Item.Properties().stacksTo(1), ID, OFFSET, DAMAGE_DEFAULT, 40, ModSounds.SHOT5, 1.0f, 10); + super(Tiers.IRON, new Item.Properties().stacksTo(1)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 40; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT5.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 1.25f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT5.get()); - if(level.isClientSide()) return; - - float spreadDegrees = getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); - for(int i = 0; i < PROJECTILE_COUNT; i++) { - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - applySpread(player, summon, spreadDegrees); - - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 1.25f); - customData.putInt("invulnerableTime", 10); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - level.addFreshEntity(summon); - } + protected int getProjectileCount(ItemStack stack, Player player) { + return PROJECTILE_COUNT; } - - private static void applySpread(Player player, StaticSummon summon, float spreadDegrees) { - Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - Vec3 forward = MathUtil.toVec3(dirs[0]).normalize(); - Vec3 up = MathUtil.toVec3(dirs[1]).normalize(); - Vec3 right = MathUtil.toVec3(dirs[2]).normalize(); - - double yaw = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - double pitch = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - Vec3 spreadDir = forward - .add(right.scale(Math.tan(yaw))) - .add(up.scale(Math.tan(pitch))) - .normalize(); - - float[] xyRot = MathUtil.computeXYRot(spreadDir.toVector3f()); - summon.setXRot(xyRot[0]); - summon.xRotO = xyRot[0]; - summon.setYRot(xyRot[1]); - summon.yRotO = xyRot[1]; + @Override + protected float getSpreadDegrees(ItemStack stack, Player player, int index) { + return getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ChainGun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ChainGun.java index e26ef76..2156701 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ChainGun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ChainGun.java @@ -1,67 +1,62 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; -import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.MathUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; -import net.minecraft.world.item.Item; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; - public class ChainGun extends Gun { public static final String ID = "chain_gun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 6.0f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final float AMMO_NOT_CONSUME_CHANCE = 0.67f; public static final float MAX_SPREAD_DEGREES = 15.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public ChainGun() { - super(Tiers.NETHERITE, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), ID, OFFSET, DAMAGE_DEFAULT, 4, ModSounds.SHOT6, 0.1f, 4); + super(Tiers.NETHERITE, new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 4; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT6.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.1f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 4; } @Override - public int getAmmoConsumeAmount(ItemStack weaponStack, LivingEntity entity) { - return entity.getRandom().nextFloat() < AMMO_NOT_CONSUME_CHANCE ? 0 : 1; + protected float getAmmoNotConsumeChance(ItemStack stack, LivingEntity entity) { + return AMMO_NOT_CONSUME_CHANCE; } - @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT6.get()); - if(level.isClientSide()) return; - - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - Vec3 forward = MathUtil.toVec3(dirs[0]).normalize(); - Vec3 up = MathUtil.toVec3(dirs[1]).normalize(); - Vec3 right = MathUtil.toVec3(dirs[2]).normalize(); - float spreadDegrees = getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); - double yaw = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - double pitch = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - Vec3 spreadDir = forward.add(right.scale(Math.tan(yaw))).add(up.scale(Math.tan(pitch))).normalize(); - float[] xyRot = MathUtil.computeXYRot(spreadDir.toVector3f()); - summon.setXRot(xyRot[0]); - summon.xRotO = xyRot[0]; - summon.setYRot(xyRot[1]); - summon.yRotO = xyRot[1]; - - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 0.1f); - customData.putInt("invulnerableTime", 4); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - level.addFreshEntity(summon); + protected float getSpreadDegrees(ItemStack stack, Player player, int index) { + return getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ClockworkAssaultRifle.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ClockworkAssaultRifle.java index 227b7c6..1c552c2 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ClockworkAssaultRifle.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/ClockworkAssaultRifle.java @@ -4,52 +4,70 @@ import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.MathUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; public class ClockworkAssaultRifle extends Gun { public static final String ID = "clockwork_assault_rifle"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); public static final float DAMAGE_DEFAULT = 2.4f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final int PROJECTILE_COUNT = 3; public static final double PROJECTILE_OFFSET = -1.0; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public ClockworkAssaultRifle() { - super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.COMMON), ID, OFFSET, DAMAGE_DEFAULT, 24, ModSounds.SHOT7, 0.2f, 5); + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); } @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT7.get()); - if(level.isClientSide()) return; + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } - Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - Vec3 dir = MathUtil.toVec3(dirs[0]); + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } - for(int i = 0;i < PROJECTILE_COUNT;i++) { - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 0.2f); - customData.putInt("invulnerableTime", 5); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 24; + } - Vec3 pos = summon.position(); - summon.setPos(pos.add(dir.scale(PROJECTILE_OFFSET * i))); - level.addFreshEntity(summon); - } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT7.get(); + } + + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.2f; + } + + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 5; + } + + @Override + protected int getProjectileCount(ItemStack stack, Player player) { + return PROJECTILE_COUNT; + } + + @Override + protected void postprocessBulletSummon(Level level, Player player, InteractionHand hand, ItemStack weaponStack, + StaticSummon summon, int index) { + summon.setPos(summon.position().add(player.getLookAngle().normalize().scale(PROJECTILE_OFFSET * index))); } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/FlintlockPistol.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/FlintlockPistol.java index b767d5f..3cd60c5 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/FlintlockPistol.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/FlintlockPistol.java @@ -1,20 +1,48 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class FlintlockPistol extends Gun { public static final String ID = "flintlock_pistol"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 2.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public FlintlockPistol() { - super(Tiers.IRON, new Item.Properties().stacksTo(1), ID, OFFSET, DAMAGE_DEFAULT, 16, ModSounds.SHOT4, 0.25f, 10); + super(Tiers.IRON, new Item.Properties().stacksTo(1)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 16; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT4.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.25f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gatligator.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gatligator.java index 4c60ce9..0384f51 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gatligator.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gatligator.java @@ -1,67 +1,69 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; -import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.MathUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.InteractionHand; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; -import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; public class Gatligator extends Gun { public static final String ID = "gatligator"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 2.4f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final float AMMO_NOT_CONSUME_CHANCE = 0.5f; public static final float MAX_SPREAD_DEGREES = 10.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public Gatligator() { - super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON), ID, OFFSET, DAMAGE_DEFAULT, 7, ModSounds.SHOT6, 0.1f, 5); + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); } @Override - public int getAmmoConsumeAmount(ItemStack weaponStack, LivingEntity entity) { - return entity.getRandom().nextFloat() < AMMO_NOT_CONSUME_CHANCE ? 0 : 1; + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; } @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT6.get()); - if(level.isClientSide()) return; + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - Vec3 forward = MathUtil.toVec3(dirs[0]).normalize(); - Vec3 up = MathUtil.toVec3(dirs[1]).normalize(); - Vec3 right = MathUtil.toVec3(dirs[2]).normalize(); - float spreadDegrees = getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); - double yaw = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - double pitch = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - Vec3 spreadDir = forward.add(right.scale(Math.tan(yaw))).add(up.scale(Math.tan(pitch))).normalize(); - float[] xyRot = MathUtil.computeXYRot(spreadDir.toVector3f()); - summon.setXRot(xyRot[0]); - summon.xRotO = xyRot[0]; - summon.setYRot(xyRot[1]); - summon.yRotO = xyRot[1]; + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 7; + } - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 0.1f); - customData.putInt("invulnerableTime", 5); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - level.addFreshEntity(summon); + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT6.get(); + } + + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.1f; + } + + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 5; + } + + @Override + protected float getAmmoNotConsumeChance(ItemStack stack, LivingEntity entity) { + return AMMO_NOT_CONSUME_CHANCE; + } + + @Override + protected float getSpreadDegrees(ItemStack stack, Player player, int index) { + return getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java index d7ae4d4..3297eee 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Gun.java @@ -1,6 +1,7 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.enchantment.ModEnchantmentConfigs; import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.entity.summon.StaticSummon; @@ -11,7 +12,9 @@ import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigStruct; import com.lzxnone.terraria.utils.AmmoUtil; +import com.lzxnone.terraria.utils.MathUtil; import com.lzxnone.terraria.utils.SoundUtil; +import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -19,12 +22,15 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tier; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; -import java.util.function.Supplier; +import java.util.List; public class Gun extends RangedWeapon { private static final float DAMAGE_MIN = 0.0f; @@ -34,61 +40,30 @@ public class Gun extends RangedWeapon { public static final double SPRINT_SPREAD_MULTIPLIER = 2.0D; public static final double WALK_SPREAD_MULTIPLIER = 1.5D; public static final double CROUCH_SPREAD_MULTIPLIER = 0.5D; + public static final Vector3f DEFAULT_OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); - private final String id; - private final Vector3f offset; - private final ConfigFloat damage; - private final boolean hasAmmoNotConsumeChance; - private final ConfigFloat ammoNotConsumeChance; - private final int useTime; - private final Supplier sound; - private final float knockbackScale; - private final int invulnerableTime; - - public Gun(Tier tier, Properties properties, String id, Vector3f offset, float damageDefault, int useTime, - Supplier sound, float knockbackScale, int invulnerableTime) { - this(tier, properties, id, offset, damageDefault, false, 0.0f, useTime, sound, knockbackScale, invulnerableTime); - } - - public Gun(Tier tier, Properties properties, String id, Vector3f offset, float damageDefault, float ammoNotConsumeChanceDefault, - int useTime, Supplier sound, float knockbackScale, int invulnerableTime) { - this(tier, properties, id, offset, damageDefault, true, ammoNotConsumeChanceDefault, useTime, sound, knockbackScale, invulnerableTime); - } - - private Gun(Tier tier, Properties properties, String id, Vector3f offset, float damageDefault, boolean hasAmmoNotConsumeChance, - float ammoNotConsumeChanceDefault, int useTime, Supplier sound, - float knockbackScale, int invulnerableTime) { + public Gun(Tier tier, Properties properties) { super(tier, properties); - this.id = id; - this.offset = offset; - this.damage = createDamageConfig(id, damageDefault); - this.hasAmmoNotConsumeChance = hasAmmoNotConsumeChance; - this.ammoNotConsumeChance = createAmmoNotConsumeChanceConfig(id, ammoNotConsumeChanceDefault); - this.useTime = useTime; - this.sound = sound; - this.knockbackScale = knockbackScale; - this.invulnerableTime = invulnerableTime; + } + + public static IConfigData createConfigData(ConfigStruct... configs) { + return new IConfigData() { + @Override + public void onConfigLoad() { + ConfigStruct.loadAll(configs); + } + }; } public static IConfigData createConfigData(String id, float damageDefault) { - return new IConfigData() { - @Override - public void onConfigLoad() { - createDamageConfig(id, damageDefault).load(); - } - }; + return createConfigData(createDamageConfig(id, damageDefault)); } public static IConfigData createConfigData(String id, float damageDefault, float ammoNotConsumeChanceDefault) { - return new IConfigData() { - @Override - public void onConfigLoad() { - ConfigStruct.loadAll( - createAmmoNotConsumeChanceConfig(id, ammoNotConsumeChanceDefault), - createDamageConfig(id, damageDefault) - ); - } - }; + return createConfigData( + createDamageConfig(id, damageDefault), + createAmmoNotConsumeChanceConfig(id, ammoNotConsumeChanceDefault) + ); } public static ConfigFloat createDamageConfig(String id, float damageDefault) { @@ -116,15 +91,6 @@ public class Gun extends RangedWeapon { return "weapon." + id + ".ammo_not_consume_chance"; } - public float getDamage() { - return damage.get(); - } - - public float getAmmoNotConsumeChance() { - if(!hasAmmoNotConsumeChance) return 0.0f; - return ammoNotConsumeChance.get(); - } - @Override public boolean canUseAmmo(ItemStack weaponStack, ItemStack ammoStack) { return ammoStack.is(ModItemTags.BULLET_AMMO); @@ -137,13 +103,54 @@ public class Gun extends RangedWeapon { @Override public int getUseTime(ItemStack weaponStack, LivingEntity entity) { - return useTime; + return 20; } @Override public int getAmmoConsumeAmount(ItemStack weaponStack, LivingEntity entity) { - if(!hasAmmoNotConsumeChance) return super.getAmmoConsumeAmount(weaponStack, entity); - return entity.getRandom().nextFloat() < getAmmoNotConsumeChance() ? 0 : 1; + float chance = getAmmoNotConsumeChance(weaponStack, entity); + if(chance <= 0.0f) return super.getAmmoConsumeAmount(weaponStack, entity); + return entity.getRandom().nextFloat() < chance ? 0 : 1; + } + + protected float getDamage(ItemStack stack, Player player) { + return 0.0f; + } + + protected float getAmmoNotConsumeChance(ItemStack stack, LivingEntity entity) { + return 0.0f; + } + + protected Vector3f getOffset(ItemStack stack, Player player) { + return DEFAULT_OFFSET; + } + + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT.get(); + } + + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.1f; + } + + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; + } + + protected int getProjectileCount(ItemStack stack, Player player) { + return 1; + } + + protected float getSpreadDegrees(ItemStack stack, Player player, int index) { + return 0.0f; + } + + protected ItemStack getBulletAmmoStack(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + return getAmmoStack(weaponStack); + } + + protected void postprocessBulletSummon(Level level, Player player, InteractionHand hand, ItemStack weaponStack, + StaticSummon summon, int index) { } protected float getFinalSpreadDegrees(float baseSpread, ItemStack weaponStack, Player player) { @@ -164,17 +171,64 @@ public class Gun extends RangedWeapon { return (float) spread; } + protected void applySpread(Player player, StaticSummon summon, float spreadDegrees) { + if(spreadDegrees <= 0.0f) return; + + Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); + Vec3 forward = MathUtil.toVec3(dirs[0]).normalize(); + Vec3 up = MathUtil.toVec3(dirs[1]).normalize(); + Vec3 right = MathUtil.toVec3(dirs[2]).normalize(); + + double yaw = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); + double pitch = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); + Vec3 spreadDir = forward + .add(right.scale(Math.tan(yaw))) + .add(up.scale(Math.tan(pitch))) + .normalize(); + + float[] xyRot = MathUtil.computeXYRot(spreadDir.toVector3f()); + summon.setXRot(xyRot[0]); + summon.xRotO = xyRot[0]; + summon.setYRot(xyRot[1]); + summon.yRotO = xyRot[1]; + } + + protected StaticSummon createBulletSummon(Level level, Player player, InteractionHand hand, ItemStack stack, int index) { + ItemStack ammoStack = getBulletAmmoStack(level, player, hand, stack); + StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, ammoStack, getOffset(stack, player)); + applySpread(player, summon, getSpreadDegrees(stack, player, index)); + + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + customData.putFloat("damage", getDamage(stack, player)); + customData.putFloat("knockbackScale", getKnockbackScale(stack, player)); + customData.putInt("invulnerableTime", getInvulnerableTime(stack, player)); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + + postprocessBulletSummon(level, player, hand, stack, summon, index); + return summon; + } + @Override protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, sound.get()); - if(!level.isClientSide()) { - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, offset); - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", knockbackScale); - customData.putInt("invulnerableTime", invulnerableTime); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + SoundUtil.playClientSound(player, getShootSound(stack, player)); + if(level.isClientSide()) return; + + int projectileCount = getProjectileCount(stack, player); + for(int i = 0; i < projectileCount; i++) { + StaticSummon summon = createBulletSummon(level, player, hand, stack, i); level.addFreshEntity(summon); } } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, + List tooltipComponents, TooltipFlag tooltipFlag) { + if(stack.is(ModItemTags.SPREAD_RANGED_WEAPONS)) { + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.spread_ranged_weapon" + ).withStyle(ChatFormatting.GRAY)); + } + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Handgun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Handgun.java index a9f77a3..4521c0a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Handgun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Handgun.java @@ -1,20 +1,48 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class Handgun extends Gun { public static final String ID = "handgun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, 0, 1.5f); public static final float DAMAGE_DEFAULT = 4.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public Handgun() { - super(Tiers.IRON, new Item.Properties().stacksTo(1), ID, OFFSET, DAMAGE_DEFAULT, 15, ModSounds.SHOT6, 0.25f, 10); + super(Tiers.IRON, new Item.Properties().stacksTo(1)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 15; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT6.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.25f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Megashark.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Megashark.java index c47b238..01d900a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Megashark.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Megashark.java @@ -1,22 +1,56 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class Megashark extends Gun { public static final String ID = "megashark"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); public static final float DAMAGE_DEFAULT = 3.0f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final float AMMO_NOT_CONSUME_CHANCE_DEFAULT = 0.5f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT, AMMO_NOT_CONSUME_CHANCE_DEFAULT); + public static final ConfigFloat AMMO_NOT_CONSUME_CHANCE = createAmmoNotConsumeChanceConfig(ID, AMMO_NOT_CONSUME_CHANCE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE, AMMO_NOT_CONSUME_CHANCE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public Megashark() { - super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON), ID, OFFSET, DAMAGE_DEFAULT, AMMO_NOT_CONSUME_CHANCE_DEFAULT, 7, ModSounds.SHOT2, 0.1f, 5); + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 7; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT2.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.1f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 5; + } + + @Override + protected float getAmmoNotConsumeChance(ItemStack stack, LivingEntity entity) { + return AMMO_NOT_CONSUME_CHANCE.get(); } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Minishark.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Minishark.java index 08530b0..9c1003b 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Minishark.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Minishark.java @@ -1,22 +1,56 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class Minishark extends Gun { public static final String ID = "minishark"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); public static final float DAMAGE_DEFAULT = 1.0f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final float AMMO_NOT_CONSUME_CHANCE_DEFAULT = 0.33f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT, AMMO_NOT_CONSUME_CHANCE_DEFAULT); + public static final ConfigFloat AMMO_NOT_CONSUME_CHANCE = createAmmoNotConsumeChanceConfig(ID, AMMO_NOT_CONSUME_CHANCE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE, AMMO_NOT_CONSUME_CHANCE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public Minishark() { - super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.COMMON), ID, OFFSET, DAMAGE_DEFAULT, AMMO_NOT_CONSUME_CHANCE_DEFAULT, 8, ModSounds.SHOT2, 0.1f, 5); + super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 8; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT2.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.1f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 5; + } + + @Override + protected float getAmmoNotConsumeChance(ItemStack stack, LivingEntity entity) { + return AMMO_NOT_CONSUME_CHANCE.get(); } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Musket.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Musket.java index 2a16ec0..159c780 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Musket.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Musket.java @@ -1,20 +1,48 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class Musket extends Gun { public static final String ID = "musket"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 3.5f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public Musket() { - super(Tiers.IRON, new Item.Properties().stacksTo(1), ID, OFFSET, DAMAGE_DEFAULT, 32, ModSounds.SHOT3, 1.0f, 10); + super(Tiers.IRON, new Item.Properties().stacksTo(1)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 32; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT3.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 1.0f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/PhoenixBlaster.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/PhoenixBlaster.java index 503e38e..ec5bfea 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/PhoenixBlaster.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/PhoenixBlaster.java @@ -1,20 +1,48 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class PhoenixBlaster extends Gun { public static final String ID = "phoenix_blaster"; public static final Vector3f OFFSET = new Vector3f(-0.3f, 0, 1.5f); public static final float DAMAGE_DEFAULT = 5.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public PhoenixBlaster() { - super(Tiers.DIAMOND, new Item.Properties().stacksTo(1), ID, OFFSET, DAMAGE_DEFAULT, 14, ModSounds.SHOT6, 0.25f, 10); + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 14; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT6.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.25f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/QuadBarrelShotgun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/QuadBarrelShotgun.java index f43a6dd..ddac790 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/QuadBarrelShotgun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/QuadBarrelShotgun.java @@ -1,71 +1,61 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; -import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.MathUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; - public class QuadBarrelShotgun extends Gun { public static final String ID = "quad_barrel_shotgun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 2.5f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final int PROJECTILE_COUNT = 4; public static final float MAX_SPREAD_DEGREES = 12.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public QuadBarrelShotgun() { - super(Tiers.IRON, new Item.Properties().stacksTo(1), ID, OFFSET, DAMAGE_DEFAULT, 55, ModSounds.SHOT5, 1.5f, 10); + super(Tiers.IRON, new Item.Properties().stacksTo(1)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 55; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT5.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 1.4f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT5.get()); - if(level.isClientSide()) return; - - float spreadDegrees = getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); - for(int i = 0; i < PROJECTILE_COUNT; i++) { - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - applySpread(player, summon, spreadDegrees); - - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 1.4f); - customData.putInt("invulnerableTime", 10); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - level.addFreshEntity(summon); - } + protected int getProjectileCount(ItemStack stack, Player player) { + return PROJECTILE_COUNT; } - - private static void applySpread(Player player, StaticSummon summon, float spreadDegrees) { - Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - Vec3 forward = MathUtil.toVec3(dirs[0]).normalize(); - Vec3 up = MathUtil.toVec3(dirs[1]).normalize(); - Vec3 right = MathUtil.toVec3(dirs[2]).normalize(); - - double yaw = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - double pitch = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - Vec3 spreadDir = forward - .add(right.scale(Math.tan(yaw))) - .add(up.scale(Math.tan(pitch))) - .normalize(); - - float[] xyRot = MathUtil.computeXYRot(spreadDir.toVector3f()); - summon.setXRot(xyRot[0]); - summon.xRotO = xyRot[0]; - summon.setYRot(xyRot[1]); - summon.yRotO = xyRot[1]; + @Override + protected float getSpreadDegrees(ItemStack stack, Player player, int index) { + return getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/RedRyder.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/RedRyder.java index 9afbfa6..de297b6 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/RedRyder.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/RedRyder.java @@ -1,20 +1,48 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class RedRyder extends Gun { public static final String ID = "red_ryder"; - public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); - public static final float DAMAGE_DEFAULT = 3.5f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); + public static final float DAMAGE_DEFAULT = 1.5f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public RedRyder() { - super(Tiers.IRON, new Item.Properties().stacksTo(1), ID, OFFSET, DAMAGE_DEFAULT, 38, ModSounds.SHOT2, 1.0f, 10); + super(Tiers.IRON, new Item.Properties().stacksTo(1)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 38; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT2.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 1.0f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Revolver.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Revolver.java index f56c286..e5d4f86 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Revolver.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Revolver.java @@ -1,20 +1,48 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class Revolver extends Gun { public static final String ID = "revolver"; - public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); - public static final float DAMAGE_DEFAULT = 2.5f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final Vector3f OFFSET = new Vector3f(-0.3f, 0, 1.5f); + public static final float DAMAGE_DEFAULT = 4.0f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public Revolver() { - super(Tiers.IRON, new Item.Properties().stacksTo(1), ID, OFFSET, DAMAGE_DEFAULT, 22, ModSounds.SHOT6, 0.8f, 10); + super(Tiers.IRON, new Item.Properties().stacksTo(1)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 22; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT6.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.8f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SDMG.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SDMG.java index ff0636e..1e3a012 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SDMG.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SDMG.java @@ -1,22 +1,56 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class SDMG extends Gun { public static final String ID = "sdmg"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); public static final float DAMAGE_DEFAULT = 10.0f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final float AMMO_NOT_CONSUME_CHANCE_DEFAULT = 0.66f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT, AMMO_NOT_CONSUME_CHANCE_DEFAULT); + public static final ConfigFloat AMMO_NOT_CONSUME_CHANCE = createAmmoNotConsumeChanceConfig(ID, AMMO_NOT_CONSUME_CHANCE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE, AMMO_NOT_CONSUME_CHANCE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public SDMG() { - super(Tiers.NETHERITE, new Item.Properties().stacksTo(1).fireResistant().rarity(Rarity.EPIC), ID, OFFSET, DAMAGE_DEFAULT, AMMO_NOT_CONSUME_CHANCE_DEFAULT, 5, ModSounds.SHOT, 0.1f, 5); + super(Tiers.NETHERITE, new Item.Properties().stacksTo(1).fireResistant().rarity(Rarity.EPIC)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 5; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.1f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 5; + } + + @Override + protected float getAmmoNotConsumeChance(ItemStack stack, LivingEntity entity) { + return AMMO_NOT_CONSUME_CHANCE.get(); } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Shotgun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Shotgun.java index e76359d..26d9ce6 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Shotgun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Shotgun.java @@ -1,65 +1,63 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; -import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.MathUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; - public class Shotgun extends Gun { public static final String ID = "shotgun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 4.0f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final int MIN_PROJECTILE_COUNT = 4; public static final int MAX_PROJECTILE_COUNT = 5; public static final float MAX_SPREAD_DEGREES = 10.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public Shotgun() { - super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.COMMON), ID, OFFSET, DAMAGE_DEFAULT, 45, ModSounds.SHOT5, 1.25f, 10); + super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 45; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT5.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 1.25f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT5.get()); - if(level.isClientSide()) return; - - int projectileCount = MIN_PROJECTILE_COUNT + player.getRandom().nextInt(MAX_PROJECTILE_COUNT - MIN_PROJECTILE_COUNT + 1); - float spreadDegrees = getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); - for(int i = 0;i < projectileCount;i++) { - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - Vec3 forward = MathUtil.toVec3(dirs[0]).normalize(); - Vec3 up = MathUtil.toVec3(dirs[1]).normalize(); - Vec3 right = MathUtil.toVec3(dirs[2]).normalize(); - double yaw = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - double pitch = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - Vec3 spreadDir = forward.add(right.scale(Math.tan(yaw))).add(up.scale(Math.tan(pitch))).normalize(); - float[] xyRot = MathUtil.computeXYRot(spreadDir.toVector3f()); - summon.setXRot(xyRot[0]); - summon.xRotO = xyRot[0]; - summon.setYRot(xyRot[1]); - summon.yRotO = xyRot[1]; - - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 1.25f); - customData.putInt("invulnerableTime", 10); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - level.addFreshEntity(summon); - } + protected int getProjectileCount(ItemStack stack, Player player) { + return MIN_PROJECTILE_COUNT + player.getRandom().nextInt(MAX_PROJECTILE_COUNT - MIN_PROJECTILE_COUNT + 1); + } + @Override + protected float getSpreadDegrees(ItemStack stack, Player player, int index) { + return getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java index c043c7a..6b0844a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/SniperRifle.java @@ -1,17 +1,16 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; import com.lzxnone.terraria.ModSounds; -import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.ModItems; -import com.lzxnone.terraria.item.weapon.RangedWeapon; import com.lzxnone.terraria.item.effect.ScopeZoomModifier; +import com.lzxnone.terraria.item.weapon.RangedWeapon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; import com.lzxnone.terraria.ui.config.struct.ConfigDouble; -import com.lzxnone.terraria.ui.config.struct.ConfigStruct; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; @@ -19,13 +18,17 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import org.joml.Vector3f; +import java.util.List; + public class SniperRifle extends Gun implements ScopeZoomModifier { public static final String ID = "sniper_rifle"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 35.0f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final double MAX_ZOOM = 10.0D; public static final ConfigDouble ZOOM_SCROLL_SPEED = new ConfigDouble( @@ -36,19 +39,11 @@ public class SniperRifle extends Gun implements ScopeZoomModifier { 10.0D ); - public static final IConfigData CONFIG_DATA = new IConfigData() { - @Override - public void onConfigLoad() { - ConfigStruct.loadAll( - createDamageConfig(ID, DAMAGE_DEFAULT), - ZOOM_SCROLL_SPEED - ); - } - }; + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE, ZOOM_SCROLL_SPEED); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); public SniperRifle() { - super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON), ID, OFFSET, DAMAGE_DEFAULT, 36, ModSounds.SHOT, 2.0f, 20); + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); } public static double getZoomScrollSpeed() { @@ -61,21 +56,51 @@ public class SniperRifle extends Gun implements ScopeZoomModifier { } @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT.get()); - if(level.isClientSide()) return; + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - ItemStack ammoStack = RangedWeapon.getAmmoStack(stack); + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 36; + } + + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT.get(); + } + + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 2.0f; + } + + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 20; + } + + @Override + protected ItemStack getBulletAmmoStack(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + ItemStack ammoStack = RangedWeapon.getAmmoStack(weaponStack); if(ammoStack.is(ModItems.MUSKET_BALL.get()) || ammoStack.is(ModItems.TUNGSTEN_BULLET.get()) || ammoStack.is(ModItems.ENDLESS_MUSKET_POUCH.get())) { - AmmoUtil.setHighVelocityBullet(summon); + return ModItems.HIGH_VELOCITY_BULLET.get().getDefaultInstance(); } + return ammoStack; + } - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 2.0f); - customData.putInt("invulnerableTime", 20); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - level.addFreshEntity(summon); + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, + List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.sniper_rifle" + ).withStyle(ChatFormatting.GRAY)); } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TacticalShotgun.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TacticalShotgun.java index c801b79..b26d977 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TacticalShotgun.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TacticalShotgun.java @@ -1,63 +1,62 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; -import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.MathUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; - public class TacticalShotgun extends Gun { public static final String ID = "tactical_shotgun"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.1f, 1.5f); public static final float DAMAGE_DEFAULT = 6.0f; + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); public static final int PROJECTILE_COUNT = 6; public static final float MAX_SPREAD_DEGREES = 8.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public TacticalShotgun() { - super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON), ID, OFFSET, DAMAGE_DEFAULT, 34, ModSounds.SHOT8, 1.5f, 10); + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 34; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT8.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 1.5f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT8.get()); - if(level.isClientSide()) return; - - float spreadDegrees = getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); - for(int i = 0;i < PROJECTILE_COUNT;i++) { - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); - Vec3 forward = MathUtil.toVec3(dirs[0]).normalize(); - Vec3 up = MathUtil.toVec3(dirs[1]).normalize(); - Vec3 right = MathUtil.toVec3(dirs[2]).normalize(); - double yaw = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - double pitch = Math.toRadians((player.getRandom().nextFloat() * 2.0f - 1.0f) * spreadDegrees); - Vec3 spreadDir = forward.add(right.scale(Math.tan(yaw))).add(up.scale(Math.tan(pitch))).normalize(); - float[] xyRot = MathUtil.computeXYRot(spreadDir.toVector3f()); - summon.setXRot(xyRot[0]); - summon.xRotO = xyRot[0]; - summon.setYRot(xyRot[1]); - summon.yRotO = xyRot[1]; - - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 1.5f); - customData.putInt("invulnerableTime", 10); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - level.addFreshEntity(summon); - } + protected int getProjectileCount(ItemStack stack, Player player) { + return PROJECTILE_COUNT; + } + @Override + protected float getSpreadDegrees(ItemStack stack, Player player, int index) { + return getFinalSpreadDegrees(MAX_SPREAD_DEGREES, stack, player); } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TheUndertaker.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TheUndertaker.java index 3dfdc7f..2d0af9a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TheUndertaker.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/TheUndertaker.java @@ -1,20 +1,48 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Tiers; import org.joml.Vector3f; - public class TheUndertaker extends Gun { public static final String ID = "the_undertaker"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 3.5f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public TheUndertaker() { - super(Tiers.IRON, new Item.Properties().stacksTo(1), ID, OFFSET, DAMAGE_DEFAULT, 20, ModSounds.SHOT2, 0.5f, 10); + super(Tiers.IRON, new Item.Properties().stacksTo(1)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 20; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT2.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.5f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 10; } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java index 48a6553..5439cc7 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/Uzi.java @@ -1,15 +1,14 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.RangedWeapon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -17,34 +16,48 @@ import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; import org.joml.Vector3f; - public class Uzi extends Gun { public static final String ID = "uzi"; public static final Vector3f OFFSET = new Vector3f(-0.3f, 0, 1.5f); public static final float DAMAGE_DEFAULT = 3.5f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public Uzi() { - super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON), ID, OFFSET, DAMAGE_DEFAULT, 9, ModSounds.SHOT2, 0.1f, 5); + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 9; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT2.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.1f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 5; } @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT2.get()); - if(level.isClientSide()) return; - - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - ItemStack ammoStack = RangedWeapon.getAmmoStack(stack); + protected ItemStack getBulletAmmoStack(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + ItemStack ammoStack = RangedWeapon.getAmmoStack(weaponStack); if(ammoStack.is(ModItems.MUSKET_BALL.get()) || ammoStack.is(ModItems.TUNGSTEN_BULLET.get()) || ammoStack.is(ModItems.ENDLESS_MUSKET_POUCH.get())) { - AmmoUtil.setHighVelocityBullet(summon); + return ModItems.HIGH_VELOCITY_BULLET.get().getDefaultInstance(); } - - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 0.1f); - customData.putInt("invulnerableTime", 5); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - level.addFreshEntity(summon); + return ammoStack; } } + diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java index 483105f..29d3825 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/gun/VenusMagnum.java @@ -1,15 +1,14 @@ package com.lzxnone.terraria.item.weapon.ranged.gun; - import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.RangedWeapon; import com.lzxnone.terraria.ui.config.ConfigListItem; import com.lzxnone.terraria.ui.config.IConfigData; -import com.lzxnone.terraria.utils.AmmoUtil; -import com.lzxnone.terraria.utils.SoundUtil; -import net.minecraft.nbt.CompoundTag; +import com.lzxnone.terraria.ui.config.struct.ConfigFloat; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -17,34 +16,48 @@ import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Tiers; import net.minecraft.world.level.Level; import org.joml.Vector3f; - public class VenusMagnum extends Gun { public static final String ID = "venus_magnum"; public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.05f, 1.5f); public static final float DAMAGE_DEFAULT = 5.0f; - public static final IConfigData CONFIG_DATA = createConfigData(ID, DAMAGE_DEFAULT); + public static final ConfigFloat DAMAGE = createDamageConfig(ID, DAMAGE_DEFAULT); + public static final IConfigData CONFIG_DATA = createConfigData(DAMAGE); public static final ConfigListItem CONFIG_LIST_ITEM = createConfigListItem(ID, CONFIG_DATA); - public VenusMagnum() { - super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), ID, OFFSET, DAMAGE_DEFAULT, 9, ModSounds.SHOT6, 0.1f, 5); + super(Tiers.DIAMOND, new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); + } + @Override + protected Vector3f getOffset(ItemStack stack, Player player) { + return OFFSET; + } + @Override + protected float getDamage(ItemStack stack, Player player) { + return DAMAGE.get(); + } + @Override + public int getUseTime(ItemStack stack, LivingEntity entity) { + return 9; + } + @Override + protected SoundEvent getShootSound(ItemStack stack, Player player) { + return ModSounds.SHOT6.get(); + } + @Override + protected float getKnockbackScale(ItemStack stack, Player player) { + return 0.1f; + } + @Override + protected int getInvulnerableTime(ItemStack stack, Player player) { + return 5; } @Override - protected void shoot(Level level, Player player, InteractionHand hand, ItemStack stack) { - SoundUtil.playClientSound(player, ModSounds.SHOT6.get()); - if(level.isClientSide()) return; - - StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, hand, stack, OFFSET); - ItemStack ammoStack = RangedWeapon.getAmmoStack(stack); + protected ItemStack getBulletAmmoStack(Level level, Player player, InteractionHand hand, ItemStack weaponStack) { + ItemStack ammoStack = RangedWeapon.getAmmoStack(weaponStack); if(ammoStack.is(ModItems.MUSKET_BALL.get()) || ammoStack.is(ModItems.TUNGSTEN_BULLET.get()) || ammoStack.is(ModItems.ENDLESS_MUSKET_POUCH.get())) { - AmmoUtil.setHighVelocityBullet(summon); + return ModItems.HIGH_VELOCITY_BULLET.get().getDefaultInstance(); } - - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - customData.putFloat("damage", getDamage()); - customData.putFloat("knockbackScale", 0.1f); - customData.putInt("invulnerableTime", 5); - summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); - level.addFreshEntity(summon); + return ammoStack; } } + diff --git a/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java b/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java index 2ae10b9..8cbde8b 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java @@ -2,6 +2,7 @@ package com.lzxnone.terraria.mixin; import com.lzxnone.terraria.client.config.RenderConfigs; import com.lzxnone.terraria.item.weapon.RangedWeapon; +import com.lzxnone.terraria.item.weapon.ranged.bow.Bow; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.world.InteractionHand; @@ -32,10 +33,12 @@ public abstract class HumanoidModelMixin { : player.getMainArm().getOpposite(); if(player.getUseItem().getItem() instanceof RangedWeapon) { - if(usedArm == HumanoidArm.RIGHT) { - this.rightArm.xRot = (float) Math.toRadians(player.getXRot() - 90); - }else { - this.leftArm.xRot = (float) Math.toRadians(player.getXRot() - 90); + if(!(player.getUseItem().getItem() instanceof Bow)) { + if(usedArm == HumanoidArm.RIGHT) { + this.rightArm.xRot = (float) Math.toRadians(player.getXRot() - 90); + }else { + 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 08ff8a1..fdf22b5 100644 --- a/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java +++ b/src/main/java/com/lzxnone/terraria/ui/config/ConfigList.java @@ -121,6 +121,7 @@ import com.lzxnone.terraria.item.weapon.ranged.Flamethrower; import com.lzxnone.terraria.item.weapon.ranged.SnowballCannon; import com.lzxnone.terraria.item.weapon.ranged.StarCannon; import com.lzxnone.terraria.item.weapon.ranged.SuperStarShooter; +import com.lzxnone.terraria.item.weapon.ranged.bow.DaedalusStormbow; import com.lzxnone.terraria.item.weapon.ranged.gun.*; import com.lzxnone.terraria.item.weapon.summon.minion.StardustDragonStaff; import com.lzxnone.terraria.item.weapon.summon.minion.Terraprisma; @@ -192,7 +193,8 @@ public class ConfigList { StarCannon.CONFIG_LIST_ITEM, SuperStarShooter.CONFIG_LIST_ITEM, Flamethrower.CONFIG_LIST_ITEM, - ElfMelter.CONFIG_LIST_ITEM + ElfMelter.CONFIG_LIST_ITEM, + DaedalusStormbow.CONFIG_LIST_ITEM }); ITEMS.put(EFFECT, new ConfigListItem[]{ BloodButcheredEffect.CONFIG_LIST_ITEM, @@ -222,7 +224,8 @@ public class ConfigList { ExplodingBullet.CONFIG_LIST_ITEM, GoldenBullet.CONFIG_LIST_ITEM, LuminiteBullet.CONFIG_LIST_ITEM, - TungstenBullet.CONFIG_LIST_ITEM + TungstenBullet.CONFIG_LIST_ITEM, + WoodenArrow.CONFIG_LIST_ITEM }); ITEMS.put(ACCESSORY, new ConfigListItem[]{ NaturesGift.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 a8fdb6a..ca68103 100644 --- a/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java @@ -5,6 +5,7 @@ import com.lzxnone.terraria.entity.summon.StaticSummon; import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.weapon.RangedWeapon; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; @@ -19,6 +20,11 @@ public class AmmoUtil { public static final Vector3f OFFSET = new Vector3f(-0.3f, -0.15f, 1.5f); public static StaticSummon createAmmoSummon(Level level, Player player, InteractionHand hand, ItemStack stack, Vector3f offset) { + return createAmmoSummon(level, player, hand, stack, RangedWeapon.getAmmoStack(stack), offset); + } + + public static StaticSummon createAmmoSummon(Level level, Player player, InteractionHand hand, ItemStack stack, + ItemStack ammoStack, Vector3f offset) { Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); Vec3 eyePos = player.getEyePosition(); offset = getOffset(hand, offset); @@ -40,7 +46,7 @@ public class AmmoUtil { summon.yRotO = xyRot[1]; summon.noPhysics = true; - ResourceLocation ammoId = RangedWeapon.getAmmo(stack); + ResourceLocation ammoId = BuiltInRegistries.ITEM.getKey(ammoStack.getItem()); String ammo = ammoId == null ? "" : ammoId.toString(); if(ammo.equals("lzxnoneterraria:musket_ball")) setMusketBall(summon); else if(ammo.equals("lzxnoneterraria:silver_bullet")) setSilverBullet(summon); @@ -58,6 +64,7 @@ public class AmmoUtil { 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); + else if(ammo.equals("lzxnoneterraria:wooden_arrow")) setWoodenArrow(summon); else if(ammo.equals("minecraft:snowball")) setSnowball(summon); else if(ammo.equals("lzxnoneterraria:fallen_star")) setFallenStar(summon); else if(ammo.equals("minecraft:slime_ball")) setSlimeBall(summon); @@ -253,6 +260,17 @@ public class AmmoUtil { summon.setNoGravity(true); } + public static void setWoodenArrow(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.WOODEN_ARROW); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.WOODEN_ARROW.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 0.5f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 1.0f); + summon.setNoGravity(true); + } + public static void setSnowball(StaticSummon summon) { summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.SNOWBALL); summon.getEntityData().set(StaticSummon.RENDER_MODE, "item"); diff --git a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java index ee81f42..4e7a130 100644 --- a/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/DamageUtil.java @@ -1,8 +1,6 @@ package com.lzxnone.terraria.utils; import com.lzxnone.terraria.damage.ModDamageTypes; -import com.lzxnone.terraria.effect.IchorEffect; -import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.entity.beam.SwordBeam; import com.lzxnone.terraria.entity.projectile.StaticProjectile; import com.lzxnone.terraria.entity.summon.BeeSummon; @@ -21,6 +19,7 @@ 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.EnchantmentHelper; +import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.phys.Vec3; import java.util.Objects; @@ -102,15 +101,13 @@ public class DamageUtil { finalDamage = MagicWeapon.applyMagicDamageBonus(itemSource, player, finalDamage); }else if(category == DamageCategory.RANGED && !itemSource.isEmpty()) { finalDamage = RangedWeapon.applyRangedDamageBonus(itemSource, player, finalDamage); + knockbackLevel += Weapon.getEnchantmentLevel(player, itemSource, Enchantments.PUNCH); }else if(category == DamageCategory.MINION && !itemSource.isEmpty()) { finalDamage = SummonWeapon.applySummonDamageBonus(itemSource, player, finalDamage); knockbackLevel = MinionWeapon.applyMinionKnockback(player, knockbackLevel); }else if(category == DamageCategory.SENTRY && !itemSource.isEmpty()) { finalDamage = SummonWeapon.applySummonDamageBonus(itemSource, player, finalDamage); } - if(category != DamageCategory.REAL) { - finalDamage = applyTargetDamageEffects(target, finalDamage); - } finalDamage = Math.max(0.0F, finalDamage); //近战暴击(月光护身符等饰品的近战暴击率,触发后伤害提升 1.5 倍) @@ -169,17 +166,6 @@ public class DamageUtil { return Math.max(0.0F, finalDamage); } - private static float applyTargetDamageEffects(Entity target, float damage) { - if(!(target instanceof LivingEntity livingTarget)) return damage; - - float finalDamage = damage; - if(livingTarget.hasEffect(ModEffects.ICHOR) && livingTarget.getEffect(ModEffects.ICHOR) != null) { - int amplifier = Objects.requireNonNull(livingTarget.getEffect(ModEffects.ICHOR)).getAmplifier(); - finalDamage *= 1.0f + IchorEffect.getDamageBonusPerLevel() * (amplifier + 1); - } - return Math.max(0.0F, finalDamage); - } - 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 66c5380..aefc322 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -68,7 +68,9 @@ "item.lzxnoneterraria.super_star_shooter": "Super Star Shooter", "item.lzxnoneterraria.flamethrower": "Flamethrower", "item.lzxnoneterraria.elf_melter": "Elf Melter", + "item.lzxnoneterraria.daedalus_stormbow": "Daedalus Stormbow", "item.lzxnoneterraria.musket_ball": "Musket Ball", + "item.lzxnoneterraria.wooden_arrow": "Wooden Arrow", "item.lzxnoneterraria.meteor_shot": "Meteor Shot", "item.lzxnoneterraria.silver_bullet": "Silver Bullet", "item.lzxnoneterraria.crystal_bullet": "Crystal Bullet", @@ -290,7 +292,6 @@ "tooltip.lzxnoneterraria.mining_speed_bonus": "Mining Speed +%s%%", "tooltip.lzxnoneterraria.move_speed_bonus": "Movement Speed +%s%%", "tooltip.lzxnoneterraria.water_breathing": "Breathe underwater", - "tooltip.lzxnoneterraria.rifle_scope": "Scroll wheel adjusts zoom while using firearms", "tooltip.lzxnoneterraria.jump_boost": "Slightly increases jump height and speed", "tooltip.lzxnoneterraria.knockback_resistance_bonus": "Knockback Resistance +%s%%", "tooltip.lzxnoneterraria.defense_bonus": "Defense +%s", @@ -356,6 +357,9 @@ "tooltip.lzxnoneterraria.ranged_damage_increase": "+%s%% ranged damage", "tooltip.lzxnoneterraria.ranged_damage_decrease": "-%s%% ranged damage", + "tooltip.lzxnoneterraria.rifle_scope": "Scroll wheel adjusts zoom while using firearms", + "tooltip.lzxnoneterraria.spread_ranged_weapon": "Standing still or sneaking reduces spread", + "tooltip.lzxnoneterraria.sniper_rifle": "Scroll wheel adjusts zoom", "lzxnoneterraria.configuration.ranged_damage_multiplier": "Ranged Damage Multiplier", "lzxnoneterraria.configuration.ranged_damage_multiplier.tooltip": "Ranged damage is multiplied by this value while equipped", @@ -438,6 +442,7 @@ "jei.lzxnoneterraria.info.summoner_emblem": "Obtained by defeating the Wither.", "jei.lzxnoneterraria.info.ranger_emblem": "Obtained by defeating the Wither.", "jei.lzxnoneterraria.info.sorcerer_emblem": "Obtained by defeating the Wither.", + "jei.lzxnoneterraria.info.daedalus_stormbow": "Can be obtained by defeating the Ender Dragon.", "entity.lzxnoneterraria.static_projectile": "Projectile", "entity.lzxnoneterraria.static_summon": "Summon", @@ -516,8 +521,8 @@ "lzxnoneterraria.configuration.demonic_flames_damage_per_level.tooltip": "Damage dealt per effect level", "lzxnoneterraria.configuration.cursed_inferno_damage_per_level": "Damage Per Level", "lzxnoneterraria.configuration.cursed_inferno_damage_per_level.tooltip": "Cursed Inferno checks damage once per second; damage dealt per effect level", - "lzxnoneterraria.configuration.ichor_damage_bonus_per_level": "Damage Bonus Per Level", - "lzxnoneterraria.configuration.ichor_damage_bonus_per_level.tooltip": "Extra damage taken per Ichor level on the target; default 0.15 means 15%", + "lzxnoneterraria.configuration.ichor_armor_reduction_per_level": "Armor Reduction Per Level", + "lzxnoneterraria.configuration.ichor_armor_reduction_per_level.tooltip": "Armor reduced per Ichor level on the target", "lzxnoneterraria.configuration.acid_venom_damage_per_level": "Damage Per Level", "lzxnoneterraria.configuration.acid_venom_damage_per_level.tooltip": "Acid Venom checks damage once per second; damage dealt per effect level", "lzxnoneterraria.configuration.midas_drop_chance": "Emerald Drop Chance", @@ -914,6 +919,12 @@ "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.wooden_arrow_base_damage": "Base Damage", + "lzxnoneterraria.configuration.wooden_arrow_base_damage.tooltip": "Base damage provided by the ammo", + "lzxnoneterraria.configuration.wooden_arrow_speed": "Speed", + "lzxnoneterraria.configuration.wooden_arrow_speed.tooltip": "Ammo movement speed per tick", + "lzxnoneterraria.configuration.wooden_arrow_gravity": "Gravity", + "lzxnoneterraria.configuration.wooden_arrow_gravity.tooltip": "Downward acceleration applied each tick", "lzxnoneterraria.configuration.luminite_bullet_base_damage": "Base Damage", "lzxnoneterraria.configuration.luminite_bullet_base_damage.tooltip": "Base damage provided by the ammo", "lzxnoneterraria.configuration.luminite_bullet_speed": "Speed", @@ -1002,6 +1013,8 @@ "lzxnoneterraria.configuration.elf_melter_range.tooltip": "Frost stream travel range", "lzxnoneterraria.configuration.elf_melter_freeze_ticks": "Freeze Duration", "lzxnoneterraria.configuration.elf_melter_freeze_ticks.tooltip": "Frozen time applied on hit, in ticks", + "lzxnoneterraria.configuration.daedalus_stormbow_damage": "Damage", + "lzxnoneterraria.configuration.daedalus_stormbow_damage.tooltip": "Damage per hit", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "Kill Mode Duration", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "Kill Mode duration in ticks", "lzxnoneterraria.configuration.devils_devastation_kill_mode_cooldown_time": "Kill Mode Cooldown", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index e7554bf..b8c9dc1 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -68,7 +68,9 @@ "item.lzxnoneterraria.super_star_shooter": "超级星星炮", "item.lzxnoneterraria.flamethrower": "火焰喷射器", "item.lzxnoneterraria.elf_melter": "精灵熔枪", + "item.lzxnoneterraria.daedalus_stormbow": "代达罗斯风暴弓", "item.lzxnoneterraria.musket_ball": "火枪子弹", + "item.lzxnoneterraria.wooden_arrow": "木箭", "item.lzxnoneterraria.meteor_shot": "流星弹", "item.lzxnoneterraria.silver_bullet": "银子弹", "item.lzxnoneterraria.crystal_bullet": "水晶子弹", @@ -290,7 +292,6 @@ "tooltip.lzxnoneterraria.mining_speed_bonus": "挖掘速度 +%s%%", "tooltip.lzxnoneterraria.move_speed_bonus": "移动速度 +%s%%", "tooltip.lzxnoneterraria.water_breathing": "水下呼吸", - "tooltip.lzxnoneterraria.rifle_scope": "使用枪械时,滚轮可以调节放大倍率", "tooltip.lzxnoneterraria.jump_boost": "略微增加跳跃高度和跳跃速度", "tooltip.lzxnoneterraria.knockback_resistance_bonus": "抗性击退 +%s%%", "tooltip.lzxnoneterraria.defense_bonus": "护甲值 +%s", @@ -356,6 +357,9 @@ "tooltip.lzxnoneterraria.ranged_damage_increase": "远程伤害 +%s%%", "tooltip.lzxnoneterraria.ranged_damage_decrease": "远程伤害 -%s%%", + "tooltip.lzxnoneterraria.rifle_scope": "使用枪械时,滚轮可以调节放大倍率", + "tooltip.lzxnoneterraria.spread_ranged_weapon": "静止或者潜行可以减低散射幅度", + "tooltip.lzxnoneterraria.sniper_rifle": "滚轮可以调节放大倍率", "lzxnoneterraria.configuration.ranged_damage_multiplier": "远程伤害倍率", "lzxnoneterraria.configuration.ranged_damage_multiplier.tooltip": "佩戴后远程伤害乘以该倍率", @@ -438,6 +442,7 @@ "jei.lzxnoneterraria.info.summoner_emblem": "通过击杀凋零获取。", "jei.lzxnoneterraria.info.ranger_emblem": "通过击杀凋零获取。", "jei.lzxnoneterraria.info.sorcerer_emblem": "通过击杀凋零获取。", + "jei.lzxnoneterraria.info.daedalus_stormbow": "可以通过击杀末影龙获得。", "entity.lzxnoneterraria.static_projectile": "弹射物", "entity.lzxnoneterraria.static_summon": "召唤物", @@ -516,8 +521,8 @@ "lzxnoneterraria.configuration.demonic_flames_damage_per_level.tooltip": "每级造成的伤害", "lzxnoneterraria.configuration.cursed_inferno_damage_per_level": "每级伤害", "lzxnoneterraria.configuration.cursed_inferno_damage_per_level.tooltip": "诅咒狱火每秒进行一次伤害判定,每级造成的伤害", - "lzxnoneterraria.configuration.ichor_damage_bonus_per_level": "每级增伤", - "lzxnoneterraria.configuration.ichor_damage_bonus_per_level.tooltip": "目标拥有灵液效果时,每级额外受到的伤害比例,默认 0.15 表示 15%", + "lzxnoneterraria.configuration.ichor_armor_reduction_per_level": "每级护甲降低", + "lzxnoneterraria.configuration.ichor_armor_reduction_per_level.tooltip": "目标拥有灵液效果时,每级降低的护甲值", "lzxnoneterraria.configuration.acid_venom_damage_per_level": "每级伤害", "lzxnoneterraria.configuration.acid_venom_damage_per_level.tooltip": "酸性毒液每秒进行一次伤害判定,每级造成的伤害", "lzxnoneterraria.configuration.midas_drop_chance": "绿宝石掉落概率", @@ -914,6 +919,12 @@ "lzxnoneterraria.configuration.tungsten_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.tungsten_bullet_speed": "速度", "lzxnoneterraria.configuration.tungsten_bullet_speed.tooltip": "子弹每刻移动速度", + "lzxnoneterraria.configuration.wooden_arrow_base_damage": "基础伤害", + "lzxnoneterraria.configuration.wooden_arrow_base_damage.tooltip": "弹药自身提供的基础伤害", + "lzxnoneterraria.configuration.wooden_arrow_speed": "速度", + "lzxnoneterraria.configuration.wooden_arrow_speed.tooltip": "弹药每刻移动速度", + "lzxnoneterraria.configuration.wooden_arrow_gravity": "重力", + "lzxnoneterraria.configuration.wooden_arrow_gravity.tooltip": "每刻向下施加的加速度", "lzxnoneterraria.configuration.luminite_bullet_base_damage": "基础伤害", "lzxnoneterraria.configuration.luminite_bullet_base_damage.tooltip": "子弹自身提供的基础伤害", "lzxnoneterraria.configuration.luminite_bullet_speed": "速度", @@ -1002,6 +1013,8 @@ "lzxnoneterraria.configuration.elf_melter_range.tooltip": "冰霜流飞行距离", "lzxnoneterraria.configuration.elf_melter_freeze_ticks": "冻结时间", "lzxnoneterraria.configuration.elf_melter_freeze_ticks.tooltip": "命中后施加的冻结时间(刻)", + "lzxnoneterraria.configuration.daedalus_stormbow_damage": "伤害", + "lzxnoneterraria.configuration.daedalus_stormbow_damage.tooltip": "每次命中伤害", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time": "杀戮模式持续时间", "lzxnoneterraria.configuration.devils_devastation_kill_mode_time.tooltip": "杀戮模式持续时间(刻)", "lzxnoneterraria.configuration.devils_devastation_kill_mode_cooldown_time": "杀戮模式冷却时间", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/bow.json b/src/main/resources/assets/lzxnoneterraria/models/item/bow.json new file mode 100644 index 0000000..b43d6de --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/bow.json @@ -0,0 +1,45 @@ +{ + "parent": "item/handheld", + "display": { + "gui": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 1.0, 1.0 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 2.0, 0 ], + "scale": [ 0.5, 1.0, 0.5 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 13.0, 7.0 ], + "scale": [ 1, 2, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.5, 1, 1 ] + }, + "thirdperson_righthand": { + "rotation": [0, 90, 0], + "translation": [0, 0, -1], + "scale": [0.85, 1.7, 0.85] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [0, 0, -1], + "scale": [0.85, 1.7, 0.85] + }, + "firstperson_righthand": { + "rotation": [0, 90, 0], + "translation": [1.13, 4.2, 0.0], + "scale": [0.68, 1.36, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [1.13, 4.2, 0.0], + "scale": [0.68, 1.36, 0.68] + } + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/daedalus_stormbow.json b/src/main/resources/assets/lzxnoneterraria/models/item/daedalus_stormbow.json new file mode 100644 index 0000000..3ac9307 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/daedalus_stormbow.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/bow", + "textures": { + "layer0": "lzxnoneterraria:item/daedalus_stormbow" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/wooden_arrow.json b/src/main/resources/assets/lzxnoneterraria/models/item/wooden_arrow.json new file mode 100644 index 0000000..3937ed7 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/wooden_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item2", + "textures": { + "layer0": "lzxnoneterraria:item/wooden_arrow" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index c4537b7..e0e0e2c 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -44,6 +44,9 @@ "whip": { "sounds": ["lzxnoneterraria:whip"] }, + "bow_shoot": { + "sounds": ["lzxnoneterraria:bow_shoot"] + }, "shot": { "sounds": ["lzxnoneterraria:shot"] }, diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/bow_shoot.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/bow_shoot.ogg new file mode 100644 index 0000000000000000000000000000000000000000..88c03da5243b9cf9fe294277afe777b8d72ea114 GIT binary patch literal 8658 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 N@-LZFl3Gd1{{yUgSla*q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/bow_shot.wav b/src/main/resources/assets/lzxnoneterraria/sounds/bow_shot.wav new file mode 100644 index 0000000000000000000000000000000000000000..c804c2d74b2961bdee0eb8b2f3c3a2ce2214ebf9 GIT binary patch literal 51244 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/daedalus_stormbow.png b/src/main/resources/assets/lzxnoneterraria/textures/item/daedalus_stormbow.png new file mode 100644 index 0000000000000000000000000000000000000000..578e2cf897d58eb59e8e435cf9d82d95062b1db6 GIT binary patch literal 343 zcmV-d0jU0oP)#tlZ%kTPx+U zLi9h^`iZ^o` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/wooden_arrow.png b/src/main/resources/assets/lzxnoneterraria/textures/item/wooden_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..fee1b8d3ab8ad40b3eff2821ae24b626f2cdf3fd GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^d_b(g!3-ot4R$UCQkDTeA+A8$$HCad#Kc@p^61Xh zPj4Qbp6y)}XtA<3w!OW5e}Dd_g?;<>?fdcdLwRaoUuDv?Y17uPUw`M$9iI7CH-MTM zOM?7@862M7NCR@RJzX3_DsIg^>&e$(z{BjI{?aKk^8f#cl&@~ViiJhT*x4I660QmB zcje6X@UnGp6G%R1*!E!J@qL?RPQH!mUmTXCa=^XCe{-tg?Bdw}AF3lwRYUt-G%cqu rdbN4$=bW?Z-LI9>_Pn=bJoJ!Rzn|4r{<7{#ptTI1u6{1-oD!M