The great particle refactoring part 2: Splitting and Streamlining!

Browse Source

- Splits all particle textures into individual files intead of sprite sheets
- Replaces arc and lightning pulse entities with particles
- Pulls particle code up to the general ParticleWizardry so behaviours such as spin can be applied to all particle types
- Renames a few ParticleBuilder methods for conciseness.
- Adds a few new particle effects to various spells and entities, with a slight tweak to EntityMagicArrow#onBlockHit to facilitate impact effects

...

This commit is contained in:

Electroblob77

2019-01-01 21:40:04 +00:00

parent ad363c64af

commit b374f71533

201 changed files with 1682 additions and 1551 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/main/resources/assets/ebwizardry/textures/particle/ice_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 307 B

src/main/resources/assets/ebwizardry/textures/particle/ice_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 238 B

src/main/resources/assets/ebwizardry/textures/particle/ice_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 217 B

src/main/resources/assets/ebwizardry/textures/particle/ice_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 191 B

src/main/resources/assets/ebwizardry/textures/particle/ice_4.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 289 B

src/main/resources/assets/ebwizardry/textures/particle/ice_5.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 259 B

src/main/resources/assets/ebwizardry/textures/particle/ice_6.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 187 B

src/main/resources/assets/ebwizardry/textures/particle/ice_7.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 183 B

src/main/resources/assets/ebwizardry/textures/particle/ice_particles.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 957 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 196 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 187 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_10.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 184 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_11.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 184 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_12.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 191 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_13.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 180 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_14.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 181 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_15.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 243 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 194 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 167 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_4.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 197 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_5.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 229 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_6.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 223 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_7.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 232 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_8.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 251 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_9.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 243 B

src/main/resources/assets/ebwizardry/textures/particle/leaf_particles.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 803 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_0_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 299 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_0_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 353 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_0_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 340 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_0_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 337 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_1_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 315 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_1_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 355 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_1_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 352 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_1_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 346 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_2_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 301 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_2_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 317 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_2_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 300 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_2_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 318 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_3_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 291 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_3_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 328 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_3_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 319 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_3_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 302 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_4_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 283 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_4_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 285 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_4_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 298 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_4_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 295 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_5_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 300 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_5_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 314 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_5_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 298 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_5_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 298 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_6_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 291 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_6_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 313 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_6_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 312 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_6_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 304 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_7_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 313 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_7_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 323 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_7_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 328 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_7_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 326 B

src/main/resources/assets/ebwizardry/textures/particle/lightning_particles.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.5 KiB

src/main/resources/assets/ebwizardry/textures/entity/lightning_pulse_0.png → src/main/resources/assets/ebwizardry/textures/particle/lightning_pulse_0.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 834 B After Width:  |  Height:  |  Size: 834 B

src/main/resources/assets/ebwizardry/textures/entity/lightning_pulse_1.png → src/main/resources/assets/ebwizardry/textures/particle/lightning_pulse_1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

src/main/resources/assets/ebwizardry/textures/entity/lightning_pulse_2.png → src/main/resources/assets/ebwizardry/textures/particle/lightning_pulse_2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 2.5 KiB

src/main/resources/assets/ebwizardry/textures/entity/lightning_pulse_3.png → src/main/resources/assets/ebwizardry/textures/particle/lightning_pulse_3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 3.7 KiB

src/main/resources/assets/ebwizardry/textures/entity/lightning_pulse_4.png → src/main/resources/assets/ebwizardry/textures/particle/lightning_pulse_4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.9 KiB After Width:  |  Height:  |  Size: 4.9 KiB

src/main/resources/assets/ebwizardry/textures/entity/lightning_pulse_5.png → src/main/resources/assets/ebwizardry/textures/particle/lightning_pulse_5.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.9 KiB After Width:  |  Height:  |  Size: 5.9 KiB

src/main/resources/assets/ebwizardry/textures/entity/lightning_pulse_6.png → src/main/resources/assets/ebwizardry/textures/particle/lightning_pulse_6.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 4.5 KiB

src/main/resources/assets/ebwizardry/textures/entity/lightning_pulse_7.png → src/main/resources/assets/ebwizardry/textures/particle/lightning_pulse_7.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 1.9 KiB

src/main/resources/assets/ebwizardry/textures/particle/path_particles.png → src/main/resources/assets/ebwizardry/textures/particle/path.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 219 B After Width:  |  Height:  |  Size: 219 B

src/main/resources/assets/ebwizardry/textures/particle/scorch_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 840 B

src/main/resources/assets/ebwizardry/textures/particle/scorch_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 867 B

src/main/resources/assets/ebwizardry/textures/particle/scorch_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 874 B

src/main/resources/assets/ebwizardry/textures/particle/scorch_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 820 B

src/main/resources/assets/ebwizardry/textures/particle/scorch_4.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 848 B

src/main/resources/assets/ebwizardry/textures/particle/scorch_5.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 862 B

src/main/resources/assets/ebwizardry/textures/particle/scorch_6.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 865 B

src/main/resources/assets/ebwizardry/textures/particle/scorch_7.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 885 B

src/main/resources/assets/ebwizardry/textures/particle/snow_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 140 B

src/main/resources/assets/ebwizardry/textures/particle/snow_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 140 B

src/main/resources/assets/ebwizardry/textures/particle/snow_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 145 B

src/main/resources/assets/ebwizardry/textures/particle/snow_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 137 B

src/main/resources/assets/ebwizardry/textures/particle/snow_particles.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 179 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_0.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 307 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_1.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 239 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_10.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 134 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 240 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 215 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_4.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 298 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_5.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 243 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_6.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 182 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_7.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 191 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_8.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 257 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_9.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 181 B

src/main/resources/assets/ebwizardry/textures/particle/sparkle_particles.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 917 B