v1.6.0
This commit is contained in:
1 parent
dfb2c94073
commit
7015a527fd
43 files changed
+1354
-15
No files matched your search
@@ -43,6 +43,14 @@ public class ModSounds {
|
||||
SOUND_EVENTS.register("star_collide",
|
||||
() -> SoundEvent.createVariableRangeEvent(
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "star_collide")));
|
||||
public static final Supplier<SoundEvent> SUMMON_TERRAPRISMA =
|
||||
SOUND_EVENTS.register("summon_terraprisma",
|
||||
() -> SoundEvent.createVariableRangeEvent(
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "summon_terraprisma")));
|
||||
public static final Supplier<SoundEvent> SHOT =
|
||||
SOUND_EVENTS.register("shot",
|
||||
() -> SoundEvent.createVariableRangeEvent(
|
||||
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "shot")));
|
||||
public static final Supplier<SoundEvent> BOOM =
|
||||
SOUND_EVENTS.register("boom",
|
||||
() -> SoundEvent.createVariableRangeEvent(
|
||||
|
||||
+5
@@ -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) {
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -55,6 +55,15 @@ public class ModCreativeModeTabs {
|
||||
output.accept(ModItems.LAST_PRISM.get());
|
||||
}).build());
|
||||
|
||||
public static final DeferredHolder<CreativeModeTab, CreativeModeTab> 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<CreativeModeTab, CreativeModeTab> SUMMON_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_summon_0", () -> CreativeModeTab.builder()
|
||||
.title(Component.translatable("itemGroup.lzxnoneterraria.summon"))
|
||||
.icon(() -> ModItems.TERRAPRISMA.get().getDefaultInstance())
|
||||
|
||||
@@ -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<String, IStaticSummonBehavior> 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) {
|
||||
|
||||
@@ -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<Item> BULLET_AMMO = create("bullet_ammo");
|
||||
|
||||
private static TagKey<Item> create(String name) {
|
||||
return TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, name));
|
||||
}
|
||||
}
|
||||
@@ -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<Item> LAST_PRISM = ITEMS.register("last_prism", LastPrism::new);
|
||||
|
||||
//远程武器
|
||||
public static final DeferredItem<Item> SDMG = ITEMS.register("sdmg", SDMG::new);
|
||||
|
||||
//弹药
|
||||
public static final DeferredItem<Item> MUSKET_BALL = ITEMS.register("musket_ball", MusketBall::new);
|
||||
public static final DeferredItem<Item> METEOR_SHOT = ITEMS.register("meteor_shot", MeteorShot::new);
|
||||
|
||||
public static final DeferredItem<Item> BULLET_PROJECTILE = ITEMS.register("bullet_projectile", BulletProjectile::new);
|
||||
public static final DeferredItem<Item> METEOR_SHOT_PROJECTILE = ITEMS.register("meteor_shot_projectile", MeteorShotProjectile::new);
|
||||
|
||||
//召唤武器
|
||||
public static final DeferredItem<Item> TERRAPRISMA = ITEMS.register("terraprisma", Terraprisma::new);
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
@@ -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<Component> 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)));
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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<ItemStack> 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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<T extends LivingEntity> {
|
||||
@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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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())) {
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user