From 74a60211f2d3ae57613a5b8e1b4274ba7343111c Mon Sep 17 00:00:00 2001
From: NormalFery <132052650+NormalFery@users.noreply.github.com>
Date: Thu, 24 Oct 2024 13:41:03 +0100
Subject: [PATCH] Add extra variants & Splash change (#14)

---
 .../mixin/SplashTextResourceSupplierMixin.java   |   4 ++++
 .../joy/textures/entity/axolotl/axolotl_ace.png  | Bin 0 -> 1356 bytes
 .../joy/textures/entity/axolotl/axolotl_aro.png  | Bin 0 -> 1418 bytes
 .../joy/textures/entity/axolotl/axolotl_bi.png   | Bin 0 -> 1251 bytes
 4 files changed, 4 insertions(+)
 create mode 100644 src/main/resources/assets/joy/textures/entity/axolotl/axolotl_ace.png
 create mode 100644 src/main/resources/assets/joy/textures/entity/axolotl/axolotl_aro.png
 create mode 100644 src/main/resources/assets/joy/textures/entity/axolotl/axolotl_bi.png

diff --git a/src/main/java/gay/pridecraft/joy/mixin/SplashTextResourceSupplierMixin.java b/src/main/java/gay/pridecraft/joy/mixin/SplashTextResourceSupplierMixin.java
index b09b0b8..aa3db7d 100644
--- a/src/main/java/gay/pridecraft/joy/mixin/SplashTextResourceSupplierMixin.java
+++ b/src/main/java/gay/pridecraft/joy/mixin/SplashTextResourceSupplierMixin.java
@@ -46,6 +46,10 @@ public class SplashTextResourceSupplierMixin {
             bdSplash.add("Happy Birthday, Blurry!");
         }
 
+        if (now.getMonth() == Month.NOVEMBER && now.getDayOfMonth() == 8) {
+            bdSplash.add("Happy Birthday, Fery!");
+        }
+
         if (!bdSplash.isEmpty()) {
             cir.setReturnValue(bdSplash);
         } else {
diff --git a/src/main/resources/assets/joy/textures/entity/axolotl/axolotl_ace.png b/src/main/resources/assets/joy/textures/entity/axolotl/axolotl_ace.png
new file mode 100644
index 0000000000000000000000000000000000000000..c99f2a36197b8107a24ab4e65dd73b4f1956a9df
GIT binary patch
literal 1356
zcmV-S1+)5zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkS{z*hZRCt{2nz3smM-+#Dc9bBb6<&fCgS?Gpg3ge}b`e)s_=<!x
z$yEl&AsolKNte>d&85*_aHX!e#wT!fg~O%L6-Np;vLHpcC1{OdE!d0*61$cbESMC^
zjCa;6OSYwWwcZcR&c4yi?tAm*&6`;R_nav|VX0K2wrv9dBuN4QxbJJV8fIo@008lL
z901@r4gjFlYGHSG*SFsw66;qXNfL6ooFLOQ4FE1F&&rPD@VZH1x?hD?d9Tc^{8h4`
z<7)sv<%g-8MEXvFL9jXRjRBL!RIym3e)D};G)?0H(s3Lf3xJEb5Rb>Py}cdCz&Op6
zX94ayXqtvxF2`32K=g!3@CrT!Y}<yWY52JL5diR{`UC*5zP=6sI5;=}0K8p#3jlaf
zdca2>xLVmD8zROOmm~?cZ9^@p!iX}(8BB58wjoK9Fa;)&m}#26BgEX>E3<8z|K6Sa
z0KNQxl^K4rATe}cDleBQD;uT(08nRDUcYy=2L%dJv6Rrx>RKQmc!gJi41zaa2EDkI
zXNECMqbKW*>M3I;pU+djG5}B)olb{#Ivux&R;yL2>pCTb2!Fb+(`vO!FF!392$^6q
zne;7(8DR>zH!@dkYFN~F=l*ABXS|$B^`?SlS!lIdLS4|{fhnKQ(`+^iUDp8stXwD*
zrT{?Kb?(OPb{hbYNF;bityT-oW)q5{2oE5HK$c}JEiDBy2=XaVC={lc!tSzPBSHuW
zA%d(@sX&%xLC%z~R4TWAQR?B=9sbAAqryC(-EMOw6-D7*Fm4a9_kI<WmbM;`#G{5@
z23azrX&M@h1^^(PPV;1Ge}5mDOa{Q^9b&y+zx9j$wD8rf`|#shc>v1<nK9z=xR5cr
z<?j1Y@X60#j;t>?Q!K+<tE_S1@$oS)GbPwOX4_kDd1Yk<fVg_h&(HJn`<3@Yz0jkh
zNBvyeJMYIc1(@5m+igC-*;d)R2ViBdC$P3|1Nq^XQupJZ<u8Q$&yW5Z*k%}FhH1bs
z4Xj}ej^n_#Z64?pMM0%f8K?*VG#U-qwvE-*Ro>Q}FC6}H2z6E!(qv`;V6YKB`}R{&
zaC8H0eTW&R0jq1F(P+Rh44j>v;r#p@wOS28Z-ndhI?oK<yE|59$xbGd0U?C9Z8n=o
zCX-NA6;{{cN~^Of4AX$#?d2RWdl$Dsyg1+eDGGiWjR69gocQtmZ{G+p;LX?XMjHd3
z<2eO@XTLw=mF~pGG)-)7Zr+)}9{>G=aQ_DHM$#`gz}E5>fZnmUWm)_OEU}Sgc_a_K
zDYYMKW9e5|1q{=`yfx1^Gp1=Gkx1~||1Nof7h~~0ZU7dbnDTB84-a9Q<~W{z=Wqjj
zIQ;+xif}wG%Q8+*POz}BARLs2iGgmlgB>1y2`+YeK|SNUF1||aV22VAD7e_!rD7=|
zS$TT;G!zElQ^2eA!?}k-(&D{_1%4nxK#+}Pu{gKLPj{`Zb?M47$FLwQgL+qoe%eb<
z*_E6U;fk&p3nIdV_gjFQAfN5u2I0FvHk<WTlu}Anb?}}&6cmd^;Y$vsloCQhIr;#u
zcKd#~lcPyzdShb)#bR-2h04oix;VEu&UgC%saC6W7$cOI%k=f!>(Gq8z%Wrhl*+$+
z`SO0pfOI;2tu;QBF`!f`4fRh9p^gC&5fKp)5fKp)5fKp)5fKshg?|C;)7ILI!Mun7
O0000<MNUMnLSTYRa%}wo

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/joy/textures/entity/axolotl/axolotl_aro.png b/src/main/resources/assets/joy/textures/entity/axolotl/axolotl_aro.png
new file mode 100644
index 0000000000000000000000000000000000000000..f18bfd228756dd20ff2f4ca6f4cd5cf950cd4a05
GIT binary patch
literal 1418
zcmV;51$Fv~P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkTJV``BRCt{2nbB)oRUF4ZsZD#i;2=#%ZXl)(;@Dm+85Tj9tC51P
zj{`GN2EG_@ApQ?32z&8mC?ZS)f*E!&p>t5S$|?gHZ4t{hmXNY*pf_EzKnK~)f*v2*
zdwOr0tnHF@X?i~|Irp4<?mgf0yXSX)zZ2N!c$!sS5!2#M?JfX^2M+;Yzy4+JB7r~v
z08P^XFbo5LQmMrEuYJ?>x!p*AtA@jahX|v|>+qn)GHW6m#am^=Fl5_ap|4egU3{}T
zyZ9&7bvsQbpqcpXwCzP&E`hDE)_kK6*lT#cHqVL1^}Z99F{Fbu3`6<?*zgOQrtz6_
zrYjv|pC#UMa64fcgD{%hDZu$9?1isF`hYvNyDVcca&&}|qa*T$i^e4`8kgj?)o!;u
zJXvfvPlQ|o;N0t5EeX4Dd%vwje)aO_UAYAM7Z(>X0u6)LfWgfk-x6<$HP{G#U@bnd
z$`;M)x{3bnMs1l)MgW8fP}i#fM59sJo=&HEA@UyqpU=^+QdwcSQ0UlzJIzyXgN;NY
z5q#_7{eC|H<#Jipbt?|*pPW7=CdYsFG?oGK`Mj{orfCA8D2nWR^X5&0!62bf$nk<=
zvB=8G3dv-$D}8_?60}>Z+b!2A9818S$TTK32M->U<z`<1fU2sfs*2a^1)yH9Gc+{B
z@bGY3gFN<ALbPg|{oq<#UzVJJ@yQe7{o(hRo17B>R(bm5<!!y7Q9OXx>qS-7cE$(5
zC$GNVvTc@YZ9Ur|ZhZ2D6l^a8WW{A^g&Xr%0eIu++p_PEnQ!s=d;|gkM}AN$m8euI
zd~xd6r?!+3qU9Ih@pwA(1pwFux3c`|<D#Q{U|`MZHHwGMrN<X8T<FMinz8L|u*ypS
z+#m3A+n)y@G!UVGJy^QYSK}4G%I*59Geh*NWFOSp8KX!hlkN0>B0Gu$tVqy`?CxlH
z9TB5dZ%sglBEV<5eR`}2Z*+7N*zoo_egifvKU2F7Y^1!6<+ldk1VH5<0Ajogz|ztZ
zuofq5huw}BHk}ArTbzBZTdA_l0Sv=Yw%=p#YdxzKx~`+^`cn_S6ZGr4PPtrWbaWKc
zG^y9?0F)k-AON#s$zkbM{C@8`nx=8gqf#oBFo)KjWtt|6qOh>AfZy+z`GfUd3wvI%
zoAj5<Wh#{lrfE_v78x2ELRHlb3)ff4X0uH*KC5hPbpR#r0Sv>S{$ibKwMwyABoqqC
z_FOJUEEXe|%TZWQk|L1^fMY^jb_wZlCMG5X!0FSc0XTmAIMr&E*~&Sx*({e=i_Cxg
zXICaP?H~nZG8v)kIujEUD2hTj97a(T<{$q6!2N*;?|8<0ZUW>kpzAu(XcR?Jq~kJ8
zQ$~8diVTFJ(I~pE6AT6cICA8OylHW9QAU5ghMa(OI!z=Jk=s$RSfpC5a-(vUY&OgM
zy?>wEAfF{$uIW@NB{Q*t?QCyqYN{vvLDO6yl}d?1p&<8XfJ7o8gPC%<%+%D>t_|{8
zA}1h~N(rCOCj*wTu`%fvtlxM%&ceb1@p$~X4Y<?DU7%1X5Rb=+#bP892>>2Ge7Nb?
z@Au2=Ucj*g(&_Y;9qh;7F1?2R?7tD~+@RNRoCmCDft!TR%*+TYK<arOJ$fYUr?B~a
zUfjBMt0%1wz^C7h?O2?ZIraj5!C;UtFD17vD3wYHdw|pv%+<~d`yU^z$Ye6&?AfzD
zV|@p6wewpF>q+tBlP6ps@ZldH?Qb7&MNEso#NYed2e`PnxVX5uxVX5uxVX5uxa=4H
Y2a+&rYba8u`~Uy|07*qoM6N<$f(JXMX8-^I

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/joy/textures/entity/axolotl/axolotl_bi.png b/src/main/resources/assets/joy/textures/entity/axolotl/axolotl_bi.png
new file mode 100644
index 0000000000000000000000000000000000000000..d03238b766f6721ac847223a2a274894b4ec266f
GIT binary patch
literal 1251
zcmV<91RVQ`P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkSl}SWFRCt{2m`!LKM;L}58CO_Jm5XFmvE*243B)0xl%_i55I2O-
zQy~zD$)VJy&|5+RzWCBZAm{WJW9TJ?UQJ0MHl)Qh^bnC^OibPM$NIBu*;@7BE$gC?
zY!9RT^(v7POI|Dcz%t*=?Cj3_&CItm3vW0+r$Y6spH=ePA~SSYq~`ow7CuRdd?YAR
zNfGH>7T?1$$LG3{-i9?phoL`c<oknAsf)CW*KA1<br0Ln(>Br5u*NLjsVw49?^Nb;
zoE_jKzL~lMNaH2&GPE^sj{ye^pZfVdb=P`tg^D5q<cBfg1T7YTVMl`au6^Xnz}Tyc
zuPCiM!KsaTCLDlSVZ?y^HdGWYT^-}n)iL9aZ<fSWN3YjLUgJe#UF-;B34rxm-)J_N
zg`3-HcB2>F9C7CosNR1}IC;dm*6svN{E8&<^|YGXAe<Tydw{vDwT)Ami)eaOrhimb
z&0frj^n;{P|J_d&1_$~Xj$7NUl%Tj?Vg6Rsoikvs9%L3Dep{r~f2o)C@6~Je9Lq*X
zNq((5*>(oQ;&MV0Z@1lw#Q}YNeU5fFV_5>e6aDb}ZX4j!)tqi;vm&UaQYpPGu<(F*
zJWe8!AQTD#Aj>jqYikUaN_^WU0k4bh0By?Kmq9Rhy{X`37Y`5$g-9e4d)VE*M|VIl
zcipF82sYaQvHv8!QS3op7@rwpWA}?NyaOjAmh(YuS>o7=(bjEPVt`q2!;!Bj&h~J`
zDjtM=G9v0+O5^_lt)h*x(^<g9GoZD7Kz%1z&20b>&eum)+c7TJg?@b0ns+fi^9~P;
zXm4Kg06Z#-bVV|zwAnr#v)o?p6Xo~bO}5mbFVFirx?|k61Y}tjhSOR%p8;&=0jK-*
zXEi{Q#kHUGNV2iFmt>G6Np!q^JmyguW>;VSq}f$*Z+)4_vWz52y1>PpRjedKu_~_p
zbV6^j3fXlT2$5Zv31%{+(`n<=wIY$pWOy$(2tYV_#E1c!o!j8=ts-gCdK)Qzh)gEK
zLf|y1fsp==g~u{yPl>ctDgj~-arRV*VztBSJxs^p^o^V)7=H2B_e7&nE<SmRQXiT_
z`5Uf0(!LJ*XYk5}Apmx25b(pf!E^Zieu!@pMAUI}U;5ZqEMEal{7w!0em}KZ4FYfN
zSKm5<J_G*PfWoH2(RUpF1?IQm&wo1Eua2QR;MZkwz^PP3esOydfMZXdih`c5TmC>3
z{{-#9Q6qCZ*%cmfJPVjbN25^y&I|_#_>Frqx7*ya4xu~1F8ciY0ZUM{r`>}76^KTo
zTpStV%7r1$3<m)C<u_$lx>Gaq-9W>QkQr?mY;A4n`5z{OT@eF3%&4O?4QIiN>JBoN
zo#6AOvZGLSbVhx?RPJ1__LFDF@2F-csG~FLv*UNVa`XY1pO|e~+^e*4D?Nomp(R1{
z6SHceP-thLI?vt9(`qwLn4g$c?_Qqnn$fq=jIgd0KR%_lEb3L-xRsvO{ANpn#-~(u
zHNV-;K6Rdv$+Fsv6UL`hb!4*KHKXt0;o;%o;o;%o;o;%o;o<Q{@;{I@@lZU7{o()s
N002ovPDHLkV1g&TWSIZ}

literal 0
HcmV?d00001