From 4ef5640b99c7a8c0445ffcf898ecc76ce5168365 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Mon, 3 Aug 2026 04:13:41 +0800 Subject: [PATCH] v1.6.1 --- .../com/lzxnone/terraria/LzxnoneTerraria.java | 2 - .../java/com/lzxnone/terraria/ModSounds.java | 8 + .../ClientStaticSummonRenderBehaviors.java | 3 + .../summon/IStaticSummonRenderBehavior.java | 6 +- .../client/event/GuiRenderHandler.java | 2 +- .../client/event/ManaHudRenderer.java | 1 + .../client/event/RangedWeaponGuiHandler.java | 2 +- .../client/event/SniperScopeHandler.java | 2 +- .../client/item/ClientDropFallenStar.java | 178 ++++++++++++++++++ .../client/item/ranged/ClientStarCannon.java | 1 + .../ModCreativeModeTabs.java | 5 + .../dynamic_lights/MEntityLuminance.java | 3 +- .../lzxnone/terraria/effect/ManaEffect.java | 42 ----- .../lzxnone/terraria/effect/ModEffects.java | 2 - .../lzxnone/terraria/effect/ModPotions.java | 60 ------ .../entity/summon/IStaticSummonBehavior.java | 5 +- .../terraria/entity/summon/StaticSummon.java | 2 + .../entity/summon/StaticSummonBehaviors.java | 5 + .../terraria/event/BrewingRecipeHandler.java | 35 ++-- .../event/FallenStarEventHandler.java | 20 +- .../event/PlayerManaSyncEventHandler.java | 9 + .../com/lzxnone/terraria/item/ModItems.java | 8 + .../terraria/item/accessory/ManaFlower.java | 2 +- .../terraria/item/accessory/NaturesGift.java | 2 +- .../terraria/item/ammo/FallenStar.java | 89 +++++++++ .../terraria/item/food/ManaCrystal.java | 7 +- .../item/potion/AbstractManaPotion.java | 43 +++++ .../item/potion/GreaterManaPotion.java | 10 + .../item/potion/LesserManaPotion.java | 10 + .../terraria/item/potion/ManaPotion.java | 10 + .../lzxnone/terraria/item/potion/Potion.java | 85 +++++++++ .../terraria/item/potion/SummoningPotion.java | 21 +++ .../terraria/item/potion/SuperManaPotion.java | 10 + .../terraria/item/weapon/MagicWeapon.java | 8 +- .../terraria/item/weapon/magic/LastPrism.java | 2 +- .../item/weapon/ranged/Flamethrower.java | 2 +- .../summon/minion/StardustDragonStaff.java | 2 +- .../weapon/summon/minion/Terraprisma.java | 2 +- .../item/weapon/summon/whip/Possession.java | 2 +- .../terraria/utils/ManaPotionUtil.java | 43 +---- .../assets/lzxnoneterraria/lang/en_us.json | 16 +- .../assets/lzxnoneterraria/lang/zh_cn.json | 16 +- .../models/item/greater_mana_potion.json | 6 + .../models/item/lesser_mana_potion.json | 6 + .../models/item/mana_potion.json | 6 + .../models/item/summoning_potion.json | 6 + .../models/item/super_mana_potion.json | 6 + .../assets/lzxnoneterraria/sounds.json | 6 + .../assets/lzxnoneterraria/sounds/drink.ogg | Bin 0 -> 8222 bytes .../lzxnoneterraria/sounds/get_mana.ogg | Bin 0 -> 23322 bytes .../textures/item/greater_mana_potion.png | Bin 0 -> 282 bytes .../textures/item/lesser_mana_potion.png | Bin 0 -> 225 bytes .../textures/item/mana_motion.png | Bin 0 -> 270 bytes .../textures/item/summoning_potion.png | Bin 0 -> 246 bytes .../textures/item/super_mana_potion.png | Bin 0 -> 288 bytes .../loot_modifiers/global_loot_modifiers.json | 3 +- .../mana_potions_simple_dungeon.json | 10 + .../loot_table/chests/mana_potions.json | 49 +++++ .../recipe/greater_mana_potion.json | 18 ++ .../lzxnoneterraria/recipe/mana_flower.json | 8 +- .../recipe/super_mana_potion.json | 18 ++ 61 files changed, 710 insertions(+), 215 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java delete mode 100644 src/main/java/com/lzxnone/terraria/effect/ManaEffect.java delete mode 100644 src/main/java/com/lzxnone/terraria/effect/ModPotions.java create mode 100644 src/main/java/com/lzxnone/terraria/item/potion/AbstractManaPotion.java create mode 100644 src/main/java/com/lzxnone/terraria/item/potion/GreaterManaPotion.java create mode 100644 src/main/java/com/lzxnone/terraria/item/potion/LesserManaPotion.java create mode 100644 src/main/java/com/lzxnone/terraria/item/potion/ManaPotion.java create mode 100644 src/main/java/com/lzxnone/terraria/item/potion/Potion.java create mode 100644 src/main/java/com/lzxnone/terraria/item/potion/SummoningPotion.java create mode 100644 src/main/java/com/lzxnone/terraria/item/potion/SuperManaPotion.java create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/greater_mana_potion.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/lesser_mana_potion.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/mana_potion.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/summoning_potion.json create mode 100644 src/main/resources/assets/lzxnoneterraria/models/item/super_mana_potion.json create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/drink.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/sounds/get_mana.ogg create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/greater_mana_potion.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/lesser_mana_potion.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/mana_motion.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/summoning_potion.png create mode 100644 src/main/resources/assets/lzxnoneterraria/textures/item/super_mana_potion.png create mode 100644 src/main/resources/data/lzxnoneterraria/loot_modifiers/mana_potions_simple_dungeon.json create mode 100644 src/main/resources/data/lzxnoneterraria/loot_table/chests/mana_potions.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/greater_mana_potion.json create mode 100644 src/main/resources/data/lzxnoneterraria/recipe/super_mana_potion.json diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java index 8abff71..41a5d65 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerraria.java @@ -4,7 +4,6 @@ import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.block.ModBlocks; import com.lzxnone.terraria.creative_mode_tab.ModCreativeModeTabs; import com.lzxnone.terraria.effect.ModEffects; -import com.lzxnone.terraria.effect.ModPotions; import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.item.ModItems; @@ -27,7 +26,6 @@ public class LzxnoneTerraria { ModBlocks.BLOCKS.register(modEventBus); ModItems.ITEMS.register(modEventBus); ModEffects.MOB_EFFECTS.register(modEventBus); - ModPotions.POTIONS.register(modEventBus); ModEntities.ENTITY_TYPES.register(modEventBus); ModParticles.PARTICLE_TYPES.register(modEventBus); ModSounds.SOUND_EVENTS.register(modEventBus); diff --git a/src/main/java/com/lzxnone/terraria/ModSounds.java b/src/main/java/com/lzxnone/terraria/ModSounds.java index ff55247..b365043 100644 --- a/src/main/java/com/lzxnone/terraria/ModSounds.java +++ b/src/main/java/com/lzxnone/terraria/ModSounds.java @@ -23,6 +23,14 @@ public class ModSounds { SOUND_EVENTS.register("max_mana", () -> SoundEvent.createVariableRangeEvent( ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "max_mana"))); + public static final Supplier GET_MANA = + SOUND_EVENTS.register("get_mana", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "get_mana"))); + public static final Supplier DRINK = + SOUND_EVENTS.register("drink", + () -> SoundEvent.createVariableRangeEvent( + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "drink"))); public static final Supplier WAVE = SOUND_EVENTS.register("wave", () -> 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 ed89576..56e15f8 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.ClientDropFallenStar; import com.lzxnone.terraria.client.item.ranged.ClientBulletAmmo; import com.lzxnone.terraria.client.item.magic.ClientLastPrism; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; @@ -29,6 +30,8 @@ public class ClientStaticSummonRenderBehaviors { static { BEHAVIORS.put(StaticSummonBehaviors.DEFAULT, DEFAULT_BEHAVIOR); + BEHAVIORS.put(StaticSummonBehaviors.DROP_FALLEN_STAR, ClientDropFallenStar.SUMMON_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); diff --git a/src/main/java/com/lzxnone/terraria/client/entity/summon/IStaticSummonRenderBehavior.java b/src/main/java/com/lzxnone/terraria/client/entity/summon/IStaticSummonRenderBehavior.java index 1666cac..161ecc8 100644 --- a/src/main/java/com/lzxnone/terraria/client/entity/summon/IStaticSummonRenderBehavior.java +++ b/src/main/java/com/lzxnone/terraria/client/entity/summon/IStaticSummonRenderBehavior.java @@ -27,9 +27,7 @@ public interface IStaticSummonRenderBehavior { 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.XP.rotationDegrees(summon.getEntityData().get(StaticSummon.RXP) + summon.getEntityData().get(StaticSummon.RXPS) * (summon.getEntityData().get(StaticSummon.AGE) + partialTick))); - poseStack.mulPose(Axis.YP.rotationDegrees(summon.getEntityData().get(StaticSummon.RYP) + summon.getEntityData().get(StaticSummon.RYPS) * (summon.getEntityData().get(StaticSummon.AGE) + partialTick))); - poseStack.mulPose(Axis.ZP.rotationDegrees(summon.getEntityData().get(StaticSummon.RZP) + summon.getEntityData().get(StaticSummon.RZPS) * (summon.getEntityData().get(StaticSummon.AGE) + partialTick))); + poseStack.mulPose(Axis.YP.rotationDegrees(summon.getEntityData().get(StaticSummon.RYPS) * (summon.getEntityData().get(StaticSummon.AGE) + partialTick))); poseStack.scale( summon.getEntityData().get(StaticSummon.SCALE_X), @@ -55,6 +53,8 @@ public interface IStaticSummonRenderBehavior { 0 ); poseStack.popPose(); + + } default void renderBlock(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { diff --git a/src/main/java/com/lzxnone/terraria/client/event/GuiRenderHandler.java b/src/main/java/com/lzxnone/terraria/client/event/GuiRenderHandler.java index cd7a6ef..401520a 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/GuiRenderHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/GuiRenderHandler.java @@ -20,7 +20,7 @@ public class GuiRenderHandler { public static void onRenderGui(RenderGuiEvent.Post event) { Minecraft minecraft = Minecraft.getInstance(); LocalPlayer player = minecraft.player; - if(player == null || minecraft.options.hideGui) return; + if(player == null || minecraft.options.hideGui || player.isSpectator()) return; ManaHudRenderer.render(event.getGuiGraphics(), player); diff --git a/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java b/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java index 325cadf..24d2f2c 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java +++ b/src/main/java/com/lzxnone/terraria/client/event/ManaHudRenderer.java @@ -35,6 +35,7 @@ public class ManaHudRenderer { int segmentCount = Mth.clamp(Mth.ceil(maxMana / (float)MANA_PER_STAR), 0, MAX_SEGMENT_COUNT); int currentMana = Mth.clamp(mana.getMana(), 0, maxMana); + if(currentMana >= maxMana) return; manaBarX = RenderConfigs.MANA_BAR_X.get(); manaBarY = RenderConfigs.MANA_BAR_Y.get(); diff --git a/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java b/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java index e737db2..c7b61bc 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/RangedWeaponGuiHandler.java @@ -41,7 +41,7 @@ public class RangedWeaponGuiHandler { public static void onRenderGui(RenderGuiEvent.Post event) { Minecraft minecraft = Minecraft.getInstance(); Player player = minecraft.player; - if(player == null || minecraft.options.hideGui) return; + if(player == null || minecraft.options.hideGui || player.isSpectator()) return; GuiGraphics guiGraphics = event.getGuiGraphics(); int centerX = guiGraphics.guiWidth() / 2; diff --git a/src/main/java/com/lzxnone/terraria/client/event/SniperScopeHandler.java b/src/main/java/com/lzxnone/terraria/client/event/SniperScopeHandler.java index 86c33af..d330d1b 100644 --- a/src/main/java/com/lzxnone/terraria/client/event/SniperScopeHandler.java +++ b/src/main/java/com/lzxnone/terraria/client/event/SniperScopeHandler.java @@ -45,7 +45,7 @@ public class SniperScopeHandler { private static ItemStack getActiveSniperStack() { Minecraft minecraft = Minecraft.getInstance(); LocalPlayer player = minecraft.player; - if(player == null || !player.isUsingItem()) return ItemStack.EMPTY; + if(player == null || player.isSpectator() || !player.isUsingItem()) return ItemStack.EMPTY; ItemStack stack = player.getUseItem(); if(stack.is(ModItems.SNIPER_RIFLE)) return stack; diff --git a/src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java b/src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java new file mode 100644 index 0000000..d6168b2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/client/item/ClientDropFallenStar.java @@ -0,0 +1,178 @@ +package com.lzxnone.terraria.client.item; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.client.entity.summon.IStaticSummonRenderBehavior; +import com.lzxnone.terraria.entity.ModRenderTypes; +import com.lzxnone.terraria.entity.TintedVertexConsumer; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.Vec3; +import org.joml.Matrix4f; + +public class ClientDropFallenStar { + private static final ResourceLocation RIBBON_RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/normal_trail.png"); + private static final ResourceLocation STAR_WAVE_RES = ResourceLocation.parse("lzxnoneterraria:textures/vfx/star_wave.png"); + private static final int RIBBON_COUNT = 14; + private static final float MIN_RIBBON_LENGTH = 0.45F; + private static final float MAX_RIBBON_LENGTH = 1.2F; + private static final float MAX_RIBBON_WIDTH = 0.21F; + private static final float RIBBON_ALPHA = 0.55F; + private static final float RIBBON_COLOR_R = 1.0F; + private static final float RIBBON_COLOR_G = 0.78F; + private static final float RIBBON_COLOR_B = 0.16F; + private static final float STAR_WAVE_HALF_WIDTH = 45 * 0.06F; + private static final float STAR_WAVE_HALF_HEIGHT = 17 * 0.06F; + private static final float STAR_WAVE_ALPHA = 0.5F; + private static final double RIBBON_CENTER_Y_OFFSET = 0.5D; + private static final double GOLDEN_ANGLE = Math.PI * (3.0D - Math.sqrt(5.0D)); + + public static final IStaticSummonRenderBehavior SUMMON_BEHAVIOR = new IStaticSummonRenderBehavior() { + @Override + public void renderItem(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(9 * (summon.getEntityData().get(StaticSummon.AGE) + partialTick))); + + poseStack.translate(0, 0.5f, 0); + + poseStack.scale(0.75f, 0.75f, 0.75f); + + Minecraft.getInstance().getItemRenderer().renderStatic( + itemStack, + ItemDisplayContext.NONE, + summon.getEntityData().get(StaticSummon.GLOW) ? LightTexture.FULL_BRIGHT : packedLight, + OverlayTexture.NO_OVERLAY, + poseStack, + renderType -> { + VertexConsumer vertexConsumer = bufferSource.getBuffer(renderType); + return new TintedVertexConsumer(vertexConsumer, + summon.getEntityData().get(StaticSummon.COLOR_R), + summon.getEntityData().get(StaticSummon.COLOR_G), + summon.getEntityData().get(StaticSummon.COLOR_B), + summon.getEntityData().get(StaticSummon.COLOR_A)); + }, + entity.level(), + 0 + ); + poseStack.popPose(); + } + + @Override + public void render(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { + if(!(entity instanceof StaticSummon summon)) return; + renderItem(entity, entityYaw, partialTick, poseStack, bufferSource, packedLight); + renderRibbons(summon, partialTick, poseStack, bufferSource); + renderStarWave(summon, poseStack, bufferSource); + } + }; + + private static void renderStarWave(StaticSummon summon, PoseStack poseStack, MultiBufferSource bufferSource) { + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + if(customData.contains("ground")) return; + if(summon.onGround()) return; + + Vec3 dir = summon.getDeltaMovement().normalize(); + float yRot = (float)(Mth.atan2(dir.x, dir.z) * Mth.RAD_TO_DEG); + float xRot = (float)(Mth.atan2(dir.y, Math.sqrt(dir.x * dir.x + dir.z * dir.z)) * Mth.RAD_TO_DEG); + + poseStack.pushPose(); + poseStack.translate(-dir.x * 2, -dir.y * 2, -dir.z * 2); + poseStack.mulPose(Axis.YP.rotationDegrees(yRot)); + poseStack.mulPose(Axis.XP.rotationDegrees(-xRot)); + poseStack.mulPose(Axis.YP.rotationDegrees(270.0F)); + + VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(STAR_WAVE_RES)); + addQuad(consumer, poseStack.last().pose(), STAR_WAVE_HALF_WIDTH, STAR_WAVE_HALF_HEIGHT, + 0.29F, 0.29F, 0.871F, STAR_WAVE_ALPHA); + poseStack.popPose(); + } + + private static void renderRibbons(StaticSummon summon, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource) { + VertexConsumer consumer = bufferSource.getBuffer(ModRenderTypes.entityAdditiveEmissive(RIBBON_RES)); + Matrix4f matrix = poseStack.last().pose(); + float age = summon.getEntityData().get(StaticSummon.AGE) + partialTick; + Vec3 entityPos = summon.getPosition(partialTick); + Vec3 cameraDir = entityPos.subtract(Minecraft.getInstance().gameRenderer.getMainCamera().getPosition()); + if(cameraDir.lengthSqr() < 1.0E-4D) cameraDir = new Vec3(0.0D, 0.0D, 1.0D); + else cameraDir = cameraDir.normalize(); + + for(int i = 0; i < RIBBON_COUNT; i++) { + Vec3 ray = getRibbonDirection(i, age, summon.getId()); + Vec3 side = ray.cross(cameraDir); + if(side.lengthSqr() < 1.0E-4D) side = ray.cross(new Vec3(0.0D, 1.0D, 0.0D)); + if(side.lengthSqr() < 1.0E-4D) side = ray.cross(new Vec3(1.0D, 0.0D, 0.0D)); + side = side.normalize(); + + float pulse = 0.65F + 0.35F * (float)Math.sin(age * 0.18F + i * 1.37F); + float length = MIN_RIBBON_LENGTH + (MAX_RIBBON_LENGTH - MIN_RIBBON_LENGTH) * pulse; + float width = MAX_RIBBON_WIDTH * (0.55F + 0.45F * pulse); + float alpha = RIBBON_ALPHA * (0.6F + 0.4F * pulse); + + Vec3 centerOffset = new Vec3(0.0D, RIBBON_CENTER_Y_OFFSET, 0.0D); + Vec3 start = centerOffset.add(ray.scale(0.08D)); + Vec3 end = centerOffset.add(ray.scale(length)); + addRibbon(consumer, matrix, start, end, side, width, RIBBON_COLOR_R, RIBBON_COLOR_G, RIBBON_COLOR_B, alpha); + } + } + + private static Vec3 getRibbonDirection(int index, float age, int seed) { + double y = 1.0D - (index + 0.5D) * 2.0D / RIBBON_COUNT; + double radius = Math.sqrt(Math.max(0.0D, 1.0D - y * y)); + double angle = index * GOLDEN_ANGLE + seed * 0.37D + age * 0.045D; + return new Vec3(Math.cos(angle) * radius, y, Math.sin(angle) * radius).normalize(); + } + + private static void addRibbon(VertexConsumer consumer, Matrix4f matrix, Vec3 start, Vec3 end, Vec3 side, + float width, float r, float g, float b, float alpha) { + Vec3 endA = end.add(side.scale(width)); + Vec3 endB = end.subtract(side.scale(width)); + + consumer.addVertex(matrix, (float)start.x, (float)start.y, (float)start.z) + .setColor(r, g, b, alpha).setUv(0.5F, 1.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(matrix, (float)start.x, (float)start.y, (float)start.z) + .setColor(r, g, b, alpha).setUv(0.5F, 0.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(matrix, (float)endA.x, (float)endA.y, (float)endA.z) + .setColor(r, g, b, 0.0F).setUv(1.0F, 0.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(matrix, (float)endB.x, (float)endB.y, (float)endB.z) + .setColor(r, g, b, 0.0F).setUv(0.0F, 1.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + } + + private static void addQuad(VertexConsumer consumer, Matrix4f matrix, float halfWidth, float halfHeight, + float r, float g, float b, float alpha) { + consumer.addVertex(matrix, -halfWidth, -halfHeight, 0.0F) + .setColor(r, g, b, alpha).setUv(0.0F, 1.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(matrix, halfWidth, -halfHeight, 0.0F) + .setColor(r, g, b, alpha).setUv(1.0F, 1.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(matrix, halfWidth, halfHeight, 0.0F) + .setColor(r, g, b, alpha).setUv(1.0F, 0.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + consumer.addVertex(matrix, -halfWidth, halfHeight, 0.0F) + .setColor(r, g, b, alpha).setUv(0.0F, 0.0F) + .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0F, 1.0F, 0.0F); + } +} diff --git a/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientStarCannon.java b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientStarCannon.java index 9eb52d9..927dc24 100644 --- a/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientStarCannon.java +++ b/src/main/java/com/lzxnone/terraria/client/item/ranged/ClientStarCannon.java @@ -56,6 +56,7 @@ public class ClientStarCannon { poseStack.popPose(); poseStack.pushPose(); + float starHalfWidth = 45 * 0.06f; float starHalfHeight = 17 * 0.06f; VertexConsumer starConsumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES)); 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 1776b21..3d0e7ab 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 @@ -54,6 +54,10 @@ public class ModCreativeModeTabs { .displayItems((parameters, output) -> { output.accept(ModItems.LAST_PRISM.get()); output.accept(ModItems.MANA_CRYSTAL.get()); + output.accept(ModItems.LESSER_MANA_POTION.get()); + output.accept(ModItems.MANA_POTION.get()); + output.accept(ModItems.GREATER_MANA_POTION.get()); + output.accept(ModItems.SUPER_MANA_POTION.get()); }).build()); public static final DeferredHolder ACCESSORY_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_accessory_0", () -> CreativeModeTab.builder() @@ -130,5 +134,6 @@ public class ModCreativeModeTabs { output.accept(ModItems.TERRAPRISMA.get()); output.accept(ModItems.STARDUST_DRAGON_STAFF.get()); output.accept(ModItems.POSSESSION.get()); + output.accept(ModItems.SUMMONING_POTION.get()); }).build()); } diff --git a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java index c18fc1d..1b1d87d 100644 --- a/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java +++ b/src/main/java/com/lzxnone/terraria/dynamic_lights/MEntityLuminance.java @@ -65,7 +65,8 @@ public class MEntityLuminance implements EntityLuminance { StaticSummonBehaviors.ELF_MELTER_FLAME, StaticSummonBehaviors.STARDUST_DRAGON, StaticSummonBehaviors.FALLEN_STAR, - StaticSummonBehaviors.FALLEN_STAR_SUPER -> { + StaticSummonBehaviors.FALLEN_STAR_SUPER, + StaticSummonBehaviors.DROP_FALLEN_STAR -> { return 15; } case StaticSummonBehaviors.CHLOROPHYTE_BULLET, diff --git a/src/main/java/com/lzxnone/terraria/effect/ManaEffect.java b/src/main/java/com/lzxnone/terraria/effect/ManaEffect.java deleted file mode 100644 index d221440..0000000 --- a/src/main/java/com/lzxnone/terraria/effect/ManaEffect.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.lzxnone.terraria.effect; - -import com.lzxnone.terraria.attachment.ModAttachments; -import com.lzxnone.terraria.attachment.PlayerMana; -import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.effect.MobEffect; -import net.minecraft.world.effect.MobEffectCategory; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; - -public class ManaEffect extends MobEffect { - private static final int[] RECOVER_AMOUNTS = {50, 100, 200, 300}; - - public ManaEffect() { - super(MobEffectCategory.BENEFICIAL, 0x00D7FF); - } - - @Override - public boolean isInstantenous() { - return true; - } - - @Override - public void applyInstantenousEffect(Entity source, Entity indirectSource, LivingEntity livingEntity, int amplifier, double health) { - if(!(livingEntity instanceof ServerPlayer player)) return; - - PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); - int oldMana = mana.getMana(); - mana.recoverManaImmediately(getRecoverAmount(amplifier)); - ManaSicknessEffect.applyTo(player); - player.setData(ModAttachments.PLAYER_MANA, mana); - if(mana.getMana() != oldMana) { - PlayerManaSyncEventHandler.sync(player); - } - } - - public static int getRecoverAmount(int amplifier) { - int index = Math.clamp(amplifier, 0, RECOVER_AMOUNTS.length - 1); - return RECOVER_AMOUNTS[index]; - } -} diff --git a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java index 565d329..807420a 100644 --- a/src/main/java/com/lzxnone/terraria/effect/ModEffects.java +++ b/src/main/java/com/lzxnone/terraria/effect/ModEffects.java @@ -28,8 +28,6 @@ public class ModEffects { MOB_EFFECTS.register("acid_venom", AcidVenomEffect::new); public static final DeferredHolder SUMMON = MOB_EFFECTS.register("summon", SummonEffect::new); - public static final DeferredHolder MANA = - MOB_EFFECTS.register("mana", ManaEffect::new); public static final DeferredHolder MANA_SICKNESS = MOB_EFFECTS.register("mana_sickness", ManaSicknessEffect::new); public static final DeferredHolder MIDAS = diff --git a/src/main/java/com/lzxnone/terraria/effect/ModPotions.java b/src/main/java/com/lzxnone/terraria/effect/ModPotions.java deleted file mode 100644 index 4f5d0de..0000000 --- a/src/main/java/com/lzxnone/terraria/effect/ModPotions.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.lzxnone.terraria.effect; - -import com.lzxnone.terraria.LzxnoneTerraria; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.item.alchemy.Potion; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredRegister; - -public class ModPotions { - public static final DeferredRegister POTIONS = - DeferredRegister.create(BuiltInRegistries.POTION, LzxnoneTerraria.MODID); - - public static final DeferredHolder SHORT_SUMMON_0 = - registerSummonPotion("short_summon_0", 6000, 0); - public static final DeferredHolder MEDIUM_SUMMON_0 = - registerSummonPotion("medium_summon_0", 36000, 0); - public static final DeferredHolder LONG_SUMMON_0 = - registerSummonPotion("long_summon_0", 216000, 0); - public static final DeferredHolder SHORT_SUMMON_1 = - registerSummonPotion("short_summon_1", 6000, 1); - public static final DeferredHolder MEDIUM_SUMMON_1 = - registerSummonPotion("medium_summon_1", 36000, 1); - public static final DeferredHolder LONG_SUMMON_1 = - registerSummonPotion("long_summon_1", 216000, 1); - public static final DeferredHolder SHORT_SUMMON_2 = - registerSummonPotion("short_summon_2", 6000, 2); - public static final DeferredHolder MEDIUM_SUMMON_2 = - registerSummonPotion("medium_summon_2", 36000, 2); - public static final DeferredHolder LONG_SUMMON_2 = - registerSummonPotion("long_summon_2", 216000, 2); - public static final DeferredHolder SHORT_SUMMON_3 = - registerSummonPotion("short_summon_3", 6000, 3); - public static final DeferredHolder MEDIUM_SUMMON_3 = - registerSummonPotion("medium_summon_3", 36000, 3); - public static final DeferredHolder LONG_SUMMON_3 = - registerSummonPotion("long_summon_3", 216000, 3); - public static final DeferredHolder SHORT_SUMMON_4 = - registerSummonPotion("short_summon_4", 6000, 4); - public static final DeferredHolder MEDIUM_SUMMON_4 = - registerSummonPotion("medium_summon_4", 36000, 4); - public static final DeferredHolder LONG_SUMMON_4 = - registerSummonPotion("long_summon_4", 216000, 4); - public static final DeferredHolder MANA_0 = - registerManaPotion("mana_0", 0); - public static final DeferredHolder MANA_1 = - registerManaPotion("mana_1", 1); - public static final DeferredHolder MANA_2 = - registerManaPotion("mana_2", 2); - public static final DeferredHolder MANA_3 = - registerManaPotion("mana_3", 3); - - private static DeferredHolder registerSummonPotion(String name, int duration, int amplifier) { - return POTIONS.register(name, () -> new Potion("summon", new MobEffectInstance(ModEffects.SUMMON, duration, amplifier))); - } - - private static DeferredHolder registerManaPotion(String name, int amplifier) { - return POTIONS.register(name, () -> new Potion("mana", new MobEffectInstance(ModEffects.MANA, 1, amplifier))); - } -} diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/IStaticSummonBehavior.java b/src/main/java/com/lzxnone/terraria/entity/summon/IStaticSummonBehavior.java index d8c3c11..9934920 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/IStaticSummonBehavior.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/IStaticSummonBehavior.java @@ -9,10 +9,11 @@ public interface IStaticSummonBehavior { onDied(summon); return; } - if(summon.getEntityData().get(StaticSummon.AGE) > summon.getEntityData().get(StaticSummon.LIFETIME)) { + int lifetime = summon.getEntityData().get(StaticSummon.LIFETIME); + if(lifetime != StaticSummon.INFINITE_LIFETIME && summon.getEntityData().get(StaticSummon.AGE) > lifetime) { onDied(summon); }else { - if(summon.getEntityData().get(StaticSummon.AGE) != -114514) summon.getEntityData().set(StaticSummon.AGE, summon.getEntityData().get(StaticSummon.AGE) + 1); + summon.getEntityData().set(StaticSummon.AGE, summon.getEntityData().get(StaticSummon.AGE) + 1); } } diff --git a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java index bfb580e..9d34c57 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummon.java @@ -21,6 +21,8 @@ import org.jspecify.annotations.NonNull; import java.util.*; public class StaticSummon extends Entity { + public static final int INFINITE_LIFETIME = -114514; + public static final EntityDataAccessor BEHAVIOR = SynchedEntityData.defineId(StaticSummon.class, EntityDataSerializers.STRING); public static final EntityDataAccessor RENDER_MODE = 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 0c5971d..a66f8e5 100644 --- a/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java +++ b/src/main/java/com/lzxnone/terraria/entity/summon/StaticSummonBehaviors.java @@ -21,6 +21,9 @@ public class StaticSummonBehaviors { public static final String DEFAULT = "default"; + //掉落实体 + public static final String DROP_FALLEN_STAR = "drop_fallen_star"; + //弹射实体 public static final String SEEDLER_NUT = "seedler_nut"; public static final String THE_HORSEMANS_BLADE_JACK = "the_horsemans_blade_jack"; @@ -72,6 +75,8 @@ public class StaticSummonBehaviors { static { BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {}); + BEHAVIORS.put(DROP_FALLEN_STAR, FallenStar.SUMMON_BEHAVIOR); + BEHAVIORS.put(SEEDLER_NUT, Seedler.SUMMON_BEHAVIOR); BEHAVIORS.put(THE_HORSEMANS_BLADE_JACK, TheHorsemansBlade.SUMMON_BEHAVIOR); BEHAVIORS.put(INFLUX_WAVER_BEAM, InfluxWaver.SUMMON_BEHAVIOR); diff --git a/src/main/java/com/lzxnone/terraria/event/BrewingRecipeHandler.java b/src/main/java/com/lzxnone/terraria/event/BrewingRecipeHandler.java index a43d7a1..8e3bbbb 100644 --- a/src/main/java/com/lzxnone/terraria/event/BrewingRecipeHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/BrewingRecipeHandler.java @@ -1,35 +1,30 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; -import com.lzxnone.terraria.effect.ModPotions; +import com.lzxnone.terraria.item.ModItems; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.item.alchemy.PotionContents; import net.minecraft.world.item.alchemy.Potions; +import net.minecraft.world.item.crafting.Ingredient; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.common.crafting.DataComponentIngredient; import net.neoforged.neoforge.event.brewing.RegisterBrewingRecipesEvent; @EventBusSubscriber(modid = LzxnoneTerraria.MODID) public class BrewingRecipeHandler { @SubscribeEvent public static void onRegisterBrewingRecipes(RegisterBrewingRecipesEvent event) { - event.getBuilder().addMix(Potions.AWKWARD, Items.NETHERITE_SCRAP, ModPotions.SHORT_SUMMON_0); - event.getBuilder().addMix(ModPotions.SHORT_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_0); - event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_0); - - event.getBuilder().addMix(ModPotions.LONG_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.SHORT_SUMMON_1); - event.getBuilder().addMix(ModPotions.SHORT_SUMMON_1, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_1); - event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_1, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_1); - - event.getBuilder().addMix(ModPotions.LONG_SUMMON_1, Items.NETHERITE_INGOT, ModPotions.SHORT_SUMMON_2); - event.getBuilder().addMix(ModPotions.SHORT_SUMMON_2, Items.NETHERITE_INGOT, ModPotions.MEDIUM_SUMMON_2); - event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_2, Items.NETHERITE_INGOT, ModPotions.LONG_SUMMON_2); - - event.getBuilder().addMix(ModPotions.LONG_SUMMON_2, Items.NETHERITE_INGOT, ModPotions.SHORT_SUMMON_3); - event.getBuilder().addMix(ModPotions.SHORT_SUMMON_3, Items.NETHERITE_INGOT, ModPotions.MEDIUM_SUMMON_3); - event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_3, Items.NETHERITE_INGOT, ModPotions.LONG_SUMMON_3); - - event.getBuilder().addMix(ModPotions.LONG_SUMMON_3, Items.NETHERITE_BLOCK, ModPotions.SHORT_SUMMON_4); - event.getBuilder().addMix(ModPotions.SHORT_SUMMON_4, Items.NETHERITE_BLOCK, ModPotions.MEDIUM_SUMMON_4); - event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_4, Items.NETHERITE_BLOCK, ModPotions.LONG_SUMMON_4); + event.getBuilder().addRecipe( + DataComponentIngredient.of(false, PotionContents.createItemStack(Items.POTION, Potions.AWKWARD)), + Ingredient.of(Items.SADDLE), + new ItemStack(ModItems.SUMMONING_POTION.get()) + ); + event.getBuilder().addRecipe( + Ingredient.of(ModItems.LESSER_MANA_POTION.get()), + Ingredient.of(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM), + new ItemStack(ModItems.MANA_POTION.get()) + ); } } diff --git a/src/main/java/com/lzxnone/terraria/event/FallenStarEventHandler.java b/src/main/java/com/lzxnone/terraria/event/FallenStarEventHandler.java index 7a1c7d6..c6d2970 100644 --- a/src/main/java/com/lzxnone/terraria/event/FallenStarEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/FallenStarEventHandler.java @@ -2,14 +2,16 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.ModSounds; +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.utils.SoundUtil; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; import net.minecraft.util.RandomSource; -import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.levelgen.Heightmap; @@ -21,12 +23,13 @@ import net.neoforged.neoforge.event.tick.PlayerTickEvent; @EventBusSubscriber(modid = LzxnoneTerraria.MODID) public class FallenStarEventHandler { private static final int CHECK_INTERVAL = 20; - private static final double SPAWN_CHANCE = 0.004D; + private static final double SPAWN_CHANCE = 0.01D; private static final int MIN_SPAWN_RADIUS = 24; private static final int MAX_SPAWN_RADIUS = 64; private static final int SPAWN_HEIGHT = 48; private static final int MAX_ATTEMPTS = 8; private static final double FALL_SPEED = -0.65D; + private static final int FALLEN_STAR_LIFETIME = 10 * 60 * 20; @SubscribeEvent public static void onPlayerTick(PlayerTickEvent.Post event) { @@ -42,11 +45,16 @@ public class FallenStarEventHandler { Vec3 spawnPos = getSpawnPos(serverLevel, player, random); if(spawnPos == null) return; - ItemEntity fallenStar = new ItemEntity(serverLevel, spawnPos.x, spawnPos.y, spawnPos.z, new ItemStack(ModItems.FALLEN_STAR.get())); + StaticSummon fallenStar = new StaticSummon(ModEntities.STATIC_SUMMON.get(), serverLevel); + fallenStar.setPos(spawnPos); + fallenStar.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.DROP_FALLEN_STAR); + fallenStar.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); + fallenStar.getEntityData().set(StaticSummon.ITEM, new ItemStack(ModItems.FALLEN_STAR.get())); + fallenStar.getEntityData().set(StaticSummon.LIFETIME, FALLEN_STAR_LIFETIME); + fallenStar.getEntityData().set(StaticSummon.GLOW, true); fallenStar.setDeltaMovement(0.0D, FALL_SPEED, 0.0D); - fallenStar.setDefaultPickUpDelay(); serverLevel.addFreshEntity(fallenStar); - SoundUtil.playServerSound(fallenStar, ModSounds.STAR_FALL.get(), 2.0f, 1.0f); + player.playNotifySound(ModSounds.STAR_FALL.get(), SoundSource.PLAYERS, 4.0f, 1.0f); } private static Vec3 getSpawnPos(ServerLevel level, ServerPlayer player, RandomSource random) { diff --git a/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java b/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java index cc64a11..9b6825a 100644 --- a/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java +++ b/src/main/java/com/lzxnone/terraria/event/PlayerManaSyncEventHandler.java @@ -1,11 +1,13 @@ package com.lzxnone.terraria.event; import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.item.weapon.MagicWeapon; import com.lzxnone.terraria.network.payload.ManaSyncPayload; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.item.ItemStack; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; @@ -52,6 +54,7 @@ public class PlayerManaSyncEventHandler { player.setData(ModAttachments.PLAYER_MANA, mana); if(mana.getMana() != oldMana) { + playMaxManaSoundIfRecovered(player, oldMana, mana); sync(player); } } @@ -61,6 +64,12 @@ public class PlayerManaSyncEventHandler { PacketDistributor.sendToPlayer(player, new ManaSyncPayload(mana.getMana(), mana.getMaxMana())); } + public static void playMaxManaSoundIfRecovered(ServerPlayer player, int oldMana, PlayerMana mana) { + if(oldMana < mana.getMaxMana() && mana.getMana() >= mana.getMaxMana()) { + player.playNotifySound(ModSounds.MAX_MANA.get(), SoundSource.PLAYERS, 4.0F, 1.0F); + } + } + private static boolean isUsingMagicWeapon(ServerPlayer player) { if(!player.isUsingItem()) return false; diff --git a/src/main/java/com/lzxnone/terraria/item/ModItems.java b/src/main/java/com/lzxnone/terraria/item/ModItems.java index 8c13240..8e551d6 100644 --- a/src/main/java/com/lzxnone/terraria/item/ModItems.java +++ b/src/main/java/com/lzxnone/terraria/item/ModItems.java @@ -6,6 +6,7 @@ import com.lzxnone.terraria.item.ammo.*; import com.lzxnone.terraria.item.accessory.ManaFlower; import com.lzxnone.terraria.item.accessory.NaturesGift; import com.lzxnone.terraria.item.food.ManaCrystal; +import com.lzxnone.terraria.item.potion.*; import com.lzxnone.terraria.item.weapon.ranged.ElfMelter; import com.lzxnone.terraria.item.weapon.magic.*; import com.lzxnone.terraria.item.weapon.melee.*; @@ -115,6 +116,13 @@ public class ModItems { //食物 public static final DeferredItem MANA_CRYSTAL = ITEMS.register("mana_crystal", ManaCrystal::new); + //药水 + public static final DeferredItem SUMMONING_POTION = ITEMS.register("summoning_potion", SummoningPotion::new); + public static final DeferredItem LESSER_MANA_POTION = ITEMS.register("lesser_mana_potion", LesserManaPotion::new); + public static final DeferredItem MANA_POTION = ITEMS.register("mana_potion", ManaPotion::new); + public static final DeferredItem GREATER_MANA_POTION = ITEMS.register("greater_mana_potion", GreaterManaPotion::new); + public static final DeferredItem SUPER_MANA_POTION = ITEMS.register("super_mana_potion", SuperManaPotion::new); + //方块 public static final DeferredItem VISION = ITEMS.register("vision", () -> new BlockItem(ModBlocks.VISION.get(), new Item.Properties())); public static final DeferredItem STARDUST_DRAGON_HEAD = ITEMS.register("stardust_dragon_head", () -> new BlockItem(ModBlocks.STARDUST_DRAGON_HEAD.get(), new Item.Properties())); diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java b/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java index 88d5b90..a6dad4c 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/ManaFlower.java @@ -29,7 +29,7 @@ public class ManaFlower extends AccessoryItem implements ManaCostModifier, AutoM ); public ManaFlower() { - super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); + super(new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); } @Override diff --git a/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java b/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java index f5eb1c1..2a81181 100644 --- a/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java +++ b/src/main/java/com/lzxnone/terraria/item/accessory/NaturesGift.java @@ -28,7 +28,7 @@ public class NaturesGift extends AccessoryItem implements ManaCostModifier { ); public NaturesGift() { - super(new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + super(new Item.Properties().stacksTo(1)); } @Override diff --git a/src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java b/src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java index fd3204e..13ebc09 100644 --- a/src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java +++ b/src/main/java/com/lzxnone/terraria/item/ammo/FallenStar.java @@ -1,4 +1,93 @@ package com.lzxnone.terraria.item.ammo; +import com.lzxnone.terraria.ModSounds; +import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.particle.ModParticles; +import com.lzxnone.terraria.utils.ParticleUtil; +import com.lzxnone.terraria.utils.SoundUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + public class FallenStar extends BulletAmmo { + public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { + private static final double GRAVITY = 0.04D; + private static final double AIR_FRICTION = 0.98D; + private static final double GROUND_FRICTION = 0.6D; + private static final double MAX_FALL_SPEED = -1.5D; + private static final double PICKUP_RADIUS = 0.35D; + + @Override + public void tick(StaticSummon summon) { + Vec3 movement = summon.getDeltaMovement(); + if(summon.onGround()) { + movement = new Vec3(movement.x * GROUND_FRICTION, 0.0D, movement.z * GROUND_FRICTION); + CompoundTag customData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA); + if(!customData.contains("ground")) SoundUtil.playServerSound(summon.level(), ModSounds.STAR_COLLIDE.get(), summon.position(), 4.0f, 1.0f); + customData.putBoolean("ground", true); + summon.getEntityData().set(StaticSummon.CUSTOM_DATA, customData); + }else { + movement = movement.add(0.0D, -GRAVITY, 0.0D); + movement = movement.multiply(AIR_FRICTION, AIR_FRICTION, AIR_FRICTION); + if(movement.y < MAX_FALL_SPEED) movement = new Vec3(movement.x, MAX_FALL_SPEED, movement.z); + } + summon.setDeltaMovement(movement); + + if(summon.level().isClientSide()) { + ParticleUtil.addParticle( + summon.level(), ModParticles.STAR_PARTICLE.get(), + summon.getBoundingBox().getCenter(), 0, + new Vec3(0, 0, 0), 0.2 + ); + return; + } + + if(tryPickup(summon)) return; + if(summon.level().isDay()) { + onDied(summon); + return; + } + + int lifetime = summon.getEntityData().get(StaticSummon.LIFETIME); + int age = summon.getEntityData().get(StaticSummon.AGE); + if(lifetime != StaticSummon.INFINITE_LIFETIME && age > lifetime) { + onDied(summon); + return; + } + summon.getEntityData().set(StaticSummon.AGE, age + 1); + } + + private boolean tryPickup(StaticSummon summon) { + List players = summon.level().getEntitiesOfClass( + ServerPlayer.class, + summon.getBoundingBox().inflate(PICKUP_RADIUS), + player -> !player.isSpectator() + ); + if(players.isEmpty()) return false; + + for(ServerPlayer player : players) { + ItemStack stack = new ItemStack(ModItems.FALLEN_STAR.get()); + if(!player.getInventory().add(stack)) continue; + + player.take(summon, 1); + player.containerMenu.broadcastChanges(); + player.playNotifySound( + SoundEvents.ITEM_PICKUP, + SoundSource.PLAYERS, + 0.2F, + ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F + ); + onDied(summon); + return true; + } + return false; + } + }; } diff --git a/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java b/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java index c098e69..dd70e30 100644 --- a/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java +++ b/src/main/java/com/lzxnone/terraria/item/food/ManaCrystal.java @@ -1,11 +1,14 @@ package com.lzxnone.terraria.item.food; +import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; +import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -16,11 +19,12 @@ import net.minecraft.world.level.Level; import java.util.List; public class ManaCrystal extends Food { + public static final int USE_DURATION = 10; public static final int MANA_INCREASE = 20; public static final int MAX_MANA = 200; public ManaCrystal() { - super(new Item.Properties().rarity(Rarity.UNCOMMON)); + super(new Item.Properties().rarity(Rarity.UNCOMMON), USE_DURATION); } @Override @@ -36,6 +40,7 @@ public class ManaCrystal extends Food { player.setData(ModAttachments.PLAYER_MANA, mana); if(player instanceof ServerPlayer serverPlayer) { PlayerManaSyncEventHandler.sync(serverPlayer); + SoundUtil.playServerSound(player, ModSounds.GET_MANA.get(), 0.5f, 1.0f); } return true; } diff --git a/src/main/java/com/lzxnone/terraria/item/potion/AbstractManaPotion.java b/src/main/java/com/lzxnone/terraria/item/potion/AbstractManaPotion.java new file mode 100644 index 0000000..a725eb1 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/potion/AbstractManaPotion.java @@ -0,0 +1,43 @@ +package com.lzxnone.terraria.item.potion; + +import com.lzxnone.terraria.attachment.ModAttachments; +import com.lzxnone.terraria.attachment.PlayerMana; +import com.lzxnone.terraria.effect.ManaSicknessEffect; +import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; + +public abstract class AbstractManaPotion extends Potion { + public abstract int getRecoverAmount(); + + @Override + protected boolean canDrink(Level level, Player player, ItemStack stack) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + return mana.getMana() < mana.getMaxMana(); + } + + @Override + protected boolean onDrink(ServerPlayer player, ItemStack stack) { + PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); + int oldMana = mana.getMana(); + if(!mana.recoverManaImmediately(getRecoverAmount())) return false; + + ManaSicknessEffect.applyTo(player); + player.setData(ModAttachments.PLAYER_MANA, mana); + PlayerManaSyncEventHandler.playMaxManaSoundIfRecovered(player, oldMana, mana); + PlayerManaSyncEventHandler.sync(player); + return true; + } + + @Override + protected String getTooltipKey() { + return "tooltip.lzxnoneterraria.mana_potion.0"; + } + + @Override + protected Object[] getTooltipArgs() { + return new Object[]{getRecoverAmount()}; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/potion/GreaterManaPotion.java b/src/main/java/com/lzxnone/terraria/item/potion/GreaterManaPotion.java new file mode 100644 index 0000000..9e7e717 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/potion/GreaterManaPotion.java @@ -0,0 +1,10 @@ +package com.lzxnone.terraria.item.potion; + +public class GreaterManaPotion extends AbstractManaPotion { + public static final int RECOVER_AMOUNT = 200; + + @Override + public int getRecoverAmount() { + return RECOVER_AMOUNT; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/potion/LesserManaPotion.java b/src/main/java/com/lzxnone/terraria/item/potion/LesserManaPotion.java new file mode 100644 index 0000000..e873b15 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/potion/LesserManaPotion.java @@ -0,0 +1,10 @@ +package com.lzxnone.terraria.item.potion; + +public class LesserManaPotion extends AbstractManaPotion { + public static final int RECOVER_AMOUNT = 50; + + @Override + public int getRecoverAmount() { + return RECOVER_AMOUNT; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/potion/ManaPotion.java b/src/main/java/com/lzxnone/terraria/item/potion/ManaPotion.java new file mode 100644 index 0000000..7ea5879 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/potion/ManaPotion.java @@ -0,0 +1,10 @@ +package com.lzxnone.terraria.item.potion; + +public class ManaPotion extends AbstractManaPotion { + public static final int RECOVER_AMOUNT = 100; + + @Override + public int getRecoverAmount() { + return RECOVER_AMOUNT; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/potion/Potion.java b/src/main/java/com/lzxnone/terraria/item/potion/Potion.java new file mode 100644 index 0000000..0b1e130 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/potion/Potion.java @@ -0,0 +1,85 @@ +package com.lzxnone.terraria.item.potion; + +import com.lzxnone.terraria.ModSounds; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundSource; +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.TooltipFlag; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.level.Level; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public abstract class Potion extends Item { + private static final int DEFAULT_USE_DURATION = 10; + + public Potion() { + super(new Item.Properties().stacksTo(99)); + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + ItemStack stack = player.getItemInHand(hand); + if(!canDrink(level, player, stack)) return InteractionResultHolder.fail(stack); + + player.startUsingItem(hand); + return InteractionResultHolder.consume(stack); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level level, LivingEntity livingEntity) { + if(!level.isClientSide() && livingEntity instanceof ServerPlayer player) { + tryDrink(player, stack); + } + return stack; + } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return DEFAULT_USE_DURATION; + } + + @Override + public @NotNull UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.DRINK; + } + + public boolean tryDrink(ServerPlayer player, ItemStack stack) { + if(!canDrink(player.level(), player, stack)) return false; + if(!onDrink(player, stack)) return false; + + playDrinkSound(player); + if(!player.hasInfiniteMaterials()) stack.shrink(1); + return true; + } + + protected boolean canDrink(Level level, Player player, ItemStack stack) { + return true; + } + + protected abstract boolean onDrink(ServerPlayer player, ItemStack stack); + + @Override + public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + super.appendHoverText(stack, context, tooltipComponents, tooltipFlag); + tooltipComponents.add(Component.translatable(getTooltipKey(), getTooltipArgs()).withStyle(ChatFormatting.GRAY)); + } + + protected abstract String getTooltipKey(); + + protected Object[] getTooltipArgs() { + return new Object[0]; + } + + public static void playDrinkSound(ServerPlayer player) { + player.playNotifySound(ModSounds.DRINK.get(), SoundSource.PLAYERS, 4.0F, 1.0F); + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/potion/SummoningPotion.java b/src/main/java/com/lzxnone/terraria/item/potion/SummoningPotion.java new file mode 100644 index 0000000..1824a41 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/potion/SummoningPotion.java @@ -0,0 +1,21 @@ +package com.lzxnone.terraria.item.potion; + +import com.lzxnone.terraria.effect.ModEffects; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.item.ItemStack; + +public class SummoningPotion extends Potion { + public static final int EFFECT_DURATION = 8 * 60 * 20; + + @Override + protected boolean onDrink(ServerPlayer player, ItemStack stack) { + player.addEffect(new MobEffectInstance(ModEffects.SUMMON, EFFECT_DURATION, 0)); + return true; + } + + @Override + protected String getTooltipKey() { + return "tooltip.lzxnoneterraria.summoning_potion.0"; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/potion/SuperManaPotion.java b/src/main/java/com/lzxnone/terraria/item/potion/SuperManaPotion.java new file mode 100644 index 0000000..c896e17 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/item/potion/SuperManaPotion.java @@ -0,0 +1,10 @@ +package com.lzxnone.terraria.item.potion; + +public class SuperManaPotion extends AbstractManaPotion { + public static final int RECOVER_AMOUNT = 300; + + @Override + public int getRecoverAmount() { + return RECOVER_AMOUNT; + } +} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java index 4968655..ff7b1a8 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/MagicWeapon.java @@ -1,5 +1,6 @@ package com.lzxnone.terraria.item.weapon; +import com.lzxnone.terraria.ModSounds; import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.enchantment.ModEnchantments; @@ -10,6 +11,7 @@ import com.lzxnone.terraria.item.accessory.AccessoryUtil; import com.lzxnone.terraria.item.accessory.effect.AutoManaPotionUser; import com.lzxnone.terraria.item.accessory.effect.ManaCostModifier; import com.lzxnone.terraria.utils.ManaPotionUtil; +import com.lzxnone.terraria.utils.SoundUtil; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerPlayer; @@ -121,7 +123,11 @@ public class MagicWeapon extends Weapon { private static boolean tryAutoUseManaPotion(ServerPlayer player) { if(!canAutoUseManaPotion(player)) return false; - return ManaPotionUtil.tryUseManaPotion(player); + boolean res = ManaPotionUtil.tryUseManaPotion(player); + if(res) { + SoundUtil.playServerSound(player, ModSounds.DRINK.get(), 0.5f, 1.0f); + } + return res; } } 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 5d089cc..9af3a0a 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 @@ -86,7 +86,7 @@ public class LastPrism extends MagicWeapon { public static final ConfigInt MANA_CONSUME_RATE = new ConfigInt( "weapon.last_prism.mana_consume_rate", "last_prism_mana_consume_rate", - 7, + 144, 0, 72000 ); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java index fc530ee..5b281ec 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/ranged/Flamethrower.java @@ -76,7 +76,7 @@ public class Flamethrower extends RangedWeapon { public static final ConfigListItem CONFIG_LIST_ITEM = Gun.createConfigListItem(ID, CONFIG_DATA); public Flamethrower() { - super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); + super(Tiers.IRON, new Item.Properties().stacksTo(1).rarity(Rarity.COMMON)); } public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() { diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java index 22102d1..a1c7c5c 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/StardustDragonStaff.java @@ -590,7 +590,7 @@ public class StardustDragonStaff extends MinionWeapon { summon.setPos(player.position()); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.STARDUST_DRAGON); summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); - summon.getEntityData().set(StaticSummon.LIFETIME, -114514); + summon.getEntityData().set(StaticSummon.LIFETIME, StaticSummon.INFINITE_LIFETIME); summon.getEntityData().set(StaticSummon.GLOW, true); summon.setNoGravity(true); summon.noPhysics = true; diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java index f568a10..334c83d 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/minion/Terraprisma.java @@ -471,7 +471,7 @@ public class Terraprisma extends MinionWeapon { summon.getEntityData().set(StaticSummon.SCALE_X, 2.0f); summon.getEntityData().set(StaticSummon.SCALE_Y, 1.0f); summon.getEntityData().set(StaticSummon.SCALE_Z, 1.0f); - summon.getEntityData().set(StaticSummon.LIFETIME, -114514); + summon.getEntityData().set(StaticSummon.LIFETIME, StaticSummon.INFINITE_LIFETIME); summon.getEntityData().set(StaticSummon.GLOW, true); CompoundTag summonData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA).copy(); summonData.putFloat("damage", DAMAGE.get()); diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java index 0ec49ed..ffd8a1a 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java @@ -51,7 +51,7 @@ public class Possession extends Whip { public static final ConfigInt MAX_PROPHETIC_MARK_STACKS = new ConfigInt("weapon.possession.max_prophetic_mark_stacks", "possession_max_prophetic_mark_stacks", 3, 0, 1024); public Possession() { - super(Tiers.NETHERITE, new Item.Properties().stacksTo(1).fireResistant().rarity(Rarity.RARE)); + super(Tiers.NETHERITE, new Item.Properties().stacksTo(1).fireResistant().rarity(Rarity.EPIC)); } @Override diff --git a/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java b/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java index 5948b4c..a39707f 100644 --- a/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/ManaPotionUtil.java @@ -1,18 +1,9 @@ package com.lzxnone.terraria.utils; -import com.lzxnone.terraria.attachment.ModAttachments; -import com.lzxnone.terraria.attachment.PlayerMana; -import com.lzxnone.terraria.effect.ManaEffect; -import com.lzxnone.terraria.effect.ManaSicknessEffect; -import com.lzxnone.terraria.effect.ModEffects; -import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; -import net.minecraft.core.component.DataComponents; +import com.lzxnone.terraria.item.potion.AbstractManaPotion; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.alchemy.PotionContents; public class ManaPotionUtil { public static boolean hasManaPotion(Player player) { @@ -24,27 +15,8 @@ public class ManaPotionUtil { if(slot < 0) return false; ItemStack stack = player.getInventory().getItem(slot); - int recoverAmount = getManaRecoverAmount(stack); - if(recoverAmount <= 0) return false; - - PlayerMana mana = player.getData(ModAttachments.PLAYER_MANA); - int oldMana = mana.getMana(); - if(!mana.recoverManaImmediately(recoverAmount)) return false; - ManaSicknessEffect.applyTo(player); - - stack.shrink(1); - ItemStack bottle = new ItemStack(Items.GLASS_BOTTLE); - if(stack.isEmpty()) { - player.getInventory().setItem(slot, bottle); - }else if(!player.getInventory().add(bottle)) { - player.drop(bottle, false); - } - - player.setData(ModAttachments.PLAYER_MANA, mana); - if(mana.getMana() != oldMana) { - PlayerManaSyncEventHandler.sync(player); - } - return true; + if(!(stack.getItem() instanceof AbstractManaPotion potion)) return false; + return potion.tryDrink(player, stack); } private static int findManaPotionSlot(Player player) { @@ -58,14 +30,7 @@ public class ManaPotionUtil { } private static int getManaRecoverAmount(ItemStack stack) { - if(!stack.is(Items.POTION)) return 0; - - PotionContents contents = stack.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY); - for(MobEffectInstance effect : contents.getAllEffects()) { - if(effect.getEffect().is(ModEffects.MANA)) { - return ManaEffect.getRecoverAmount(effect.getAmplifier()); - } - } + if(stack.getItem() instanceof AbstractManaPotion potion) return potion.getRecoverAmount(); return 0; } } diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 33ceddc..3004553 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -87,6 +87,11 @@ "item.lzxnoneterraria.natures_gift": "Nature's Gift", "item.lzxnoneterraria.mana_flower": "Mana Flower", "item.lzxnoneterraria.mana_crystal": "Mana Crystal", + "item.lzxnoneterraria.summoning_potion": "Summoning Potion", + "item.lzxnoneterraria.lesser_mana_potion": "Lesser Mana Potion", + "item.lzxnoneterraria.mana_potion": "Mana Potion", + "item.lzxnoneterraria.greater_mana_potion": "Greater Mana Potion", + "item.lzxnoneterraria.super_mana_potion": "Super Mana Potion", "enchantment.lzxnoneterraria.mana_leak": "Mana Leak", "enchantment.lzxnoneterraria.mana_efficiency": "Mana Efficiency", @@ -115,6 +120,8 @@ "tooltip.lzxnoneterraria.mana_flower.0": "%s%% reduced mana cost", "tooltip.lzxnoneterraria.mana_flower.1": "Automatically uses mana potions when mana runs out", "tooltip.lzxnoneterraria.mana_crystal.0": "Permanently increases maximum mana by 20, up to 200", + "tooltip.lzxnoneterraria.summoning_potion.0": "Increases minion capacity by 1 for 8 minutes", + "tooltip.lzxnoneterraria.mana_potion.0": "Restores %s mana", "entity.lzxnoneterraria.static_projectile": "Projectile", "entity.lzxnoneterraria.static_summon": "Summon", @@ -130,16 +137,7 @@ "effect.lzxnoneterraria.acid_venom": "Acid Venom", "effect.lzxnoneterraria.midas": "Midas", "effect.lzxnoneterraria.summon": "Summon", - "effect.lzxnoneterraria.mana": "Mana", "effect.lzxnoneterraria.mana_sickness": "Mana Sickness", - "item.minecraft.potion.effect.summon": "Potion of Summon", - "item.minecraft.splash_potion.effect.summon": "Splash Potion of Summon", - "item.minecraft.lingering_potion.effect.summon": "Lingering Potion of Summon", - "item.minecraft.tipped_arrow.effect.summon": "Arrow of Summon", - "item.minecraft.potion.effect.mana": "Mana Potion", - "item.minecraft.splash_potion.effect.mana": "Splash Mana Potion", - "item.minecraft.lingering_potion.effect.mana": "Lingering Mana Potion", - "item.minecraft.tipped_arrow.effect.mana": "Arrow of Mana", "key.categories.lzxnoneterraria": "lzxnoneterraria", "key.lzxnoneterraria.kill_mode": "Kill Mode", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 108666a..bd89d39 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -87,6 +87,11 @@ "item.lzxnoneterraria.natures_gift": "大自然的恩赐", "item.lzxnoneterraria.mana_flower": "魔力花", "item.lzxnoneterraria.mana_crystal": "魔力水晶", + "item.lzxnoneterraria.summoning_potion": "召唤药水", + "item.lzxnoneterraria.lesser_mana_potion": "弱效魔力药水", + "item.lzxnoneterraria.mana_potion": "魔力药水", + "item.lzxnoneterraria.greater_mana_potion": "强效魔力药水", + "item.lzxnoneterraria.super_mana_potion": "超级魔力药水", "enchantment.lzxnoneterraria.mana_leak": "魔力泄漏", "enchantment.lzxnoneterraria.mana_efficiency": "魔力效率", @@ -115,6 +120,8 @@ "tooltip.lzxnoneterraria.mana_flower.0": "魔力花费降低 %s%%", "tooltip.lzxnoneterraria.mana_flower.1": "魔力枯竭时自动使用魔力药水", "tooltip.lzxnoneterraria.mana_crystal.0": "永久提升 20 点最大魔力,最高提升到 200", + "tooltip.lzxnoneterraria.summoning_potion.0": "增加 1 个仆从栏位,持续 8 分钟", + "tooltip.lzxnoneterraria.mana_potion.0": "恢复 %s 点魔力", "entity.lzxnoneterraria.static_projectile": "弹射物", "entity.lzxnoneterraria.static_summon": "召唤物", @@ -129,16 +136,7 @@ "effect.lzxnoneterraria.acid_venom": "酸性毒液", "effect.lzxnoneterraria.midas": "迈达斯", "effect.lzxnoneterraria.summon": "召唤", - "effect.lzxnoneterraria.mana": "魔力", "effect.lzxnoneterraria.mana_sickness": "耐魔性", - "item.minecraft.potion.effect.summon": "召唤药水", - "item.minecraft.splash_potion.effect.summon": "喷溅型召唤药水", - "item.minecraft.lingering_potion.effect.summon": "滞留型召唤药水", - "item.minecraft.tipped_arrow.effect.summon": "召唤之箭", - "item.minecraft.potion.effect.mana": "魔力药水", - "item.minecraft.splash_potion.effect.mana": "喷溅型魔力药水", - "item.minecraft.lingering_potion.effect.mana": "滞留型魔力药水", - "item.minecraft.tipped_arrow.effect.mana": "魔力之箭", "key.categories.lzxnoneterraria": "lzxnoneterraria", "key.lzxnoneterraria.kill_mode": "进入杀戮模式", diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/greater_mana_potion.json b/src/main/resources/assets/lzxnoneterraria/models/item/greater_mana_potion.json new file mode 100644 index 0000000..a48c9d2 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/greater_mana_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/greater_mana_potion" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/lesser_mana_potion.json b/src/main/resources/assets/lzxnoneterraria/models/item/lesser_mana_potion.json new file mode 100644 index 0000000..899c3cc --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/lesser_mana_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/lesser_mana_potion" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/mana_potion.json b/src/main/resources/assets/lzxnoneterraria/models/item/mana_potion.json new file mode 100644 index 0000000..0721a44 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/mana_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/mana_motion" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/summoning_potion.json b/src/main/resources/assets/lzxnoneterraria/models/item/summoning_potion.json new file mode 100644 index 0000000..935c0d8 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/summoning_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/summoning_potion" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/models/item/super_mana_potion.json b/src/main/resources/assets/lzxnoneterraria/models/item/super_mana_potion.json new file mode 100644 index 0000000..81fd068 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/models/item/super_mana_potion.json @@ -0,0 +1,6 @@ +{ + "parent": "lzxnoneterraria:item/item", + "textures": { + "layer0": "lzxnoneterraria:item/super_mana_potion" + } +} diff --git a/src/main/resources/assets/lzxnoneterraria/sounds.json b/src/main/resources/assets/lzxnoneterraria/sounds.json index 13ea0fc..c4537b7 100644 --- a/src/main/resources/assets/lzxnoneterraria/sounds.json +++ b/src/main/resources/assets/lzxnoneterraria/sounds.json @@ -11,6 +11,12 @@ "max_mana": { "sounds": ["lzxnoneterraria:max_mana"] }, + "get_mana": { + "sounds": ["lzxnoneterraria:get_mana"] + }, + "drink": { + "sounds": ["lzxnoneterraria:drink"] + }, "beam": { "sounds": ["lzxnoneterraria:beam"] }, diff --git a/src/main/resources/assets/lzxnoneterraria/sounds/drink.ogg b/src/main/resources/assets/lzxnoneterraria/sounds/drink.ogg new file mode 100644 index 0000000000000000000000000000000000000000..41370260afd182b37ab621e0c0dae1ab12d2292a GIT binary patch literal 8222 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/greater_mana_potion.png b/src/main/resources/assets/lzxnoneterraria/textures/item/greater_mana_potion.png new file mode 100644 index 0000000000000000000000000000000000000000..1cde54793ed1de83a5def8737e0bbb125e2737e7 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy|!3-qBSn@#vmH|E?u0UEqcLt|aq_FAMxPr#m z`v0dldj{KaSH=h#ME{svEBF8BRxL9}ZriWx4qxX{%%8aGz@(M`uRVNIcFt%bP%~pm zkY6x^!?PP{Ku*7>i(^Q|t=P-)EzbvK$=+~jnDWJ9>FH&iRspZ=J5F5MXTR{$u1O{v8V!x)*#*5U^-uF8^EmcT zozc0?_lC>!De*xQrp(#AasK!73UOxnFJvB7^xZJ?Rk`%pZbAQC#Vw4_bY2Qe`3C&F e{=NR*N8ZDiI0I!$F6jfE#^CAd=d#Wzp$Py5a&%w- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/lesser_mana_potion.png b/src/main/resources/assets/lzxnoneterraria/textures/item/lesser_mana_potion.png new file mode 100644 index 0000000000000000000000000000000000000000..3c63f01ecf7d90953c05ca08d682227a8825520e GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy~!VDx`*CzS_DXjpX5LY10DHSQ8J44uXYg|EN zZ2f<3+pj!|`C4X<2GKtzt~#*p@bzmC-%MKh-=~_<4XB#2B*-tA!Qt7BG$1F{)5S5Q z;#Th2K;8oiJgyhh8M(IxfKbE=R-FV!?uY}2_N+NQjfd;|Yn570MhBZcf2Y`0P4*C( z*wlOJcIRW4psl^rOgFn;3bkDBu-{m4`2lw??cS+(uZjx`|7?$$DW+7L_=tC=p7H9s TKcd_~3mH6J{an^LB{Ts5{g6+X literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/mana_motion.png b/src/main/resources/assets/lzxnoneterraria/textures/item/mana_motion.png new file mode 100644 index 0000000000000000000000000000000000000000..ef28c11982ed24dd9ce4c1334867c1f3e1901c27 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^B0wy~!3-oDVtf37lx2WVh%1ohl!_G4oe@{iC~Uel zw*Ei2?N==`$J3iVc@*;}t~#*p@bzFj?#dV;gXkZVYvryzeDnY3)=4Y>3rF7h4%Ez8 z666=m;PC858j#cM>EaktajW5Gf2mYu)YSR1cAM`lU4*or@IfBm-K$M}Sq{qL+@ SGd2R9!{F)a=d#Wzp$Pz8v~R-z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/item/summoning_potion.png b/src/main/resources/assets/lzxnoneterraria/textures/item/summoning_potion.png new file mode 100644 index 0000000000000000000000000000000000000000..343e40db45691662802d8c651bcc90507b70b017 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^B0wz1!VDzu*(gTJx}B0i2HE@0$yPy~pa6h*uimZnR&m;QS>*UrHB@KxW} z?Y1k^ud6Tg?kv00?)o;p{-xiFo4@{P9P+Yq{U?#!V*Y(nr_lS1HNi7Az6LGpvAnH$ m*t0DsrL=#WV9-9r&&;0}*dILP|JWR8KZB>MpUXO@geCw4X5Z3?Xj|J@t~Q|0*^?uEW=ns=(Ia z?Dg3ZsQ>@~0d!JMQvg8b*k%9#0F_BZK~#9!jnTo5!XOkt(L+lIGWP$!R0kN-;=*oB zq{`+cFDG~Lh(LM{4McBVe7axVWIya!Hd#gf*yN^TdtJVfQOB%VT~FkyxTrdUpbz9K zph}9MTHFV6(*zXkCebvIv!q!LyV$kU=IqZ!akoeVS!K;8xgno4^U*9OzH0s`ADUgY mYBmx7w&6YLu3!g!^hXa2NjxE9hp{UF0000~=E% literal 0 HcmV?d00001 diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json index 2a1b288..d301f77 100644 --- a/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json +++ b/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json @@ -1,6 +1,7 @@ { "replace": false, "entries": [ - "lzxnoneterraria:natures_gift_simple_dungeon" + "lzxnoneterraria:natures_gift_simple_dungeon", + "lzxnoneterraria:mana_potions_simple_dungeon" ] } diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/mana_potions_simple_dungeon.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/mana_potions_simple_dungeon.json new file mode 100644 index 0000000..b081062 --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/loot_modifiers/mana_potions_simple_dungeon.json @@ -0,0 +1,10 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/simple_dungeon" + } + ], + "table": "lzxnoneterraria:chests/mana_potions" +} diff --git a/src/main/resources/data/lzxnoneterraria/loot_table/chests/mana_potions.json b/src/main/resources/data/lzxnoneterraria/loot_table/chests/mana_potions.json new file mode 100644 index 0000000..9001ddc --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/loot_table/chests/mana_potions.json @@ -0,0 +1,49 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.25 + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "lzxnoneterraria:lesser_mana_potion", + "weight": 3 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "lzxnoneterraria:mana_potion", + "weight": 1 + } + ], + "rolls": 1.0 + } + ] +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/greater_mana_potion.json b/src/main/resources/data/lzxnoneterraria/recipe/greater_mana_potion.json new file mode 100644 index 0000000..7bb2c8d --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/greater_mana_potion.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "CBC", + "AAA", + "CAC" + ], + "key": { + "A": { "item": "lzxnoneterraria:mana_potion" }, + "B": { "item": "lzxnoneterraria:fallen_star" }, + "C": { "item": "minecraft:amethyst_shard" } + }, + "result": { + "id": "lzxnoneterraria:greater_mana_potion", + "count": 4 + } +} diff --git a/src/main/resources/data/lzxnoneterraria/recipe/mana_flower.json b/src/main/resources/data/lzxnoneterraria/recipe/mana_flower.json index aa60f95..3563e02 100644 --- a/src/main/resources/data/lzxnoneterraria/recipe/mana_flower.json +++ b/src/main/resources/data/lzxnoneterraria/recipe/mana_flower.json @@ -6,13 +6,7 @@ "item": "lzxnoneterraria:natures_gift" }, { - "type": "neoforge:components", - "items": "minecraft:potion", - "components": { - "minecraft:potion_contents": { - "potion": "lzxnoneterraria:mana_0" - } - } + "item": "lzxnoneterraria:mana_potion" } ], "result": { diff --git a/src/main/resources/data/lzxnoneterraria/recipe/super_mana_potion.json b/src/main/resources/data/lzxnoneterraria/recipe/super_mana_potion.json new file mode 100644 index 0000000..d487aee --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/recipe/super_mana_potion.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "combat", + "pattern": [ + "CBC", + "AAA", + "BAB" + ], + "key": { + "A": { "item": "lzxnoneterraria:greater_mana_potion" }, + "B": { "item": "lzxnoneterraria:fallen_star" }, + "C": { "item": "minecraft:amethyst_shard" } + }, + "result": { + "id": "lzxnoneterraria:super_mana_potion", + "count": 4 + } +}