From 850736f8290cf5e7af6cabd21f68b57ed7dcd61d Mon Sep 17 00:00:00 2001
From: Kastle <26531652+Kas-tle@users.noreply.github.com>
Date: Wed, 21 Apr 2021 14:28:36 -0700
Subject: [PATCH] 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                                    |   4 +-
 copy_java_files_to_pack.sh                    |   2 +
 particles/barrier.particle.json               |   2 +-
 particles/basic_bubble_manual.json            |  43 ++++++++++++++++++
 particles/landing_honey.particle.json         |   2 +-
 particles/landing_lava.particle.json          |   2 +-
 particles/landing_obsidian_tear.particle.json |   4 +-
 particles/underwater.particle.json            |   3 +-
 particles/warped_spore.particle.json          |  11 +----
 textures/particle/bubble_pop.png              | Bin 1543 -> 0 bytes
 textures/particle/sweep_attack.png            | Bin 1947 -> 0 bytes
 11 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100755 particles/basic_bubble_manual.json
 delete mode 100644 textures/particle/bubble_pop.png
 delete mode 100644 textures/particle/sweep_attack.png

diff --git a/.gitignore b/.gitignore
index 8df6d15..9e7cd96 100644
--- a/.gitignore
+++ b/.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
\ No newline at end of file
+textures/particle/nautilus.png
+textures/particle/bubble_pop.png
+textures/particle/sweep_attack.png
\ No newline at end of file
diff --git a/copy_java_files_to_pack.sh b/copy_java_files_to_pack.sh
index 647b822..49c3367 100755
--- a/copy_java_files_to_pack.sh
+++ b/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
\ No newline at end of file
diff --git a/particles/barrier.particle.json b/particles/barrier.particle.json
index e05b31d..e9b1db8 100644
--- a/particles/barrier.particle.json
+++ b/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]
 				}
 			}
 		}
diff --git a/particles/basic_bubble_manual.json b/particles/basic_bubble_manual.json
new file mode 100755
index 0000000..9055a8d
--- /dev/null
+++ b/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": {}
+    }
+  }
+}
+
diff --git a/particles/landing_honey.particle.json b/particles/landing_honey.particle.json
index 910ca71..9dd7b19 100644
--- a/particles/landing_honey.particle.json
+++ b/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": {
diff --git a/particles/landing_lava.particle.json b/particles/landing_lava.particle.json
index cb3af64..3aa166e 100644
--- a/particles/landing_lava.particle.json
+++ b/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": {
diff --git a/particles/landing_obsidian_tear.particle.json b/particles/landing_obsidian_tear.particle.json
index 4586ab1..1d50450 100644
--- a/particles/landing_obsidian_tear.particle.json
+++ b/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": {
diff --git a/particles/underwater.particle.json b/particles/underwater.particle.json
index 01d6f23..11dc551 100644
--- a/particles/underwater.particle.json
+++ b/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
diff --git a/particles/warped_spore.particle.json b/particles/warped_spore.particle.json
index ef4096f..ba554fc 100644
--- a/particles/warped_spore.particle.json
+++ b/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": {
-					"interpolant": "v.random",
-					"gradient": {
-						"0.0": "#ffffffff",
-						"1.0": "#ff000000"
-					}
-				}
+				"color": [0.09804, 0.09804, 0.29804, 1]
 			}
 		}
 	}
diff --git a/textures/particle/bubble_pop.png b/textures/particle/bubble_pop.png
deleted file mode 100644
index ea4375aec16cbb42ca35de4699cca41b5144b8b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1543
zcmbVMUx?g97|&@>uC0eH`cUp^np$ktB$I45yBRK?cgeZCr8&2EOFhAdn@whS<0Y9i
z$#r+{Ns9;yB31+`)|V4}5ZYRN^T9%?Nc-Z$fiDH01RoSZ5PVxF`zM@o{%goE-^~2x
z_x+jg``)UrRAvv&9pX4{wpO)P*?feJ`phGl^x1E-Y&sZKUrspg@Z;H-;;wvjjN_)~
zyvBOEZl6UC4MgnHCJ}o<#Lyf!ztD@Yvq@6WByBG=_+P&KiU*!+@Gli@Xh$aLc-8Hg
ztZlC}ob63Vclm|qz<duef`FtL^a4LjP|x6pyokx!w#0)WB;7Rl#Y`bsx9h;9F#(zg
z1qVU}lyp(nR8@n|0tG5if<;MI1X)8+MREy@Kb~oe-4<H4UKs0QD}(Q(X@n%H+wF?o
zf=J`GB<s2^K}Av&fgyyXAEvk`gvp5sgGCZ2_M+6IA;=hUlWwI3&nz9e5JWj`n2f{3
z0w(ovB*`MoTp9vhC&xuwu|HJqIuh|oK*BU(SUJZ=9h%alL;r?4KmL;f7FyfRb?j?P
z5acS7bonB4V;qou(Mh8p5owhqbSrkq@<nFmiOib_nK8jBjT@BulZUELOa_W9D&Ulj
z9WTtBIKAfzv2aQZp1qqaz=8nF4Mjn!%6=vz2uDzxx?ZclFH}S9t@lD%(zrOq{|a^;
z)S_{Knaf^)+eC`OHV^VZB9r<wW{R10g}wVV)2zp|<@xL&S*<LA+Onz1x~2(=C=boG
zZBz@B6o(F}Sq9I-BYK{TbXg}Q-6;!&QrQtyqLqZED?>pp7Mm>@V^S!WC-*JtY-LF>
zx$pkZ`!B{GD?;o)Fi%#RS@xi+m#}y3kBeuGTo_Bf2ZjlQu#**n!8=(75SJfsdk-9e
z5pB0a80kOc#R!(rR@%ieS!}at{fEqxnE6sxv?EWXzdAWQ+f(2ZIO`gjn71po$QvFB
zS(l4hJM*tsvsU<i&01`%A9Q{n3>F?f`61rro<8>4V{Zue51)VU^PiQe56ZXhKQ$PX
zuJ#u{J`Uf3=Ek+-_m13D-@SD1`672_0M4F2^GWU3lXvS&Z_msvo%(*w=gv*vyEP3o
z`^FdW$}`{0%-`IJf83pFTsVE_%||~)Np#@rnd<9L{P6A3t5)UqtLl@L+nc-BcQ(`;
e74x$D-9y~nS9UJ{WE^N__SKeGtZPdfm;M0lGv~Je

diff --git a/textures/particle/sweep_attack.png b/textures/particle/sweep_attack.png
deleted file mode 100644
index eb967d1624d61ee160e2bd83bff4b2a451f68fe0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1947
zcmbVNeM}Q)7{9aAg2S<8PM!a7o*`4Qz3b5ydfHNG5lSo&M8P?f<L)iJ(B2()hb_bi
zx-D~aLt=2#jTtn8a|$EVEz8Ver*nSI1zmJF#Sy1*%RVrgNQ{x~y?%u)?#sJe-ml;D
zdp_RhdG6Kn(xPcoXHP{CWSXbgT>(c7K~N-R3Y?warLKiTs#LsEL6FCv);<(@yK5GL
zOrFhGR;$(Cr8FxBjSMH&0b@8QK{SFa&I?Nn+W=Io4%G949Unb>1jl&Jj#pW{q*rnQ
zKVRG;gJmtHm267`Yvb@d2evp&LxLbs87v$O2nrpx<56B3&b4g<$D$Cm!H(x^3bAT$
zIpz{&fLV>Cfh9=_%dr_vR<qekF2pF3A_>w$m?(qEN|R>Vl!L_|9BPv}A6?;I64wP+
zcHFP35={`HP{<g{Hi~jRVY1n51W6GTWq=5S(k!S<*dQo#6AW&kure>HyeMEABU2|f
zsdgM%8gn5iC20jE9wrztBFspH$w+E0MS&cf#7RwZAgY{W2@n85AgBt&nvz(_FRG&A
z7ypJjdHg2@FtlE8QpZDW2?moY6t!?IbR!;+hoY6rW(g1#KoOf{78I_9X3o{Tk!Y6;
z7*&)jMKO@LsPcr#7-ce2*gP-8@`C2X{0Sn!&8WbR!+SFs$ZP|dQ)#l$*%q3#7|2|j
zBx6vo$nn1Bhe6F2+5#mfKw;8wjLQ5gm}6<5C<htnG9P5>0U-(XIF<|~?Ggi`3>8D`
zvM26)T&{9i^zi|Bpi~qUV4gyk)nv0;4V2LoHP`E<J%XY#0t-BDI}XER<av&!tQMao
z*G3xZd@!xd)?AB$p(xIfZ3CuUGsvMRpD!Wr7TG2(2@>+$|CBG2d02!@;E{Q>($unt
zF6I?@ug&q|Sq2*8vjC4p6NYA3tq|-ut7QP-@c1_W$PtLqhWr4M{zG2GV2bEdLyQda
z>tVG1L*^0Cd_pVQm?y+vos6DMDDVUvb`5QsY*%oRY<NI`T~3DW?3J>v9SAb%IgdNP
zGW^}ISI!B?u(X$%tH0MA%NlrRSMPMPabWnp);<22!=1#OhFhPPEa=&D(vE8Vv+V<<
zI?&U(RWTkN9YPoE7EUxy4>?Qb-{?A%a&6L&HE+=7{<f<fpXi=<r*!9kfs}5_bq?7_
z#_hM#kTRFXpgq~Ui_r1C-wb;foLJs=3GF$%Fk`TL>75N(*jwwIla{}9xivrC?Qlll
zNM~A12+OD~>78<D^SPT9`>Rm#lzxeR+lOeX`LQdhnZga-4E^e__5JN@M&Iw-87Xo|
zV<WSN#GAUkSp|;B!M1fV4g_&J5a+jfgIOP~INjLf=&tEMvMv3Wg%^spkDk`=nbq6g
z_+aH&moj$n%)Lnapy%E6ujH=bRZ7nqWXp@8CkdzDG17eZy6(De>8Uv5ZM2tLbsHTU
zM>hu|eXX@q8qesLY}zuuVSl{@hI&&y_w|b!j`w7Z>_|^TpL#}y3>RHTp+#-;pN&yC
z9g)t!qS}wY4BQ<@gBK3`meH}|{Ldx#?#}60JvwlBV~ehO=f0HfpB0|#qc2`Lu4zY3
z>JtuK*B!Z>CtW>@-hA!SA$n)u`c)TRuXEJa94Ni7e?dHI%}CkT{!>QE1N?ToFFd0o
zoy^q5L{I9sZ$-mTL_S?T{rkws`pF0A%r_U!E4Z_vy9yc1i~IopqzG~iZFQHe*y!Bs
QovAH7g{AKPg4&IL09SpJ`v3p{