From 0f6d912743639f82ec83e14760b7750cd27a12d3 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 12 Feb 2025 04:33:46 -0500 Subject: [PATCH] Table Revamp --- .../npcs/client/model/blocks/ModelTable.java | 110 +++++++++--------- .../renderer/blocks/BlockTableRenderer.java | 15 +-- .../textures/models/table/acacia.png | Bin 986 -> 934 bytes .../textures/models/table/birch.png | Bin 1064 -> 995 bytes .../textures/models/table/dark_oak.png | Bin 840 -> 802 bytes .../textures/models/table/jungle.png | Bin 1379 -> 1327 bytes .../customnpcs/textures/models/table/oak.png | Bin 1015 -> 926 bytes .../textures/models/table/spruce.png | Bin 961 -> 890 bytes 8 files changed, 60 insertions(+), 65 deletions(-) diff --git a/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java b/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java index e44916856..f29345807 100644 --- a/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java +++ b/src/main/java/noppes/npcs/client/model/blocks/ModelTable.java @@ -6,77 +6,77 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelTable extends ModelBase { - public final ModelRenderer Shape1; - private final ModelRenderer cube_r1; - private final ModelRenderer cube_r2; public final ModelRenderer Shape3; public final ModelRenderer Shape4; - private final ModelRenderer cube_r3; - public final ModelRenderer Shape2; - private final ModelRenderer cube_r4; + private final ModelRenderer cube_r1; + public final ModelRenderer Shape1; + private final ModelRenderer cube_r2; + private final ModelRenderer cube_r3; + public final ModelRenderer Shape5; + private final ModelRenderer cube_r4; public final ModelRenderer Table; - public ModelTable() { - textureWidth = 64; - textureHeight = 64; + public ModelTable() { + textureWidth = 64; + textureHeight = 32; - Shape1 = new ModelRenderer(this); - Shape1.setRotationPoint(-4.8333F, 14.8333F, 4.8333F); - Shape1.cubeList.add(new ModelBox(Shape1, 0, 19, -2.1667F, -3.8333F, 0.1667F, 2, 13, 2, 0.0F)); + Shape3 = new ModelRenderer(this); + Shape3.setRotationPoint(-6.0F, 24.0F, 6.0F); + Shape3.cubeList.add(new ModelBox(Shape3, 8, 19, 6.0F, -13.0F, -12.0F, 5, 5, 0, 0.0F)); + Shape3.cubeList.add(new ModelBox(Shape3, 0, 0, 11.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F)); + Shape3.cubeList.add(new ModelBox(Shape3, 8, 14, 12.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F)); - cube_r1 = new ModelRenderer(this); - cube_r1.setRotationPoint(-1.1667F, -1.3333F, -2.3333F); - Shape1.addChild(cube_r1); - setRotationAngle(cube_r1, 0.0F, 3.1416F, 0.0F); - cube_r1.cubeList.add(new ModelBox(cube_r1, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F)); + Shape4 = new ModelRenderer(this); + Shape4.setRotationPoint(-6.0F, 24.0F, 6.0F); + Shape4.cubeList.add(new ModelBox(Shape4, 8, 19, 6.0F, -13.0F, 0.0F, 5, 5, 0, 0.0F)); + Shape4.cubeList.add(new ModelBox(Shape4, 0, 0, 11.0F, -13.0F, -1.0F, 2, 13, 2, 0.0F)); - cube_r2 = new ModelRenderer(this); - cube_r2.setRotationPoint(2.3333F, -1.3333F, 1.1667F); - Shape1.addChild(cube_r2); - setRotationAngle(cube_r2, 0.0F, 3.1416F, 0.0F); - cube_r2.cubeList.add(new ModelBox(cube_r2, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F)); + cube_r1 = new ModelRenderer(this); + cube_r1.setRotationPoint(12.0F, -10.5F, -3.5F); + Shape4.addChild(cube_r1); + setRotationAngle(cube_r1, 0.0F, 3.1416F, 0.0F); + cube_r1.cubeList.add(new ModelBox(cube_r1, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F)); - Shape3 = new ModelRenderer(this); - Shape3.setRotationPoint(-6.0F, 24.0F, 6.0F); - Shape3.cubeList.add(new ModelBox(Shape3, 8, 19, 6.0F, -13.0F, -12.0F, 5, 5, 0, 0.0F)); - Shape3.cubeList.add(new ModelBox(Shape3, 0, 19, 11.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F)); - Shape3.cubeList.add(new ModelBox(Shape3, 8, 14, 12.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F)); + Shape1 = new ModelRenderer(this); + Shape1.setRotationPoint(-6.0F, 24.0F, 6.0F); + Shape1.cubeList.add(new ModelBox(Shape1, 0, 0, -1.0F, -13.0F, -1.0F, 2, 13, 2, 0.0F)); - Shape4 = new ModelRenderer(this); - Shape4.setRotationPoint(-6.0F, 24.0F, 6.0F); - Shape4.cubeList.add(new ModelBox(Shape4, 8, 19, 6.0F, -13.0F, 0.0F, 5, 5, 0, 0.0F)); - Shape4.cubeList.add(new ModelBox(Shape4, 0, 19, 11.0F, -13.0F, -1.0F, 2, 13, 2, 0.0F)); + cube_r2 = new ModelRenderer(this); + cube_r2.setRotationPoint(0.0F, -10.5F, -3.5F); + Shape1.addChild(cube_r2); + setRotationAngle(cube_r2, 0.0F, 3.1416F, 0.0F); + cube_r2.cubeList.add(new ModelBox(cube_r2, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F)); - cube_r3 = new ModelRenderer(this); - cube_r3.setRotationPoint(12.0F, -10.5F, -3.5F); - Shape4.addChild(cube_r3); - setRotationAngle(cube_r3, 0.0F, 3.1416F, 0.0F); - cube_r3.cubeList.add(new ModelBox(cube_r3, 8, 14, 0.0F, -2.5F, -2.5F, 0, 5, 5, 0.0F)); + cube_r3 = new ModelRenderer(this); + cube_r3.setRotationPoint(3.5F, -10.5F, 0.0F); + Shape1.addChild(cube_r3); + setRotationAngle(cube_r3, 0.0F, 3.1416F, 0.0F); + cube_r3.cubeList.add(new ModelBox(cube_r3, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F)); - Shape2 = new ModelRenderer(this); - Shape2.setRotationPoint(0.0F, 24.0F, 6.0F); - Shape2.cubeList.add(new ModelBox(Shape2, 0, 19, -7.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F)); - Shape2.cubeList.add(new ModelBox(Shape2, 8, 14, -6.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F)); + Shape5 = new ModelRenderer(this); + Shape5.setRotationPoint(-6.0F, 24.0F, 6.0F); + Shape5.cubeList.add(new ModelBox(Shape5, 0, 0, -1.0F, -13.0F, -13.0F, 2, 13, 2, 0.0F)); + Shape5.cubeList.add(new ModelBox(Shape5, 8, 14, 0.0F, -13.0F, -11.0F, 0, 5, 5, 0.0F)); - cube_r4 = new ModelRenderer(this); - cube_r4.setRotationPoint(-2.5F, -10.5F, -12.0F); - Shape2.addChild(cube_r4); - setRotationAngle(cube_r4, 0.0F, 3.1416F, 0.0F); - cube_r4.cubeList.add(new ModelBox(cube_r4, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F)); + cube_r4 = new ModelRenderer(this); + cube_r4.setRotationPoint(3.5F, -10.5F, -12.0F); + Shape5.addChild(cube_r4); + setRotationAngle(cube_r4, 0.0F, 3.1416F, 0.0F); + cube_r4.cubeList.add(new ModelBox(cube_r4, 8, 19, -2.5F, -2.5F, 0.0F, 5, 5, 0, 0.0F)); - Table = new ModelRenderer(this); - Table.setRotationPoint(0.0F, 24.0F, 6.0F); - Table.cubeList.add(new ModelBox(Table, 0, 0, -8.0F, -16.0F, -14.0F, 16, 3, 16, 0.0F)); - } + Table = new ModelRenderer(this); + Table.setRotationPoint(-6.0F, 24.0F, 6.0F); + Table.cubeList.add(new ModelBox(Table, 0, 0, -2.0F, -16.0F, -14.0F, 16, 3, 16, 0.0F)); + } - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + @Override + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); + Shape3.render(f5); + Shape4.render(f5); Shape1.render(f5); - Shape3.render(f5); - Shape4.render(f5); - Shape2.render(f5); - } + Shape5.render(f5); + } public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { modelRenderer.rotateAngleX = x; diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java index 9cc53b0da..1d958196f 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTableRenderer.java @@ -45,15 +45,10 @@ public class BlockTableRenderer extends BlockRendererInterface{ boolean east = var1.getWorldObj().getBlock(var1.xCoord, var1.yCoord, var1.zCoord + 1) == CustomItems.table; boolean west = var1.getWorldObj().getBlock(var1.xCoord, var1.yCoord, var1.zCoord - 1) == CustomItems.table; - legacyTable.Shape1.showModel = !south && !east; - legacyTable.Shape3.showModel = !north && !west; - legacyTable.Shape4.showModel = !north && !east; - legacyTable.Shape5.showModel = !south && !west; - - table.Shape1.showModel = !south && !east; - table.Shape2.showModel = !south && !west; - table.Shape3.showModel = !north && !west; - table.Shape4.showModel = !north && !east; + legacyTable.Shape1.showModel = table.Shape1.showModel = !south && !east; + legacyTable.Shape3.showModel = table.Shape3.showModel = !north && !west; + legacyTable.Shape4.showModel = table.Shape4.showModel = !north && !east; + legacyTable.Shape5.showModel = table.Shape5.showModel = !south && !west; if(ConfigClient.LegacyTable){ setWoodTexture(var1.getBlockMetadata()); @@ -94,9 +89,9 @@ public class BlockTableRenderer extends BlockRendererInterface{ GL11.glColor3f(1, 1, 1); table.Table.render(0.0625f); table.Shape1.showModel = true; - table.Shape2.showModel = true; table.Shape3.showModel = true; table.Shape4.showModel = true; + table.Shape5.showModel = true; table.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } diff --git a/src/main/resources/assets/customnpcs/textures/models/table/acacia.png b/src/main/resources/assets/customnpcs/textures/models/table/acacia.png index ae87e7dbc48b63d84ad915219de7f37c246975c5..98067a527f7361ac757169512f7555fb98e791ae 100644 GIT binary patch delta 906 zcmV;519kk`2c`#*7k?lK1^@s6qMd$(00001b5ch_0Itp)=>Px&MoC0LRA_<(otd54x&2-@ka2!?GCACB0e=7n!x$gG|8AfHKiu*EjZ=rO>hI>f zDghrsg7jrQOrt}|^tFMK!j6Ds1WnI+olv~0)Z(QP+#edu=+AIuTdm~?`3xqk{u3Qu-FfZOsugzJq+`xE`L{neC)3o;~=xiDD-c0*^bY3CYgSuPEv2GYcqz*^uT6Dp4i-O0^s)k0l;)R z=Z$)m#HkLS4YWk4jZHD#1hX|yaJdS!W>pkIN#P}Wd;ehVuAa9;Hf_dp{@(2}XMb3g zARfiGcYB$V%T=N4u!=%k)=7%fqg@+w(fyr#+<&VzU4>mAH`XQyE^qGadZX7Fmy4i; z2g4YHVezTKZ+|ZQK~xsYZF?Pp58r;R^_F9mnUUm5;Cw6vf_Z`7wkz`Sj-b1epG9 zMmj2!?XgnnBGm0f0Q_l0WwJe1DxUzK-@cgaD>=LHNP%l@usGM-zuK)l54rN$LW=%~1DgXcg2$RGE7D!06UjP6A delta 943 zcmV;g15o^?2igaa7k@wq1^@s6s%dfF00001b5ch_0Itp)=>Px&dPzhi4XXG44|8JqnzzTKUf{hFQqfEp_Dke*590ifBT#&i<}DFQuH$uNVABXkpm zJt?$Iub)C0GrQYvSmk?CXkD_CsF9YrxawP;u_!@h3kBUoSu@GMr3jD=Gb{gKYr}GX z>Xa10TwC2lxqoVQbq_GtWT#ozv)^gfb$O>*x8$S<(BpQBJd!hYCf^xUVVBpvD9${9 zka2`YYrMAUR}>9xv>JL~%IGxfr8@NMqQe|#10aQM%Ip9yE9(f)lOmWJj9GP6!Knub z=H>v94pIQq-Y`#}WJ%ZT@I3uRs5}4^iDeu?4Kv+%OMgaM7!QnMJ400} z4*+*vnl%$O%yhn*(`YJ72WhDsx9uV(I5`LbliAR}YJ{DlOvI6Wnkync&r`#3CzD}j zxq6~TkVQV=X66Z}G2r(80l?Uu%Vzy44JR4y4YWk44p%rE09vy$jvz%~HT3rWL6@8P zGL9@arhl?Tji&Ui(`89~SQMuoK*wPjNBTP%X4aYgc)vY!8{~54F`IN;oc~Rn-35C6 z6utg*05svJKNEf-dd!wtcNMA+fEwZTs}_LAqq4bWnwZ}5KXzO!h1&V)QNAa|)c&0g zQY-KGpF}r~A5_dVHEw59&a_2&6xfzof9>q#FnI>km84y54iQWiZ}zMPRv?8G#9YS1&8)HcZ1}J(J35PSXH)7ehPDo#US|RTxK0$Vjr%xHuQMSq{mSC{ z)#W)80@H77F5ldqJ7GFVbPx&gGod|RA_Zq7#08hx$^M_ziI&8ysGr=pw2I1J`Q$R*V$Qhc#9xE_6m)Az#r@uX$3$%+( zu&Mx3o+8emGulAo3%I_y0|3Ps6gW*kCIB-W_41@HLdeRGC6Y%%sF1g1q}OIE+`GCw-B1|*n~ z7(<8{^ZPJynlZ@r3Le{6b8@``M82l$bzG%^_2n1GFNTcf0PX()_aWr^8PQ_L2yfda zvSB*$5X@rZoF?bj!mo>;x!5Y2`)K%7cP-)P{c)|ikA~WP0Ox&NU7l`q5_wC@+@V8< a4jnpl=+L3V|Al|eax?s=XipN80t6=L+|a!M delta 1034 zcmV+l1oivl2dD^;7k@wq1^@s6s%dfF00001b5ch_0Itp)=>Px&$Vo&&RCt{2n7?Wp zF&MyqE^f+Quw}4^xKKQ#OQCb2Q|CTLA0kucOnryWd4pu_6zClA(gaMQ&S1k`igmOd zuEU*llJ1hYIYFFQzr}a@q|>KQ`u@lrS~C55l;0*#qy%6P$A7gpm!>{uTN7_S9Cp^z zw3%+3!2oC9zVjk_0YJ3d*X?ms*=4!-1uThn`@~U>%sOPNYwJ7FZl5$tEZK0>BTfGR zAhT+nO8z_h-B$hf26+GOHBjGGbLS@GLGchr0L(7t#8FST&*lk`Gua;({iLYPV}E~m z=gC-?)&_uEj(=;pV3%s4nf-p#IGNSlBazaJ5xf}SPTwsT>dN)=P2&thm~vmc4<2Jc zwA&|JU28utd^gd)tNd2U=U0D?w!bNilVGH>N z!~n~8Wo9qL@cpL#Mf5MS#I1{RzNzBJP4&e8(Aogg^PgoMpz?gNC^y$D-&Zo_>rm7Q zX6(3Y?8est)h^n8s`>~4W-fPkax#uKp zu619$8GoSgXTzt>#i<8l0ks`8U=lA`YeSzr^g4mN<)AyN!{!0aDUV**HWY*^{!CI(>=PTTz$K#pV{8j zN9ka?fvLlN=kE%!gUtH8dAp}OPtUIqVn;`2nRS@#@2M{_y@biwPE)gaQk;Z_8(^|n z7OBmV>EdTJWO{y8=^!(vm#KA2)H=wlbh*Bz!+q!P4&s!M9RtyoSR>o{;_1L4Jy}}UChZ=zepC(t>f+Lq;!~!2TU(hYo0dq18{nL zke{6#=4U5|`RVaN?Hqmi{AsPW$A%7qrZt*^%*$7!wb~vV-LsR!+$~85am@7VQJzT2 z`;SK*03mibJwC|IAR@%h1F7wg?qD=zc7HJks=ub(cR(BBsqyTg6?ka6KSL zU8n~=pOx08)3xet_nPVP+PSGbGwW>kZzdmqIc+*?XMv|m2!gQPL2&EqfUP&c)~CTh zAP@)y0)apv5C{YUfj}S-2m}IwKp+qZYyPx%!bwCyRA_D~tja9h_59WoRM^3fy~5_fQEQ?hI;v4$St z-(=b(MM$nE%3#(zF9*peF6>fWj0Mu0Ml?`{44`;7eTt#4`8PF0t)9!*=Z|9m!0}wR z_b76?m}i^q9-HkRv*`o?u-WeM`tqF3rW1UB`_($ayyE~6DFJ9@z8jcw9WK3Spb#lh zv}3o|1)0PGlz;j(leX+jq=fUC0;YF$9k9Q1A3pYvAc1QA-CK{zC@$)f+fr&%s_Sc3 z*tn>+n;G`pmbcjjY1FMXvOXi7jAE!^UeoDKBZID_F|TnT*9G8Q16E9u50SqfzrV6jEV-Tvi+qOIQ8wB519#_GeBR>8UH=?D45NX{GbLmRbah~Fe>@}Xjy7#!$tcG5PjxE=On=nr z+`fAX$baMIj3geL0a|hsv<(8TgG>3G>dZL)y3P(wzPLZzR~Lfp0)*>GY`^1aP91lp zK0ghHJo(wk!$}u`98TH@jAUObtA2pM?F$z79|E~r??mP1=XnzZ%rfEY0RPTwx~;5i zT`p7o(^?S%!T$r?dk3Hl31R=p|9}woV!4=S_J6G})mh_xo)##&kB71+JJRE}+^*(_)6>(_^M3dXZW5n^Tg~l10000EWmrjOO-%qQ0000800000 I0FyTZ5v412rT_o{ delta 796 zcmV+%1LORn2FM1G7k@wq1^@s6s%dfF00001b5ch_0Itp)=>Px%=t)FDRCt{2nZJ+P zFcinXhB)Ld{c%#IcA!$%Zb)6ab!YFN+5Pt0x>UNY>q)(#L#5Ld3d90;2o5g~2Lg6g z!oAOgojm_|e!mOXvn-$KJ{sTijrIEF1pr_=-^_O`!3qG|H~^$t0Y=yRdKzu;y_fbh zQmv|a_#D4(YFMYaL8CaMtGp0U{wf}=`j6dhN=f%q4GV5349}+m5i0cAA|Mj>6 zJyCcR;ge|^Ka@B@kVS6pyN*qNT@k*GZ_8|y;pS5aS4gk|%Ei|g!WZfkz`~o-ABB(4UFjI2x&T_9PJh$F_XWeWr%OvYB^Ti7k6HxZ z=&lr&4>COb*-oWk>C|nyln*z7XlW4M!e#TjFt%3y`f7(=W6|;WSRq7BgT9iO_fa!< z8~2$$tp;OOew<#+!Ki;CQpw6MSakdtM2i7naezLjKE1DeoKn!^`9u2L#&pQfZci!h+fO7ZoSn^H|@P7~BfiZ@B%>vN! z6n!TUL;euiSn`!hs3ImagKu|_3IN8Vq4f>GC%eAA5BfCqzo>%Xo2%!QDdmF!sPSlMe?I&M)=B^X+P=QMSD!z=wSQ>%vXg3sFJFIj^7H{9$uqU_p|u6@ zc9%D}j|3inj`5|XDPx(&q+iV~9Dl@_+ZTGvj$P@6EjTeQ%ti zg)571gzsLM0pRxU54dsbUWy)Yb9pKBeIL`b0PuZJwcEk>y{_vWCmY|#`Bi~ zNXy1Y?_J=p%}1(z0Wj%I0-*Qb|ML5;C;Y<~AB3_k z6)QMHSeXm}jx&i6Rdw^y2>IrD{8}#&~ zrz@QYgs8^mwUgInf*?@5p_603+#evF%bGlNBUgKI*al#?CfKbB)$av*dMY?Wc+Hy1 z1p1tA@}0)LW)qMhQ0eMH{}yQg(}*jY?019Y0DnD(tQfvS3BOe%pO8ivF*H?=d|h*iCHa)^oIkI zhW22163N&eA9pAe&QLCwR4S7NQF3mwFH@*#T8aqE<&u)^D+fsCw~Q=a&^XfW6*>n% zg@1yG+!$c(;ks(KBSGCT03oXEwdBj?k}9R;+I{7KT-M~E;o}7ja@i;j^>la~?%sc_ z;#a-}eBYx`ID_kM08tDlIRKJxfkOh7GOBiX^(T*$A6vY2?vQ!cH!Cd6pHuyx?yRuz<}2ifM*yhS_ElRM zQ?JF!X}Pxi0{B6c-%TUK`euc>nJG2r&dNijL(a5VT`wNd;lp?4PrQFRrQQEQ!+)po zq)Fb+(s&Xnmpv8b-tC=j0QLKRz0Q7Ji|1Bb&XzfrOPER02m0Z@uE!B@~Bu^O* z^ZwHm{O!82iqf`65u!@!sYj}H0)Jr`QWXs*PER33L~w4YP8fpYOz=V&d0{SV#%?gF z!++iXSX{kyKD>JA{E_0I)A)0V>(>^;o6Aee*qh5s;q_~a&%E(HzXsh>9V?ST8twaj zET=!$(Es;azI-uUzI-uk_uBvi3^2d|0}L?00M8Kq0UhAsza0F<0RR914wFFzB7(q# A4*&oF delta 1339 zcmV-B1;qNV3gZfp7k@wq1^@s6s%dfF00001b5ch_0Itp)=>Px)14%?dRCt{2m_ctF zMHGNPM|SO9D_b`qT_rU}1-XhSDuk*CP8C!Ii3_S)^~!|o`rRjg*-AE`K|-J8x#*n|bfeY=Qw< zm_Hx-zK>i;I`OO+3Z470E$_0j}NngF}u5)R@grs0prn z4FD#cgRFZEN|h!BcbrnCsbn`iAD}BAQE)q|t;kA0mSyAnEtbl)nEW6NY=AdjJfh0c z#A+1WaqLtI0Ds5H0jT<1F|Srqc7v4VDTZ{MoN6OR1encFs4=fB-X3WF0~U02cf!bqt z(7$D9F@He!VOgP8r$ejLh~@L0{8*14y)t$xg=N{wpiAZ2(Bi;<76Tk7N2PL4)#W+q z)OTEM$sV3pkDUQrcP7?uR!bs#G6n!lO}P{bN2yjTDwTO&ecN%ipRA-%%d%AD;=gi)_5Buw!cj`46(I8A z-WUMAcY&<{Dl+Qq@WL_d)XLtz3+QRgb!SxW-g+M?bNb{<$`y3P|0QndJ0%DLbtIM} zx5)3A7@+&Je&+ADy>~)CCrF=qfBHDXBJtJ7XT#O|O^!V~K{jKt+4lM6w|l&Hd@J%U zuYcA!ee$@fe|P-`r(b=Z+`&Tt)EgVBtdwas*wiK~eajQT52E~TrBf`g)|e|EQEjf@ zxU1%nwQO!Km$%K~y*Ez|Jbp5v{Z80y`?Mc+$T=C>52MLt4n(3lnHq(cX;CWGiD^;3=A-L`|V_~!lvl%P4g1vKin(@{8e|Yxg@U2rt0IvOdhkq+S z-d5i}di#|S;PT?F*zc#E-tQ;Iq;T%cDb^be)*B7ZojDb2bb0Ys;zV(Zh57TLyjz$* zAD$>q?Q7)$58xK3|< zlu>CAfG|4e^wvk2=sMi1=>I@*At@INJDs5ww6~QPx&K1oDDRA_3-hbce?l9_kS*d8yxL#xfwGF0BCiu z@#@{T1VZ4)``51A9`qf|&1XfM+Z@bdVU~(y|LpCjP&~)MpbvQyHXnY0&p%JFWSLld zxC8*;P6t41?0jz=VA(V()h3#DSIb@(iSGw5T>9gKz5@V|+t15iC;s81{VkVS4BX}b zfaUysF?Q8$dw-;*TU;;~m19xuwLKtht>Cg=^KBk%hXE1n*cZP3x%sTmyNLL#?W4lD zead7IIf`BK9=a)DNLuA#y7sy-0DzJoA=sXT^c`f(r1DU@_EBNTi_Id&g2d=%DY@OI@zdJtLR$rnPfn3zDbWtbEs-4R_b|>I zya!a9diI*oPJ)lu?xI?vm0wtUeEc1ns|wmlkU-%=oqiZ4-am#J7I*AR0qh9Cf)sS#okWI-Q6y_!T#OtqPw?K8tMNpaai8;9d>W0 zwqrb{}UV=25j_@$*FcM`kXMP)d|h!G=3j2JOu#JFSl2ZQ=rBkxZ& I=abO`CYhtVa{vGU delta 972 zcmV;-12g=d2loe%7k@wq1^@s6s%dfF00001b5ch_0Itp)=>Px&mq|oHRCt{2nLkJy zQ5?s=i3ieLOn46zB1v0yC|E)0;?SvEp-8)S>EKe3Zq9bl*{u{@9J)BxQVJakP90pF zB+#KMMhx6=k4tiq49Rtf@8#X)j+%Q1n&f@9_wM~JzxU_&{eQjRB?U!(etPH0?RLw- z#AIHynaw~bx%K-7wSW2HOKK2*gBU8t0PywKF=nWV#m6%M0Om9R)FQ`sp93VHMfu!< zWxGoDswk}<0PJtAdV~@%n*ji3OAp1fYqt)-zl#sdsnBO}?eF{qaJYjF`_k7xF`4%r zVeWX+_Hj{O0DtZrk6j+We5Zh()9sc60AftL$qPzgVkN*Gw3M2!P?}!)$x^WtW z$9R=BMf|JStD?LB&!0U3(A%-uQt#QdTklhKpnGcO=lt)9YrlJNqU3*K8W43%W#`*1 z2RSnxIw@8AxFog!oS683RPtQP3z@hq6r=+ED7H;zxwDk5$z`>%McYOjK_1_Y}?peJ0i!t))i zxgF6TRe$LXV*mEz_q){q*;(#n&P+#+A(P!cp3}o78(fqy`>=6wNbPT}dSxjUg&o84 zx#cTYtE?&7!bz!24THZkYMk63Hir8kr$E_?3W?Bdna~h&d zCA1Ep61w_P>8oL1g3uBkm{Y#1F2CGlX%WmR3x6L7t>g5p;wz204}{i3Pfgt4H@Zq% z!&T)%q?syfVt%e9`l_sn`9NBd^S4~p$?2=za(pq%)xG9+d=t2;T%gLDcyy!goIam! z-c2a+6-_F?F9c+NYt`eiTXQ=;aoJp3@hscL?!k#qaNfUJ@@A-s?Y$#qF}*8#Af2T}Fq?td3|U%4ur0H`bC|Mh7nbdg#N>e(_kf@d3_AwUe{l)6M;Qa?{|J%P z*OpPx&8c9S!RA_Mc$9wHyzD1V~%|bhL?wXmY6Eoj|1r`<-z6C5Syax+QmgE%* zGPN9wL6&1HiQC3qT=JW8vUIvT-<=gPySY)3ucjG7#xVvf^oERA<_KZ{ItV-yyCgGnrOIPT0RSM@ zDP(HKdPInIimvYgovOYj@ZliR#-N!2f*4-Dc&??=c>Vr!ZDa!9hg2GZ7y?gYlRP9D zgP@?IuZ&b0V}GS8V|}8zc~Bf7&DL*w#_=R$#hy*!0E#yuty7L%$2c*L#0d~Gj(`Jz z24@W09Xm@yPJtxPTw^#@^ax@_zyb~k9|-dGNd}}^Bh7WhdbVd%c&t;1%ot-8yK)^r zOIE~`0r`@;I-aN-dVsuJ|7ZdSO0}2c%5^+@Eaqz%0DmZ`)NsFC!@$xyzM5v}ktj-J zVGj`|HEgCffy-1Q%(KxN>&kU}`)v$uQp5MrLso?Y0Qa)$pd;7OCljrvHQcm^tO^&L zA@F^pm>b7kxsH*XwaTJS7u0y=ITrVT7|E^Hju!NYRcZV|ZT&eQWW3ne8tTe*wEi5h z-2pDIjelTk&XwzE{W&1X7{)5ejWDU_%5}8<91wWA=;XF0UAd0dp93zhm#4m!>uCKs z;HE!2H_`TU06RI{(>o%>q!dwGV>==Q0E}defH-tr0YGdJcKQOp{wRE({KC`T7PcPILVtNAV~DOml+Pc_zX(0QP+T_ZNml>> z)YN1K_kc75CMBbGyJAkaYfH4mHsmj+92C0;h(Nwc?jKjOaM}hHM2NGg$pH85x{lOE zKOkO2v;4cf#vMykI`?c@7Fw*~ZkCkw++}~)r=^@7?d$Tjm&?iFo_4R(9vs6#q|c8J z=0lu3KR(dILG-Ylw_Kb?6=#QoNMD?`-}yUz0_{B^U_M2!-hFC*7;hVANBa-I=GUxQ Yvu4ejHU9Px&VM#G?|GDK8BhUR;3iF-Rcosx%NA_NZh1xlee%NH=Vs+cIvf}oexiizrPV~qmFq)G5yQH8OYt9@xw0CHcFm7#BH z47o2k7$q={R=Xv7rF1kRa~^9HY2tZo5{gP;P1+h13|^Bt&%(K0-;psJ<8YdZSLpWL9h>8)dpY8{qpup>z8`9%e# z_muS-xnJ)YOSA+2?r4#l3hEnsTO2Rl9XTMoU;c<8+5z8vZ8u{Wz@)txKI+CW+!)7K ztBR?yZHR2mAvPS1CWpij?SMc235v$V@R!IT4<*_GM}H>7a%>F8=8%UH?SP9cYujy{ zZi(^Ub++e#oZ^4Yz1Wf?9*Wcfu?t8YAa#J$0a6Em)B!tN2dJ}?V?VPKmK~2aF*dUk z04}ne)M%#0uyl^8F#K?B%FhS`zj)4z^Cm!J4{ z`h+K6nSZVFMV4a^Ec1H&BKwa?GHMs@D)r5Q1;DMs$M`}&VNphy)mX8ziT8-!)n$0HN1KEQO&I7 z#q(zy&zu*}pZS@!J8L|EIzOHJ?&ApPJ)U0w`auD_{BiCtuW9A;)44w!!^@vP?5y!n zpMW&+y`o|$Lon1D#rf&nH%{Ai;{lS~mlTzvs1&&`8OmK=y?w71&arTgS8w0%yzx*! z27h}c>=wDpF30;elBQM%$V$&p-gh*BPO5(AK;CDx)rxc!Dmklz;X`?!N$wu9-{^_b zZPIJryNB{VldNAk;cyH?dEe1RrC7M|Vs7iNu|s*E(P`q_j~Y$&HX+By se<%xrAP9mW2!bF8f*=TjAP9mW2!bF8!V7Nm8TUqtQv>UFB9l}DCZnXs&;S4c