This commit is contained in:
LZX committed 2026-08-03 04:13:41 +08:00
1 parent 9993d92afa
commit 4ef5640b99
61 files changed
+710 -215

No files matched your search

@@ -4,7 +4,6 @@ import com.lzxnone.terraria.attachment.ModAttachments;
import com.lzxnone.terraria.block.ModBlocks; import com.lzxnone.terraria.block.ModBlocks;
import com.lzxnone.terraria.creative_mode_tab.ModCreativeModeTabs; import com.lzxnone.terraria.creative_mode_tab.ModCreativeModeTabs;
import com.lzxnone.terraria.effect.ModEffects; import com.lzxnone.terraria.effect.ModEffects;
import com.lzxnone.terraria.effect.ModPotions;
import com.lzxnone.terraria.entity.ModEntities; import com.lzxnone.terraria.entity.ModEntities;
import com.lzxnone.terraria.entity.summon.BeeSummon; import com.lzxnone.terraria.entity.summon.BeeSummon;
import com.lzxnone.terraria.item.ModItems; import com.lzxnone.terraria.item.ModItems;
@@ -27,7 +26,6 @@ public class LzxnoneTerraria {
ModBlocks.BLOCKS.register(modEventBus); ModBlocks.BLOCKS.register(modEventBus);
ModItems.ITEMS.register(modEventBus); ModItems.ITEMS.register(modEventBus);
ModEffects.MOB_EFFECTS.register(modEventBus); ModEffects.MOB_EFFECTS.register(modEventBus);
ModPotions.POTIONS.register(modEventBus);
ModEntities.ENTITY_TYPES.register(modEventBus); ModEntities.ENTITY_TYPES.register(modEventBus);
ModParticles.PARTICLE_TYPES.register(modEventBus); ModParticles.PARTICLE_TYPES.register(modEventBus);
ModSounds.SOUND_EVENTS.register(modEventBus); ModSounds.SOUND_EVENTS.register(modEventBus);
@@ -23,6 +23,14 @@ public class ModSounds {
SOUND_EVENTS.register("max_mana", SOUND_EVENTS.register("max_mana",
() -> SoundEvent.createVariableRangeEvent( () -> SoundEvent.createVariableRangeEvent(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "max_mana"))); ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "max_mana")));
public static final Supplier<SoundEvent> GET_MANA =
SOUND_EVENTS.register("get_mana",
() -> SoundEvent.createVariableRangeEvent(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "get_mana")));
public static final Supplier<SoundEvent> DRINK =
SOUND_EVENTS.register("drink",
() -> SoundEvent.createVariableRangeEvent(
ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "drink")));
public static final Supplier<SoundEvent> WAVE = public static final Supplier<SoundEvent> WAVE =
SOUND_EVENTS.register("wave", SOUND_EVENTS.register("wave",
() -> SoundEvent.createVariableRangeEvent( () -> SoundEvent.createVariableRangeEvent(
@@ -1,5 +1,6 @@
package com.lzxnone.terraria.client.entity.summon; 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.ranged.ClientBulletAmmo;
import com.lzxnone.terraria.client.item.magic.ClientLastPrism; import com.lzxnone.terraria.client.item.magic.ClientLastPrism;
import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation; import com.lzxnone.terraria.client.item.melee.ClientDevilsDevastation;
@@ -29,6 +30,8 @@ public class ClientStaticSummonRenderBehaviors {
static { static {
BEHAVIORS.put(StaticSummonBehaviors.DEFAULT, DEFAULT_BEHAVIOR); 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.SEEDLER_NUT, DEFAULT_BEHAVIOR);
BEHAVIORS.put(StaticSummonBehaviors.THE_HORSEMANS_BLADE_JACK, DEFAULT_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.THE_HORSEMANS_BLADE_JACK, DEFAULT_BEHAVIOR);
BEHAVIORS.put(StaticSummonBehaviors.INFLUX_WAVER_BEAM, DEFAULT_BEHAVIOR); BEHAVIORS.put(StaticSummonBehaviors.INFLUX_WAVER_BEAM, DEFAULT_BEHAVIOR);
@@ -27,9 +27,7 @@ public interface IStaticSummonRenderBehavior {
poseStack.mulPose(Axis.YP.rotationDegrees(-Mth.lerp(partialTick, summon.yRotO, summon.getYRot()))); 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(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.RYPS) * (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.scale( poseStack.scale(
summon.getEntityData().get(StaticSummon.SCALE_X), summon.getEntityData().get(StaticSummon.SCALE_X),
@@ -55,6 +53,8 @@ public interface IStaticSummonRenderBehavior {
0 0
); );
poseStack.popPose(); poseStack.popPose();
} }
default void renderBlock(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) { default void renderBlock(Entity entity, float entityYaw, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight) {
@@ -20,7 +20,7 @@ public class GuiRenderHandler {
public static void onRenderGui(RenderGuiEvent.Post event) { public static void onRenderGui(RenderGuiEvent.Post event) {
Minecraft minecraft = Minecraft.getInstance(); Minecraft minecraft = Minecraft.getInstance();
LocalPlayer player = minecraft.player; 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); ManaHudRenderer.render(event.getGuiGraphics(), player);
@@ -35,6 +35,7 @@ public class ManaHudRenderer {
int segmentCount = Mth.clamp(Mth.ceil(maxMana / (float)MANA_PER_STAR), 0, MAX_SEGMENT_COUNT); int segmentCount = Mth.clamp(Mth.ceil(maxMana / (float)MANA_PER_STAR), 0, MAX_SEGMENT_COUNT);
int currentMana = Mth.clamp(mana.getMana(), 0, maxMana); int currentMana = Mth.clamp(mana.getMana(), 0, maxMana);
if(currentMana >= maxMana) return;
manaBarX = RenderConfigs.MANA_BAR_X.get(); manaBarX = RenderConfigs.MANA_BAR_X.get();
manaBarY = RenderConfigs.MANA_BAR_Y.get(); manaBarY = RenderConfigs.MANA_BAR_Y.get();
@@ -41,7 +41,7 @@ public class RangedWeaponGuiHandler {
public static void onRenderGui(RenderGuiEvent.Post event) { public static void onRenderGui(RenderGuiEvent.Post event) {
Minecraft minecraft = Minecraft.getInstance(); Minecraft minecraft = Minecraft.getInstance();
Player player = minecraft.player; Player player = minecraft.player;
if(player == null || minecraft.options.hideGui) return; if(player == null || minecraft.options.hideGui || player.isSpectator()) return;
GuiGraphics guiGraphics = event.getGuiGraphics(); GuiGraphics guiGraphics = event.getGuiGraphics();
int centerX = guiGraphics.guiWidth() / 2; int centerX = guiGraphics.guiWidth() / 2;
@@ -45,7 +45,7 @@ public class SniperScopeHandler {
private static ItemStack getActiveSniperStack() { private static ItemStack getActiveSniperStack() {
Minecraft minecraft = Minecraft.getInstance(); Minecraft minecraft = Minecraft.getInstance();
LocalPlayer player = minecraft.player; 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(); ItemStack stack = player.getUseItem();
if(stack.is(ModItems.SNIPER_RIFLE)) return stack; if(stack.is(ModItems.SNIPER_RIFLE)) return stack;
@@ -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);
}
}
@@ -56,6 +56,7 @@ public class ClientStarCannon {
poseStack.popPose(); poseStack.popPose();
poseStack.pushPose(); poseStack.pushPose();
float starHalfWidth = 45 * 0.06f; float starHalfWidth = 45 * 0.06f;
float starHalfHeight = 17 * 0.06f; float starHalfHeight = 17 * 0.06f;
VertexConsumer starConsumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES)); VertexConsumer starConsumer = bufferSource.getBuffer(ModRenderTypes.entityTranslucentEmissive(RES));
@@ -54,6 +54,10 @@ public class ModCreativeModeTabs {
.displayItems((parameters, output) -> { .displayItems((parameters, output) -> {
output.accept(ModItems.LAST_PRISM.get()); output.accept(ModItems.LAST_PRISM.get());
output.accept(ModItems.MANA_CRYSTAL.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()); }).build());
public static final DeferredHolder<CreativeModeTab, CreativeModeTab> ACCESSORY_TAB = CREATIVE_MODE_TABS.register("lzxnoneterraria_accessory_0", () -> CreativeModeTab.builder() public static final DeferredHolder<CreativeModeTab, CreativeModeTab> 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.TERRAPRISMA.get());
output.accept(ModItems.STARDUST_DRAGON_STAFF.get()); output.accept(ModItems.STARDUST_DRAGON_STAFF.get());
output.accept(ModItems.POSSESSION.get()); output.accept(ModItems.POSSESSION.get());
output.accept(ModItems.SUMMONING_POTION.get());
}).build()); }).build());
} }
@@ -65,7 +65,8 @@ public class MEntityLuminance implements EntityLuminance {
StaticSummonBehaviors.ELF_MELTER_FLAME, StaticSummonBehaviors.ELF_MELTER_FLAME,
StaticSummonBehaviors.STARDUST_DRAGON, StaticSummonBehaviors.STARDUST_DRAGON,
StaticSummonBehaviors.FALLEN_STAR, StaticSummonBehaviors.FALLEN_STAR,
StaticSummonBehaviors.FALLEN_STAR_SUPER -> { StaticSummonBehaviors.FALLEN_STAR_SUPER,
StaticSummonBehaviors.DROP_FALLEN_STAR -> {
return 15; return 15;
} }
case StaticSummonBehaviors.CHLOROPHYTE_BULLET, case StaticSummonBehaviors.CHLOROPHYTE_BULLET,
@@ -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];
}
}
@@ -28,8 +28,6 @@ public class ModEffects {
MOB_EFFECTS.register("acid_venom", AcidVenomEffect::new); MOB_EFFECTS.register("acid_venom", AcidVenomEffect::new);
public static final DeferredHolder<MobEffect, SummonEffect> SUMMON = public static final DeferredHolder<MobEffect, SummonEffect> SUMMON =
MOB_EFFECTS.register("summon", SummonEffect::new); MOB_EFFECTS.register("summon", SummonEffect::new);
public static final DeferredHolder<MobEffect, ManaEffect> MANA =
MOB_EFFECTS.register("mana", ManaEffect::new);
public static final DeferredHolder<MobEffect, ManaSicknessEffect> MANA_SICKNESS = public static final DeferredHolder<MobEffect, ManaSicknessEffect> MANA_SICKNESS =
MOB_EFFECTS.register("mana_sickness", ManaSicknessEffect::new); MOB_EFFECTS.register("mana_sickness", ManaSicknessEffect::new);
public static final DeferredHolder<MobEffect, MidasEffect> MIDAS = public static final DeferredHolder<MobEffect, MidasEffect> MIDAS =
@@ -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<Potion> POTIONS =
DeferredRegister.create(BuiltInRegistries.POTION, LzxnoneTerraria.MODID);
public static final DeferredHolder<Potion, Potion> SHORT_SUMMON_0 =
registerSummonPotion("short_summon_0", 6000, 0);
public static final DeferredHolder<Potion, Potion> MEDIUM_SUMMON_0 =
registerSummonPotion("medium_summon_0", 36000, 0);
public static final DeferredHolder<Potion, Potion> LONG_SUMMON_0 =
registerSummonPotion("long_summon_0", 216000, 0);
public static final DeferredHolder<Potion, Potion> SHORT_SUMMON_1 =
registerSummonPotion("short_summon_1", 6000, 1);
public static final DeferredHolder<Potion, Potion> MEDIUM_SUMMON_1 =
registerSummonPotion("medium_summon_1", 36000, 1);
public static final DeferredHolder<Potion, Potion> LONG_SUMMON_1 =
registerSummonPotion("long_summon_1", 216000, 1);
public static final DeferredHolder<Potion, Potion> SHORT_SUMMON_2 =
registerSummonPotion("short_summon_2", 6000, 2);
public static final DeferredHolder<Potion, Potion> MEDIUM_SUMMON_2 =
registerSummonPotion("medium_summon_2", 36000, 2);
public static final DeferredHolder<Potion, Potion> LONG_SUMMON_2 =
registerSummonPotion("long_summon_2", 216000, 2);
public static final DeferredHolder<Potion, Potion> SHORT_SUMMON_3 =
registerSummonPotion("short_summon_3", 6000, 3);
public static final DeferredHolder<Potion, Potion> MEDIUM_SUMMON_3 =
registerSummonPotion("medium_summon_3", 36000, 3);
public static final DeferredHolder<Potion, Potion> LONG_SUMMON_3 =
registerSummonPotion("long_summon_3", 216000, 3);
public static final DeferredHolder<Potion, Potion> SHORT_SUMMON_4 =
registerSummonPotion("short_summon_4", 6000, 4);
public static final DeferredHolder<Potion, Potion> MEDIUM_SUMMON_4 =
registerSummonPotion("medium_summon_4", 36000, 4);
public static final DeferredHolder<Potion, Potion> LONG_SUMMON_4 =
registerSummonPotion("long_summon_4", 216000, 4);
public static final DeferredHolder<Potion, Potion> MANA_0 =
registerManaPotion("mana_0", 0);
public static final DeferredHolder<Potion, Potion> MANA_1 =
registerManaPotion("mana_1", 1);
public static final DeferredHolder<Potion, Potion> MANA_2 =
registerManaPotion("mana_2", 2);
public static final DeferredHolder<Potion, Potion> MANA_3 =
registerManaPotion("mana_3", 3);
private static DeferredHolder<Potion, Potion> registerSummonPotion(String name, int duration, int amplifier) {
return POTIONS.register(name, () -> new Potion("summon", new MobEffectInstance(ModEffects.SUMMON, duration, amplifier)));
}
private static DeferredHolder<Potion, Potion> registerManaPotion(String name, int amplifier) {
return POTIONS.register(name, () -> new Potion("mana", new MobEffectInstance(ModEffects.MANA, 1, amplifier)));
}
}
@@ -9,10 +9,11 @@ public interface IStaticSummonBehavior {
onDied(summon); onDied(summon);
return; 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); onDied(summon);
}else { }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);
} }
} }
@@ -21,6 +21,8 @@ import org.jspecify.annotations.NonNull;
import java.util.*; import java.util.*;
public class StaticSummon extends Entity { public class StaticSummon extends Entity {
public static final int INFINITE_LIFETIME = -114514;
public static final EntityDataAccessor<String> BEHAVIOR = public static final EntityDataAccessor<String> BEHAVIOR =
SynchedEntityData.defineId(StaticSummon.class, EntityDataSerializers.STRING); SynchedEntityData.defineId(StaticSummon.class, EntityDataSerializers.STRING);
public static final EntityDataAccessor<String> RENDER_MODE = public static final EntityDataAccessor<String> RENDER_MODE =
@@ -21,6 +21,9 @@ public class StaticSummonBehaviors {
public static final String DEFAULT = "default"; 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 SEEDLER_NUT = "seedler_nut";
public static final String THE_HORSEMANS_BLADE_JACK = "the_horsemans_blade_jack"; public static final String THE_HORSEMANS_BLADE_JACK = "the_horsemans_blade_jack";
@@ -72,6 +75,8 @@ public class StaticSummonBehaviors {
static { static {
BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {}); BEHAVIORS.put(DEFAULT, new IStaticSummonBehavior() {});
BEHAVIORS.put(DROP_FALLEN_STAR, FallenStar.SUMMON_BEHAVIOR);
BEHAVIORS.put(SEEDLER_NUT, Seedler.SUMMON_BEHAVIOR); BEHAVIORS.put(SEEDLER_NUT, Seedler.SUMMON_BEHAVIOR);
BEHAVIORS.put(THE_HORSEMANS_BLADE_JACK, TheHorsemansBlade.SUMMON_BEHAVIOR); BEHAVIORS.put(THE_HORSEMANS_BLADE_JACK, TheHorsemansBlade.SUMMON_BEHAVIOR);
BEHAVIORS.put(INFLUX_WAVER_BEAM, InfluxWaver.SUMMON_BEHAVIOR); BEHAVIORS.put(INFLUX_WAVER_BEAM, InfluxWaver.SUMMON_BEHAVIOR);
@@ -1,35 +1,30 @@
package com.lzxnone.terraria.event; package com.lzxnone.terraria.event;
import com.lzxnone.terraria.LzxnoneTerraria; 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.Items;
import net.minecraft.world.item.alchemy.PotionContents;
import net.minecraft.world.item.alchemy.Potions; import net.minecraft.world.item.alchemy.Potions;
import net.minecraft.world.item.crafting.Ingredient;
import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.common.crafting.DataComponentIngredient;
import net.neoforged.neoforge.event.brewing.RegisterBrewingRecipesEvent; import net.neoforged.neoforge.event.brewing.RegisterBrewingRecipesEvent;
@EventBusSubscriber(modid = LzxnoneTerraria.MODID) @EventBusSubscriber(modid = LzxnoneTerraria.MODID)
public class BrewingRecipeHandler { public class BrewingRecipeHandler {
@SubscribeEvent @SubscribeEvent
public static void onRegisterBrewingRecipes(RegisterBrewingRecipesEvent event) { public static void onRegisterBrewingRecipes(RegisterBrewingRecipesEvent event) {
event.getBuilder().addMix(Potions.AWKWARD, Items.NETHERITE_SCRAP, ModPotions.SHORT_SUMMON_0); event.getBuilder().addRecipe(
event.getBuilder().addMix(ModPotions.SHORT_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.MEDIUM_SUMMON_0); DataComponentIngredient.of(false, PotionContents.createItemStack(Items.POTION, Potions.AWKWARD)),
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_0, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_0); Ingredient.of(Items.SADDLE),
new ItemStack(ModItems.SUMMONING_POTION.get())
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().addRecipe(
event.getBuilder().addMix(ModPotions.MEDIUM_SUMMON_1, Items.NETHERITE_SCRAP, ModPotions.LONG_SUMMON_1); Ingredient.of(ModItems.LESSER_MANA_POTION.get()),
Ingredient.of(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM),
event.getBuilder().addMix(ModPotions.LONG_SUMMON_1, Items.NETHERITE_INGOT, ModPotions.SHORT_SUMMON_2); new ItemStack(ModItems.MANA_POTION.get())
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);
} }
} }
@@ -2,14 +2,16 @@ package com.lzxnone.terraria.event;
import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.ModSounds; 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.item.ModItems;
import com.lzxnone.terraria.utils.SoundUtil;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundSource;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.util.RandomSource; import net.minecraft.util.RandomSource;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.Heightmap;
@@ -21,12 +23,13 @@ import net.neoforged.neoforge.event.tick.PlayerTickEvent;
@EventBusSubscriber(modid = LzxnoneTerraria.MODID) @EventBusSubscriber(modid = LzxnoneTerraria.MODID)
public class FallenStarEventHandler { public class FallenStarEventHandler {
private static final int CHECK_INTERVAL = 20; 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 MIN_SPAWN_RADIUS = 24;
private static final int MAX_SPAWN_RADIUS = 64; private static final int MAX_SPAWN_RADIUS = 64;
private static final int SPAWN_HEIGHT = 48; private static final int SPAWN_HEIGHT = 48;
private static final int MAX_ATTEMPTS = 8; private static final int MAX_ATTEMPTS = 8;
private static final double FALL_SPEED = -0.65D; private static final double FALL_SPEED = -0.65D;
private static final int FALLEN_STAR_LIFETIME = 10 * 60 * 20;
@SubscribeEvent @SubscribeEvent
public static void onPlayerTick(PlayerTickEvent.Post event) { public static void onPlayerTick(PlayerTickEvent.Post event) {
@@ -42,11 +45,16 @@ public class FallenStarEventHandler {
Vec3 spawnPos = getSpawnPos(serverLevel, player, random); Vec3 spawnPos = getSpawnPos(serverLevel, player, random);
if(spawnPos == null) return; 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.setDeltaMovement(0.0D, FALL_SPEED, 0.0D);
fallenStar.setDefaultPickUpDelay();
serverLevel.addFreshEntity(fallenStar); 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) { private static Vec3 getSpawnPos(ServerLevel level, ServerPlayer player, RandomSource random) {
@@ -1,11 +1,13 @@
package com.lzxnone.terraria.event; package com.lzxnone.terraria.event;
import com.lzxnone.terraria.LzxnoneTerraria; import com.lzxnone.terraria.LzxnoneTerraria;
import com.lzxnone.terraria.ModSounds;
import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.ModAttachments;
import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.attachment.PlayerMana;
import com.lzxnone.terraria.item.weapon.MagicWeapon; import com.lzxnone.terraria.item.weapon.MagicWeapon;
import com.lzxnone.terraria.network.payload.ManaSyncPayload; import com.lzxnone.terraria.network.payload.ManaSyncPayload;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.EventBusSubscriber;
@@ -52,6 +54,7 @@ public class PlayerManaSyncEventHandler {
player.setData(ModAttachments.PLAYER_MANA, mana); player.setData(ModAttachments.PLAYER_MANA, mana);
if(mana.getMana() != oldMana) { if(mana.getMana() != oldMana) {
playMaxManaSoundIfRecovered(player, oldMana, mana);
sync(player); sync(player);
} }
} }
@@ -61,6 +64,12 @@ public class PlayerManaSyncEventHandler {
PacketDistributor.sendToPlayer(player, new ManaSyncPayload(mana.getMana(), mana.getMaxMana())); 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) { private static boolean isUsingMagicWeapon(ServerPlayer player) {
if(!player.isUsingItem()) return false; if(!player.isUsingItem()) return false;
@@ -6,6 +6,7 @@ import com.lzxnone.terraria.item.ammo.*;
import com.lzxnone.terraria.item.accessory.ManaFlower; import com.lzxnone.terraria.item.accessory.ManaFlower;
import com.lzxnone.terraria.item.accessory.NaturesGift; import com.lzxnone.terraria.item.accessory.NaturesGift;
import com.lzxnone.terraria.item.food.ManaCrystal; 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.ranged.ElfMelter;
import com.lzxnone.terraria.item.weapon.magic.*; import com.lzxnone.terraria.item.weapon.magic.*;
import com.lzxnone.terraria.item.weapon.melee.*; import com.lzxnone.terraria.item.weapon.melee.*;
@@ -115,6 +116,13 @@ public class ModItems {
//食物 //食物
public static final DeferredItem<Item> MANA_CRYSTAL = ITEMS.register("mana_crystal", ManaCrystal::new); public static final DeferredItem<Item> MANA_CRYSTAL = ITEMS.register("mana_crystal", ManaCrystal::new);
//药水
public static final DeferredItem<Item> SUMMONING_POTION = ITEMS.register("summoning_potion", SummoningPotion::new);
public static final DeferredItem<Item> LESSER_MANA_POTION = ITEMS.register("lesser_mana_potion", LesserManaPotion::new);
public static final DeferredItem<Item> MANA_POTION = ITEMS.register("mana_potion", ManaPotion::new);
public static final DeferredItem<Item> GREATER_MANA_POTION = ITEMS.register("greater_mana_potion", GreaterManaPotion::new);
public static final DeferredItem<Item> SUPER_MANA_POTION = ITEMS.register("super_mana_potion", SuperManaPotion::new);
//方块 //方块
public static final DeferredItem<Item> VISION = ITEMS.register("vision", () -> new BlockItem(ModBlocks.VISION.get(), new Item.Properties())); public static final DeferredItem<Item> VISION = ITEMS.register("vision", () -> new BlockItem(ModBlocks.VISION.get(), new Item.Properties()));
public static final DeferredItem<Item> STARDUST_DRAGON_HEAD = ITEMS.register("stardust_dragon_head", () -> new BlockItem(ModBlocks.STARDUST_DRAGON_HEAD.get(), new Item.Properties())); public static final DeferredItem<Item> STARDUST_DRAGON_HEAD = ITEMS.register("stardust_dragon_head", () -> new BlockItem(ModBlocks.STARDUST_DRAGON_HEAD.get(), new Item.Properties()));
@@ -29,7 +29,7 @@ public class ManaFlower extends AccessoryItem implements ManaCostModifier, AutoM
); );
public ManaFlower() { public ManaFlower() {
super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); super(new Item.Properties().stacksTo(1).rarity(Rarity.COMMON));
} }
@Override @Override
@@ -28,7 +28,7 @@ public class NaturesGift extends AccessoryItem implements ManaCostModifier {
); );
public NaturesGift() { public NaturesGift() {
super(new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)); super(new Item.Properties().stacksTo(1));
} }
@Override @Override
@@ -1,4 +1,93 @@
package com.lzxnone.terraria.item.ammo; 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 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<ServerPlayer> 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;
}
};
} }
@@ -1,11 +1,14 @@
package com.lzxnone.terraria.item.food; package com.lzxnone.terraria.item.food;
import com.lzxnone.terraria.ModSounds;
import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.ModAttachments;
import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.attachment.PlayerMana;
import com.lzxnone.terraria.event.PlayerManaSyncEventHandler; import com.lzxnone.terraria.event.PlayerManaSyncEventHandler;
import com.lzxnone.terraria.utils.SoundUtil;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
@@ -16,11 +19,12 @@ import net.minecraft.world.level.Level;
import java.util.List; import java.util.List;
public class ManaCrystal extends Food { public class ManaCrystal extends Food {
public static final int USE_DURATION = 10;
public static final int MANA_INCREASE = 20; public static final int MANA_INCREASE = 20;
public static final int MAX_MANA = 200; public static final int MAX_MANA = 200;
public ManaCrystal() { public ManaCrystal() {
super(new Item.Properties().rarity(Rarity.UNCOMMON)); super(new Item.Properties().rarity(Rarity.UNCOMMON), USE_DURATION);
} }
@Override @Override
@@ -36,6 +40,7 @@ public class ManaCrystal extends Food {
player.setData(ModAttachments.PLAYER_MANA, mana); player.setData(ModAttachments.PLAYER_MANA, mana);
if(player instanceof ServerPlayer serverPlayer) { if(player instanceof ServerPlayer serverPlayer) {
PlayerManaSyncEventHandler.sync(serverPlayer); PlayerManaSyncEventHandler.sync(serverPlayer);
SoundUtil.playServerSound(player, ModSounds.GET_MANA.get(), 0.5f, 1.0f);
} }
return true; return true;
} }
@@ -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()};
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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<ItemStack> 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<Component> 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);
}
}
@@ -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";
}
}
@@ -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;
}
}
@@ -1,5 +1,6 @@
package com.lzxnone.terraria.item.weapon; package com.lzxnone.terraria.item.weapon;
import com.lzxnone.terraria.ModSounds;
import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.attachment.ModAttachments;
import com.lzxnone.terraria.attachment.PlayerMana; import com.lzxnone.terraria.attachment.PlayerMana;
import com.lzxnone.terraria.enchantment.ModEnchantments; 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.AutoManaPotionUser;
import com.lzxnone.terraria.item.accessory.effect.ManaCostModifier; import com.lzxnone.terraria.item.accessory.effect.ManaCostModifier;
import com.lzxnone.terraria.utils.ManaPotionUtil; import com.lzxnone.terraria.utils.ManaPotionUtil;
import com.lzxnone.terraria.utils.SoundUtil;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@@ -121,7 +123,11 @@ public class MagicWeapon extends Weapon {
private static boolean tryAutoUseManaPotion(ServerPlayer player) { private static boolean tryAutoUseManaPotion(ServerPlayer player) {
if(!canAutoUseManaPotion(player)) return false; 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;
} }
} }
@@ -86,7 +86,7 @@ public class LastPrism extends MagicWeapon {
public static final ConfigInt MANA_CONSUME_RATE = new ConfigInt( public static final ConfigInt MANA_CONSUME_RATE = new ConfigInt(
"weapon.last_prism.mana_consume_rate", "weapon.last_prism.mana_consume_rate",
"last_prism_mana_consume_rate", "last_prism_mana_consume_rate",
7, 144,
0, 0,
72000 72000
); );
@@ -76,7 +76,7 @@ public class Flamethrower extends RangedWeapon {
public static final ConfigListItem CONFIG_LIST_ITEM = Gun.createConfigListItem(ID, CONFIG_DATA); public static final ConfigListItem CONFIG_LIST_ITEM = Gun.createConfigListItem(ID, CONFIG_DATA);
public Flamethrower() { 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() { public static final IStaticSummonBehavior SUMMON_BEHAVIOR = new IStaticSummonBehavior() {
@@ -590,7 +590,7 @@ public class StardustDragonStaff extends MinionWeapon {
summon.setPos(player.position()); summon.setPos(player.position());
summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.STARDUST_DRAGON); summon.getEntityData().set(StaticSummon.BEHAVIOR, StaticSummonBehaviors.STARDUST_DRAGON);
summon.getEntityData().set(StaticSummon.RENDER_MODE, "custom"); 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.getEntityData().set(StaticSummon.GLOW, true);
summon.setNoGravity(true); summon.setNoGravity(true);
summon.noPhysics = true; summon.noPhysics = true;
@@ -471,7 +471,7 @@ public class Terraprisma extends MinionWeapon {
summon.getEntityData().set(StaticSummon.SCALE_X, 2.0f); summon.getEntityData().set(StaticSummon.SCALE_X, 2.0f);
summon.getEntityData().set(StaticSummon.SCALE_Y, 1.0f); summon.getEntityData().set(StaticSummon.SCALE_Y, 1.0f);
summon.getEntityData().set(StaticSummon.SCALE_Z, 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); summon.getEntityData().set(StaticSummon.GLOW, true);
CompoundTag summonData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA).copy(); CompoundTag summonData = summon.getEntityData().get(StaticSummon.CUSTOM_DATA).copy();
summonData.putFloat("damage", DAMAGE.get()); summonData.putFloat("damage", DAMAGE.get());
@@ -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 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() { 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 @Override
@@ -1,18 +1,9 @@
package com.lzxnone.terraria.utils; package com.lzxnone.terraria.utils;
import com.lzxnone.terraria.attachment.ModAttachments; import com.lzxnone.terraria.item.potion.AbstractManaPotion;
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 net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.alchemy.PotionContents;
public class ManaPotionUtil { public class ManaPotionUtil {
public static boolean hasManaPotion(Player player) { public static boolean hasManaPotion(Player player) {
@@ -24,27 +15,8 @@ public class ManaPotionUtil {
if(slot < 0) return false; if(slot < 0) return false;
ItemStack stack = player.getInventory().getItem(slot); ItemStack stack = player.getInventory().getItem(slot);
int recoverAmount = getManaRecoverAmount(stack); if(!(stack.getItem() instanceof AbstractManaPotion potion)) return false;
if(recoverAmount <= 0) return false; return potion.tryDrink(player, stack);
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;
} }
private static int findManaPotionSlot(Player player) { private static int findManaPotionSlot(Player player) {
@@ -58,14 +30,7 @@ public class ManaPotionUtil {
} }
private static int getManaRecoverAmount(ItemStack stack) { private static int getManaRecoverAmount(ItemStack stack) {
if(!stack.is(Items.POTION)) return 0; if(stack.getItem() instanceof AbstractManaPotion potion) return potion.getRecoverAmount();
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());
}
}
return 0; return 0;
} }
} }
@@ -87,6 +87,11 @@
"item.lzxnoneterraria.natures_gift": "Nature's Gift", "item.lzxnoneterraria.natures_gift": "Nature's Gift",
"item.lzxnoneterraria.mana_flower": "Mana Flower", "item.lzxnoneterraria.mana_flower": "Mana Flower",
"item.lzxnoneterraria.mana_crystal": "Mana Crystal", "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_leak": "Mana Leak",
"enchantment.lzxnoneterraria.mana_efficiency": "Mana Efficiency", "enchantment.lzxnoneterraria.mana_efficiency": "Mana Efficiency",
@@ -115,6 +120,8 @@
"tooltip.lzxnoneterraria.mana_flower.0": "%s%% reduced mana cost", "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_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.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_projectile": "Projectile",
"entity.lzxnoneterraria.static_summon": "Summon", "entity.lzxnoneterraria.static_summon": "Summon",
@@ -130,16 +137,7 @@
"effect.lzxnoneterraria.acid_venom": "Acid Venom", "effect.lzxnoneterraria.acid_venom": "Acid Venom",
"effect.lzxnoneterraria.midas": "Midas", "effect.lzxnoneterraria.midas": "Midas",
"effect.lzxnoneterraria.summon": "Summon", "effect.lzxnoneterraria.summon": "Summon",
"effect.lzxnoneterraria.mana": "Mana",
"effect.lzxnoneterraria.mana_sickness": "Mana Sickness", "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.categories.lzxnoneterraria": "lzxnoneterraria",
"key.lzxnoneterraria.kill_mode": "Kill Mode", "key.lzxnoneterraria.kill_mode": "Kill Mode",
@@ -87,6 +87,11 @@
"item.lzxnoneterraria.natures_gift": "大自然的恩赐", "item.lzxnoneterraria.natures_gift": "大自然的恩赐",
"item.lzxnoneterraria.mana_flower": "魔力花", "item.lzxnoneterraria.mana_flower": "魔力花",
"item.lzxnoneterraria.mana_crystal": "魔力水晶", "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_leak": "魔力泄漏",
"enchantment.lzxnoneterraria.mana_efficiency": "魔力效率", "enchantment.lzxnoneterraria.mana_efficiency": "魔力效率",
@@ -115,6 +120,8 @@
"tooltip.lzxnoneterraria.mana_flower.0": "魔力花费降低 %s%%", "tooltip.lzxnoneterraria.mana_flower.0": "魔力花费降低 %s%%",
"tooltip.lzxnoneterraria.mana_flower.1": "魔力枯竭时自动使用魔力药水", "tooltip.lzxnoneterraria.mana_flower.1": "魔力枯竭时自动使用魔力药水",
"tooltip.lzxnoneterraria.mana_crystal.0": "永久提升 20 点最大魔力,最高提升到 200", "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_projectile": "弹射物",
"entity.lzxnoneterraria.static_summon": "召唤物", "entity.lzxnoneterraria.static_summon": "召唤物",
@@ -129,16 +136,7 @@
"effect.lzxnoneterraria.acid_venom": "酸性毒液", "effect.lzxnoneterraria.acid_venom": "酸性毒液",
"effect.lzxnoneterraria.midas": "迈达斯", "effect.lzxnoneterraria.midas": "迈达斯",
"effect.lzxnoneterraria.summon": "召唤", "effect.lzxnoneterraria.summon": "召唤",
"effect.lzxnoneterraria.mana": "魔力",
"effect.lzxnoneterraria.mana_sickness": "耐魔性", "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.categories.lzxnoneterraria": "lzxnoneterraria",
"key.lzxnoneterraria.kill_mode": "进入杀戮模式", "key.lzxnoneterraria.kill_mode": "进入杀戮模式",
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/greater_mana_potion"
}
}
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/lesser_mana_potion"
}
}
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/mana_motion"
}
}
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/summoning_potion"
}
}
@@ -0,0 +1,6 @@
{
"parent": "lzxnoneterraria:item/item",
"textures": {
"layer0": "lzxnoneterraria:item/super_mana_potion"
}
}
@@ -11,6 +11,12 @@
"max_mana": { "max_mana": {
"sounds": ["lzxnoneterraria:max_mana"] "sounds": ["lzxnoneterraria:max_mana"]
}, },
"get_mana": {
"sounds": ["lzxnoneterraria:get_mana"]
},
"drink": {
"sounds": ["lzxnoneterraria:drink"]
},
"beam": { "beam": {
"sounds": ["lzxnoneterraria:beam"] "sounds": ["lzxnoneterraria:beam"]
}, },
Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 270 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 288 B

@@ -1,6 +1,7 @@
{ {
"replace": false, "replace": false,
"entries": [ "entries": [
"lzxnoneterraria:natures_gift_simple_dungeon" "lzxnoneterraria:natures_gift_simple_dungeon",
"lzxnoneterraria:mana_potions_simple_dungeon"
] ]
} }
@@ -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"
}
@@ -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
}
]
}
@@ -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
}
}
@@ -6,13 +6,7 @@
"item": "lzxnoneterraria:natures_gift" "item": "lzxnoneterraria:natures_gift"
}, },
{ {
"type": "neoforge:components", "item": "lzxnoneterraria:mana_potion"
"items": "minecraft:potion",
"components": {
"minecraft:potion_contents": {
"potion": "lzxnoneterraria:mana_0"
}
}
} }
], ],
"result": { "result": {
@@ -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
}
}