From e9d4665059c475d8782ad4d9cfdcddca9fceeba2 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Tue, 28 Jul 2026 01:58:46 +0800 Subject: [PATCH] v1.6.0 --- .../client/event/RangedWeaponGuiHandler.java | 33 ++++++++++-- .../terraria/effect/AcidVenomEffect.java | 4 +- .../terraria/item/ammo/BasicBulletAmmo.java | 54 ------------------- .../terraria/item/ammo/BulletAmmo.java | 2 +- .../terraria/item/ammo/ChlorophyteBullet.java | 2 +- .../terraria/item/ammo/CrystalBullet.java | 2 +- .../terraria/item/ammo/CursedBullet.java | 2 +- .../terraria/item/ammo/ExplodingBullet.java | 2 +- .../terraria/item/ammo/GoldenBullet.java | 2 +- .../item/ammo/HighVelocityBullet.java | 2 +- .../terraria/item/ammo/IchorBullet.java | 2 +- .../terraria/item/ammo/LuminiteBullet.java | 2 +- .../terraria/item/ammo/NanoBullet.java | 2 +- .../terraria/item/ammo/PartyBullet.java | 2 +- .../terraria/item/ammo/SilverBullet.java | 2 +- .../terraria/item/ammo/TungstenBullet.java | 2 +- .../terraria/item/ammo/VenomBullet.java | 2 +- .../terraria/item/weapon/RangedWeapon.java | 12 +++++ 18 files changed, 58 insertions(+), 73 deletions(-) delete mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/BasicBulletAmmo.java diff --git a/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java b/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java index d4f4bd4..94c4cb7 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java @@ -3,6 +3,7 @@ package com.lzxnone.terraria.client.event; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.item.ModItemTags; import com.lzxnone.terraria.item.weapon.RangedWeapon; +import net.minecraft.client.gui.Font; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.entity.HumanoidArm; @@ -49,7 +50,7 @@ public class RangedWeaponGuiHandler { for(int i = 0; i < 9; i++) { ItemStack stack = player.getInventory().items.get(i); int slotX = centerX - 90 + i * 20 + 2; - renderSelectedAmmoIcon(guiGraphics, stack, slotX, hotbarY); + renderSelectedAmmoIcon(guiGraphics, stack, slotX, hotbarY, player); } ItemStack offhandStack = player.getOffhandItem(); @@ -57,7 +58,7 @@ public class RangedWeaponGuiHandler { int offhandX = player.getMainArm().getOpposite() == HumanoidArm.LEFT ? centerX - 91 - 26 : centerX + 91 + 10; - renderSelectedAmmoIcon(guiGraphics, offhandStack, offhandX, hotbarY); + renderSelectedAmmoIcon(guiGraphics, offhandStack, offhandX, hotbarY, player); } } @@ -70,7 +71,11 @@ public class RangedWeaponGuiHandler { } private static void renderSelectedAmmoIcon(GuiGraphics guiGraphics, ItemStack weaponStack, int slotX, int slotY) { - if(!(weaponStack.getItem() instanceof RangedWeapon)) return; + renderSelectedAmmoIcon(guiGraphics, weaponStack, slotX, slotY, null); + } + + private static void renderSelectedAmmoIcon(GuiGraphics guiGraphics, ItemStack weaponStack, int slotX, int slotY, Player player) { + if(!(weaponStack.getItem() instanceof RangedWeapon rangedWeapon)) return; ItemStack ammoStack = RangedWeapon.getAmmoStack(weaponStack); if(ammoStack.isEmpty()) return; @@ -83,5 +88,27 @@ public class RangedWeaponGuiHandler { guiGraphics.pose().scale(0.25F, 0.25F, 1.0F); guiGraphics.renderItem(ammoStack, 0, 0); guiGraphics.pose().popPose(); + + if(player != null) { + renderAmmoCount(guiGraphics, rangedWeapon, weaponStack, player, x, y); + } + } + + private static void renderAmmoCount(GuiGraphics guiGraphics, RangedWeapon rangedWeapon, + ItemStack weaponStack, Player player, int iconX, int iconY) { + int count = rangedWeapon.getAmmoCount(weaponStack, player); + String text = Integer.toString(count); + Minecraft minecraft = Minecraft.getInstance(); + Font font = minecraft.font; + float scale = 0.75F; + int textWidth = font.width(text); + float textX = (iconX - 2) / scale - textWidth; + float textY = (iconY - 3) / scale; + + guiGraphics.pose().pushPose(); + guiGraphics.pose().translate(0.0F, 0.0F, 300.0F); + guiGraphics.pose().scale(scale, scale, 1.0F); + guiGraphics.drawString(font, text, (int) textX, (int) textY, 0xFFFFFF, true); + guiGraphics.pose().popPose(); } } diff --git a/src/main/java/com/lzxnone/terraria/effect/AcidVenomEffect.java b/src/main/java/com/lzxnone/terraria/effect/AcidVenomEffect.java index 6754ab8..d242d29 100644 --- a/src/main/java/com/lzxnone/terraria/effect/AcidVenomEffect.java +++ b/src/main/java/com/lzxnone/terraria/effect/AcidVenomEffect.java @@ -56,8 +56,8 @@ public class AcidVenomEffect extends MobEffect { public static final DustParticleOptions PARTICLE = new DustParticleOptions( 0.075f, 0.5f, 40, false, new Vector3f[]{ - new Vector3f(0.0F, 0.0F, 0.0F), - new Vector3f(0.06F, 0.06F, 0.06F) + new Vector3f(0.12F, 0.0F, 0.18F), + new Vector3f(0.45F, 0.05F, 0.65F) } ); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/BasicBulletAmmo.java b/src/main/java/com/lzxnone/terraria/item/ammo/BasicBulletAmmo.java deleted file mode 100644 index 132778b..0000000 --- a/src/main/java/com/lzxnone/terraria/item/ammo/BasicBulletAmmo.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.lzxnone.terraria.item.ammo; - -import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; -import com.lzxnone.terraria.entity.summon.StaticSummon; -import com.lzxnone.terraria.utils.CollisionUtil; -import com.lzxnone.terraria.utils.DamageUtil; -import com.lzxnone.terraria.utils.FilterUtil; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; -import net.minecraft.world.phys.Vec3; - -import java.util.List; - -public abstract class BasicBulletAmmo extends BulletAmmo { - public static IStaticSummonBehavior createSummonBehavior(float baseDamage, double speed) { - return new IStaticSummonBehavior() { - @Override - public void tick(StaticSummon summon) { - this.checkBeforeTick(summon); - Vec3 motion = summon.getLookAngle().normalize().scale(speed); - summon.setDeltaMovement(motion); - - AABB hitBox = new AABB(summon.position(), summon.position().add(motion)).inflate(0.25); - List targets = summon.level().getEntitiesOfClass( - Entity.class, - hitBox, - FilterUtil.createTargetFilter(summon, summon.getOwner()) - ); - if(!targets.isEmpty()) { - CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); - float damage = customData.contains("damage") ? customData.getFloat("damage") : 0; - float knockbackScale = customData.contains("knockbackScale") ? customData.getFloat("knockbackScale") : 1.0f; - int invulnerableTime = customData.contains("invulnerableTime") ? customData.getInt("invulnerableTime") : 20; - - ItemStack sourceStack = summon.getEntityData().get(StaticSummon.STACK_SOURCE); - Entity target = targets.getFirst(); - if(DamageUtil.rangedAttack(summon, target, sourceStack, baseDamage + damage, knockbackScale)) { - target.invulnerableTime = invulnerableTime; - this.onDied(summon); - } - } - - BlockHitResult blockHitResult = CollisionUtil.checkBlockHit(summon, summon.position().add(motion)); - if(blockHitResult.getType() != HitResult.Type.MISS) { - this.onDied(summon); - } - } - }; - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java b/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java index b5de9cc..0137141 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java @@ -3,7 +3,7 @@ package com.lzxnone.terraria.item.ammo; import net.minecraft.world.item.Item; public class BulletAmmo extends Item { - public static final int MAX_STACK_SIZE = 9999; + public static final int MAX_STACK_SIZE = 99; public BulletAmmo() { super(new Item.Properties().stacksTo(MAX_STACK_SIZE)); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java index 025b9b7..4e3d239 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ChlorophyteBullet.java @@ -22,7 +22,7 @@ import org.joml.Vector3f; import java.util.List; -public class ChlorophyteBullet extends BasicBulletAmmo { +public class ChlorophyteBullet extends BulletAmmo { public static final String ID = "chlorophyte_bullet"; public static final float BASE_DAMAGE_DEFAULT = 1.5f; public static final double SPEED_DEFAULT = 3.0D; 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 7e9c96e..e5028f1 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CrystalBullet.java @@ -21,7 +21,7 @@ import org.joml.Vector3f; import java.util.List; -public class CrystalBullet extends BasicBulletAmmo { +public class CrystalBullet extends BulletAmmo { public static final String ID = "crystal_bullet"; public static final float BASE_DAMAGE_DEFAULT = 1.2f; public static final double SPEED_DEFAULT = 3.0D; 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 0934a18..c0ac36f 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/CursedBullet.java @@ -20,7 +20,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class CursedBullet extends BasicBulletAmmo { +public class CursedBullet extends BulletAmmo { public static final String ID = "cursed_bullet"; public static final float BASE_DAMAGE_DEFAULT = 2.0f; public static final double SPEED_DEFAULT = 3.0D; 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 67dde48..a1f274f 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/ExplodingBullet.java @@ -20,7 +20,7 @@ import org.joml.Vector3f; import java.util.List; -public class ExplodingBullet extends BasicBulletAmmo { +public class ExplodingBullet extends BulletAmmo { public static final String ID = "exploding_bullet"; public static final float BASE_DAMAGE_DEFAULT = 1.5f; public static final double SPEED_DEFAULT = 3.0D; 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 42c9afc..6874f0a 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/GoldenBullet.java @@ -25,7 +25,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class GoldenBullet extends BasicBulletAmmo { +public class GoldenBullet extends BulletAmmo { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String BASE_DAMAGE_PATH = "ammo.golden_bullet.base_damage"; 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 d241024..516a529 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/HighVelocityBullet.java @@ -17,7 +17,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class HighVelocityBullet extends BasicBulletAmmo { +public class HighVelocityBullet extends BulletAmmo { public static final String ID = "high_velocity_bullet"; public static final float BASE_DAMAGE_DEFAULT = 1.5f; public static final double SPEED_DEFAULT = 4.0D; 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 587e218..4fc513d 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/IchorBullet.java @@ -20,7 +20,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class IchorBullet extends BasicBulletAmmo { +public class IchorBullet extends BulletAmmo { public static final String ID = "ichor_bullet"; public static final float BASE_DAMAGE_DEFAULT = 2.25f; public static final double SPEED_DEFAULT = 3.0D; 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 cff9434..d9aa24c 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/LuminiteBullet.java @@ -17,7 +17,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class LuminiteBullet extends BasicBulletAmmo { +public class LuminiteBullet extends BulletAmmo { public static final String ID = "luminite_bullet"; public static final float BASE_DAMAGE_DEFAULT = 3.0f; public static final double SPEED_DEFAULT = 3.5D; 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 0928bd8..0e37569 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/NanoBullet.java @@ -22,7 +22,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class NanoBullet extends BasicBulletAmmo { +public class NanoBullet extends BulletAmmo { public static final String ID = "nano_bullet"; public static final float BASE_DAMAGE_DEFAULT = 2.5f; public static final double SPEED_DEFAULT = 3.0D; 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 7504d52..873856d 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/PartyBullet.java @@ -17,7 +17,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class PartyBullet extends BasicBulletAmmo { +public class PartyBullet extends BulletAmmo { public static final String ID = "party_bullet"; public static final float BASE_DAMAGE_DEFAULT = 1.5f; public static final double SPEED_DEFAULT = 3.0D; 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 ec5c1b7..ca693c9 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/SilverBullet.java @@ -25,7 +25,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class SilverBullet extends BasicBulletAmmo { +public class SilverBullet extends BulletAmmo { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String BASE_DAMAGE_PATH = "ammo.silver_bullet.base_damage"; 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 6982d31..93a6520 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/TungstenBullet.java @@ -22,7 +22,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class TungstenBullet extends BasicBulletAmmo { +public class TungstenBullet extends BulletAmmo { private static final String CONFIG_TRANSLATION_PREFIX = "lzxnoneterraria.configuration."; public static final String BASE_DAMAGE_PATH = "ammo.tungsten_bullet.base_damage"; 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 8ed0d9b..6c44c61 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/VenomBullet.java @@ -20,7 +20,7 @@ import net.minecraft.world.phys.Vec3; import java.util.List; -public class VenomBullet extends BasicBulletAmmo { +public class VenomBullet extends BulletAmmo { public static final String ID = "venom_bullet"; public static final float BASE_DAMAGE_DEFAULT = 2.5f; public static final double SPEED_DEFAULT = 3.0D; 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 2e1c559..ebb50b3 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java @@ -82,6 +82,18 @@ public class RangedWeapon extends Weapon { return false; } + 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; + for(ItemStack inventoryStack : player.getInventory().items) { + if(inventoryStack.is(ammoItem)) count += inventoryStack.getCount(); + } + return count; + } + public boolean consumeAmmo(ItemStack weaponStack, Player player, int amount) { if(amount <= 0 || player.hasInfiniteMaterials()) return true; if(shouldSkipAmmoConsume(weaponStack, player)) return true;