Merge branch '1.20.1' of https://github.com/Low-Drag-MC/Photon into 1.20.1

Author: Yefancy

CHANGELOG.md

@@ -1,4 +1,4 @@
 ## ChangeLog
 
-# v1.1.9
-* fixed sub fxs won't be saved
+# v1.1.10
+* Fixed sub fxs won't be saved

CHANGELOGS.md

@@ -1,7 +1,11 @@
 ## ChangeLogs
 
+# v1.1.10
+* Fixed sub fxs won't be saved
+
 # v1.1.9
-* fixed sub fxs won't be saved
+* Fixed the delay of the Beam Particle doesn't work
+* Fixed the animation time normalization
 
 # v1.1.8
 * Fixed remove entity command.

common/src/main/java/com/lowdragmc/photon/client/gameobject/particle/BeamParticle.java

@@ -152,39 +152,41 @@ protected float getRealEmit(float pPartialTicks) {
     }
 
     public void render(@Nonnull VertexConsumer pBuffer, @Nonnull Camera camera, float partialTicks) {
-        var cameraPos = camera.getPosition().toVector3f();
-        var from = getWorldPos();
-        var end = new Vector3f(from).add(emitter.transform().localToWorldMatrix().transformDirection(config.getEnd(), new Vector3f()));
-
-        var offset = - getRealEmit(partialTicks);
-        var uvs = getRealUVs(partialTicks);
-        var u0 = uvs.x + offset;
-        var u1 = uvs.z + offset;
-        var v0 = uvs.y;
-        var v1 = uvs.w;
-        var beamHeight = getRealWidth(partialTicks);
-        var light = getRealLight(partialTicks);
-
-        var color = getRealColor(partialTicks);
-        var r = color.x;
-        var g = color.y;
-        var b = color.z;
-        var a = color.w;
-
-        var direction = new Vector3f(end).sub(from);
-
-        var toO = new Vector3f(from).sub(cameraPos);
-        Vector3f n = new Vector3f(toO).cross(direction).normalize().mul(beamHeight);
-
-        var p0 = new Vector3f(from).add(n).sub(cameraPos);
-        var p1 = new Vector3f(from).add(n.mul(-1)).sub(cameraPos);
-        var p3 = new Vector3f(end).add(n).sub(cameraPos);
-        var p4 = new Vector3f(end).add(n.mul(-1)).sub(cameraPos);
-
-        pBuffer.vertex(p1.x, p1.y, p1.z).uv(u0, v0).color(r, g, b, a).uv2(light).endVertex();
-        pBuffer.vertex(p0.x, p0.y, p0.z).uv(u0, v1).color(r, g, b, a).uv2(light).endVertex();
-        pBuffer.vertex(p4.x, p4.y, p4.z).uv(u1, v1).color(r, g, b, a).uv2(light).endVertex();
-        pBuffer.vertex(p3.x, p3.y, p3.z).uv(u1, v0).color(r, g, b, a).uv2(light).endVertex();
+        if (delay <= 0 && this.emitter.isVisible()) {
+            var cameraPos = camera.getPosition().toVector3f();
+            var from = getWorldPos();
+            var end = new Vector3f(from).add(emitter.transform().localToWorldMatrix().transformDirection(config.getEnd(), new Vector3f()));
+
+            var offset = - getRealEmit(partialTicks);
+            var uvs = getRealUVs(partialTicks);
+            var u0 = uvs.x + offset;
+            var u1 = uvs.z + offset;
+            var v0 = uvs.y;
+            var v1 = uvs.w;
+            var beamHeight = getRealWidth(partialTicks);
+            var light = getRealLight(partialTicks);
+
+            var color = getRealColor(partialTicks);
+            var r = color.x;
+            var g = color.y;
+            var b = color.z;
+            var a = color.w;
+
+            var direction = new Vector3f(end).sub(from);
+
+            var toO = new Vector3f(from).sub(cameraPos);
+            Vector3f n = new Vector3f(toO).cross(direction).normalize().mul(beamHeight);
+
+            var p0 = new Vector3f(from).add(n).sub(cameraPos);
+            var p1 = new Vector3f(from).add(n.mul(-1)).sub(cameraPos);
+            var p3 = new Vector3f(end).add(n).sub(cameraPos);
+            var p4 = new Vector3f(end).add(n.mul(-1)).sub(cameraPos);
+
+            pBuffer.vertex(p1.x, p1.y, p1.z).uv(u0, v0).color(r, g, b, a).uv2(light).endVertex();
+            pBuffer.vertex(p0.x, p0.y, p0.z).uv(u0, v1).color(r, g, b, a).uv2(light).endVertex();
+            pBuffer.vertex(p4.x, p4.y, p4.z).uv(u1, v1).color(r, g, b, a).uv2(light).endVertex();
+            pBuffer.vertex(p3.x, p3.y, p3.z).uv(u1, v0).color(r, g, b, a).uv2(light).endVertex();
+        }
     }
 
     @Override