From 1c12de5c45a1a935b412cae40b13aff6c0f18f5f Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Thu, 27 Aug 2026 14:15:50 +0800 Subject: [PATCH] v1.8.2 --- .../lzxnone/terraria/LzxnoneTerrariaClient.java | 2 +- .../terraria/particle/IronSparkParticle.java | 12 ++---------- .../terraria/particle/ZenithTrailParticle.java | 2 +- .../particles/iron_spark_particle.json | 5 ----- .../textures/particle/excalibur_hit_particle.png | Bin 236 -> 0 bytes .../textures/particle/iron_spark_particle.png | Bin 1765 -> 0 bytes .../particle/nights_edge_hit_particle0.png | Bin 264 -> 0 bytes .../particle/nights_edge_hit_particle1.png | Bin 331 -> 0 bytes .../particle/nights_edge_hit_particle2.png | Bin 266 -> 0 bytes .../particle/terra_beam_hit_particle0.png | Bin 1448 -> 0 bytes .../particle/terra_beam_hit_particle1.png | Bin 223 -> 0 bytes .../particle/terra_beam_hit_particle2.png | Bin 222 -> 0 bytes .../particle/terra_beam_hit_particle3.png | Bin 143 -> 0 bytes .../particle/true_excalibur_hit_particle.png | Bin 249 -> 0 bytes .../particle/true_nights_edge_hit_particle0.png | Bin 257 -> 0 bytes .../particle/true_nights_edge_hit_particle1.png | Bin 311 -> 0 bytes .../particle/true_nights_edge_hit_particle2.png | Bin 250 -> 0 bytes 17 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 src/main/resources/assets/lzxnoneterraria/particles/iron_spark_particle.json delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/excalibur_hit_particle.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/iron_spark_particle.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle0.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle1.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle2.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle0.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle1.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle2.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle3.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/true_excalibur_hit_particle.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle0.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle1.png delete mode 100644 src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle2.png diff --git a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java index 2f74866..b38e583 100644 --- a/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java +++ b/src/main/java/com/lzxnone/terraria/LzxnoneTerrariaClient.java @@ -59,7 +59,7 @@ public class LzxnoneTerrariaClient { event.registerSpriteSet(ModParticles.ZENITH_TRAIL_PARTICLE.get(), ZenithTrailParticle.Provider::new); }); modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { - event.registerSpriteSet(ModParticles.IRON_SPARK_PARTICLE.get(), IronSparkParticle.Provider::new); + event.registerSpecial(ModParticles.IRON_SPARK_PARTICLE.get(), new IronSparkParticle.Provider()); }); modEventBus.addListener(RegisterParticleProvidersEvent.class, event -> { event.registerSpriteSet(ModParticles.CIRCLE_PARTICLE.get(), CircleParticle.Provider::new); diff --git a/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java b/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java index 3dd20ec..8033fb8 100644 --- a/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/IronSparkParticle.java @@ -16,7 +16,7 @@ public class IronSparkParticle extends TextureSheetParticle { protected IronSparkParticle(ClientLevel level, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed, - IronSparkParticleOptions options, SpriteSet spriteSet) { + IronSparkParticleOptions options) { super(level, x, y, z, xSpeed, ySpeed, zSpeed); this.hasPhysics = false; @@ -40,8 +40,6 @@ public class IronSparkParticle extends TextureSheetParticle { this.xd = velocity.x; this.yd = velocity.y; this.zd = velocity.z; - - this.pickSprite(spriteSet); } @Override @@ -114,17 +112,11 @@ public class IronSparkParticle extends TextureSheetParticle { } public static class Provider implements ParticleProvider { - private final SpriteSet spriteSet; - - public Provider(SpriteSet spriteSet) { - this.spriteSet = spriteSet; - } - @Override public Particle createParticle(IronSparkParticleOptions type, ClientLevel level, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { - return new IronSparkParticle(level, x, y, z, xSpeed, ySpeed, zSpeed, type, this.spriteSet); + return new IronSparkParticle(level, x, y, z, xSpeed, ySpeed, zSpeed, type); } } } diff --git a/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java b/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java index 7bd5618..59b389f 100644 --- a/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java +++ b/src/main/java/com/lzxnone/terraria/particle/ZenithTrailParticle.java @@ -143,7 +143,7 @@ public class ZenithTrailParticle extends TextureSheetParticle { @Override public ParticleRenderType getRenderType() { - return ParticleRenderType.PARTICLE_SHEET_OPAQUE; + return ModParticleRenderTypes.EMISSIVE_BLOOM_PARTICLE; } public static class Provider implements ParticleProvider { diff --git a/src/main/resources/assets/lzxnoneterraria/particles/iron_spark_particle.json b/src/main/resources/assets/lzxnoneterraria/particles/iron_spark_particle.json deleted file mode 100644 index 0d62045..0000000 --- a/src/main/resources/assets/lzxnoneterraria/particles/iron_spark_particle.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": [ - "lzxnoneterraria:iron_spark_particle" - ] -} diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/excalibur_hit_particle.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/excalibur_hit_particle.png deleted file mode 100644 index 961d89b6dc7d60bfb24609a9e6e3fe8935036e71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNC^*m4 z#W5tJ_3br7z6J#z)(c5*URtbQp1dMhST*5RJTG6Wk;Wf(mW3T0Yjtj4`of~3z*x`l zCgbq6zT5IWJH?jFzrbSmdKI;Vst0QF8&)c^nh diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/iron_spark_particle.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/iron_spark_particle.png deleted file mode 100644 index 6f950bfd39518355d347901185300c4ae58be96b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1765 zcmbVNeQXnD7{3mjj0w?wsdLWD4YL_&@7iwtICi7kI=32bjICn>GwJQ_ZF^bogS#v3 zCM?a+1Tcb5@DJI{f-w>kQD9l3=;kIy6GF0t2qZJvfP|?qfhh9F82Db-Hk+9eX>z^i z?)^Q#=li*R4fVCFR_3on5M-67&fN&_E_iuYq{DxU$=n2Q8FJlL6+u>?(J#Z{wX2^) zkmbMg-d3%Z-bk{NU}89_9hjnm4ABTuz9A|zYzNTLb`ao23cGoF1Ved_!dl8`f|jd6 zkgw}fKvP$}m+k6cogB8I0xge{kU#($gGPmrsFG0%i}R9D)?eco8i!~d6jrGlL|f?w zv|3UC>NJ^+EJ0XNyVK;fISIyLUx!)Jenj|HFo1IQ4PFQe@#Rw5bwNuoXs8Ljlk_>L3vI;M2yd0hW*$BPWW+|qQ)#*)4WLdt}y)$D{}BoeYDTJ?6y0B;1U6joSJvlF^mq(>u@)e2xV zN%2ZjC|Rk7q|2zqW^$kg+0SD8uL&v$C7?Y5f~USFE9as%VGdSQ)witrI4gR!_Yfx+zXl} zJ)){HA`3ij3WG75c%CEu4l_~8*xHTlHajq~j#9tTVdc!mGLAFDUL@>hhDqwXB{r;A zHmT43PyI~_4@Zj$Ju;6zaC%FSb-W6T)tQ)xCa@zRg?KdH1ti1j-A!SvURJQCPBiD--cj&W<;8IQ<*$yjRkc+)yR$8^JXg`OprLe;kUjfB=A{!4 za)+;_j~2Vq$J2t{$HqE8TtD$gc@f#ODfYy`W8*&}+mN?)!FM%wa$Wz-@Xe1(_8$$m zee>Ij3WLtJ=T5AY?iVJf@4t{BDZFm@D}SK>!K*jAw_kre!Bc)=*$rn~^H0Ctow?6E zBVPP--&8iLdvx$l>}bg_S#kE{kwbmiyV5ws7`t|&kf6`E{D7ZT-s@EtFwAwY9~#M@ zo!y2%nL_$Lzufj&_Tco_7c#o4^dP=?eb2&=1mu&94m??AkY|NqGDk8mx^Vz%u4<5W- zSg33;@xp;fMs7~s8jTIgjR#yCML9+6L>*MZ9%waAY+;?V!jdz6;?#5WBdRB diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle1.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/nights_edge_hit_particle1.png deleted file mode 100644 index f6d7a4dcec5b988469554744289d25ce84ae5fdc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmV-R0kr;!P);H*G|gciOO@JJwVQNSXB!nXp5gaxh=SV=^{QyMzqE~GPU zfx`l$#PA-5r(_sL5&(sp1fl~L&>TY~9{&l|6&T?+r0Wf)wyhG_jnpm=me>ktn~ZgK zhyrMbvq&rjtnC$*U3&w2`u}0<{ayYnWj9{d%7tIFE8upzxqM&iAw_c~{ujT#P5W5Llj&N< zx~_o#RiCUHQj3iQ_v2VM`{aN7YpUE zZuv07Wf}vMzwAMGPO}b=uRe#JW_`U7_{U9TKfj3h4F=zu52ZFqT(^M!VDNPHb6Mw< G&;$USv|z3P diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle0.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle0.png deleted file mode 100644 index 9018e3201ca36c6fd95cfdfd4bc5cdb9a3df713f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1448 zcmbVMO^Xyq815AjU0o4Gq7q11Mo6OFUGuRs(}nG_*($%0CNdQ4hbZvcuh#i#r%d4G{Slb9`x<`XjC?l*icj#(~i&eBj&9Ng_@%6hc^EE#|Ies+{Wi-UE)RyqT??OVsUy$V*|J9-9~qA!^me^Ql18aF@}7j0LicobC})KxNCYN)}<2 z@-dVr`B{?`Oj6Qw7R}`;+>bvD;$q&SE6&NWFxc6+qf|sqv)Ahxy@Da*wwbdm%OrU- zpVtAQC+neNeLYMLPZ%7Lc(ETTUxp}UWKFrIYz(T7YzU%^HcZBT0*{$}7MVGNq&5wK z+{Kh9U5Eu!GOkP6okVJRqB6>tj0*bXoF8)8OFn(=fpC}- zHioE`bW+wyu?|rqMVcc=Nre(Jg1VCXt@TZzC0dw$0}46AnPTq*bC0%U956804_I56 zQP{>Pb0b}lT^WO5(5^7l!gXmiOcV<}QFUw#HXFXrX;BDXAiSwtMN8DuPvcr7a#Npj* zH9LVrBS@E73xZA7#6$?4D~1+@H@u&ry7vEze1w|2K{f2mhm-+lAz*H>#tf-?ucKYM@U>_;!A@y4O^ lf4sb4AG#&aX_omh^b7kF(lYY?$Pu=4>)|EJWvjFE@ zc_IC;cbRvJ6=%N; z#W5tJ_3cz|z6J#zmxC3|eXFD`8MOPf(k0B3c5M*s@=SiCqS6vCA8aSraQVs-sk;n3 z2N-w~L=tobvpb#rSMFlwYgnQ4yKU8Gy(ss)jXTSkrhmRQ&-s(>>z~)&&tN;JSePs$ zd70(XTqeCA!Sc(~*jK%qGvUpjOYid?%ehu8QJ??nHs2n_Qg)E32N?JynLjOmd2{X$ QpxYQcUHx3vIVCg!0DWpsumAu6 diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle3.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/terra_beam_hit_particle3.png deleted file mode 100644 index 95f4d8695ebc42130a3ce49e32bfdf87087ea8dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDCp?v z;usRq`u5sJUIqsar@+!Q?ea1l6|2ZJ?r`d4?e-fWz$x^ zV@qHFB8ClK?C<~TxG(EJSUY#+Qm+HY1A10S?mcfD)G6%YCeqX#%-A8E;TolWarVwwW8if;I|F1L+XseiY`atZ0#Ankoz39s>gTe~DWM4f7=d2J diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle0.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle0.png deleted file mode 100644 index 8802bd0f98ce36c691cbc0a54ebef988517a4d30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7e|v z#W5tJ_3gE@ybTIGY!{LuT0|vIJe24Vm0x^IW z4BPf`oZSC+N36*t$HjYh3-5@1BR7Fdzxw)BMyF4UI;?C|?AfO*p6HbDFgJUnScgK{ zp}+=~B=Z`MA59Bd{266fOlvq7C|Ep^2`8=RLE~(n|n3pTX1B&t;ucLK6U; CTw84b diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle1.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle1.png deleted file mode 100644 index 4f6535783b0319af32344ab90a62cfa42b63a36b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWNDEQLT z#W5tJ_3pKUyoVKdSObDnC$2f*AlcWriD~hLU@ewoKcv04eAS&e=|9UsKaHgq&Q<05 z{%1Q77{5fu{&(Tr@((;xdv`}SzTUH&eb1r!<=3w=2KBA$u(Elo!8~v2N2h{^Z?6?a zKWMtpvYCOu#jJ)S!cpO&(t#$2!^;_15;?;eO*pbG1Opw~CYCJIeQ2=2)#Urb0;R(S zlbCcqC;v8SVVsrRaphZoz+R@si?`j{7TR#rGTzaL@s?V$YX`%Y!;u2c4O{mv;t<<# z>2@H?cmEwCeM)ZiF5VA?oLE0_JQs*Lc=^Kax_pVhvJZIUcopm_kD7J@JgTe~ HDWM4flQnv; diff --git a/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle2.png b/src/main/resources/assets/lzxnoneterraria/textures/particle/true_nights_edge_hit_particle2.png deleted file mode 100644 index eca85ae2d2089c9e227db688feeb364db66780fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND7ePc z#W5tJ_3gE@ybTIGYysIZEus<~4<$N8C0O;7Os34=rX_c4w$NX>TqP&3%$bp|uavNA zI52VrG%)>RxM9KnGvlK1otX^t8TvNd-r7IytK27!tljU|UggrLcd