From 7015a527fdf0a6a32c2eff9314692c60f03ce4d8 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Mon, 27 Jul 2026 20:04:35 +0800 Subject: [PATCH] v1.6.0 --- .gitignore | 4 +- .../world/entity/player/Inventory.java | 618 ++++++++++++++++++ .../java/com/lzxnone/terraria/ModSounds.java | 8 + .../ClientStaticSummonRenderBehaviors.java | 5 + .../client/event/RangedWeaponGuiHandler.java | 87 +++ .../client/item/ammo/ClientBulletAmmo.java | 76 +++ .../ModCreativeModeTabs.java | 9 + .../entity/summon/StaticSummonBehaviors.java | 12 + .../lzxnone/terraria/item/ModItemTags.java | 15 + .../com/lzxnone/terraria/item/ModItems.java | 14 + .../terraria/item/ammo/BulletAmmo.java | 9 + .../terraria/item/ammo/MeteorShot.java | 13 + .../terraria/item/ammo/MusketBall.java | 13 + .../projectile/ammo/BulletProjectile.java | 9 + .../projectile/ammo/MeteorShotProjectile.java | 9 + .../terraria/item/weapon/RangedWeapon.java | 146 +++++ .../terraria/item/weapon/magic/LastPrism.java | 14 +- .../terraria/item/weapon/ranged/SDMG.java | 50 ++ .../item/weapon/summon/Terraprisma.java | 3 + .../terraria/mixin/HumanoidModelMixin.java | 41 ++ .../terraria/mixin/ItemInHandRenderMixin.java | 2 +- .../lzxnone/terraria/mixin/UseSpeedMixin.java | 3 +- .../com/lzxnone/terraria/utils/AmmoUtil.java | 66 ++ .../assets/lzxnoneterraria/lang/en_us.json | 5 + .../assets/lzxnoneterraria/lang/zh_cn.json | 5 + .../models/item/bullet_projectile.json | 6 + .../lzxnoneterraria/models/item/gun.json | 45 ++ .../models/item/meteor_shot.json | 6 + .../models/item/meteor_shot_projectile.json | 6 + .../models/item/musket_ball.json | 6 + .../lzxnoneterraria/models/item/sdmg.json | 6 + .../lzxnoneterraria/models/item/seedler.json | 44 +- .../assets/lzxnoneterraria/sounds.json | 6 + .../assets/lzxnoneterraria/sounds/dig.wav | Bin 7596 -> 0 bytes .../assets/lzxnoneterraria/sounds/shot.ogg | Bin 0 -> 10320 bytes .../sounds/summon_terraprisma.ogg | Bin 0 -> 11639 bytes .../textures/item/bullet_projectile.png | Bin 0 -> 465 bytes .../textures/item/meteor_shot.png | Bin 0 -> 134 bytes .../textures/item/meteor_shot_projectile.png | Bin 0 -> 466 bytes .../textures/item/musket_ball.png | Bin 0 -> 141 bytes .../lzxnoneterraria/textures/item/sdmg.png | Bin 0 -> 356 bytes .../tags/item/bullet_ammo.json | 7 + .../resources/lzxnoneterraria.mixins.json | 1 + 43 files changed, 1354 insertions(+), 15 deletions(-) create mode 100644 net/minecraft/world/entity/player/Inventory.java create mode 100644 src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java create mode 100644 src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ModItemTags.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java create mode 100644 src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java create mode 100644 src/main/java/com/lzxnone/terraria/item/projectile/ammo/BulletProjectile.java create mode 100644 src/main/java/com/lzxnone/terraria/item/projectile/ammo/MeteorShotProjectile.java create mode 100644 src/main/java/com/lzxnone/terraria/item/weapon/ranged/SDMG.java create mode 100644 src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java create mode 100644 src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/bullet_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/gun.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot_projectile.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/musket_ball.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/sdmg.json delete mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/dig.wav create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/shot.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/summon_terraprisma.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/bullet_projectile.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/meteor_shot.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/meteor_shot_projectile.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/musket_ball.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/sdmg.png create mode 100644 src/main/resources/data/lzxnoneterraria/tags/item/bullet_ammo.json diff --git a/.gitignore b/.gitignore index 3e7c3f7..823a020 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,6 @@ repo/ .reasonix reasonix.toml null -work \ No newline at end of file +work +scripts +export \ No newline at end of file diff --git a/net/minecraft/world/entity/player/Inventory.java b/net/minecraft/world/entity/player/Inventory.java new file mode 100644 index 0000000..ab7c7e4 --- /dev/null +++ b/net/minecraft/world/entity/player/Inventory.java @@ -0,0 +1,618 @@ +package net.minecraft.world.entity.player; + +import com.google.common.collect.ImmutableList; +import java.util.List; +import java.util.function.Predicate; +import net.minecraft.CrashReport; +import net.minecraft.CrashReportCategory; +import net.minecraft.ReportedException; +import net.minecraft.core.NonNullList; +import net.minecraft.core.component.DataComponents; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.tags.TagKey; +import net.minecraft.world.Container; +import net.minecraft.world.ContainerHelper; +import net.minecraft.world.Nameable; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.state.BlockState; + +public class Inventory implements Container, Nameable { + public static final int POP_TIME_DURATION = 5; + public static final int INVENTORY_SIZE = 36; + private static final int SELECTION_SIZE = 9; + public static final int SLOT_OFFHAND = 40; + public static final int NOT_FOUND_INDEX = -1; + public static final int[] ALL_ARMOR_SLOTS = new int[]{0, 1, 2, 3}; + public static final int[] HELMET_SLOT_ONLY = new int[]{3}; + public final NonNullList items = NonNullList.withSize(36, ItemStack.EMPTY); + public final NonNullList armor = NonNullList.withSize(4, ItemStack.EMPTY); + public final NonNullList offhand = NonNullList.withSize(1, ItemStack.EMPTY); + private final List> compartments = ImmutableList.of(this.items, this.armor, this.offhand); + public int selected; + public final Player player; + private int timesChanged; + + public Inventory(Player player) { + this.player = player; + } + + public ItemStack getSelected() { + return isHotbarSlot(this.selected) ? this.items.get(this.selected) : ItemStack.EMPTY; + } + + public static int getSelectionSize() { + return 9; + } + + private boolean hasRemainingSpaceForItem(ItemStack destination, ItemStack origin) { + return !destination.isEmpty() + && ItemStack.isSameItemSameComponents(destination, origin) + && destination.isStackable() + && destination.getCount() < this.getMaxStackSize(destination); + } + + public int getFreeSlot() { + for (int i = 0; i < this.items.size(); i++) { + if (this.items.get(i).isEmpty()) { + return i; + } + } + + return -1; + } + + public void setPickedItem(ItemStack stack) { + int i = this.findSlotMatchingItem(stack); + if (isHotbarSlot(i)) { + this.selected = i; + } else { + if (i == -1) { + this.selected = this.getSuitableHotbarSlot(); + if (!this.items.get(this.selected).isEmpty()) { + int j = this.getFreeSlot(); + if (j != -1) { + this.items.set(j, this.items.get(this.selected)); + } + } + + this.items.set(this.selected, stack); + } else { + this.pickSlot(i); + } + } + } + + public void pickSlot(int index) { + this.selected = this.getSuitableHotbarSlot(); + ItemStack itemstack = this.items.get(this.selected); + this.items.set(this.selected, this.items.get(index)); + this.items.set(index, itemstack); + } + + public static boolean isHotbarSlot(int index) { + return index >= 0 && index < 9; + } + + /** + * Finds the stack or an equivalent one in the main inventory + */ + public int findSlotMatchingItem(ItemStack stack) { + for (int i = 0; i < this.items.size(); i++) { + if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameComponents(stack, this.items.get(i))) { + return i; + } + } + + return -1; + } + + public int findSlotMatchingUnusedItem(ItemStack stack) { + for (int i = 0; i < this.items.size(); i++) { + ItemStack itemstack = this.items.get(i); + if (!itemstack.isEmpty() + && ItemStack.isSameItemSameComponents(stack, itemstack) + && !itemstack.isDamaged() + && !itemstack.isEnchanted() + && !itemstack.has(DataComponents.CUSTOM_NAME)) { + return i; + } + } + + return -1; + } + + public int getSuitableHotbarSlot() { + for (int i = 0; i < 9; i++) { + int j = (this.selected + i) % 9; + if (this.items.get(j).isEmpty()) { + return j; + } + } + + for (int k = 0; k < 9; k++) { + int l = (this.selected + k) % 9; + if (!this.items.get(l).isNotReplaceableByPickAction(this.player, l)) { + return l; + } + } + + return this.selected; + } + + /** + * Change the selected item in the hotbar after a mouse scroll. Select the slot to the left if {@code direction} is positive, or to the right if negative. + */ + public void swapPaint(double direction) { + int i = (int)Math.signum(direction); + this.selected -= i; + + while (this.selected < 0) { + this.selected += 9; + } + + while (this.selected >= 9) { + this.selected -= 9; + } + } + + public int clearOrCountMatchingItems(Predicate stackPredicate, int maxCount, Container inventory) { + int i = 0; + boolean flag = maxCount == 0; + i += ContainerHelper.clearOrCountMatchingItems(this, stackPredicate, maxCount - i, flag); + i += ContainerHelper.clearOrCountMatchingItems(inventory, stackPredicate, maxCount - i, flag); + ItemStack itemstack = this.player.containerMenu.getCarried(); + i += ContainerHelper.clearOrCountMatchingItems(itemstack, stackPredicate, maxCount - i, flag); + if (itemstack.isEmpty()) { + this.player.containerMenu.setCarried(ItemStack.EMPTY); + } + + return i; + } + + /** + * This function stores as many items of an ItemStack as possible in a matching slot and returns the quantity of left over items. + */ + private int addResource(ItemStack stack) { + int i = this.getSlotWithRemainingSpace(stack); + if (i == -1) { + i = this.getFreeSlot(); + } + + return i == -1 ? stack.getCount() : this.addResource(i, stack); + } + + private int addResource(int slot, ItemStack stack) { + int i = stack.getCount(); + ItemStack itemstack = this.getItem(slot); + if (itemstack.isEmpty()) { + itemstack = stack.copyWithCount(0); + this.setItem(slot, itemstack); + } + + int j = this.getMaxStackSize(itemstack) - itemstack.getCount(); + int k = Math.min(i, j); + if (k == 0) { + return i; + } else { + i -= k; + itemstack.grow(k); + itemstack.setPopTime(5); + return i; + } + } + + /** + * Stores a stack in the player's inventory. It first tries to place it in the selected slot in the player's hotbar, then the offhand slot, then any available/empty slot in the player's inventory. + */ + public int getSlotWithRemainingSpace(ItemStack stack) { + if (this.hasRemainingSpaceForItem(this.getItem(this.selected), stack)) { + return this.selected; + } else if (this.hasRemainingSpaceForItem(this.getItem(40), stack)) { + return 40; + } else { + for (int i = 0; i < this.items.size(); i++) { + if (this.hasRemainingSpaceForItem(this.items.get(i), stack)) { + return i; + } + } + + return -1; + } + } + + public void tick() { + int slot = 0; + for (NonNullList nonnulllist : this.compartments) { + for (int i = 0; i < nonnulllist.size(); i++) { + if (!nonnulllist.get(i).isEmpty()) { + // Neo: Fix the slot param to be the global index instead of the per-compartment index. + // Neo: Fix the selected param to only be true for hotbar slots. + nonnulllist.get(i).inventoryTick(this.player.level(), this.player, slot, this.selected == slot); + } + slot++; + } + } + } + + /** + * Adds the stack to the first empty slot in the player's inventory. Returns {@code false} if it's not possible to place the entire stack in the inventory. + */ + public boolean add(ItemStack stack) { + return this.add(-1, stack); + } + + /** + * Adds the stack to the specified slot in the player's inventory. Returns {@code false} if it's not possible to place the entire stack in the inventory. + */ + public boolean add(int slot, ItemStack stack) { + if (stack.isEmpty()) { + return false; + } else { + try { + if (stack.isDamaged()) { + if (slot == -1) { + slot = this.getFreeSlot(); + } + + if (slot >= 0) { + this.items.set(slot, stack.copyAndClear()); + this.items.get(slot).setPopTime(5); + return true; + } else if (this.player.hasInfiniteMaterials()) { + stack.setCount(0); + return true; + } else { + return false; + } + } else { + int i; + do { + i = stack.getCount(); + if (slot == -1) { + stack.setCount(this.addResource(stack)); + } else { + stack.setCount(this.addResource(slot, stack)); + } + } while (!stack.isEmpty() && stack.getCount() < i); + + if (stack.getCount() == i && this.player.hasInfiniteMaterials()) { + stack.setCount(0); + return true; + } else { + return stack.getCount() < i; + } + } + } catch (Throwable throwable) { + CrashReport crashreport = CrashReport.forThrowable(throwable, "Adding item to inventory"); + CrashReportCategory crashreportcategory = crashreport.addCategory("Item being added"); + crashreportcategory.setDetail("Registry Name", () -> String.valueOf(net.minecraft.core.registries.BuiltInRegistries.ITEM.getKey(stack.getItem()))); + crashreportcategory.setDetail("Item Class", () -> stack.getItem().getClass().getName()); + crashreportcategory.setDetail("Item ID", Item.getId(stack.getItem())); + crashreportcategory.setDetail("Item data", stack.getDamageValue()); + crashreportcategory.setDetail("Item name", () -> stack.getHoverName().getString()); + throw new ReportedException(crashreport); + } + } + } + + public void placeItemBackInInventory(ItemStack stack) { + this.placeItemBackInInventory(stack, true); + } + + public void placeItemBackInInventory(ItemStack stack, boolean sendPacket) { + while (!stack.isEmpty()) { + int i = this.getSlotWithRemainingSpace(stack); + if (i == -1) { + i = this.getFreeSlot(); + } + + if (i == -1) { + this.player.drop(stack, false); + break; + } + + int j = stack.getMaxStackSize() - this.getItem(i).getCount(); + if (this.add(i, stack.split(j)) && sendPacket && this.player instanceof ServerPlayer) { + ((ServerPlayer)this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, 0, i, this.getItem(i))); + } + } + } + + /** + * Removes up to a specified number of items from an inventory slot and returns them in a new stack. + */ + @Override + public ItemStack removeItem(int index, int count) { + List list = null; + + for (NonNullList nonnulllist : this.compartments) { + if (index < nonnulllist.size()) { + list = nonnulllist; + break; + } + + index -= nonnulllist.size(); + } + + return list != null && !list.get(index).isEmpty() ? ContainerHelper.removeItem(list, index, count) : ItemStack.EMPTY; + } + + public void removeItem(ItemStack stack) { + for (NonNullList nonnulllist : this.compartments) { + for (int i = 0; i < nonnulllist.size(); i++) { + if (nonnulllist.get(i) == stack) { + nonnulllist.set(i, ItemStack.EMPTY); + break; + } + } + } + } + + /** + * Removes a stack from the given slot and returns it. + */ + @Override + public ItemStack removeItemNoUpdate(int index) { + NonNullList nonnulllist = null; + + for (NonNullList nonnulllist1 : this.compartments) { + if (index < nonnulllist1.size()) { + nonnulllist = nonnulllist1; + break; + } + + index -= nonnulllist1.size(); + } + + if (nonnulllist != null && !nonnulllist.get(index).isEmpty()) { + ItemStack itemstack = nonnulllist.get(index); + nonnulllist.set(index, ItemStack.EMPTY); + return itemstack; + } else { + return ItemStack.EMPTY; + } + } + + /** + * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). + */ + @Override + public void setItem(int index, ItemStack stack) { + NonNullList nonnulllist = null; + + for (NonNullList nonnulllist1 : this.compartments) { + if (index < nonnulllist1.size()) { + nonnulllist = nonnulllist1; + break; + } + + index -= nonnulllist1.size(); + } + + if (nonnulllist != null) { + nonnulllist.set(index, stack); + } + } + + public float getDestroySpeed(BlockState state) { + return this.items.get(this.selected).getDestroySpeed(state); + } + + /** + * Writes the inventory out as a list of compound tags. This is where the slot indices are used (+100 for armor, +80 for crafting). + */ + public ListTag save(ListTag listTag) { + for (int i = 0; i < this.items.size(); i++) { + if (!this.items.get(i).isEmpty()) { + CompoundTag compoundtag = new CompoundTag(); + compoundtag.putByte("Slot", (byte)i); + listTag.add(this.items.get(i).save(this.player.registryAccess(), compoundtag)); + } + } + + for (int j = 0; j < this.armor.size(); j++) { + if (!this.armor.get(j).isEmpty()) { + CompoundTag compoundtag1 = new CompoundTag(); + compoundtag1.putByte("Slot", (byte)(j + 100)); + listTag.add(this.armor.get(j).save(this.player.registryAccess(), compoundtag1)); + } + } + + for (int k = 0; k < this.offhand.size(); k++) { + if (!this.offhand.get(k).isEmpty()) { + CompoundTag compoundtag2 = new CompoundTag(); + compoundtag2.putByte("Slot", (byte)(k + 150)); + listTag.add(this.offhand.get(k).save(this.player.registryAccess(), compoundtag2)); + } + } + + return listTag; + } + + /** + * Reads from the given tag list and fills the slots in the inventory with the correct items. + */ + public void load(ListTag listTag) { + this.items.clear(); + this.armor.clear(); + this.offhand.clear(); + + for (int i = 0; i < listTag.size(); i++) { + CompoundTag compoundtag = listTag.getCompound(i); + int j = compoundtag.getByte("Slot") & 255; + ItemStack itemstack = ItemStack.parse(this.player.registryAccess(), compoundtag).orElse(ItemStack.EMPTY); + if (j >= 0 && j < this.items.size()) { + this.items.set(j, itemstack); + } else if (j >= 100 && j < this.armor.size() + 100) { + this.armor.set(j - 100, itemstack); + } else if (j >= 150 && j < this.offhand.size() + 150) { + this.offhand.set(j - 150, itemstack); + } + } + } + + @Override + public int getContainerSize() { + return this.items.size() + this.armor.size() + this.offhand.size(); + } + + @Override + public boolean isEmpty() { + for (ItemStack itemstack : this.items) { + if (!itemstack.isEmpty()) { + return false; + } + } + + for (ItemStack itemstack1 : this.armor) { + if (!itemstack1.isEmpty()) { + return false; + } + } + + for (ItemStack itemstack2 : this.offhand) { + if (!itemstack2.isEmpty()) { + return false; + } + } + + return true; + } + + /** + * Returns the stack in the given slot. + */ + @Override + public ItemStack getItem(int index) { + List list = null; + + for (NonNullList nonnulllist : this.compartments) { + if (index < nonnulllist.size()) { + list = nonnulllist; + break; + } + + index -= nonnulllist.size(); + } + + return list == null ? ItemStack.EMPTY : list.get(index); + } + + @Override + public Component getName() { + return Component.translatable("container.inventory"); + } + + /** + * @return a player armor item (as an {@code ItemStack}) contained in specified armor slot + */ + public ItemStack getArmor(int slot) { + return this.armor.get(slot); + } + + public void dropAll() { + for (List list : this.compartments) { + for (int i = 0; i < list.size(); i++) { + ItemStack itemstack = list.get(i); + if (!itemstack.isEmpty()) { + this.player.drop(itemstack, true, false); + list.set(i, ItemStack.EMPTY); + } + } + } + } + + @Override + public void setChanged() { + this.timesChanged++; + } + + public int getTimesChanged() { + return this.timesChanged; + } + + /** + * Don't rename this method to canInteractWith due to conflicts with Container + */ + @Override + public boolean stillValid(Player player) { + return player.canInteractWithEntity(this.player, 4.0); + } + + /** + * Returns {@code true} if the specified {@link net.minecraft.world.item.ItemStack} exists in the inventory. + */ + public boolean contains(ItemStack stack) { + for (List list : this.compartments) { + for (ItemStack itemstack : list) { + if (!itemstack.isEmpty() && ItemStack.isSameItemSameComponents(itemstack, stack)) { + return true; + } + } + } + + return false; + } + + public boolean contains(TagKey tag) { + for (List list : this.compartments) { + for (ItemStack itemstack : list) { + if (!itemstack.isEmpty() && itemstack.is(tag)) { + return true; + } + } + } + + return false; + } + + public boolean contains(Predicate predicate) { + for (List list : this.compartments) { + for (ItemStack itemstack : list) { + if (predicate.test(itemstack)) { + return true; + } + } + } + + return false; + } + + /** + * Copy the ItemStack contents from another InventoryPlayer instance + */ + public void replaceWith(Inventory playerInventory) { + for (int i = 0; i < this.getContainerSize(); i++) { + this.setItem(i, playerInventory.getItem(i)); + } + + this.selected = playerInventory.selected; + } + + @Override + public void clearContent() { + for (List list : this.compartments) { + list.clear(); + } + } + + public void fillStackedContents(StackedContents stackedContent) { + for (ItemStack itemstack : this.items) { + stackedContent.accountSimpleStack(itemstack); + } + } + + /** + * @param removeStack Whether to remove the entire stack of items. If {@code false + * }, removes a single item. + */ + public ItemStack removeFromSelected(boolean removeStack) { + ItemStack itemstack = this.getSelected(); + return itemstack.isEmpty() ? ItemStack.EMPTY : this.removeItem(this.selected, removeStack ? itemstack.getCount() : 1); + } +} diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index 44b4c07..64271c6 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -43,6 +43,14 @@ public class ModSounds { SOUND_EVENTS.register("star_collide", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "star_collide"))); + public static final Supplier SUMMON_TERRAPRISMA = + SOUND_EVENTS.register("summon_terraprisma", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "summon_terraprisma"))); + public static final Supplier SHOT = + SOUND_EVENTS.register("shot", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "shot"))); public static final Supplier BOOM = SOUND_EVENTS.register("boom", () -> 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 9d3cb1d..7f72301 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 @@ -1,5 +1,6 @@ package com.lzxnone.terraria.client.entity.summon; +import com.lzxnone.terraria.client.item.ammo.ClientBulletAmmo; import com.lzxnone.terraria.client.item.magic.ClientLastPrism; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; import com.lzxnone.terraria.client.item.melee.ClientFirstFractal; @@ -22,6 +23,7 @@ public class ClientStaticSummonRenderBehaviors { static { BEHAVIORS.put(StaticSummonBehaviors.DEFAULT, DEFAULT_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.SEEDLER_NUT, DEFAULT_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.THE_HORSEMANS_BLADE_JACK, DEFAULT_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.INFLUX_WAVER_BEAM, DEFAULT_BEHAVIOR); @@ -41,6 +43,9 @@ public class ClientStaticSummonRenderBehaviors { BEHAVIORS.put(StaticSummonBehaviors.LAST_PRISM_TRI, ClientLastPrism.SUMMON_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.LAST_PRISM_BEAM, ClientLastPrism.SUMMON_BEHAVIOR2); BEHAVIORS.put(StaticSummonBehaviors.TERRAPRISMA, ClientTerraprisma.SUMMON_BEHAVIOR); + + BEHAVIORS.put(StaticSummonBehaviors.MUSKET_BALL, ClientBulletAmmo.SUMMON_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.METEOR_SHOT, ClientBulletAmmo.SUMMON_BEHAVIOR); } public static IStaticSummonRenderBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java b/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java new file mode 100644 index 0000000..d4f4bd4 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java @@ -0,0 +1,87 @@ +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.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.world.entity.HumanoidArm; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.client.event.ContainerScreenEvent; +import net.neoforged.neoforge.client.event.RenderGuiEvent; + +@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) +public class RangedWeaponGuiHandler { + private static final int VALID_AMMO_COLOR = 0x6600FF00; + private static final int INVALID_AMMO_COLOR = 0x66FF0000; + + @SubscribeEvent + public static void onContainerForeground(ContainerScreenEvent.Render.Foreground event) { + ItemStack carriedStack = event.getContainerScreen().getMenu().getCarried(); + GuiGraphics guiGraphics = event.getGuiGraphics(); + + for(Slot slot : event.getContainerScreen().getMenu().slots) { + if(!slot.isActive()) continue; + + ItemStack weaponStack = slot.getItem(); + if(!(weaponStack.getItem() instanceof RangedWeapon rangedWeapon)) continue; + + renderAmmoDropHint(guiGraphics, rangedWeapon, weaponStack, carriedStack, slot); + renderSelectedAmmoIcon(guiGraphics, weaponStack, slot.x, slot.y); + } + } + + @SubscribeEvent + public static void onRenderGui(RenderGuiEvent.Post event) { + Minecraft minecraft = Minecraft.getInstance(); + Player player = minecraft.player; + if(player == null || minecraft.options.hideGui) return; + + GuiGraphics guiGraphics = event.getGuiGraphics(); + int centerX = guiGraphics.guiWidth() / 2; + int hotbarY = guiGraphics.guiHeight() - 19; + + 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); + } + + ItemStack offhandStack = player.getOffhandItem(); + if(!offhandStack.isEmpty()) { + int offhandX = player.getMainArm().getOpposite() == HumanoidArm.LEFT + ? centerX - 91 - 26 + : centerX + 91 + 10; + renderSelectedAmmoIcon(guiGraphics, offhandStack, offhandX, hotbarY); + } + } + + private static void renderAmmoDropHint(GuiGraphics guiGraphics, RangedWeapon rangedWeapon, + ItemStack weaponStack, ItemStack carriedStack, Slot slot) { + if(carriedStack.isEmpty() || !carriedStack.is(ModItemTags.BULLET_AMMO)) return; + + int color = rangedWeapon.canUseAmmo(weaponStack, carriedStack) ? VALID_AMMO_COLOR : INVALID_AMMO_COLOR; + guiGraphics.fill(slot.x, slot.y, slot.x + 16, slot.y + 16, color); + } + + private static void renderSelectedAmmoIcon(GuiGraphics guiGraphics, ItemStack weaponStack, int slotX, int slotY) { + if(!(weaponStack.getItem() instanceof RangedWeapon)) return; + + ItemStack ammoStack = RangedWeapon.getAmmoStack(weaponStack); + if(ammoStack.isEmpty()) return; + + int x = slotX + 12; + int y = slotY + 12; + + guiGraphics.pose().pushPose(); + guiGraphics.pose().translate(x, y, 200.0F); + guiGraphics.pose().scale(0.25F, 0.25F, 1.0F); + guiGraphics.renderItem(ammoStack, 0, 0); + guiGraphics.pose().popPose(); + } +} diff --git a/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java b/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java new file mode 100644 index 0000000..2f16e27 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/ammo/ClientBulletAmmo.java @@ -0,0 +1,76 @@ +package com.lzxnone.terraria.client.item.ammo; + +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.MultiBufferSource; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; + +public class ClientBulletAmmo { + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + 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; + + poseStack.pushPose(); + + //旋转(方向修正) + poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot()))); + poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot()))); + + poseStack.mulPose(Axis.YP.rotationDegrees(-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( + itemStack, + ItemDisplayContext.NONE, + packedLight, + OverlayTexture.NO_OVERLAY, + poseStack, + bufferSource, + entity.level(), + 0 + ); + poseStack.popPose(); + + poseStack.pushPose(); + + //旋转(方向修正) + poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot()))); + poseStack.mulPose(Axis.XP.rotationDegrees(Mth.lerp(partialTick, summon.xRotO, summon.getXRot()))); + + poseStack.mulPose(Axis.ZP.rotationDegrees(90)); + poseStack.mulPose(Axis.YP.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( + itemStack, + ItemDisplayContext.NONE, + 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 9b3ed0f..9f2b910 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 @@ -55,6 +55,15 @@ public class ModCreativeModeTabs { output.accept(ModItems.LAST_PRISM.get()); }).build()); + public static final DeferredHolder RANGED_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_ranged_0", () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup.lzxnoneterraria.ranged")) + .icon(() -> ModItems.SDMG.get().getDefaultInstance()) + .displayItems((parameters, output) -> { + output.accept(ModItems.SDMG.get()); + output.accept(ModItems.MUSKET_BALL.get()); + output.accept(ModItems.METEOR_SHOT.get()); + }).build()); + public static final DeferredHolder SUMMON_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_summon_0", () -> CreativeModeTab.builder() .title(Component.translatable("itemGroup.lzxnoneterraria.summon")) .icon(() -> ModItems.TERRAPRISMA.get().getDefaultInstance()) 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 f97376d..08bb32c 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -1,5 +1,7 @@ package com.lzxnone.terraria.entity.summon; +import com.lzxnone.terraria.item.ammo.MeteorShot; +import com.lzxnone.terraria.item.ammo.MusketBall; import com.lzxnone.terraria.item.weapon.magic.LastPrism; import com.lzxnone.terraria.item.weapon.melee.*; import com.lzxnone.terraria.item.weapon.summon.Terraprisma; @@ -11,6 +13,8 @@ public class StaticSummonBehaviors { private static final Map BEHAVIORS = new HashMap<>(); public static final String DEFAULT = "default"; + + //弹射实体 public static final String SEEDLER_NUT = "seedler_nut"; public static final String THE_HORSEMANS_BLADE_JACK = "the_horsemans_blade_jack"; public static final String INFLUX_WAVER_BEAM = "influx_waver_beam"; @@ -31,8 +35,13 @@ public class StaticSummonBehaviors { public static final String LAST_PRISM_BEAM = "last_prism_beam"; public static final String TERRAPRISMA = "terraprisma"; + //弹药实体 + public static final String MUSKET_BALL = "musket_ball"; + public static final String METEOR_SHOT = "meteor_shot"; + static { BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {}); + BEHAVIORS.put(SEEDLER_NUT, Seedler.SUMMON_BEHAVIOR); BEHAVIORS.put(THE_HORSEMANS_BLADE_JACK, TheHorsemansBlade.SUMMON_BEHAVIOR); BEHAVIORS.put(INFLUX_WAVER_BEAM, InfluxWaver.SUMMON_BEHAVIOR); @@ -52,6 +61,9 @@ public class StaticSummonBehaviors { BEHAVIORS.put(LAST_PRISM_TRI, LastPrism.SUMMON_BEHAVIOR); BEHAVIORS.put(LAST_PRISM_BEAM, LastPrism.SUMMON_BEHAVIOR2); BEHAVIORS.put(TERRAPRISMA, Terraprisma.SUMMON_BEHAVIOR); + + BEHAVIORS.put(MUSKET_BALL, MusketBall.SUMMON_BEHAVIOR); + BEHAVIORS.put(METEOR_SHOT, MeteorShot.SUMMON_BEHAVIOR); } public static IStaticSummonBehavior getBehavior(String id) { diff --git a/src/main/java/com/lzxnone/terraria/item/ModItemTags.java b/src/main/java/com/lzxnone/terraria/item/ModItemTags.java new file mode 100644 index 0000000..a4253a9 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ModItemTags.java @@ -0,0 +1,15 @@ +package com.lzxnone.terraria.item; + +import com.lzxnone.terraria.LzxnoneTerraria; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; + +public class ModItemTags { + public static final TagKey BULLET_AMMO = create("bullet_ammo"); + + 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 9ba0c32..fb01704 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -1,10 +1,14 @@ package com.lzxnone.terraria.item; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.ammo.*; import com.lzxnone.terraria.item.projectile.*; +import com.lzxnone.terraria.item.projectile.ammo.BulletProjectile; +import com.lzxnone.terraria.item.projectile.ammo.MeteorShotProjectile; import com.lzxnone.terraria.item.projectile.first_fractal.*; import com.lzxnone.terraria.item.weapon.magic.*; import com.lzxnone.terraria.item.weapon.melee.*; +import com.lzxnone.terraria.item.weapon.ranged.*; import com.lzxnone.terraria.item.weapon.summon.*; import net.minecraft.world.item.Item; import net.neoforged.neoforge.registries.DeferredItem; @@ -42,6 +46,16 @@ public class ModItems { //魔法武器 public static final DeferredItem LAST_PRISM = ITEMS.register("last_prism", LastPrism::new); + //远程武器 + public static final DeferredItem SDMG = ITEMS.register("sdmg", SDMG::new); + + //弹药 + public static final DeferredItem MUSKET_BALL = ITEMS.register("musket_ball", MusketBall::new); + public static final DeferredItem METEOR_SHOT = ITEMS.register("meteor_shot", MeteorShot::new); + + public static final DeferredItem BULLET_PROJECTILE = ITEMS.register("bullet_projectile", BulletProjectile::new); + public static final DeferredItem METEOR_SHOT_PROJECTILE = ITEMS.register("meteor_shot_projectile", MeteorShotProjectile::new); + //召唤武器 public static final DeferredItem TERRAPRISMA = ITEMS.register("terraprisma", Terraprisma::new); diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java b/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java new file mode 100644 index 0000000..585c8c3 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/BulletAmmo.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.ammo; + +import net.minecraft.world.item.Item; + +public class BulletAmmo extends Item { + public BulletAmmo() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java new file mode 100644 index 0000000..510fcb7 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MeteorShot.java @@ -0,0 +1,13 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; + +public class MeteorShot extends BulletAmmo { + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java new file mode 100644 index 0000000..a11bdb2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/ammo/MusketBall.java @@ -0,0 +1,13 @@ +package com.lzxnone.terraria.item.ammo; + +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; + +public class MusketBall extends BulletAmmo { + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + @Override + public void tick(StaticSummon summon) { + this.checkBeforeTick(summon); + } + }; +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/ammo/BulletProjectile.java b/src/main/java/com/lzxnone/terraria/item/projectile/ammo/BulletProjectile.java new file mode 100644 index 0000000..0f30d00 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/ammo/BulletProjectile.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.ammo; + +import net.minecraft.world.item.Item; + +public class BulletProjectile extends Item { + public BulletProjectile() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/projectile/ammo/MeteorShotProjectile.java b/src/main/java/com/lzxnone/terraria/item/projectile/ammo/MeteorShotProjectile.java new file mode 100644 index 0000000..86af2cc --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/projectile/ammo/MeteorShotProjectile.java @@ -0,0 +1,9 @@ +package com.lzxnone.terraria.item.projectile.ammo; + +import net.minecraft.world.item.Item; + +public class MeteorShotProjectile extends Item { + public MeteorShotProjectile() { + super(new Item.Properties()); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java index 3565d68..2a39262 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/RangedWeapon.java @@ -1,8 +1,27 @@ package com.lzxnone.terraria.item.weapon; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.SlotAccess; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.ClickAction; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.item.Tier; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.Level; + +import java.util.List; public class RangedWeapon extends Weapon { + public static final String AMMO_KEY = "ammo"; + public RangedWeapon(Tier tier, Properties properties) { super(tier, properties); } @@ -10,4 +29,131 @@ public class RangedWeapon extends Weapon { public RangedWeapon(Properties properties) { super(properties); } + + public boolean canUseAmmo(ItemStack weaponStack, ItemStack ammoStack) { + return false; + } + + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 20; + } + + public int getAmmoConsumeAmount(ItemStack weaponStack, LivingEntity entity) { + return 1; + } + + public boolean shouldShootThisTick(ItemStack weaponStack, LivingEntity entity, int remainingUseTicks) { + int useTime = Math.max(1, getUseTime(weaponStack, entity)); + int elapsedMinecraftTicks = getUseDuration(weaponStack, entity) - remainingUseTicks; + if(elapsedMinecraftTicks <= 0) return false; + + int currentShot = elapsedMinecraftTicks * 3 / useTime; + int previousShot = (elapsedMinecraftTicks - 1) * 3 / useTime; + return currentShot > previousShot; + } + + public boolean canShoot(ItemStack weaponStack, Player player) { + ItemStack ammoStack = getAmmoStack(weaponStack); + if(ammoStack.isEmpty() || !canUseAmmo(weaponStack, ammoStack)) return false; + + Item ammoItem = ammoStack.getItem(); + for(ItemStack inventoryStack : player.getInventory().items) { + if(inventoryStack.is(ammoItem)) return true; + } + return false; + } + + public boolean consumeAmmo(ItemStack weaponStack, Player player, int amount) { + if(amount <= 0 || player.hasInfiniteMaterials()) return true; + + ItemStack ammoStack = getAmmoStack(weaponStack); + if(ammoStack.isEmpty() || !canUseAmmo(weaponStack, ammoStack)) return false; + + Item ammoItem = ammoStack.getItem(); + int available = 0; + for(ItemStack inventoryStack : player.getInventory().items) { + if(inventoryStack.is(ammoItem)) { + available += inventoryStack.getCount(); + if(available >= amount) break; + } + } + if(available < amount) return false; + + int remaining = amount; + for(ItemStack inventoryStack : player.getInventory().items) { + if(!inventoryStack.is(ammoItem)) continue; + + int consumed = Math.min(remaining, inventoryStack.getCount()); + inventoryStack.shrink(consumed); + remaining -= consumed; + if(remaining <= 0) return true; + } + + return false; + } + + public boolean tryShoot(Level level, Player player, ItemStack weaponStack) { + if(!canShoot(weaponStack, player)) return false; + if(!level.isClientSide() && !consumeAmmo(weaponStack, player, getAmmoConsumeAmount(weaponStack, player))) return false; + + shoot(level, player, weaponStack); + return true; + } + + protected void shoot(Level level, Player player, ItemStack weaponStack) { + } + + @Override + public void onUseTick(Level level, LivingEntity entity, ItemStack stack, int remainingUseTicks) { + if(!(entity instanceof Player player)) return; + if(!shouldShootThisTick(stack, entity, remainingUseTicks)) return; + + if(!tryShoot(level, player, stack)) { + player.stopUsingItem(); + } + } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return 72000; + } + + public static ResourceLocation getAmmo(ItemStack weaponStack) { + String ammo = weaponStack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag() + .getString(AMMO_KEY); + return ammo.isEmpty() ? null : ResourceLocation.parse(ammo); + } + + public static ItemStack getAmmoStack(ItemStack weaponStack) { + ResourceLocation ammoId = getAmmo(weaponStack); + if(ammoId == null) return ItemStack.EMPTY; + + Item ammoItem = BuiltInRegistries.ITEM.get(ammoId); + return ammoItem == Items.AIR ? ItemStack.EMPTY : ammoItem.getDefaultInstance(); + } + + @Override + public boolean overrideOtherStackedOnMe(ItemStack stack, ItemStack other, Slot slot, + ClickAction action, Player player, SlotAccess access) { + if(action != ClickAction.PRIMARY || other.isEmpty() || !canUseAmmo(stack, other)) return false; + + ResourceLocation ammoId = BuiltInRegistries.ITEM.getKey(other.getItem()); + CustomData.update(DataComponents.CUSTOM_DATA, stack, tag -> tag.putString(AMMO_KEY, ammoId.toString())); + return true; + } + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, + List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + + ItemStack ammoStack = getAmmoStack(stack); + if(ammoStack.isEmpty()) return; + + tooltipComponents.add(Component.translatable( + "tooltip.lzxnoneterraria.ammo", + ammoStack.getHoverName() + ).withStyle(style -> style.withColor(0x55FF55))); + } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java index e6938e6..8766950 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/magic/LastPrism.java @@ -178,13 +178,12 @@ public class LastPrism extends MagicWeapon { public void tick(StaticSummon summon) { this.checkBeforeTick(summon); if(summon.getOwner() instanceof Player player) { - ItemStack stack = player.getMainHandItem(); - if(!stack.is(ModItems.LAST_PRISM.get()) || !player.isUsingItem()) { + if(!player.isUsingItem()) { this.onDied(summon); return; } - ItemStack usingStack = player.getUseItem(); - if(!usingStack.is(ModItems.LAST_PRISM.get())) { + ItemStack stack = player.getUseItem(); + if(!stack.is(ModItems.LAST_PRISM.get())) { this.onDied(summon); return; } @@ -214,13 +213,6 @@ public class LastPrism extends MagicWeapon { return; } - ItemStack stack = player.getMainHandItem(); - ItemStack usingStack = player.getUseItem(); - if(!stack.is(ModItems.LAST_PRISM.get()) || !player.isUsingItem() || !usingStack.is(ModItems.LAST_PRISM.get())) { - this.onDied(beam); - return; - } - beam.setPos(tri.position()); BeamData beamData = computeBeamData(tri, getBeamIndex(beam), 0.0f); if(beamData == null) return; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SDMG.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SDMG.java new file mode 100644 index 0000000..4c18106 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/SDMG.java @@ -0,0 +1,50 @@ +package com.lzxnone.terraria.item.weapon.ranged; + +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.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.Tiers; +import net.minecraft.world.level.Level; + +public class SDMG extends RangedWeapon { + public SDMG() { + super(Tiers.NETHERITE, new Item.Properties().stacksTo(1).fireResistant().rarity(Rarity.EPIC)); + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + ItemStack stack = player.getItemInHand(hand); + if(!tryShoot(level, player, stack)) return InteractionResultHolder.fail(stack); + player.startUsingItem(hand); + return InteractionResultHolder.consume(stack); + } + + @Override + public boolean canUseAmmo(ItemStack weaponStack, ItemStack ammoStack) { + return ammoStack.is(ModItemTags.BULLET_AMMO); + } + + @Override + public int getUseTime(ItemStack weaponStack, LivingEntity entity) { + return 5; + } + + @Override + protected void shoot(Level level, Player player, ItemStack stack) { + SoundUtil.playClientSound(player, ModSounds.SHOT.get()); + if(!level.isClientSide()) { + StaticSummon summon = AmmoUtil.createAmmoSummon(level, player, stack); + level.addFreshEntity(summon); + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java index dc19c63..e7ddb59 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/Terraprisma.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.item.weapon.summon; +import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.enchantment.ModEnchantments; import com.lzxnone.terraria.entity.ModEntities; @@ -15,6 +16,7 @@ import com.lzxnone.terraria.ui.config.IConfigData; import com.lzxnone.terraria.utils.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; +import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.core.registries.Registries; @@ -601,6 +603,7 @@ public class Terraprisma extends SummonWeapon { } } } + SoundUtil.playClientSound(player, ModSounds.SUMMON_TERRAPRISMA.get()); return InteractionResultHolder.consume(stack); } diff --git a/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java b/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java new file mode 100644 index 0000000..fe71ea9 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/mixin/HumanoidModelMixin.java @@ -0,0 +1,41 @@ +package com.lzxnone.terraria.mixin; + +import com.lzxnone.terraria.item.ModItems; +import net.minecraft.client.model.HumanoidModel; +import net.minecraft.client.model.geom.ModelPart; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.HumanoidArm; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(HumanoidModel.class) +public abstract class HumanoidModelMixin { + @Shadow @Final public ModelPart rightArm; + @Shadow @Final public ModelPart leftArm; + + @Inject(method = "setupAnim", at = @At("RETURN")) + private void setupAnim(T entity, float limbSwing, float limbSwingAmount, float ageInTicks, + float netHeadYaw, float headPitch, CallbackInfo ci) { + if(!(entity instanceof Player player)) return; + if(!player.isUsingItem()) return; + + HumanoidArm usedArm = player.getUsedItemHand() == InteractionHand.MAIN_HAND + ? player.getMainArm() + : player.getMainArm().getOpposite(); + + if(player.getUseItem().is(ModItems.SDMG.get())) { + float horizontalArmRot = (float) Math.toRadians(-90.0D); + if(usedArm == HumanoidArm.RIGHT) { + this.rightArm.xRot = horizontalArmRot; + }else { + this.leftArm.xRot = horizontalArmRot; + } + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java b/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java index 806387b..d51bbca 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java @@ -123,7 +123,7 @@ public class ItemInHandRenderMixin { if(player.getCooldowns().isOnCooldown(itemStack.getItem())) { ci.cancel(); } - }else if(itemStack.is(ModItems.LAST_PRISM) && entity instanceof Player player) { + }else if(itemStack.is(ModItems.LAST_PRISM.get()) && entity instanceof Player player) { if(player.isUsingItem()) { ItemStack usingStack = player.getUseItem(); if(usingStack.is(itemStack.getItem())) { diff --git a/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java b/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java index 3c5046a..aeac1aa 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java @@ -19,7 +19,8 @@ public abstract class UseSpeedMixin { || usingItem.is(ModItems.FIRST_FRACTAL.get()) || usingItem.is(ModItems.TERRAGRIM.get()) || usingItem.is(ModItems.MACE.get()) - || usingItem.is(ModItems.LAST_PRISM.get()); + || usingItem.is(ModItems.LAST_PRISM.get()) + || usingItem.is(ModItems.SDMG.get()); } @WrapOperation( diff --git a/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java b/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java new file mode 100644 index 0000000..69e6b6e --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/utils/AmmoUtil.java @@ -0,0 +1,66 @@ +package com.lzxnone.terraria.utils; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.entity.ModEntities; +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.component.DataComponents; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import org.joml.Vector3f; + +public class AmmoUtil { + public static final Vector3f OFFSET = new Vector3f(-0.3f, 0, 1.5f); + + public static StaticSummon createAmmoSummon(Level level, Player player, ItemStack stack) { + Vector3f[] dirs = MathUtil.computeCoordinateSystem(player); + Vec3 eyePos = player.getEyePosition(); + Vec3 pos = new Vec3( + eyePos.x + dirs[0].x * OFFSET.z + dirs[1].x * OFFSET.y + dirs[2].x * OFFSET.x, + eyePos.y + dirs[0].y * OFFSET.z + dirs[1].y * OFFSET.y + dirs[2].y * OFFSET.x, + eyePos.z + dirs[0].z * OFFSET.z + dirs[1].z * OFFSET.y + dirs[2].z * OFFSET.x + ); + + StaticSummon summon = new StaticSummon(ModEntities.STATIC_SUMMON.get(), level); + summon.setOwner(player); + summon.setPos(pos); + summon.getEntityData().set(StaticSummon.STACK_SOURCE, stack.copy()); + summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + + float[] xyRot = MathUtil.computeXYRot(dirs[0], dirs[1]); + summon.setXRot(xyRot[0]); + summon.setYRot(xyRot[1]); + summon.xRotO = xyRot[0]; + summon.yRotO = xyRot[1]; + + String ammo = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag().getString(RangedWeapon.AMMO_KEY); + if(ammo.equals("lzxnoneterraria:musket_ball")) setMusketBall(summon); + else if(ammo.equals("lzxnoneterraria:meteor_shot")) setMeteorShot(summon); + return summon; + } + + public static void setMusketBall(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.MUSKET_BALL); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.BULLET_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } + + public static void setMeteorShot(StaticSummon summon) { + summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.METEOR_SHOT); + summon.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.METEOR_SHOT_PROJECTILE.get())); + summon.getEntityData().set(StaticSummon.LIFETIME, 100); + summon.getEntityData().set(StaticSummon.SCALE_X, 1.0f); + summon.getEntityData().set(StaticSummon.SCALE_Y, 0.05f); + summon.getEntityData().set(StaticSummon.SCALE_Z, 0.01f); + summon.setNoGravity(true); + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 735af99..8edead9 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -1,6 +1,7 @@ { "itemGroup.lzxnoneterraria.melee": "Terraria Melee", "itemGroup.lzxnoneterraria.magic": "Terraria Magic", + "itemGroup.lzxnoneterraria.ranged": "Terraria Ranged", "itemGroup.lzxnoneterraria.summon": "Terraria Summon", "itemGroup.lzxnoneterraria.block": "Terraria Block", "itemGroup.lzxnoneterraria.calamity_melee": "Terraria Calamity Melee", @@ -31,6 +32,9 @@ "item.lzxnoneterraria.mace": "Mace", "item.lzxnoneterraria.devils_devastation": "Devil's Devastation", "item.lzxnoneterraria.last_prism": "Last Prism", + "item.lzxnoneterraria.sdmg": "S.D.M.G.", + "item.lzxnoneterraria.musket_ball": "Musket Ball", + "item.lzxnoneterraria.meteor_shot": "Meteor Shot", "item.lzxnoneterraria.terraprisma": "Terraprisma", "enchantment.lzxnoneterraria.mana_leak": "Mana Leak", @@ -48,6 +52,7 @@ "tooltip.lzxnoneterraria.relative_distance": "Relative Distance", "tooltip.lzxnoneterraria.absolute_distance": "Absolute Distance", + "tooltip.lzxnoneterraria.ammo": "Ammo: %s", "tooltip.lzxnoneterraria.devils_devastation_kill_mode": "Kill Mode", "tooltip.lzxnoneterraria.devils_devastation.0": "The perfect blade of the Underworld, wielding the power of Brimstone directly.", "tooltip.lzxnoneterraria.devils_devastation.1": "Humans understand this force as Havoc, the inevitable sundering of all order in fire.", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index f2b978d..6bbc9cc 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -1,6 +1,7 @@ { "itemGroup.lzxnoneterraria.melee": "泰拉瑞亚 近战武器", "itemGroup.lzxnoneterraria.magic": "泰拉瑞亚 魔法武器", + "itemGroup.lzxnoneterraria.ranged": "泰拉瑞亚 远程武器", "itemGroup.lzxnoneterraria.summon": "泰拉瑞亚 召唤武器", "itemGroup.lzxnoneterraria.block": "泰拉瑞亚 方块", "itemGroup.lzxnoneterraria.calamity_melee": "泰拉瑞亚灾厄 近战武器", @@ -31,6 +32,9 @@ "item.lzxnoneterraria.mace": "链锤", "item.lzxnoneterraria.devils_devastation": "破灭魔王剑", "item.lzxnoneterraria.last_prism": "终极棱镜", + "item.lzxnoneterraria.sdmg": "S.D.M.G.", + "item.lzxnoneterraria.musket_ball": "火枪子弹", + "item.lzxnoneterraria.meteor_shot": "流星弹", "item.lzxnoneterraria.terraprisma": "泰拉棱镜", "enchantment.lzxnoneterraria.mana_leak": "魔力泄漏", @@ -48,6 +52,7 @@ "tooltip.lzxnoneterraria.relative_distance": "相对距离", "tooltip.lzxnoneterraria.absolute_distance": "绝对距离", + "tooltip.lzxnoneterraria.ammo": "弹药: %s", "tooltip.lzxnoneterraria.devils_devastation_kill_mode": "杀戮模式", "tooltip.lzxnoneterraria.devils_devastation.0": "完美的地狱之剑,直接掌握着硫磺火之力。", "tooltip.lzxnoneterraria.devils_devastation.1": "人类将这种力量理解为浩劫,即一切秩序在火焰之中的必然毁灭。", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/bullet_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/bullet_projectile.json new file mode 100644 index 0000000..a6f20fa --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/bullet_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/bullet_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/gun.json b/src/main/resources/assets/lzxnoneterraria/models/item/gun.json new file mode 100644 index 0000000..7b71259 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/gun.json @@ -0,0 +1,45 @@ +{ + "parent": "item/handheld", + "display": { + "gui": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 1.0, 0.5, 1.0 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 2.0, 0 ], + "scale": [ 1.0, 0.5, 0.5 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 13.0, 7.0 ], + "scale": [ 2, 1, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 1, 0.5, 1 ] + }, + "thirdperson_righthand": { + "rotation": [0, 90, 0], + "translation": [0, 0, -1], + "scale": [1.7, 0.85, 0.85] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, 0], + "translation": [0, 0, -1], + "scale": [1.7, 0.85, 0.85] + }, + "firstperson_righthand": { + "rotation": [0, 90, 25], + "translation": [1.13, 4.2, 0.0], + "scale": [1.36, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, -90, -25], + "translation": [1.13, 4.2, 0.0], + "scale": [1.36, 0.68, 0.68] + } + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot.json b/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot.json new file mode 100644 index 0000000..b601b53 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/meteor_shot" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot_projectile.json b/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot_projectile.json new file mode 100644 index 0000000..96bdc6f --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/meteor_shot_projectile.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/meteor_shot_projectile" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/musket_ball.json b/src/main/resources/assets/lzxnoneterraria/models/item/musket_ball.json new file mode 100644 index 0000000..2bab7d7 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/musket_ball.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lzxnoneterraria:item/musket_ball" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/sdmg.json b/src/main/resources/assets/lzxnoneterraria/models/item/sdmg.json new file mode 100644 index 0000000..b4d0e36 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/sdmg.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/gun", + "textures": { + "layer0": "lzxnoneterraria:item/sdmg" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/seedler.json b/src/main/resources/assets/lzxnoneterraria/models/item/seedler.json index 39c0f91..b3b30fc 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/item/seedler.json +++ b/src/main/resources/assets/lzxnoneterraria/models/item/seedler.json @@ -1,6 +1,48 @@ { - "parent": "lzxnoneterraria:item/sword3", + "parent": "item/handheld", "textures": { "layer0": "lzxnoneterraria:item/seedler" + }, + "display": { + "gui": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.65, 1.0, 1.0 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 2.0, 0 ], + "scale": [ 0.5, 0.75, 0.5 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 13.0, 7.0 ], + "scale": [ 1, 1.5, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 0.65, 1.0, 1 ] + }, + "thirdperson_righthand": { + "rotation": [0, 90, 55], + "translation": [0, 10.0, 7.0], + "scale": [1.2, 1.8, 1.8] + }, + "thirdperson_lefthand": { + "rotation": [0, -90, -55], + "translation": [0, 10.0, 7.0], + "scale": [1.2, 1.8, 1.8] + }, + "firstperson_righthand": { + "rotation": [0, 90, 25], + "translation": [1.13, 10.0, 0.0], + "scale": [0.83, 1.25, 1.25] + }, + "firstperson_lefthand": { + "rotation": [0, -90, -25], + "translation": [1.13, 10.0, 0.0], + "scale": [0.83, 1.25, 1.25] + } } } diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index 1991771..fd943c7 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -23,6 +23,12 @@ "star_collide": { "sounds": ["lzxnoneterraria:star_collide"] }, + "summon_terraprisma": { + "sounds": ["lzxnoneterraria:summon_terraprisma"] + }, + "shot": { + "sounds": ["lzxnoneterraria:shot"] + }, "boom": { "sounds": ["lzxnoneterraria:boom"] }, diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/dig.wav b/src/main/resources/assets/lzxnoneterraria/sounds/dig.wav deleted file mode 100644 index 5a761e32d963028755239261b52d3f1cba0e177f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7596 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 pnGEJ{roIsRm@8q82se*|6mEm?xA~PxZTb0k diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/shot.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/shot.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7f1ef2e6a366a266d8a3e7a0e6575a307fe72f68 GIT binary patch literal 10320 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/meteor_shot_projectile.png b/src/main/resources/assets/lzxnoneterraria/textures/item/meteor_shot_projectile.png new file mode 100644 index 0000000000000000000000000000000000000000..2ebb21be19affb55162d2402f2a399fba8e40f70 GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^GC<74!3HF~FYc)aQjEnx?oJHr&dIz4vLiD?B1$5B zeXNr6bM+Ea@{>~aDsl^esu&n-Dy)Fa+|-gpg^Jvqyke^gTP3gxD1^l#~=$>Fbx5m+O@q>*W`v z>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxD?a#8ycO zWDy)d+*y*DhOjBG80syc2lYWR`i6Q2`f#&>T5Uk0R{lkqsX&`S=Gz(CfK{T1LG7{8 z2U(8f7>G~7qCl_OaoOm@gUyc1=a70NFeKGIT^vI=WRvgcz5F(xk-MP!Xp`%d4FZdI nYKFP?oI90JsJ3R4i3kgW;VBlyk_L+zpwRbp^>bP0l+XkK>8p#B literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/musket_ball.png b/src/main/resources/assets/lzxnoneterraria/textures/item/musket_ball.png new file mode 100644 index 0000000000000000000000000000000000000000..df4e6b3f09bb039c08f9ecabb98e8ab6d2056d45 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a)45KkA!kcwN$4(zK|t@=OFaF@+b zsVhs4{BPc{d9$%ZdRkhOL5%WFDFLp(Z`L?StSbog7v)IKSQ6tLxIviXut?B4#_7u+ pvN;@m$aV5cgJhuu*U4)P3|xjwCFgtXu>+dV;OXk;vd$@?2>=e2FVO%1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/sdmg.png b/src/main/resources/assets/lzxnoneterraria/textures/item/sdmg.png new file mode 100644 index 0000000000000000000000000000000000000000..cdaca9e26a799cc3c1c352ec93a61ef772ab3282 GIT binary patch literal 356 zcmV-q0h|7bP)k7RCwB@%~6pYvEdmg;>DCTEGGp)&dr40Sj2b0v67~ z%-(6IeWC6Dl1%cE91n$=9WT8lg4PoIM!0(l6^V~Uo}2ZbWM*`8aglUR6A}UMqC{n< zBH}XcMa