@@ -26,16 +26,16 @@ public CrossDustParticle(ClientLevel level, double x, double y, double z, CrossD
2626 super (level , x , y , z );
2727 this .sprites = sprites ;
2828 this .options = options ;
29- this .lifetime = options .getLifetime () ;
30- this .gravity = options .isNoGravity () ? 0 : 0.7f ;
31- this .hasPhysics = !options .isNoPhysics () ;
32- this .quadSize = 0.1f ;
33- setScale (options .isPulse () ? 0 : options .getScale () );
34- quadSizeOld = quadSize ;
35- xd = options .getVelocity () .x ;
36- yd = options .getVelocity () .y ;
37- zd = options .getVelocity () .z ;
38- age = 1 ;
29+ this .lifetime = options .lifetime ;
30+ this .gravity = options .noGravity ? 0 : 0.7F ;
31+ this .hasPhysics = !options .noPhysics ;
32+ this .quadSize = 0.1F ;
33+ setScale (options .pulse ? 0 : options .scale );
34+ this . quadSizeOld = quadSize ;
35+ this . xd = options .velocity .x ;
36+ this . yd = options .velocity .y ;
37+ this . zd = options .velocity .z ;
38+ this . age = 1 ;
3939 }
4040
4141 @ Override
@@ -50,37 +50,38 @@ public void render(VertexConsumer buffer, Camera renderInfo, float partialTicks)
5050 public void tick () {
5151 float lastProgress = ((float ) age - 1 ) / lifetime ;
5252 float progress = (float ) age / lifetime ;
53- if (options .isNoGravity () ) {
54- accelOld = accel ;
55- accel = LibUtils .cubicBezier (progress , options .getSpeedCurve () .x , options .getSpeedCurve () .y , options .getSpeedCurve () .z , options .getSpeedCurve () .w );
53+ if (options .noGravity ) {
54+ this . accelOld = accel ;
55+ this . accel = LibUtils .cubicBezier (progress , options .speedCurve .x , options .speedCurve .y , options .speedCurve .z , options .speedCurve .w );
5656 float k = (accel - accelOld ) / (progress - lastProgress );
57- xd = options .getVelocity () .x * k ;
58- yd = options .getVelocity () .y * k ;
59- zd = options .getVelocity () .z * k ;
57+ this . xd = options .velocity .x * k ;
58+ this . yd = options .velocity .y * k ;
59+ this . zd = options .velocity .z * k ;
6060 }
61- oRoll = roll ;
62- rollDeltaOld = rollDelta ;
63- rollDelta = LibUtils .cubicBezier (progress , options .getRollCurve () .x , options .getRollCurve () .y , options .getRollCurve () .z , options .getRollCurve () .w );
61+ this . oRoll = roll ;
62+ this . rollDeltaOld = rollDelta ;
63+ this . rollDelta = LibUtils .cubicBezier (progress , options .rollCurve .x , options .rollCurve .y , options .rollCurve .z , options .rollCurve .w );
6464 float k = (rollDelta - rollDeltaOld ) / (progress - lastProgress );
65- roll += options .getRoll () * k * Mth .DEG_TO_RAD ;
65+ this . roll += options .roll * k * Mth .DEG_TO_RAD ;
6666
67- quadSizeOld = quadSize ;
68- if (options .isPulse () ) {
67+ this . quadSizeOld = quadSize ;
68+ if (options .pulse ) {
6969 if (progress < 0.5f ) {
70- setScale (options .getScale () * progress * 2 );
71- }else {
72- setScale (options .getScale () * (1 - progress ) * 2 );
70+ setScale (options .scale * progress * 2 );
71+ } else {
72+ setScale (options .scale * (1 - progress ) * 2 );
7373 }
74- }else {
75- setScale (options .getScale () * (1 - progress ));
74+ } else {
75+ setScale (options .scale * (1 - progress ));
7676 }
7777
7878 super .tick ();
7979 }
8080
8181 public void setScale (float scale ) {
82- quadSize = scale * 0.1f ;
83- setSize (scale * 0.2f , scale * 0.2f );
82+ this .quadSize = scale * 0.1F ;
83+ scale = quadSize + quadSize ;
84+ setSize (scale , scale );
8485 }
8586
8687 @ Override
@@ -89,33 +90,25 @@ public float getQuadSize(float partialTicks) {
8990 }
9091
9192 protected void useCenterSprite () {
92- setSprite (sprites .get (options .isLarge () ? 3 : 1 , 4 ));
93- float a = (options .getCenterColor () >>> 24 & 0xff ) / 255f ;
94- float r = (options .getCenterColor () >>> 16 & 0xff ) / 255f ;
95- float g = (options .getCenterColor () >>> 8 & 0xff ) / 255f ;
96- float b = (options .getCenterColor () & 0xff ) / 255f ;
97- this .alpha = a ;
98- this .rCol = r ;
99- this .gCol = g ;
100- this .bCol = b ;
93+ setSprite (sprites .get (options .large ? 3 : 1 , 4 ));
94+ this .alpha = (options .centerColor >>> 24 & 0xFF ) / 255F ;
95+ this .rCol = (options .centerColor >>> 16 & 0xFF ) / 255F ;
96+ this .gCol = (options .centerColor >>> 8 & 0xFF ) / 255F ;
97+ this .bCol = (options .centerColor & 0xFF ) / 255F ;
10198 }
10299
103100 protected void useEdgeSprite () {
104- setSprite (sprites .get (options .isLarge () ? 4 : 2 , 4 ));
105- float a = (options .getEdgeColor () >>> 24 & 0xff ) / 255f ;
106- float r = (options .getEdgeColor () >>> 16 & 0xff ) / 255f ;
107- float g = (options .getEdgeColor () >>> 8 & 0xff ) / 255f ;
108- float b = (options .getEdgeColor () & 0xff ) / 255f ;
109- this .alpha = a ;
110- this .rCol = r ;
111- this .gCol = g ;
112- this .bCol = b ;
101+ setSprite (sprites .get (options .large ? 4 : 2 , 4 ));
102+ this .alpha = (options .edgeColor >>> 24 & 0xFF ) / 255F ;
103+ this .rCol = (options .edgeColor >>> 16 & 0xFF ) / 255F ;
104+ this .gCol = (options .edgeColor >>> 8 & 0xFF ) / 255F ;
105+ this .bCol = (options .edgeColor & 0xFF ) / 255F ;
113106 }
114107
115108 @ Override
116109 protected int getLightColor (float partialTick ) {
117- if (options .isFullBrightness () ) {
118- return 15 << 20 | 15 << 4 ;
110+ if (options .fullBrightness ) {
111+ return 0xF000F0 ;
119112 }
120113 return super .getLightColor (partialTick );
121114 }
0 commit comments