From 782f2d1c30c0821863f86f3a210b615ea9144656 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Thu, 16 Jul 2026 19:50:19 +0800 Subject: [PATCH] v1.4.0 --- gradle.properties | 2 +- .../terraria/entity/BloomRenderer.java | 237 ++++++++++++++++++ .../entity/EntityEmissiveRenderer.java | 76 ------ .../lzxnone/terraria/entity/IrisCompat.java | 39 +++ .../terraria/entity/ModRenderTypes.java | 43 ++-- .../entity/beam/ISwordBeamBehavior.java | 1 + .../lzxnone/terraria/event/InputHandler.java | 90 +++++++ .../terraria/event/ShaderRegistry.java | 50 ++++ .../terraria/event_handler/InputHandler.java | 100 -------- .../item/weapon/melee/FirstFractal.java | 53 ++-- .../terraria/item/weapon/melee/Terragrim.java | 9 +- .../weapon/melee/TrueCopperShortsword.java | 54 ++-- .../terraria/item/weapon/melee/Zenith.java | 67 ++--- .../terraria/mixin/ItemInHandRenderMixin.java | 38 +-- .../lzxnone/terraria/mixin/UseSpeedMixin.java | 45 ++++ .../lzxnone/terraria/utils/RenderUtil.java | 16 ++ .../lzxnoneterraria/shaders/core/blur.fsh | 29 +++ .../lzxnoneterraria/shaders/core/blur.json | 14 ++ .../lzxnoneterraria/shaders/core/blur.vsh | 11 + .../shaders/core/composite.fsh | 11 + .../shaders/core/composite.json | 12 + .../shaders/core/composite.vsh | 11 + .../resources/lzxnoneterraria.mixins.json | 3 +- 23 files changed, 673 insertions(+), 338 deletions(-) create mode 100644 src/main/java/com/lzxnone/terraria/entity/BloomRenderer.java delete mode 100644 src/main/java/com/lzxnone/terraria/entity/EntityEmissiveRenderer.java create mode 100644 src/main/java/com/lzxnone/terraria/entity/IrisCompat.java create mode 100644 src/main/java/com/lzxnone/terraria/event/InputHandler.java create mode 100644 src/main/java/com/lzxnone/terraria/event/ShaderRegistry.java delete mode 100644 src/main/java/com/lzxnone/terraria/event_handler/InputHandler.java create mode 100644 src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java create mode 100644 src/main/resources/assets/lzxnoneterraria/shaders/core/blur.fsh create mode 100644 src/main/resources/assets/lzxnoneterraria/shaders/core/blur.json create mode 100644 src/main/resources/assets/lzxnoneterraria/shaders/core/blur.vsh create mode 100644 src/main/resources/assets/lzxnoneterraria/shaders/core/composite.fsh create mode 100644 src/main/resources/assets/lzxnoneterraria/shaders/core/composite.json create mode 100644 src/main/resources/assets/lzxnoneterraria/shaders/core/composite.vsh diff --git a/gradle.properties b/gradle.properties index d3cb64c..8336ed6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ mod_name=Lzxnone Terraria # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=1.4.0 +mod_version=1.4.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/lzxnone/terraria/entity/BloomRenderer.java b/src/main/java/com/lzxnone/terraria/entity/BloomRenderer.java new file mode 100644 index 0000000..04443f2 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/entity/BloomRenderer.java @@ -0,0 +1,237 @@ +package com.lzxnone.terraria.entity; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.entity.beam.SwordBeam; +import com.lzxnone.terraria.entity.beam.SwordBeamBehaviors; +import com.lzxnone.terraria.entity.projectile.StaticProjectile; +import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; +import com.lzxnone.terraria.entity.summon.StaticSummon; +import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; +import com.lzxnone.terraria.event.ShaderRegistry; +import com.mojang.blaze3d.pipeline.RenderTarget; +import com.mojang.blaze3d.pipeline.TextureTarget; +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.shaders.Uniform; +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.*; +import net.minecraft.client.Camera; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.ShaderInstance; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.client.GlStateBackup; +import net.neoforged.neoforge.client.event.RenderLevelStageEvent; + +import java.util.Objects; + +@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) +public class BloomRenderer { + private static final int GL_LINEAR = 9729; + private static final int GLOW_DIV = 2; + private static final int BLOOM_DIV = 16; + + private static RenderTarget glowTarget; + private static RenderTarget bloomTarget; + private static RenderTarget pingTarget; + private static RenderTarget pongTarget; + private static int lastGlowW = -1; + private static int lastGlowH = -1; + private static int lastBloomW = -1; + private static int lastBloomH = -1; + + @SubscribeEvent + public static void onRenderStage(RenderLevelStageEvent event) { + //开启光影禁用 + if(IrisCompat.isShaderPackInUse()) return; + if(ShaderRegistry.getBlur() == null || ShaderRegistry.getComposite() == null) return; + + ensureTargets(); + if(glowTarget == null || bloomTarget == null) return; + + if(event.getStage() == RenderLevelStageEvent.Stage.AFTER_ENTITIES) { + onAfterEntities(event); + }else if(event.getStage() == RenderLevelStageEvent.Stage.AFTER_LEVEL) { + onAfterLevel(); + } + } + + private static void ensureTargets() { + RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); + int gw = Math.max(1, main.viewWidth / GLOW_DIV); + int gh = Math.max(1, main.viewHeight / GLOW_DIV); + int bw = Math.max(1, main.viewWidth / BLOOM_DIV); + int bh = Math.max(1, main.viewHeight / BLOOM_DIV); + + if(gw != lastGlowW || gh != lastGlowH || glowTarget == null) { + if(glowTarget != null) glowTarget.destroyBuffers(); + glowTarget = new TextureTarget(gw, gh, true, false); + glowTarget.setClearColor(0f, 0f, 0f, 0f); + glowTarget.setFilterMode(GL_LINEAR); + lastGlowW = gw; + lastGlowH = gh; + } + if(bw != lastBloomW || bh != lastBloomH || bloomTarget == null) { + if(bloomTarget != null) bloomTarget.destroyBuffers(); + if(pingTarget != null) pingTarget.destroyBuffers(); + if(pongTarget != null) pongTarget.destroyBuffers(); + bloomTarget = new TextureTarget(bw, bh, false, false); + pingTarget = new TextureTarget(bw, bh, false, false); + pongTarget = new TextureTarget(bw, bh, false, false); + for(RenderTarget t : new RenderTarget[]{bloomTarget, pingTarget, pongTarget}) { + t.setClearColor(0f, 0f, 0f, 0f); + t.setFilterMode(GL_LINEAR); + } + lastBloomW = bw; + lastBloomH = bh; + } + } + + private static void onAfterEntities(RenderLevelStageEvent event) { + GlStateBackup backup = new GlStateBackup(); + RenderSystem.backupGlState(backup); + ShaderInstance prevShader = RenderSystem.getShader(); + int prevTex0 = RenderSystem.getShaderTexture(0); + + try{ + RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); + glowTarget.clear(false); + glowTarget.bindWrite(true); + glowTarget.copyDepthFrom(main); + glowTarget.bindWrite(true); + + renderGlowEntities( + event.getPoseStack(), + event.getCamera(), + event.getPartialTick().getGameTimeDeltaPartialTick(true) + ); + + downsamplePass(glowTarget, bloomTarget); + + blurPass(bloomTarget, pingTarget, true); + blurPass(pingTarget, pongTarget, false); + }finally { + Minecraft.getInstance().getMainRenderTarget().bindWrite(true); + RenderSystem.setShaderTexture(0, prevTex0); + if(prevShader != null) { + RenderSystem.setShader(() -> prevShader); + } + RenderSystem.restoreGlState(backup); + } + } + + private static void onAfterLevel() { + GlStateBackup backup = new GlStateBackup(); + RenderSystem.backupGlState(backup); + ShaderInstance prevShader = RenderSystem.getShader(); + int prevTex0 = RenderSystem.getShaderTexture(0); + + try{ + RenderTarget main = Minecraft.getInstance().getMainRenderTarget(); + main.bindWrite(true); + + ShaderInstance shader = ShaderRegistry.getComposite(); + RenderSystem.setShader(() -> shader); + RenderSystem.setShaderTexture(0, pongTarget.getColorTextureId()); + RenderSystem.enableBlend(); + RenderSystem.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE); + RenderSystem.disableDepthTest(); + RenderSystem.depthMask(false); + drawFullscreen(); + }finally { + RenderSystem.setShaderTexture(0, prevTex0); + if(prevShader != null) { + RenderSystem.setShader(() -> prevShader); + } + RenderSystem.restoreGlState(backup); + } + } + + private static void downsamplePass(RenderTarget src, RenderTarget dst) { + dst.bindWrite(true); + ShaderInstance shader = ShaderRegistry.getComposite(); + RenderSystem.setShader(() -> shader); + RenderSystem.setShaderTexture(0, src.getColorTextureId()); + RenderSystem.disableBlend(); + RenderSystem.disableDepthTest(); + RenderSystem.depthMask(false); + drawFullscreen(); + } + + private static void blurPass(RenderTarget src, RenderTarget dst, boolean horizontal) { + dst.bindWrite(true); + + ShaderInstance shader = ShaderRegistry.getBlur(); + RenderSystem.setShader(() -> shader); + RenderSystem.setShaderTexture(0, src.getColorTextureId()); + + Uniform dir = shader.getUniform("Direction"); + if(dir != null) { + float dx = horizontal ? (1f / src.viewWidth) : 0f; + float dy = horizontal ? 0f : (1f / src.viewHeight); + dir.set(dx, dy); + } + + RenderSystem.disableDepthTest(); + RenderSystem.depthMask(false); + RenderSystem.disableBlend(); + drawFullscreen(); + } + + private static void drawFullscreen() { + BufferBuilder bb = RenderSystem.renderThreadTesselator().begin( + VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); + bb.addVertex(-1f, -1f, 0f).setUv(0f, 0f); + bb.addVertex(1f, -1f, 0f).setUv(1f, 0f); + bb.addVertex(1f, 1f, 0f).setUv(1f, 1f); + bb.addVertex(-1f, 1f, 0f).setUv(0f, 1f); + BufferUploader.drawWithShader(Objects.requireNonNull(bb.build())); + } + + public static void renderGlowEntities(PoseStack poseStack, Camera camera, float partialTick) { + Minecraft mc = Minecraft.getInstance(); + if(mc.level == null) { + return; + } + try(ByteBufferBuilder byteBuf = new ByteBufferBuilder(65536)) { + MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(byteBuf); + for (Entity entity : mc.level.entitiesForRendering()) { + double x = Mth.lerp(partialTick, entity.xo, entity.getX()); + double y = Mth.lerp(partialTick, entity.yo, entity.getY()); + double z = Mth.lerp(partialTick, entity.zo, entity.getZ()); + float entityYaw = Mth.lerp(partialTick, entity.yRotO, entity.getYRot()); + + double camX = x - camera.getPosition().x(); + double camY = y - camera.getPosition().y(); + double camZ = z - camera.getPosition().z(); + + if(entity instanceof StaticProjectile projectile + && projectile.getEntityData().get(StaticProjectile.GLOW)) { + poseStack.pushPose(); + poseStack.translate(camX, camY, camZ); + StaticProjectileBehaviors.getBehavior(projectile.getEntityData().get(StaticProjectile.BEHAVIOR)) + .render(projectile, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); + poseStack.popPose(); + }else if (entity instanceof StaticSummon summon + && summon.getEntityData().get(StaticSummon.GLOW)) { + poseStack.pushPose(); + poseStack.translate(camX, camY, camZ); + StaticSummonBehaviors.getBehavior(summon.getEntityData().get(StaticSummon.BEHAVIOR)) + .render(summon, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); + poseStack.popPose(); + }else if (entity instanceof SwordBeam beam) { + poseStack.pushPose(); + poseStack.translate(camX, camY, camZ); + SwordBeamBehaviors.getBehavior(beam.getEntityData().get(SwordBeam.BEHAVIOR)) + .render(beam, entityYaw, partialTick, poseStack, bufferSource, LightTexture.FULL_BRIGHT); + poseStack.popPose(); + } + } + bufferSource.endBatch(); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/entity/EntityEmissiveRenderer.java b/src/main/java/com/lzxnone/terraria/entity/EntityEmissiveRenderer.java deleted file mode 100644 index d2cd950..0000000 --- a/src/main/java/com/lzxnone/terraria/entity/EntityEmissiveRenderer.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.lzxnone.terraria.entity; - -import com.lzxnone.terraria.LzxnoneTerraria; -import com.lzxnone.terraria.entity.beam.SwordBeam; -import com.lzxnone.terraria.entity.beam.SwordBeamBehaviors; -import com.lzxnone.terraria.entity.projectile.StaticProjectile; -import com.lzxnone.terraria.entity.projectile.StaticProjectileBehaviors; -import com.lzxnone.terraria.entity.summon.StaticSummon; -import com.lzxnone.terraria.entity.summon.StaticSummonBehaviors; -import com.mojang.blaze3d.vertex.ByteBufferBuilder; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.Camera; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.util.Mth; -import net.minecraft.world.entity.Entity; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.neoforge.client.event.RenderLevelStageEvent; - -@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) -public class EntityEmissiveRenderer { - @SubscribeEvent - public static void onRenderStage(RenderLevelStageEvent event) { - if(event.getStage() != RenderLevelStageEvent.Stage.AFTER_ENTITIES) return; - - /* - - Minecraft mc = Minecraft.getInstance(); - if(mc.level == null || mc.player == null) return; - - PoseStack poseStack = event.getPoseStack(); - try(ByteBufferBuilder byteBuf = new ByteBufferBuilder(65536)) { - MultiBufferSource.BufferSource bufferSource = MultiBufferSource.immediate(byteBuf); - Camera camera = event.getCamera(); - float partialTick = event.getPartialTick().getGameTimeDeltaPartialTick(true); - for(Entity entity : mc.level.entitiesForRendering()) { - double x = Mth.lerp(partialTick, entity.xo, entity.getX()); - double y = Mth.lerp(partialTick, entity.yo, entity.getY()); - double z = Mth.lerp(partialTick, entity.zo, entity.getZ()); - float entityYaw = Mth.lerp(partialTick, entity.yRotO, entity.getYRot()); - - double camX = x - camera.getPosition().x(); - double camY = y - camera.getPosition().y(); - double camZ = z - camera.getPosition().z(); - - if(entity instanceof StaticProjectile projectile && projectile.getEntityData().get(StaticProjectile.RENDER_MODE).equals("custom") && projectile.getEntityData().get(StaticProjectile.GLOW)) { - poseStack.pushPose(); - poseStack.translate(camX, camY, camZ); - StaticProjectileBehaviors.getBehavior(projectile.getEntityData().get(StaticProjectile.BEHAVIOR)) - .render(projectile, entityYaw, partialTick, poseStack, bufferSource, 15728880); - - poseStack.popPose(); - }else if(entity instanceof StaticSummon summon && summon.getEntityData().get(StaticSummon.RENDER_MODE).equals("custom") && summon.getEntityData().get(StaticSummon.GLOW)) { - poseStack.pushPose(); - poseStack.translate(camX, camY, camZ); - StaticSummonBehaviors.getBehavior(summon.getEntityData().get(StaticSummon.BEHAVIOR)) - .render(summon, entityYaw, partialTick, poseStack, bufferSource, 15728880); - - poseStack.popPose(); - }else if(entity instanceof SwordBeam beam) { - poseStack.pushPose(); - poseStack.translate(camX, camY, camZ); - SwordBeamBehaviors.getBehavior(beam.getEntityData().get(SwordBeam.BEHAVIOR)) - .render(beam, entityYaw, partialTick, poseStack, bufferSource, 15728880); - - poseStack.popPose(); - } - } - bufferSource.endBatch(); - } - - */ - } -} diff --git a/src/main/java/com/lzxnone/terraria/entity/IrisCompat.java b/src/main/java/com/lzxnone/terraria/entity/IrisCompat.java new file mode 100644 index 0000000..f652964 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/entity/IrisCompat.java @@ -0,0 +1,39 @@ +package com.lzxnone.terraria.entity; + +import java.lang.reflect.Method; + +public class IrisCompat { + private static final boolean IRIS_PRESENT; + private static final Method GET_INSTANCE; + private static final Method IS_SHADER_PACK; + + static { + Method gi = null; + Method issp = null; + try { + Class cls = Class.forName("net.irisshaders.iris.api.v0.IrisApi"); + gi = cls.getMethod("getInstance"); + issp = cls.getMethod("isShaderPackInUse"); + } catch (Throwable ignored) { + } + GET_INSTANCE = gi; + IS_SHADER_PACK = issp; + IRIS_PRESENT = gi != null && issp != null; + } + + public static boolean isShaderPackInUse() { + if (!IRIS_PRESENT) { + return false; + } + try { + Object instance = GET_INSTANCE.invoke(null); + if (instance == null) { + return false; + } + Object result = IS_SHADER_PACK.invoke(instance); + return result instanceof Boolean b ? b : false; + } catch (Throwable t) { + return false; + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java b/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java index c8e4826..4eec521 100644 --- a/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java +++ b/src/main/java/com/lzxnone/terraria/entity/ModRenderTypes.java @@ -1,5 +1,7 @@ package com.lzxnone.terraria.entity; +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; import net.minecraft.client.renderer.RenderStateShard; @@ -29,26 +31,23 @@ public class ModRenderTypes { } public static RenderType entityTranslucent(ResourceLocation texture) { - return RenderType.create( - "m_entity_translucent", - DefaultVertexFormat.NEW_ENTITY, - VertexFormat.Mode.QUADS, - 1536, - false, - false, - RenderType.CompositeState.builder() - // 1. 核心修改:换成标准实体半透明着色器(支持环境光照计算) - .setShaderState(RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_SHADER) - .setTextureState(new RenderStateShard.TextureStateShard(texture, false, false)) - .setTransparencyState(RenderStateShard.TRANSLUCENT_TRANSPARENCY) - .setCullState(RenderStateShard.NO_CULL) - // 2. 核心修改:开启光照图(Lightmap),让它正式吃环境光 - .setLightmapState(RenderStateShard.LIGHTMAP) - .setOverlayState(RenderStateShard.OVERLAY) - .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST) - // 3. 依然保留深度写入,防止被水面、云层裁剪掉 - .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE) - .createCompositeState(true) - ); -} + return RenderType.create( + "m_entity_translucent", + DefaultVertexFormat.NEW_ENTITY, + VertexFormat.Mode.QUADS, + 1536, + false, + false, + RenderType.CompositeState.builder() + .setShaderState(RenderStateShard.RENDERTYPE_ENTITY_TRANSLUCENT_SHADER) + .setTextureState(new RenderStateShard.TextureStateShard(texture, false, false)) + .setTransparencyState(RenderStateShard.TRANSLUCENT_TRANSPARENCY) + .setCullState(RenderStateShard.NO_CULL) + .setLightmapState(RenderStateShard.LIGHTMAP) + .setOverlayState(RenderStateShard.OVERLAY) + .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST) + .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE) + .createCompositeState(true) + ); + } } diff --git a/src/main/java/com/lzxnone/terraria/entity/beam/ISwordBeamBehavior.java b/src/main/java/com/lzxnone/terraria/entity/beam/ISwordBeamBehavior.java index 099f7ed..295c1a7 100644 --- a/src/main/java/com/lzxnone/terraria/entity/beam/ISwordBeamBehavior.java +++ b/src/main/java/com/lzxnone/terraria/entity/beam/ISwordBeamBehavior.java @@ -151,6 +151,7 @@ public interface ISwordBeamBehavior { color1.x(), color1.y(), color1.z(), alpha, 32 * SwordBeam.SCALE, 32 * SwordBeam.SCALE, 0f, 0f, 0.03f); } poseStack.popPose(); + } default void renderQuad(Matrix4f matrix, VertexConsumer consumer, float r, float g, float b, float a, float halfWidth, float halfHeight, float offsetX, float offsetY, float offsetZ) { diff --git a/src/main/java/com/lzxnone/terraria/event/InputHandler.java b/src/main/java/com/lzxnone/terraria/event/InputHandler.java new file mode 100644 index 0000000..f8692d1 --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/event/InputHandler.java @@ -0,0 +1,90 @@ +package com.lzxnone.terraria.event; + +import com.lzxnone.terraria.Config; +import com.lzxnone.terraria.LzxnoneTerraria; +import com.lzxnone.terraria.item.ModItems; +import com.lzxnone.terraria.item.weapon.melee.FirstFractal; +import com.lzxnone.terraria.item.weapon.melee.TrueCopperShortsword; +import com.lzxnone.terraria.item.weapon.melee.Zenith; +import com.lzxnone.terraria.network.payload.FirstFractalScrollPayload; +import com.lzxnone.terraria.network.payload.ZenithScrollPayload; +import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; +import net.minecraft.client.player.Input; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.core.component.DataComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.client.event.InputEvent; +import net.neoforged.neoforge.client.event.MovementInputUpdateEvent; +import net.neoforged.neoforge.network.PacketDistributor; + +@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) +public class InputHandler { + @SubscribeEvent + public static void onMouseScroll(InputEvent.MouseScrollingEvent event) { + Minecraft mc = Minecraft.getInstance(); + LocalPlayer player = mc.player; + if(player == null) return; + + ItemStack mainHand = player.getMainHandItem(); + if(mainHand.getItem() instanceof Zenith || mainHand.getItem() instanceof TrueCopperShortsword) { + if(player.isUsingItem() && (player.getUseItem().is(ModItems.ZENITH.get()) || player.getUseItem().is(ModItems.TRUE_COPPER_SHORTSWORD.get()))) { + double scrollDelta = event.getScrollDeltaY(); + if(scrollDelta != 0) { + event.setCanceled(true); + double deltaDist = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getDouble("deltaDist"); + + double finalDelta = deltaDist + scrollDelta * Config.zenithMouseSpeed; + + if(Config.zenithDistanceMode) { + if(finalDelta > Config.zenithMaxRange) finalDelta = Config.zenithMaxRange; + else if(finalDelta < -Config.zenithMaxRange) finalDelta = -Config.zenithMaxRange; + }else { + if(finalDelta > Config.zenithMaxRange) finalDelta = Config.zenithMaxRange; + else if(finalDelta < 0) finalDelta = 0; + } + + MutableComponent displayText = Component.empty(); + displayText.append(Component.literal(String.format("%s", Config.zenithDistanceMode ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) + .append(Component.literal(String.format("%.1f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); + player.displayClientMessage(displayText, true); + + PacketDistributor.sendToServer(new ZenithScrollPayload(scrollDelta)); + } + } + }else if(mainHand.getItem() instanceof FirstFractal) { + if(player.isUsingItem() && (player.getUseItem().is(ModItems.FIRST_FRACTAL.get()))) { + double scrollDelta = event.getScrollDeltaY(); + if(scrollDelta != 0) { + event.setCanceled(true); + double deltaDist = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getDouble("deltaDist"); + + double finalDelta = deltaDist + scrollDelta * Config.firstFractalScrollSpeed; + + if(Config.firstFractalDistanceMode) { + if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; + else if(finalDelta < -Config.firstFractalMaxRange) finalDelta = -Config.firstFractalMaxRange; + }else { + if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; + else if(finalDelta < 0) finalDelta = 0; + } + MutableComponent displayText = Component.empty(); + displayText.append(Component.literal(String.format("%s", Config.firstFractalDistanceMode ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) + .append(Component.literal(String.format("%.1f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); + player.displayClientMessage(displayText, true); + + PacketDistributor.sendToServer(new FirstFractalScrollPayload(scrollDelta)); + } + } + } + } +} diff --git a/src/main/java/com/lzxnone/terraria/event/ShaderRegistry.java b/src/main/java/com/lzxnone/terraria/event/ShaderRegistry.java new file mode 100644 index 0000000..c59e8aa --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/event/ShaderRegistry.java @@ -0,0 +1,50 @@ +package com.lzxnone.terraria.event; + +import com.lzxnone.terraria.LzxnoneTerraria; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import net.minecraft.client.renderer.ShaderInstance; +import net.minecraft.resources.ResourceLocation; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.client.event.RegisterShadersEvent; + +import java.io.IOException; + +@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) +public class ShaderRegistry { + private static ShaderInstance blur; + private static ShaderInstance composite; + + public static ShaderInstance getBlur() { + return blur; + } + + public static ShaderInstance getComposite() { + return composite; + } + + @SubscribeEvent + public static void registerShaders(RegisterShadersEvent event) { + try { + event.registerShader( + new ShaderInstance( + event.getResourceProvider(), + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "blur"), + DefaultVertexFormat.POSITION_TEX + ), + shader -> blur = shader + ); + event.registerShader( + new ShaderInstance( + event.getResourceProvider(), + ResourceLocation.fromNamespaceAndPath(LzxnoneTerraria.MODID, "composite"), + DefaultVertexFormat.POSITION_TEX + ), + shader -> composite = shader + ); + } catch (IOException e) { + throw new RuntimeException("Shader load error", e); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/lzxnone/terraria/event_handler/InputHandler.java b/src/main/java/com/lzxnone/terraria/event_handler/InputHandler.java deleted file mode 100644 index 2d78b56..0000000 --- a/src/main/java/com/lzxnone/terraria/event_handler/InputHandler.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.lzxnone.terraria.event_handler; - -import com.lzxnone.terraria.Config; -import com.lzxnone.terraria.LzxnoneTerraria; -import com.lzxnone.terraria.item.ModItems; -import com.lzxnone.terraria.item.weapon.melee.FirstFractal; -import com.lzxnone.terraria.item.weapon.melee.TrueCopperShortsword; -import com.lzxnone.terraria.item.weapon.melee.Zenith; -import com.lzxnone.terraria.network.payload.FirstFractalScrollPayload; -import com.lzxnone.terraria.network.payload.ZenithScrollPayload; -import net.minecraft.ChatFormatting; -import net.minecraft.client.Minecraft; -import net.minecraft.client.player.Input; -import net.minecraft.client.player.LocalPlayer; -import net.minecraft.core.component.DataComponents; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.component.CustomData; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.neoforge.client.event.InputEvent; -import net.neoforged.neoforge.client.event.MovementInputUpdateEvent; -import net.neoforged.neoforge.network.PacketDistributor; - -@EventBusSubscriber(modid = LzxnoneTerraria.MODID, value = Dist.CLIENT) -public class InputHandler { - @SubscribeEvent - public static void onMouseScroll(InputEvent.MouseScrollingEvent event) { - Minecraft mc = Minecraft.getInstance(); - LocalPlayer player = mc.player; - if(player == null) return; - - ItemStack mainHand = player.getMainHandItem(); - if(mainHand.getItem() instanceof Zenith || mainHand.getItem() instanceof TrueCopperShortsword) { - int count = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - double scrollDelta = event.getScrollDeltaY(); - if(scrollDelta != 0 && count > 0) { - event.setCanceled(true); - double deltaDist = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getDouble("deltaDist"); - - double finalDelta = deltaDist + scrollDelta * Config.zenithMouseSpeed; - - if(Config.zenithDistanceMode) { - if(finalDelta > Config.zenithMaxRange) finalDelta = Config.zenithMaxRange; - else if(finalDelta < -Config.zenithMaxRange) finalDelta = -Config.zenithMaxRange; - }else { - if(finalDelta > Config.zenithMaxRange) finalDelta = Config.zenithMaxRange; - else if(finalDelta < 0) finalDelta = 0; - } - - MutableComponent displayText = Component.empty(); - displayText.append(Component.literal(String.format("%s", Config.zenithDistanceMode ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) - .append(Component.literal(String.format("%.1f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); - player.displayClientMessage(displayText, true); - - PacketDistributor.sendToServer(new ZenithScrollPayload(scrollDelta)); - } - }else if(mainHand.getItem() instanceof FirstFractal) { - int count = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - double scrollDelta = event.getScrollDeltaY(); - if(scrollDelta != 0 && count > 0) { - event.setCanceled(true); - double deltaDist = mainHand.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getDouble("deltaDist"); - - double finalDelta = deltaDist + scrollDelta * Config.firstFractalScrollSpeed; - - if(Config.firstFractalDistanceMode) { - if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; - else if(finalDelta < -Config.firstFractalMaxRange) finalDelta = -Config.firstFractalMaxRange; - }else { - if(finalDelta > Config.firstFractalMaxRange) finalDelta = Config.firstFractalMaxRange; - else if(finalDelta < 0) finalDelta = 0; - } - MutableComponent displayText = Component.empty(); - displayText.append(Component.literal(String.format("%s", Config.firstFractalDistanceMode ? "相对距离: " : "绝对距离: ")).withStyle(ChatFormatting.WHITE)) - .append(Component.literal(String.format("%.1f", finalDelta)).withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD)); - player.displayClientMessage(displayText, true); - - PacketDistributor.sendToServer(new FirstFractalScrollPayload(scrollDelta)); - } - } - } - - @SubscribeEvent - public static void onMovementInputUpdate(MovementInputUpdateEvent event) { - Player player = event.getEntity(); - if(player.isUsingItem() && (player.getUseItem().is(ModItems.TERRAGRIM.get()) || player.getUseItem().is(ModItems.MACE.get()))) { - Input input = event.getInput(); - input.forwardImpulse *= 5.0F; - input.leftImpulse *= 5.0F; - } - } -} diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java index ab02ec8..3d58316 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/FirstFractal.java @@ -42,6 +42,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import org.joml.Matrix4f; import org.joml.Vector3f; +import org.jspecify.annotations.NonNull; import java.util.List; import java.util.UUID; @@ -376,42 +377,28 @@ public class FirstFractal extends SwordItem { @Override public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - - if(!level.isClientSide()) { - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putInt("attackCount", 3)); - }else { - SoundUtil.playClientSound(player, ModSounds.WAVE.get()); - } - - player.getCooldowns().addCooldown(stack.getItem(), 3); - return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); + player.startUsingItem(hand); + return InteractionResultHolder.consume(stack); } @Override - public void inventoryTick(ItemStack stack, Level level, net.minecraft.world.entity.Entity entity, int slotId, boolean isSelected) { - super.inventoryTick(stack, level, entity, slotId, isSelected); - if(entity instanceof Player player) { - if(isSelected) { - if(player.tickCount % 3 == 0) { - double deltaDist = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getDouble("deltaDist"); - int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - if(count > 0) { - summon(player, deltaDist); - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putInt("attackCount", count - 1)); - } - } - }else { - int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - if(count > 0) { - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putInt("attackCount", 0)); - } - } + public void onUseTick(Level level, LivingEntity livingEntity, ItemStack stack, int count) { + if(!(livingEntity instanceof Player player)) return; + if(player.tickCount % 3 == 0) { + double deltaDist = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getDouble("deltaDist"); + summon(player, deltaDist); + SoundUtil.playClientSound(player, ModSounds.WAVE.get()); } } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return 72000; + } + + @Override + public @NonNull UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.BLOCK; + } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java index 760328a..a631fd2 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Terragrim.java @@ -8,7 +8,6 @@ import com.lzxnone.terraria.entity.ModRenderTypes; import com.lzxnone.terraria.entity.summon.IStaticSummonBehavior; 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.DamageUtil; import com.lzxnone.terraria.utils.FilterUtil; import com.lzxnone.terraria.utils.MathUtil; @@ -18,7 +17,6 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.component.DataComponents; import net.minecraft.nbt.CompoundTag; @@ -37,10 +35,10 @@ import net.minecraft.world.item.component.CustomData; import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.Vec3; import org.joml.Quaternionf; import org.joml.Vector3f; +import org.jspecify.annotations.NonNull; import java.util.List; @@ -225,4 +223,9 @@ public class Terragrim extends SwordItem { public int getUseDuration(ItemStack stack, LivingEntity entity) { return 72000; } + + @Override + public @NonNull UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.BLOCK; + } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueCopperShortsword.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueCopperShortsword.java index ffd8846..2ecb873 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueCopperShortsword.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/TrueCopperShortsword.java @@ -15,6 +15,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.EquipmentSlotGroup; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; @@ -24,6 +25,7 @@ import net.minecraft.world.item.component.ItemAttributeModifiers; import net.minecraft.world.level.Level; import net.minecraft.world.phys.Vec3; import org.joml.Vector3f; +import org.jspecify.annotations.NonNull; public class TrueCopperShortsword extends SwordItem { public TrueCopperShortsword() { @@ -129,44 +131,30 @@ public class TrueCopperShortsword extends SwordItem { @Override public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - - if(!level.isClientSide()) { - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putInt("attackCount", 3)); - }else { - SoundUtil.playClientSound(player, ModSounds.WAVE.get()); - } - - player.getCooldowns().addCooldown(stack.getItem(), 3); - return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); + player.startUsingItem(hand); + return InteractionResultHolder.consume(stack); } @Override - public void inventoryTick(ItemStack stack, Level level, net.minecraft.world.entity.Entity entity, int slotId, boolean isSelected) { - super.inventoryTick(stack, level, entity, slotId, isSelected); - if(entity instanceof Player player) { - if(isSelected) { - if(player.tickCount % 3 == 0) { - double deltaDist = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getDouble("deltaDist"); - int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - if(count > 0) { - summon(player, deltaDist); - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putInt("attackCount", count - 1)); - } - } - }else { - int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - if(count > 0) { - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putInt("attackCount", 0)); - } - } + public void onUseTick(Level level, LivingEntity livingEntity, ItemStack stack, int count) { + if(!(livingEntity instanceof Player player)) return; + if(player.tickCount % 3 == 0) { + double deltaDist = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getDouble("deltaDist"); + summon(player, deltaDist); + SoundUtil.playClientSound(player, ModSounds.WAVE.get()); } } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return 72000; + } + + @Override + public @NonNull UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.BLOCK; + } } diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java index 87701b7..33cdb48 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/melee/Zenith.java @@ -41,6 +41,7 @@ import net.minecraft.world.phys.Vec3; import org.joml.Matrix4f; import org.joml.Quaternionf; import org.joml.Vector3f; +import org.jspecify.annotations.NonNull; import java.util.List; @@ -462,52 +463,36 @@ public class Zenith extends SwordItem { @Override public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - - if(!level.isClientSide()) { - int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - if(count == 0) { - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putBoolean("isFirst", true)); - } - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putInt("attackCount", 3)); - }else { - SoundUtil.playClientSound(player, ModSounds.WAVE.get()); - } - - player.getCooldowns().addCooldown(stack.getItem(), 3); - return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); + CustomData.update(DataComponents.CUSTOM_DATA, stack, + tag -> tag.putBoolean("isFirst", true)); + player.startUsingItem(hand); + return InteractionResultHolder.consume(stack); } @Override - public void inventoryTick(ItemStack stack, Level level, net.minecraft.world.entity.Entity entity, int slotId, boolean isSelected) { - super.inventoryTick(stack, level, entity, slotId, isSelected); - if(entity instanceof Player player) { - if(isSelected) { - if(player.tickCount % 3 == 0) { - double deltaDist = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getDouble("deltaDist"); - boolean isFirst = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + public void onUseTick(Level level, LivingEntity livingEntity, ItemStack stack, int count) { + if(!(livingEntity instanceof Player player)) return; + if(player.tickCount % 3 == 0) { + double deltaDist = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) + .copyTag().getDouble("deltaDist"); + boolean isFirst = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) .copyTag().getBoolean("isFirst"); - int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - if(count > 0) { - summon(player, deltaDist, isFirst); - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putInt("attackCount", count - 1)); - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putBoolean("isFirst", false)); - } - } - }else { - int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - if(count > 0) { - CustomData.update(DataComponents.CUSTOM_DATA, stack, - tag -> tag.putInt("attackCount", 0)); - } + if(isFirst) { + CustomData.update(DataComponents.CUSTOM_DATA, stack, + tag -> tag.putBoolean("isFirst", false)); } + summon(player, deltaDist, isFirst); + SoundUtil.playClientSound(player, ModSounds.WAVE.get()); } } + + @Override + public int getUseDuration(ItemStack stack, LivingEntity entity) { + return 72000; + } + + @Override + public @NonNull UseAnim getUseAnimation(ItemStack stack) { + return UseAnim.BLOCK; + } } diff --git a/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java b/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java index 174e49d..fe69f7b 100644 --- a/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java +++ b/src/main/java/com/lzxnone/terraria/mixin/ItemInHandRenderMixin.java @@ -31,28 +31,14 @@ public class ItemInHandRenderMixin { InteractionHand hand, float swingProgress, ItemStack stack, float equippedProgress, PoseStack poseStack, MultiBufferSource buffer, int combinedLight, CallbackInfo ci) { - if(!player.isScoping()) { - if(stack.is(ModItems.ZENITH.get()) || stack.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) || stack.is(ModItems.FIRST_FRACTAL.get())) { - int count = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - if(count > 0) { - boolean isMainHand = hand == InteractionHand.MAIN_HAND; - HumanoidArm humanoidarm = isMainHand ? player.getMainArm() : player.getMainArm().getOpposite(); - - poseStack.pushPose(); - - if(!player.isInvisible()) { - this.renderPlayerArm(poseStack, buffer, combinedLight, equippedProgress, swingProgress, humanoidarm); - } - - poseStack.popPose(); - ci.cancel(); - } - }else if(stack.is(ModItems.TERRAGRIM.get())) { + if(stack.is(ModItems.ZENITH.get()) + || stack.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) + || stack.is(ModItems.FIRST_FRACTAL.get()) + || stack.is(ModItems.TERRAGRIM.get())) { if(player.isUsingItem()) { ItemStack usingStack = player.getUseItem(); - if(usingStack.is(ModItems.TERRAGRIM.get())) { + if(usingStack.is(stack.getItem())) { boolean isMainHand = hand == InteractionHand.MAIN_HAND; HumanoidArm humanoidarm = isMainHand ? player.getMainArm() : player.getMainArm().getOpposite(); @@ -91,16 +77,13 @@ public class ItemInHandRenderMixin { boolean leftHand, PoseStack poseStack, MultiBufferSource buffer, int seed, CallbackInfo ci) { - if(itemStack.is(ModItems.ZENITH.get()) || itemStack.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) || itemStack.is(ModItems.FIRST_FRACTAL.get())) { - int count = itemStack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY) - .copyTag().getInt("attackCount"); - if(count > 0) { - ci.cancel(); - } - }else if(itemStack.is(ModItems.TERRAGRIM.get()) && entity instanceof Player player) { + if((itemStack.is(ModItems.ZENITH.get()) + || itemStack.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) + || itemStack.is(ModItems.FIRST_FRACTAL.get()) + || itemStack.is(ModItems.TERRAGRIM.get())) && entity instanceof Player player) { if(player.isUsingItem()) { ItemStack usingStack = player.getUseItem(); - if(usingStack.is(ModItems.TERRAGRIM.get())) { + if(usingStack.is(itemStack.getItem())) { ci.cancel(); } } @@ -109,7 +92,6 @@ public class ItemInHandRenderMixin { .copyTag().getInt("state"); if(state != Mace.State.IDLE.ordinal()) { ci.cancel(); - } } } diff --git a/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java b/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java new file mode 100644 index 0000000..4bff1bb --- /dev/null +++ b/src/main/java/com/lzxnone/terraria/mixin/UseSpeedMixin.java @@ -0,0 +1,45 @@ +package com.lzxnone.terraria.mixin; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import com.lzxnone.terraria.item.ModItems; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.world.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(LocalPlayer.class) +public abstract class UseSpeedMixin { + + private boolean isCustomModWeapon(LocalPlayer player) { + if(!player.isUsingItem()) return false; + ItemStack usingItem = player.getUseItem(); + return usingItem.is(ModItems.ZENITH.get()) + || usingItem.is(ModItems.TRUE_COPPER_SHORTSWORD.get()) + || usingItem.is(ModItems.FIRST_FRACTAL.get()) + || usingItem.is(ModItems.TERRAGRIM.get()) + || usingItem.is(ModItems.MACE.get()); + } + + @WrapOperation( + method = "aiStep", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isUsingItem()Z") + ) + private boolean wrapIsUsingItemInAiStep(LocalPlayer instance, Operation original) { + if(isCustomModWeapon(instance)) { + return false; + } + return original.call(instance); + } + + @WrapOperation( + method = "canStartSprinting", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;isUsingItem()Z") + ) + private boolean wrapIsUsingItemInCanStartSprinting(LocalPlayer instance, Operation original) { + if(isCustomModWeapon(instance)) { + return false; + } + return original.call(instance); + } +} diff --git a/src/main/java/com/lzxnone/terraria/utils/RenderUtil.java b/src/main/java/com/lzxnone/terraria/utils/RenderUtil.java index f73dec7..ac5c513 100644 --- a/src/main/java/com/lzxnone/terraria/utils/RenderUtil.java +++ b/src/main/java/com/lzxnone/terraria/utils/RenderUtil.java @@ -56,4 +56,20 @@ public class RenderUtil { .setColor(ir, ig, ib, ia).setUv(0.0f, 0.0f) .setOverlay(OverlayTexture.NO_OVERLAY).setLight(LightTexture.FULL_BRIGHT).setNormal(0.0f, 1.0f, 0.0f); } + + public static void renderGlow(Matrix4f matrix, VertexConsumer consumer, + float r, float g, float b, float baseAlpha, + float halfWidth, float halfHeight, + int layers, float scaleStep, float alphaDecay, + float offsetX, float offsetY, float offsetZ) { + float scale = 1.0f; + float a = baseAlpha; + for (int i = 0; i < layers; i++) { + renderQuad(matrix, consumer, r, g, b, a, + halfWidth * scale, halfHeight * scale, + offsetX, offsetY, offsetZ); + scale += scaleStep; + a *= alphaDecay; + } + } } diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.fsh new file mode 100644 index 0000000..71c916c --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.fsh @@ -0,0 +1,29 @@ +#version 150 + +in vec2 texCoord0; + +uniform sampler2D Sampler0; +uniform vec2 Direction; + +out vec4 fragColor; + +void main() { + vec4 sum = texture(Sampler0, texCoord0) * 0.0788; + sum += texture(Sampler0, texCoord0 + Direction * 1.0) * 0.0777; + sum += texture(Sampler0, texCoord0 - Direction * 1.0) * 0.0777; + sum += texture(Sampler0, texCoord0 + Direction * 2.0) * 0.0745; + sum += texture(Sampler0, texCoord0 - Direction * 2.0) * 0.0745; + sum += texture(Sampler0, texCoord0 + Direction * 3.0) * 0.0695; + sum += texture(Sampler0, texCoord0 - Direction * 3.0) * 0.0695; + sum += texture(Sampler0, texCoord0 + Direction * 4.0) * 0.0631; + sum += texture(Sampler0, texCoord0 - Direction * 4.0) * 0.0631; + sum += texture(Sampler0, texCoord0 + Direction * 5.0) * 0.0557; + sum += texture(Sampler0, texCoord0 - Direction * 5.0) * 0.0557; + sum += texture(Sampler0, texCoord0 + Direction * 6.0) * 0.0478; + sum += texture(Sampler0, texCoord0 - Direction * 6.0) * 0.0478; + sum += texture(Sampler0, texCoord0 + Direction * 7.0) * 0.0399; + sum += texture(Sampler0, texCoord0 - Direction * 7.0) * 0.0399; + sum += texture(Sampler0, texCoord0 + Direction * 8.0) * 0.0324; + sum += texture(Sampler0, texCoord0 - Direction * 8.0) * 0.0324; + fragColor = sum; +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.json b/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.json new file mode 100644 index 0000000..f3afd2a --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.json @@ -0,0 +1,14 @@ +{ + "vertex": "lzxnoneterraria:blur", + "fragment": "lzxnoneterraria:blur", + "samplers": [ + { "name": "Sampler0" } + ], + "attributes": [ + "Position", + "UV0" + ], + "uniforms": [ + { "name": "Direction", "type": "float", "count": 2, "values": [ 1.0, 0.0 ] } + ] +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.vsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.vsh new file mode 100644 index 0000000..007d9a0 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/blur.vsh @@ -0,0 +1,11 @@ +#version 150 + +in vec3 Position; +in vec2 UV0; + +out vec2 texCoord0; + +void main() { + gl_Position = vec4(Position, 1.0); + texCoord0 = UV0; +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.fsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.fsh new file mode 100644 index 0000000..d57316e --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.fsh @@ -0,0 +1,11 @@ +#version 150 + +in vec2 texCoord0; + +uniform sampler2D Sampler0; + +out vec4 fragColor; + +void main() { + fragColor = texture(Sampler0, texCoord0); +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.json b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.json new file mode 100644 index 0000000..80a7984 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.json @@ -0,0 +1,12 @@ +{ + "vertex": "lzxnoneterraria:composite", + "fragment": "lzxnoneterraria:composite", + "samplers": [ + { "name": "Sampler0" } + ], + "attributes": [ + "Position", + "UV0" + ], + "uniforms": [] +} diff --git a/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.vsh b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.vsh new file mode 100644 index 0000000..007d9a0 --- /dev/null +++ b/src/main/resources/assets/lzxnoneterraria/shaders/core/composite.vsh @@ -0,0 +1,11 @@ +#version 150 + +in vec3 Position; +in vec2 UV0; + +out vec2 texCoord0; + +void main() { + gl_Position = vec4(Position, 1.0); + texCoord0 = UV0; +} diff --git a/src/main/resources/lzxnoneterraria.mixins.json b/src/main/resources/lzxnoneterraria.mixins.json index 9585384..580d8c8 100644 --- a/src/main/resources/lzxnoneterraria.mixins.json +++ b/src/main/resources/lzxnoneterraria.mixins.json @@ -4,7 +4,8 @@ "package": "com.lzxnone.terraria.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ - "ItemInHandRenderMixin" + "ItemInHandRenderMixin", + "UseSpeedMixin" ], "client": [], "injectors": {