Requested Fixes

- Use imagemagick to create sprites on the CI
- Fix barrier particle UV
- Make bubble and underwater particles visible out of water
- Increase acceleration of landing particles
- Fix warped spore particle color

.gitignore

@@ -8,4 +8,6 @@ textures/entity/arrow/spectral_arrow.png
 textures/entity/rabbit/caerbannog.png
 textures/particle/damage.png
 textures/particle/flash.png
-textures/particle/nautilus.png
+textures/particle/nautilus.png
+textures/particle/bubble_pop.png
+textures/particle/sweep_attack.png

copy_java_files_to_pack.sh

@@ -7,5 +7,7 @@ while read -r p || [ -n "$p" ]; do
   mkdir -p "${filesToCopy[1]}"
   cp "extracted/${filesToCopy[0]}" "${filesToCopy[1]}"
 done <required_files.txt
+convert -append extracted/assets/minecraft/textures/particle/sweep_*.png -define png:format=png8 textures/particle/sweep_attack.png
+convert -append extracted/assets/minecraft/textures/particle/bubble_pop_*.png -define png:format=png8 textures/particle/bubble_pop.png
 rm client.jar
 rm -r extracted

particles/barrier.particle.json

@@ -28,7 +28,7 @@
 					"texture_width": 16,
 					"texture_height": 16,
 					"uv": [0, 0],
-					"uv_size": [1, 1]
+					"uv_size": [16, 16]
 				}
 			}
 		}

particles/basic_bubble_manual.json

@@ -0,0 +1,43 @@
+{
+  "format_version": "1.10.0",
+  "particle_effect": {
+    "description": {
+      "identifier": "minecraft:basic_bubble_particle_manual",
+      "basic_render_parameters": {
+        "material": "particles_alpha",
+        "texture": "textures/particle/particles"
+      }
+    },
+    "components": {
+      "minecraft:emitter_rate_manual": {
+        "max_particles": 100
+      },
+      "minecraft:emitter_lifetime_expression": {
+        "activation_expression": 1,
+        "expiration_expression": 0
+      },
+      "minecraft:emitter_shape_point": {
+      },
+      "minecraft:particle_lifetime_expression": {
+        "max_lifetime": "2 / ((Math.Random(0.0, 1.0) * 0.8 + 0.2) * 5)"
+      },
+      "minecraft:particle_expire_if_not_in_blocks": [],
+      "minecraft:particle_motion_dynamic": {
+        "linear_acceleration": [ 0, 0.8, 0 ],
+        "linear_drag_coefficient": 5.25
+      },
+      "minecraft:particle_appearance_billboard": {
+        "size": [ "(0.05*variable.particle_random_1+0.1)*(variable.particle_random_2*0.9+0.2)", "(0.05*variable.particle_random_1+0.1)*(variable.particle_random_2*0.9+0.2)" ],
+        "facing_camera_mode": "lookat_xyz",
+        "uv": {
+          "texture_width": 128,
+          "texture_height": 128,
+          "uv": [ 0, 16 ],
+          "uv_size": [ 8, 8 ]
+        }
+      },
+      "minecraft:particle_appearance_lighting": {}
+    }
+  }
+}
+

particles/landing_honey.particle.json

@@ -21,7 +21,7 @@
 			},
 			"minecraft:particle_initial_speed": 0.2,
 			"minecraft:particle_motion_dynamic": {
-				"linear_acceleration": [0, -6, 0],
+				"linear_acceleration": [0, -12, 0],
 				"linear_drag_coefficient": 2
 			},
 			"minecraft:particle_appearance_billboard": {

particles/landing_lava.particle.json

@@ -21,7 +21,7 @@
 			},
 			"minecraft:particle_initial_speed": 0.2,
 			"minecraft:particle_motion_dynamic": {
-				"linear_acceleration": [0, -6, 0],
+				"linear_acceleration": [0, -12, 0],
 				"linear_drag_coefficient": 2
 			},
 			"minecraft:particle_appearance_billboard": {

particles/landing_obsidian_tear.particle.json

@@ -2,7 +2,7 @@
 	"format_version": "1.10.0",
 	"particle_effect": {
 		"description": {
-			"identifier": "geyseropt:landing_lava",
+			"identifier": "geyseropt:landing_obsidian_tear",
 			"basic_render_parameters": {
 				"material": "particles_alpha",
 				"texture": "textures/particle/particles"
@@ -21,7 +21,7 @@
 			},
 			"minecraft:particle_initial_speed": 0.2,
 			"minecraft:particle_motion_dynamic": {
-				"linear_acceleration": [0, -6, 0],
+				"linear_acceleration": [0, -12, 0],
 				"linear_drag_coefficient": 2
 			},
 			"minecraft:particle_appearance_billboard": {

particles/underwater.particle.json

@@ -13,7 +13,7 @@
 				"creation_expression": "v.size = math.random(0.01, 0.02);"
 			},
 			"minecraft:emitter_rate_instant": {
-				"num_particles": 3
+				"num_particles": 1
 			},
 			"minecraft:emitter_lifetime_once": {
 				"active_time": 2.5
@@ -25,7 +25,6 @@
 			"minecraft:particle_lifetime_expression": {
 				"max_lifetime": 2.5
 			},
-			"minecraft:particle_expire_if_not_in_blocks": ["minecraft:flowing_water", "minecraft:water"],
 			"minecraft:particle_initial_speed": 0.3,
 			"minecraft:particle_motion_dynamic": {
 				"linear_drag_coefficient": 2

particles/warped_spore.particle.json

@@ -9,9 +9,6 @@
 			}
 		},
 		"components": {
-			"minecraft:emitter_initialization": {
-				"creation_expression": "v.random = math.random(0, 1);"
-			},
 			"minecraft:emitter_rate_instant": {
 				"num_particles": 1
 			},
@@ -39,13 +36,7 @@
 			},
 			"minecraft:particle_appearance_lighting": {},
 			"minecraft:particle_appearance_tinting": {
-				"color": {
+				"color": [0.09804, 0.09804, 0.29804, 1]
-					"interpolant": "v.random",
-					"gradient": {
-						"0.0": "#ffffffff",
-						"1.0": "#ff000000"
-					}
-				}
 			}
 		}
 	}