Fix trail fade not being bloomed

I have no idea why putting cap after draw makes the alpha work correctly but whatever makes more sense to draw the end after the rest anyway.

Author: MEEPofFaith

src/progressed/content/effects/TrailFadeFx.java

@@ -1,8 +1,10 @@
 package progressed.content.effects;
 
+import arc.util.*;
 import mindustry.entities.*;
 import mindustry.graphics.*;
 import progressed.entities.bullet.explosive.RocketBulletType.*;
+import progressed.graphics.*;
 import progressed.graphics.trails.*;
 
 import static arc.graphics.g2d.Draw.*;
@@ -19,8 +21,8 @@ public class TrailFadeFx{
         if(!state.isPaused()){
             trail.shorten();
         }
-        trail.drawCap(e.color, e.rotation);
         trail.draw(e.color, e.rotation);
+        trail.drawCap(e.color, e.rotation);
     }),
 
     rocketTrailFade = new Effect(440f, e -> {
@@ -32,8 +34,8 @@ public class TrailFadeFx{
         if(!state.isPaused()){
             data.trail.shorten();
         }
-        data.trail.drawCap(e.color, e.rotation);
         data.trail.draw(e.color, e.rotation);
+        data.trail.drawCap(e.color, e.rotation);
     }),
 
     driftTrailFade = new Effect(400f, e -> {
@@ -45,8 +47,8 @@ public class TrailFadeFx{
             trail.shorten();
             trail.drift();
         }
-        trail.drawCap(e.color, e.rotation);
         trail.draw(e.color, e.rotation);
+        trail.drawCap(e.color, e.rotation);
     }),
 
     heightTrailFade = new Effect(400f, e -> {
@@ -57,7 +59,12 @@ public class TrailFadeFx{
         if(!state.isPaused()){
             trail.shorten();
         }
-        trail.drawCap(e.color, e.rotation);
-        trail.draw(e.color, e.rotation);
+        int col = e.color.rgba8888();
+        float size = e.rotation;
+        Draw3D.highBloom(() -> {
+            Tmp.c1.rgba8888(col);
+            trail.draw(Tmp.c1, size);
+            trail.drawCap(Tmp.c1, size);
+        });
     }).layer(Layer.flyingUnit + 1.9f);
 }

src/progressed/entities/bullet/pseudo3d/ArcBasicBulletType.java

@@ -73,7 +73,7 @@ public void draw(Bullet b){
             });
         }
 
-        Draw.z(layer);
+        Draw.z(layer + data.z / 3000f); //Higher elevation should draw above
         drawTrail(b);
         Draw3D.highBloom(bloomSprite, () -> {
             Draw.scl(1f + hMul(data.z));

src/progressed/entities/bullet/pseudo3d/ArcBulletType.java

@@ -297,7 +297,10 @@ public void drawTrail(Bullet b){
         if(trailLength > 0 && b.trail != null){
             float z = Draw.z();
             Draw.z(z - 0.0001f);
-            Draw3D.highBloom(bloomTrail, () -> b.trail.draw(trailColor, trailWidth));
+            Draw3D.highBloom(bloomTrail, () -> {
+                b.trail.draw(trailColor, trailWidth);
+                b.trail.drawCap(trailColor, trailWidth);
+            });
             Draw.z(z);
         }
     }
@@ -507,9 +510,6 @@ public Bullet create3DInherit(Bullet b, float angle, float inaccCone, float grav
         bullet.data = data;
         bullet.drag = drag;
         bullet.hitSize = hitSize;
-        if(trailLength > 0){
-            bullet.trail = b.trail.copy();
-        }
         bullet.add();
         return bullet;
     }

src/progressed/graphics/trails/HeightTrail.java

@@ -46,15 +46,18 @@ public int size(){
 
     public void drawCap(Color color, float width, boolean fade){
         if(points.size > 4){
-            Draw.color(color);
-            if(fade) Draw.alpha(Draw3D.scaleAlpha(lastH));
             int i = points.size - 4;
             float x1 = x(i - 4), y1 = y(i - 4),
                 x2 = x(-1), y2 = y(-1),
                 w1 = w(-1), w = w1 * width / (points.size / 4) * i / 4f * 2f;
             if(w1 <= 0.001f) return;
+            if(fade){
+                Draw.color(Tmp.c1.set(color).mulA(Draw3D.scaleAlpha(lastH)));
+            }else{
+                Draw.color(color);
+            }
             Draw.rect("hcircle", x2, y2, w, w, Angles.angle(x1, y1, x2, y2));
-            Draw.reset();
+            Draw.color();
         }
     }
 
@@ -78,11 +81,10 @@ public void draw(Color color, float width, boolean fade){
                 y2 = y(i + 4);
                 w2 = w(i + 4);
                 z2 = items[i + 4 + 3];
-
             }else{
-                x2 = Draw3D.x(lastX, lastH);
-                y2 = Draw3D.y(lastY, lastH);
-                w2 = lastW * hScale(lastH);
+                x2 = x(-1);
+                y2 = y(-1);
+                w2 = w(-1);
                 z2 = lastH;
             }
 
@@ -114,7 +116,7 @@ public void draw(Color color, float width, boolean fade){
             lastAngle = a2;
         }
 
-        Draw.reset();
+        Draw.color();
     }
 
     @Override