From e21e10ee8b050618a787ef7247a6022ca10daa27 Mon Sep 17 00:00:00 2001 From: MotionlessTrain Date: Wed, 30 Oct 2024 15:44:58 +0100 Subject: [PATCH 01/23] crusher and sifter (#10376) Modify the Jungle Treehouse crusher's hut and sifter's hut to fit together The sifter's hut has been modified such that the chute belowe the hut block is now its input, and it now looks like the output materials from the crusher are flowing into the sifter's hut. It has an indent where the crusher's output chute fits in (if both are built at the same Y-level) --- .../craftsmanship/masonry/crusher1.blueprint | Bin 1857 -> 2118 bytes .../craftsmanship/masonry/crusher2.blueprint | Bin 2035 -> 2992 bytes .../craftsmanship/masonry/crusher3.blueprint | Bin 2360 -> 3494 bytes .../craftsmanship/masonry/crusher4.blueprint | Bin 2827 -> 3924 bytes .../craftsmanship/masonry/crusher5.blueprint | Bin 3581 -> 3973 bytes .../craftsmanship/masonry/sifter1.blueprint | Bin 2200 -> 1836 bytes .../craftsmanship/masonry/sifter2.blueprint | Bin 2358 -> 2632 bytes .../craftsmanship/masonry/sifter3.blueprint | Bin 2759 -> 3364 bytes .../craftsmanship/masonry/sifter4.blueprint | Bin 3294 -> 3901 bytes .../craftsmanship/masonry/sifter5.blueprint | Bin 3817 -> 3958 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/crusher1.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/crusher1.blueprint index 4a3143ed1413369dc151b5246870ab307c9e40f6..a42abe0dea32dc2ec5f7ebe39e964bb8d7a23f32 100644 GIT binary patch literal 2118 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 literal 2035 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 Ute-8W{}>kj2ZNv>P>NK&V<6SqyRw7Ht5O|QvJ zI@6CFkX(_dK!9C#Tt*m6kUwOz*|UIPqFwR}7U zfGEEi+-X6rXS@9iykPtT_Oy+s826x+N=c(wY=uafvIiev%)+%6#Lcst#cxwy$hN;6 zPRH1SHm{F1bmpM$!*@8Y9pC^{9^o;KVzCwEDpMZe*@qY(q7hyNj%cqKEhU_T(@}p2xrx2Itg`HklDDvMS#wf76L`o9H zRCLHSAaF7z-ftYDVt&YRtq{j_kj9DBR)O6#zoPOM99DbT@D@L~S^Df}#jd&qHb!>!NnNG+J;W$+2Zeqq@qFib zhK0}g4E^&0)Z)0`bKD;aaoZ0Sz7mwjd>uT1@51-c)8B_5@D_46_$0$oc=mp*C8@1c z*zE*oLN7lLK1VUNFx+VjC&RNueh-2bvkYGZpL97|;i`%u@^n?0r@tn3JCFU$XUb8tOyh^7Im~!^4DL@`I|EY)uKf(l6pX zPgm0Vdc)yHa=lKF^MiDH{3yqTqEL)`FNS-<_p_3AA=t0`C>V7Q@-$ z@#_@gwuQG8U7g_XY+W%=|2T}S*7C-!BrY!;hp6~?^b71`9?!w$g{0lQ`AZU)tpkAH zC_4D<9J{-)Sjf{=G8B&s@%2%5zmUcig*+YnKLs84X^M3f-+w8>?Q{Uqb1^UAxB(sC zvPoAyH^Y4W_8!#67Nssl*Eha$>5zPB`X&yo-%ead{9tNoScdNCeLD3ECY>o*S5`%J> zxZYpP;h)S2#7c!G%XmqctNb%C_f#ssSZy04H(JapCo*mOZeX zVZv35OIYQ?9L~8wP;?MnN}NlBbEya}hcPY`%e9k#!C9p6cwH?~A?00#Y_LMs+jwfb zx_Y%5k6IzsU4^V%A<7WZ=1wgMr@oVXZutyHNkT2twr5>ReDcDdQnP21CbYy4-pCAi zi`ND<&;2w0`0``dyy#AB)4A~A_2}B)rp^#2apHmz%qx_;`nEZP(-eswwfYxbv`5WY zZ>lHvs>a-F8gmDQdqp$uhQ{1gzgIQmZrl>?HI2E~HRG=8-O!A?p)q&W?+wkk8ya(0 z=aDVVxR*8NUe%a;O=Ipt?;Xy)tQq&R#@wqKbFXR4eNW-8+uEb9F?ZGPx~)Cx8gp0u zuG<{At}%Dj@4C%_>l$-c=QB;sxR*8NUe%a;O;7FyRM>^Arve&KpO`lBeZu}b`XeIw zvjLsRjA>Dj$@e{xu~b-n8fWmOu5`A1qC1enZ^}q3lr=yk}(E=TP?Di2<$W z%qzA#9FhT4&rRDS22{O~IU!(RuBJ5{`3BU^%|3fZpz66(e-zqH`@{2*m$x~Kr;$a^ zcOB9d4h_ua^9m|Z0$$6^CWm*e=lZ@oo=?4rGzsn6j!W@ZXqQ(lzn0a41Hg&q zx9aNc)N+=*w$g>S#OOh9LfYB3mzv`!J#XLb;Y5~WH`4R2(#u`jbgYwGtk2(o;pK{4 zzcg`$;rOu6C*kZdF#fnxp3ENdY~@p9{2n!h-Jffs9hyK{heZMA}&@$y-$Dq8NUe`D#Z(_P#*i&z3NQ@VBOEzQWT-dpDX3qhWr6$nV z7w0lF=!EH<#;t64JU4B-n>opzH@L^K04>36}RD~-H2f0%!WxlfAdE^3y*CU1v&zROA#EqEVZn3wz z5}#*#rG7QuN;cglS6NrqEvL&!g=Xp#_c@`8-B_8>2Hxu=Yvv@|J>4OeVo$I)+YGPD7TVVS6WG=+TIT-|H(1jvZ=@CX zB@0Px-5uB>m7HrcdgE-b42^L=eEqEbqzN5&!u~2X?e2iTv)NMqQEkHhgj!>h&bsdT exkvoq?Z9U6cAycw9av>A2>uV}In?ryV*mgxn8l?4 diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/crusher4.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/crusher4.blueprint index e74b773f992051640ca06b4d46a6db56dc10aeae..59d042921bc82221e1e598a5f1d846f7a32f5a19 100644 GIT binary patch literal 3924 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 literal 2827 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 literal 3581 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 DUri$e diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/sifter1.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/sifter1.blueprint index 9561a6b8ab94783fd09504c2834f2cfd5081589a..8f0073fd5a7fa390803d7814bedb95678b301e18 100644 GIT binary patch literal 1836 zcmV+{2h;c;iwFP!00000|Lt2_Z`(E$K8|m)9Vbniq?fE|nq9jsZQ7>j<#ok?4ed}M z1NLapHf?i}C6A($IKzIx-uAEdi-uv?fR3bOS$E5_lzM|nR2P0cJcs;v4oNGm0<1vE zAeXpt32POoQ~cAAP~2|x^|qk^Kn_;>M8hpz)ir{R3Mg1(gz-lZX)Ha0^%|6#s@^)~ zKiN^iu>hR!NY2jg3cyYmBa{2f< zOfrn0vF>SjxP4jU!8NWLkK!*{J~(-CZ%sFzoWHOX*S>k>7X=UJFP-+^4}UP#zG(Ty z;b$7Y*!+dz;VB+})8rS2pF?;MiQk9qNc<5z4$+h}6&<-G`6=@!CtiYenXkcy#5Wzd zklKJ-GH=3d*o6<^P5=%P7tforY@9xH$@_8f{4snY^QR&Bx+8za@$mj__~hMbL!REe zEu@FvmiV1eJV{cZ!p|&>6p9(0h8rSWoEs1YA=GdOA?p^EZoP+oHzfCys=p3gU z$3OB|wB>5^p3maD9{q|3zwaqg9Q`xjy%KI+evN72PaM~@lH$6W@iDA_{`GIqQ+J=| zxH^;LZvFn+UjDqjjNiUHJ#<_bCB@@!$GT7BZx)@&akqYN?Ue}rL>x}e-(sd3tlC-d zvkG+=e#7x>@^>>7H`8L_pTifP{H0Ig|B}4^H7mYMX{M;1`7$j)8h=;1fNK?~Gos?g z_`6e;!&QD5V5ocY%_SDKt5Eq`r(OICF~qlHCj(tGUj)-NqWyp{adWZf?;6WVv3IjfO;bFV;~A0MM8evR6rlO88WLvELnt*{SHKdRrt)| z?*2XMzCi<+X9QeU%#7yqu>Y}MKf^hx;QbXbaP15HqpAm9h%&j2E!LD z2iJPYXmnNmoI|pR8(S0-6pBq%h8(4j4Fh$t{5zup)P6n?^$uPh9Q+dZg-;h^G|tfl zZktB0IE*ftMz2YuDe5pji@F;3)DG1(me|f6+kn@+;r-!YpY<@e<)&T!is+Ouynn(F zp&YqxBj<$mtm?Py!f%IKSH=5Z(V@}9qW+cbm`cm_V6hhH@{*9b30a6Zq)1Y$&Ry4k zFb*xmP*$=Z%5B?#w;acOWQf5{S+|RcwvSu|6eHDDz$g}@DVAhStl9o$y#nO{QZZv# zIPfvAC>Qtoq%WK$7#H6$7#+6QkdjOM()_#HVbfrQ4Vjqbyvuw$GQd>)BBDU4gIZz@ zE^0dEdx~)*Ta&iWk*YR$^l0_GvITTO3^Bw3Qa{Qm(NOhnn8pG|2AfS`?Huuu;ca#~ z#l;R%4LsiT<(WRP8{78TVW_C-Grxz_juZ@OxoGqdZ@Q`vIo42dhdIW};H8uCy5ZL- zT*pYNvu5g~q}xlNG`zw;|ez?735VesHmy>ys&(RC_x&7HMvxY9jn}#h4Oje z+TlteXNhPaILM6q7(c#QZ*#<$kUq@d0!ahKJTo$}&P0iag50%;3XTd z;3>W9AD7;cnFpOL_36a`p%a2Ai$FGT1SQ}8%M|9NCI~@Zv a>+?jx`aDswK2OO1i|{Yyv&u~&KmY*JD!I!5 literal 2200 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 a9}cOz&ub{|!yyWLw&Q=bZ<#R#Q~&_vH)urw diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/sifter2.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/sifter2.blueprint index 896c140493064efa219363a9173ec865c5941e45..0d501d3d9cf0af51299ec6bee5407c2465f3d6bc 100644 GIT binary patch literal 2632 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 literal 2759 zcmV;&3OMy2iwFP!00000|LtAmcW3H zvN5(XPqr_%7F+TpIcf5j?myZ1sob3;`y`!SY)h8akMBN~W9iZJe4o4TJ@?#MbtQls zP%+hO)VhWp5gG>i&sa53w>8werU2yfc2^&chb`UElp)fr@et}mRYM(ppld2JMG){= z)xv)Qz*OHA$Tg_62YTlmUl9Kb8|zAI71!{qyR=5h9pbt>d4+2_oM^K(9?~-#&T)2q zetcp2W~qmB+?~wsp;MD+n+L_Zx>dk6>>4S%^cXI81V6^tkFeZZ;4iG)0oCPJfM3%4 z0N(b=ozU|qSmrcRpNnwUxfZ4`=ux;nq9chMtMAD1JKF9Myo>8wvAuBu-{E?ipx>f# zJ&*N9A}PXCG345`yb{Cbx1ATjI}v=Ij*mD#PxZy|8DjK>$*=kReAc-5?DlAwoQ&&j z=M}|2nbte-5$s3uk4W8fUh#aMVq9%LH{l`N#mBhbXktd6CXie6Ijk=4&2UL#mb|3Rw_Q{=0^qo>UwuWO2*XOO#`lfu2x9iF!vkR2Z@eBmY z=Oj!m8lM*}$#l3ponMaR8%-RYnlwV$^XfLO-h6t>=O&Qe{q>~Y^~jxg^gU#9Zm*oT zJan>hQVwF|0KTHJKPczMcp_Jw)F`_r)Zg!%EFr2qjMT$wjMfuY^5*OF#Ah7uZX}W-d=@$9Sw7o^?+aU!@-%6Do;Qx?&DX5? z99|@v6WYf*8xKD-YfzyppP;qx6D7iFsF z4m}3#di6!gk!$y8{cIu^v`fkp#}87!#&Tit`LFP;qw!np2j8x@?9n{upD|K^(Gj`* z)a33{xd+Udy!o0RpJlq*a*u?k+uZ&=@O&b2uW@3B?A-gI^Z6(6Q}`KIj>P9X@H^kx zpj@!L#+8!;XL)u>Il!;i;m`1f^Er&qGSe=ujp%Z~9G5BAVvcsno3DBD**-Suk?@qy zB5yuu%LQ{px6gl`$f{o|X!juEZol2&*{B@$FOmA(vu?Y%Hlj;2)@n8-Xg6=Z=FeyQ z7|v&JvE_K$y!VFZ&&kdnB$VUxIcbUFGeB}auTIIEuW9qS1ZCL7l|7R8icf9_UVxjp z-g1tFr#In6cqt(Fy63aa=QrR-p0mGzW1pN|{Bn=rWB5HsZpUZ$5m#GKZU_DdpTifi zcE7|Pe#6n}m$P;L4ePXP*?B(>w2Q6tu~TnN-v7bHy}Xh)U(@Du@>25fp73-NUgpT{ zz?)1Za&K~2;Fq&&Q0^1>14k~%mPZ^Zp4^w1MSn_Qm#>pA_xAu#^JZz{;y!ox6mE*p zu+#x+xzFX1HSI??VB;wW_;>{+e7puxfE#KTj{J}J9S;=?8LBcET(t~jp{Lf^P}&28 z*WdOB^s!0yLB}>zF>}_nxktw?+d+J2&B_>9v24wI0UeTmS|}g~AZ>gHdH* zh)h6P`yBgsp?v`eN|`rN?7+*%6&CQhcwn5vRWM?uRA2w z4%vXpP&EwQm?4stphBCQbkD}Rtt0;upln@@5WL_asi~gfY@)>U1KCk2k1%)rV}zcz z`p~rRdGKy~Fh(Oo)hr2aP5vhR^w`iZ)Gjh4sCIDTf{gdcPY%G?y`?2h(mKqnR@|?xJ7nPwVb))Eqt?H~lTk~x)*o(I2s}vafR)Mjz?OwF?>Q;fVv$RTk!Ljig$3zTM2)ExMK!=Z z{i zPn+FK_nhZ5y3)$2YKPH$q*5CxgIH{XPwVt8B5 zJhBL5)A2L$5+foNc96tn!<@?+R;vT0+eJnelTN~RCL>RKXN7{_se8c~(jQy)cQ{!t zC6*W(vR*bVG|#2I50!l@^HYgMHvi`gz$t7u%)O#mW}@r~{i~HIXFj(0LwaSt|6JOz z&du(sd~LF{NH%8xjn6J-$fMHQVb0_`*d*~k{hj7nlJEWClPV;yp+6x(HfeaFx^3u} z+TyFCka)Eam*@RC1RMNeKspj<8cQ#5O z4m*>d;;G-4prMb*<7~>H)uq2*Rb!rdlRzFB>QFJRTKd_Ui7e-rk_6|Ml0@g1lIVYF N^#f^LfiU!d0047ojc)(| diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/sifter4.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/sifter4.blueprint index fcad5feb79d427a3bc99faed6bbb57cf36eac06d..1cc23fcb018933703f19af019c952b902afe392d 100644 GIT binary patch literal 3901 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 L^+Sp!N6!EN24%hs literal 3294 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 c@qgjA}f`8=p2kHFuX7{)N0Kc`Si2wiq diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/sifter5.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/masonry/sifter5.blueprint index 69edb7fc7b632277a1bdfe3f874186d552e37973..6686c98317312d7fe6643188f2dcbba09ebf312a 100644 GIT binary patch literal 3958 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 Q$LQ{XFoBWcMoUY|=o&esTfmXx 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 TTpf;xIg0R9%M|%BO+oP=ri7-C From d222925535af0cbf9e8d5735d35c24320ab8dc7e Mon Sep 17 00:00:00 2001 From: MotionlessTrain Date: Thu, 31 Oct 2024 15:21:02 +0100 Subject: [PATCH 02/23] Jungle tweaks (part 2) in 1.21.1 (#10380) Courier's hut tweaks New alternate guard tower, which fits in a tree, similar to the courier's hut --- .../storage/deliveryman1.blueprint | Bin 1572 -> 1597 bytes .../storage/deliveryman2.blueprint | Bin 1807 -> 1830 bytes .../storage/deliveryman3.blueprint | Bin 2389 -> 2418 bytes .../storage/deliveryman4.blueprint | Bin 2709 -> 3321 bytes .../storage/deliveryman5.blueprint | Bin 3119 -> 3873 bytes .../jungle/military/guardalt1.blueprint | Bin 0 -> 1405 bytes .../jungle/military/guardalt2.blueprint | Bin 0 -> 1955 bytes .../jungle/military/guardalt3.blueprint | Bin 0 -> 3199 bytes .../jungle/military/guardalt4.blueprint | Bin 0 -> 3433 bytes .../jungle/military/guardalt5.blueprint | Bin 0 -> 3871 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/blueprints/minecolonies/jungle/military/guardalt1.blueprint create mode 100644 src/main/resources/blueprints/minecolonies/jungle/military/guardalt2.blueprint create mode 100644 src/main/resources/blueprints/minecolonies/jungle/military/guardalt3.blueprint create mode 100644 src/main/resources/blueprints/minecolonies/jungle/military/guardalt4.blueprint create mode 100644 src/main/resources/blueprints/minecolonies/jungle/military/guardalt5.blueprint diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/storage/deliveryman1.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/storage/deliveryman1.blueprint index 2d29c5edda40cf577491251122f19d33362e7151..dabdc068a60583a2ab160cf49660b8a093afde32 100644 GIT binary patch literal 1597 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 literal 1807 zcmV+q2k`hGiwFP!00000|Lq#tZret1EZI6O+lk{Ob(&gH+a!H)a{&eNmIEpBkRYgC z?DR}03JKLbM0_uNT~vlgM!0OY4a2| z%1{&Z&jAy(-L!byDS;wywYfF0nq1h#qP84Zux>G%8rxjva*S=nzn+C9lxP&;Q`x@X1ViM$GQ~P=&!P}E)3a%oi!DZj0EWTE-jTi^z>0PfD zN4-6X=E5DsH28A%D2JA;;&FCb&cl+XxfrFD5oe|4e9UXwdT3-_V_Bo}b=jMta8F~D z=8gs&+!?E(k*s=#Y54@(v-;D8wa_sNh0rm8GE@-DvFoI{;gK}jwJ{E1DLZ2$%GYV2 zX!X$jG@c_}?#-d+h(ns~;kj`h3hsxF^FT3l44|qT3#mCD!O zrf`Vv!>l}$wMieDWP5n-EOO2Y)s*Aec|xc<#Cf_kAPII8_95WV@aw~(^jxg%S)rVO z0WBB7d1%*l-oKGZb9>X<@Lejcu5)jc_Ptjzewb62G+Mgt7Y%M+tY{r7vHDQMu4M$9 zco)vQc?lARnp^7Lvp*nDE{2NZtrb|KR$mU4_~lgzR^_ly;b!3asxd4|(mi;6O8sHkgX^J%kM>*Ufc6EmWd(NpYqewV z1pmO=R8*j7aA8yNFb^vypFVy156?q9|AXgKbq0URBQ*s@71b0xm(>(JuTB$Qf|_IW zs6`|*-V%$#dUzg&N1r=~r2B^SVa!4lokx-@cI6jO>=ReBfB(jp2qYA8YPg(Jx|BQ6N!4Py}-2s)>By%J z>)H!2B+%i3r+*twK%QbKQNf654x551?gK$uCapl#z0rOs!EPWx{}1G6PL7&=lh{WN z+z4oY4D2puJ(o~|z38eo5l79?(nd_5;~ta9fb^+oq5^_|YfR;m7?X$63(k)YnWdA> zgwVs8&j-RD%?v%FwKA-|med;kOUDfo<&rCbjvZV}44Q}9NZuir#B_yLf1?KLQ|EVw zwjmxZm9N;rv1s|4jX8T}3bM~Tjs+x^U9San;>h}8k2zk3+VC^fRe#Pi)8IXB#`0_} zl$p*i%T|3Uo*6~ojG&TWTCBfghRqDmj?IKjdm#7gZ;&;$PZ_=EOvtncw7*|}EZS*S zVTn~6m{zdMQ0xs5yDLP*Zma8~vCa0{0WQX%k;pdQ=W=+*7KXa;Hq|7-V zl2BLGW+MJ@kQ3&pUM?Y6Jcg)STA+>VGEvGET$rzp$2A4fOBltR>0CE?KTyud2QVIvj@# z7XK{blWqnieZCV;eY&Ie^7xM x@2j^;Vm90Qjl3Fq`K-VOzP?&S44b^uaj5h@SQjE6to7d-{s%UCY`%In005O6g3SN` diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/storage/deliveryman3.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/storage/deliveryman3.blueprint index de9c7d4123f0e7049471d4a2ecf755a8f1347eaf..e71d4e5f27a136ce16c390fca7ecf4806fd952f6 100644 GIT binary patch literal 2418 zcmV-&361t2iwFP!00000|Lt7qa~ro62k%=}WcjEa*Noyg>7_K1+obAg$92aalF`)e z_#+1-K@!z+m&JmXs80WY{>7d4i~E4(F0mJn<&qLIdKm42hsFE7hld9&7Gf2lEGpXc zlC&<-P6ag>`NxS5O&pDThmh z(5$`*x?MxXwqbS7fKhsdG8(3zLrTKCN$I9vKuW^9NlDVvnEb^utOw z{o#6~A7VRPSE@sbrku2OVPzgdzk+l_VT!jkLQfz?Q4W0~ZQYEp_B@`T&mhIob!ww5 zr1W@MnS`ygp%PAxuyq`7megEf>8!MMR$5yv7tNbjr^*v;6vq>76y_zh%OYM5rkn$J^xRFQ_vq}4S$lk z&*k-R*0!fZMdcWzl5(8UF8T=V!O^+igS%ai_c40pEBgrjI8a--{(D|+ekptCzAs1E zI*tVINV#8Br;Fte5$NJ@x;3b}howZ@%%NlDxIW#6zkPWW*Zb3)#k4;sCtO1~N7(wy zn7V`Qu&B;?Smseu-8VtEV~*?BIWOmz(|5HfI$XIOlF}x0kEb%KM5L<1q7-lUleFArC-1W~NKZ}UTvpKCAlLh6J@nJWTcNE~cHJqT|hUzQ@=EqNbym%ev z>Ar1pd*VHB998?~fv>FpZZZ7~Qjm&M&TM>`%_@!+o|?0$&iNFt!+hPhOPj^=G?e35 z{ZO%WupN*xc7)sE8Twsn=&n;c{Ak)EXX$~*E1^$)Wj|eVKImMz<3kirUAtI?=Zp`( zkL1N+iPzypNcV3;HEoL?Mx<@D&mr3Kg^8woH zSYt*BJ3ee1V=`jY&}Tu%0o!A0bg9`F&fA9CTbx|*4B8!FyVWCuuukK|$g}YrJ8$-?=FXsg#_^kOHj*xxrZCQ}E ztZmYkw>@m%TZhe;cwz&_2VUko${`Z+<_iOZ;J(kg@2G84pY@M~Q6=(>L|&K3GY;}E zf}3qlphFQxv0+SFjEE}647UwZMK$L}nx%{$D4|^Jx%twl$NM?Vi&NdtGDfs@?ONVXte9UA22bGwgMZv8#43YKFb8F?QAN zCC#wcHO8*my{sAby2jX5yH_;BUe_4AYWJ#U*y|c&SM6TY40~N;?5f@Cnqkjsj6J6@ z_PoZ}3mRiDYK*<4G4`^?*ee=iuWF3FrZM)q#@L;4wQ+@OsgHwCbul|@DUTk6@SG1Q zhYIkBu!s(zzcM*g{?@Y2-qNAmx;1BK3zU2@W~N(G8TK0C9emSw`j2K9d+;pokQ{2b z^4?k;8;;Q0UrC3Ki2XO4bR)dwYTlSOj@-coz?=Ju|=A)~|QG3)yFuD#)h&F|nj zVqQ}6x$WBr_!3W=r?g|zPEbd&eN(tGx~p#ToNWfJpwb8%gmWVH0RII_%PpaenQoXe z>okZ-3E~DDH=*EWC?}HT!J#5&--Bp|8 z*2t^%PN=Ke25tvy%MY;8lMlw!T(AewK~WhnV%i_@GAj0PM{F|96L3CHTsSh=9F(-Z z0?KCVKEv;cktURLvJ8}uMD~sw30yy$M6bT8+7^ZQ~0}=TMPBWEv8Z#xKcB7QU8{?A@j; zdYQ;MSN4*z)8*fq@wvr1gLH$NzaMNVqWXKn@D1}Ll>(tpXMCd%^o5700|LnJkDcLm&X^+E8X5!sKzHgsn zBWC`cP6%6VTumo}EgV*r)@U>9+>CMJND!p~Hv3YhuYr~ICm5mOvC!+~Wsw$GVi`McQLwOcTqRvQDu?wOW;N=A2t)G@!H<+*N~Fw@X-R<5Y?Re4r1c z8eP&3z=>naW`#xv(GAOtj4c~|{f}8#N%a1oGbj)Bo`5TczeUYnu4XKGl&ja`+sjJ5 zH9q{$4Ib+aImz52x`mtaY4=E@R!%F8ZS(2X|i($TAEYpi~+{vMyk3Un&t zNU~S0wU>kaPPMJo@6AhHCS1nL&3M1tlF6aUu;cxROXJ^F)UZb4OBOa-UHMV4rhM?K kqMZ?=L(C>EtJkv$pZ@qtG4SIn74aee|En62Bd}!v03m7Xt^fc4 literal 2389 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 H3u6EPj~1!< diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/storage/deliveryman4.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/storage/deliveryman4.blueprint index 0dcb66be871081b08b2d0c7d685bb3426fb464d8..f9eaf6780e1d67d9ebbe48abdecf3bd13e1062f1 100644 GIT binary patch literal 3321 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 be}s>cpWfzDJG?b`#1gyZIVYQW?AZSRf&sSn literal 2709 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 diff --git a/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/storage/deliveryman5.blueprint b/src/main/resources/blueprints/minecolonies/jungle/craftsmanship/storage/deliveryman5.blueprint index 2aa33fdce93f3ea468de8ed1b1a5144e0ee5a7cd..50861dd3ce275f5329580d953635c3c59c8a1064 100644 GIT binary patch literal 3873 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 JS9)k@{sRV)#5Di_ literal 3119 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 diff --git a/src/main/resources/blueprints/minecolonies/jungle/military/guardalt1.blueprint b/src/main/resources/blueprints/minecolonies/jungle/military/guardalt1.blueprint new file mode 100644 index 0000000000000000000000000000000000000000..281db75350d850f6d127188482c6af7b8b180fb6 GIT binary patch literal 1405 zcmV-@1%mn?iwFP!00000|Lq#ta@#g=by}h#CG`=fb<^}rPba=IN&MWG&a|D(q%(cg zKqMrwrbre9ZOebqKkJ9|A3ALx+yy96lz2!cMcZ|?JEll1_P`z>09pYkLeQIqQ&Z$ZGAdkE_dsCEoXJwZbC59Isr z;bX)!v=uHFKR`@FTVWb}7}Ne_ZX7;}p?!MeW4c?os)yTwcQFpP6>3n6p%kUB%U7lW ze1^D!FvR;BU<)w{im)kty&mE1B$|K+h;eY&W0c0%@gO`6($^63b`otq+@2T}p@bM$ z?@_ch>E*hlDe}HC!x6;tT$+%u9ilyw?ZFn|>)Bp$G~vUipnv0Q*9ny19%3nUAJsS55=VP?N!t_A4}RNftGnPXKnd9 z!Om|2ElFb!a)-w%;2?0#4o&=P$*Z_;jaueIE1@MUA>0xl2MEPsp3Ed$k|6Ea^MGc| zHM`8@mSx5vE#xuwv~XX(-GcazPg{qL8Qi=AZAZQn-jAe>*QSjGS~-IDg`CB|#CiN` zwnWqR9#Ben$_Df5VR?|>7_JXm2~XMJ`r?q^814dGUmRAD1plu%+}^XN zI~a%Yce-==m5=KNZI8d>DM&6ApgPbQvlxb@p_@MwM*EiQP<&@q<+s0~kWz=bZk{5e z#fE}yrvMc?u=!A&B(CmiQ07CM!glbB>2c2`OykxWWhGcUrOeSSQ#ccQ+eAHq=UVr0 zU)$Szz57Z%dbxXaL_52k*Hqmld#?^(ynJzRL^||)q7C2n2`45&DV+4)es@8ADZCFG zQVlWq{40!u{gDhP)csDFL$>AoM0!6E8?yKTZ7iWA&%V;r zk$p$r5dQidQyvMGqG+xch0)a-6m<=DrlR8|cgNKYO*eZUlM-O6drVEq#7LJPcc>Qb zrbKqbp_yXzQ7)>(noSJKITe+3h+UW!_h1!p@VG@^Tb)EMQ3yoi)Izdag3$MsI*+n-!ghuJed~5r!mpf z>OJ|&ABL27sj1Rs=^j00QoW#`8>pVLHcJ)!<;8a7hP*W5o6NlKQ7WEJgLbp$aHe3U z^{w>IC>4`(*ME#E9Lb+w-6ZN>uyV%q`x82@Yt(*p6sjGIb89ds_Ff>SW1lI<7gD?I z!b(5ZEP0-GsOic%Qi->G69wnX+X~AwNN33-xB;(?D(9+7W7sz*>}SL<+6je}at6JT zH^q%kp?R-8a+tpt4e-*Z$&@-5EWB}t)}(``GafR9oa>I*5=2zRNFdr4S5ecpEL2c2 z#rR}ugCjQ!eV0$Rp|KWBO{CEljH!<%RCz`IHYXh;loOFLiPrdFBGVw67H{ZGsw{Q# zS>9Bcaq7ueY4jYMv(Cs8%y%&!In(4E&*-gHx_7)yaGojmDbZ%_uR+aHRoB*i3w-Gt zfl~-(otbTM77;DEYgr-BWR;w4*Kz}SpKlJvY(n#1^X1^)411uIYSS)e(ww9e{L|S& z3F-sYKdNp1ra;rO#X%b}+8W_RfkxmwPJx!q^Z{YRw$<%Al#h-~E2AUH`sm11{;SWw L)l1)0ax(w`Eh)JL literal 0 HcmV?d00001 diff --git a/src/main/resources/blueprints/minecolonies/jungle/military/guardalt2.blueprint b/src/main/resources/blueprints/minecolonies/jungle/military/guardalt2.blueprint new file mode 100644 index 0000000000000000000000000000000000000000..2b43033f46aaf697ede81734ab15844a39c14133 GIT binary patch literal 1955 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/blueprints/minecolonies/jungle/military/guardalt4.blueprint b/src/main/resources/blueprints/minecolonies/jungle/military/guardalt4.blueprint new file mode 100644 index 0000000000000000000000000000000000000000..54f8b4c75d35a2f12042d274f46e6e683c0358fa GIT binary patch literal 3433 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 AcK`qY literal 0 HcmV?d00001 diff --git a/src/main/resources/blueprints/minecolonies/jungle/military/guardalt5.blueprint b/src/main/resources/blueprints/minecolonies/jungle/military/guardalt5.blueprint new file mode 100644 index 0000000000000000000000000000000000000000..992a4fda52c5879316f36866f78007d866204698 GIT binary patch literal 3871 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 Date: Sun, 27 Oct 2024 17:38:24 +0100 Subject: [PATCH 03/23] fix 10320 (#10346) Make sure citizens don't spawn with 1 statsc --- .../java/com/minecolonies/core/colony/CitizenData.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/minecolonies/core/colony/CitizenData.java b/src/main/java/com/minecolonies/core/colony/CitizenData.java index 5b966ed5033..d8fc656af5f 100755 --- a/src/main/java/com/minecolonies/core/colony/CitizenData.java +++ b/src/main/java/com/minecolonies/core/colony/CitizenData.java @@ -1,5 +1,6 @@ package com.minecolonies.core.colony; +import com.minecolonies.api.IMinecoloniesAPI; import com.minecolonies.api.MinecoloniesAPIProxy; import com.minecolonies.api.colony.CitizenNameFile; import com.minecolonies.api.colony.ICitizenData; @@ -501,8 +502,12 @@ public void initForNewCivilian() textureId = random.nextInt(255); saturation = MAX_SATURATION; - final int levelCap = (int) colony.getOverallHappiness(); + int levelCap = (int) colony.getOverallHappiness() * 2; + if (colony.getCitizenManager().getCitizens().size() < IMinecoloniesAPI.getInstance().getConfig().getServer().initialCitizenAmount.get()) + { + levelCap = Math.max(5, levelCap); + } citizenSkillHandler.init(levelCap); markDirty(0); From 8b8208d86e50b7556ca39c986c372f030d0c5387 Mon Sep 17 00:00:00 2001 From: Raycoms Date: Sun, 27 Oct 2024 17:39:05 +0100 Subject: [PATCH 04/23] small perf improvement (#10356) Small performance improvement for look at goals --- .../com/minecolonies/core/entity/citizen/EntityCitizen.java | 2 +- .../com/minecolonies/core/entity/visitor/VisitorCitizen.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java b/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java index 3972f9179e4..7feac723d85 100755 --- a/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java +++ b/src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java @@ -372,7 +372,7 @@ private void initTasks() int priority = 0; this.goalSelector.addGoal(priority, new EntityAIFloat(this)); this.goalSelector.addGoal(priority, new EntityAIInteractToggleAble(this, FENCE_TOGGLE, TRAP_TOGGLE, DOOR_TOGGLE)); - this.goalSelector.addGoal(++priority, new LookAtEntityInteractGoal(this, Player.class, WATCH_CLOSEST2, 1.0F)); + this.goalSelector.addGoal(++priority, new LookAtEntityInteractGoal(this, Player.class, WATCH_CLOSEST2, 0.2F)); this.goalSelector.addGoal(++priority, new LookAtEntityInteractGoal(this, EntityCitizen.class, WATCH_CLOSEST2_FAR, WATCH_CLOSEST2_FAR_CHANCE)); this.goalSelector.addGoal(++priority, new LookAtEntityGoal(this, LivingEntity.class, WATCH_CLOSEST)); } diff --git a/src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java b/src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java index 3d21d2fa56e..cb989d2535d 100644 --- a/src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java +++ b/src/main/java/com/minecolonies/core/entity/visitor/VisitorCitizen.java @@ -19,6 +19,7 @@ import com.minecolonies.core.colony.buildings.modules.TavernBuildingModule; import com.minecolonies.core.entity.ai.minimal.EntityAIInteractToggleAble; import com.minecolonies.core.entity.ai.minimal.LookAtEntityGoal; +import com.minecolonies.core.entity.ai.minimal.LookAtEntityInteractGoal; import com.minecolonies.core.entity.ai.visitor.EntityAIVisitor; import com.minecolonies.core.entity.citizen.EntityCitizen; import com.minecolonies.core.entity.citizen.citizenhandlers.*; @@ -150,8 +151,8 @@ private void initTasks() this.goalSelector.addGoal(priority, new FloatGoal(this)); this.goalSelector.addGoal(++priority, new OpenDoorGoal(this, true)); this.goalSelector.addGoal(priority, new EntityAIInteractToggleAble(this, FENCE_TOGGLE, TRAP_TOGGLE, DOOR_TOGGLE)); - this.goalSelector.addGoal(++priority, new InteractGoal(this, Player.class, WATCH_CLOSEST2, 1.0F)); - this.goalSelector.addGoal(++priority, new InteractGoal(this, EntityCitizen.class, WATCH_CLOSEST2_FAR, WATCH_CLOSEST2_FAR_CHANCE)); + this.goalSelector.addGoal(++priority, new LookAtEntityInteractGoal(this, Player.class, WATCH_CLOSEST2, 0.2F)); + this.goalSelector.addGoal(++priority, new LookAtEntityInteractGoal(this, EntityCitizen.class, WATCH_CLOSEST2_FAR, WATCH_CLOSEST2_FAR_CHANCE)); this.goalSelector.addGoal(++priority, new LookAtEntityGoal(this, LivingEntity.class, WATCH_CLOSEST)); new EntityAIVisitor(this); } From cb60c42ce3f280ab2317ab920fe31620ac83ac3d Mon Sep 17 00:00:00 2001 From: Ray Neiheiser Date: Fri, 1 Nov 2024 10:39:56 +0100 Subject: [PATCH 05/23] Remove free blocks from configuration (has become redundant) (#10339) Free blocks and positions become datapacks in favor of configuration values --- .../compatibility/CompatibilityManager.java | 54 ------------------- .../compatibility/ICompatibilityManager.java | 15 ------ .../configuration/ServerConfiguration.java | 2 - .../ColonyPermissionEventHandler.java | 2 +- 4 files changed, 1 insertion(+), 72 deletions(-) diff --git a/src/main/java/com/minecolonies/api/compatibility/CompatibilityManager.java b/src/main/java/com/minecolonies/api/compatibility/CompatibilityManager.java index 47f86ec1987..e8fb5f7ef82 100755 --- a/src/main/java/com/minecolonies/api/compatibility/CompatibilityManager.java +++ b/src/main/java/com/minecolonies/api/compatibility/CompatibilityManager.java @@ -17,7 +17,6 @@ import com.minecolonies.api.util.constant.NbtTagConstants; import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap; import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; @@ -37,7 +36,6 @@ import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeManager; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.AirBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.FurnaceBlockEntity; @@ -148,16 +146,6 @@ public class CompatibilityManager implements ICompatibilityManager */ private static ImmutableList allItems = ImmutableList.of(); - /** - * Free block positions everyone can interact with. - */ - private final Set freeBlocks = new HashSet<>(); - - /** - * Free positions everyone can interact with. - */ - private final Set freePositions = new HashSet<>(); - /** * Hashmap of mobs we may or may not attack. */ @@ -195,8 +183,6 @@ private void clear() recruitmentCostsWeights.clear(); diseases.clear(); diseaseList.clear(); - freeBlocks.clear(); - freePositions.clear(); monsters = ImmutableSet.of(); creativeModeTabMap.clear(); } @@ -215,7 +201,6 @@ public void discover(@NotNull final RecipeManager recipeManager, final Level lev discoverLuckyOres(); discoverRecruitCosts(); discoverDiseases(); - discoverFreeBlocksAndPos(); discoverModCompat(); discoverCompostRecipes(recipeManager); @@ -272,7 +257,6 @@ public void deserialize(@NotNull final RegistryFriendlyByteBuf buf, final Client discoverLuckyOres(); discoverRecruitCosts(); discoverDiseases(); - discoverFreeBlocksAndPos(); discoverModCompat(); } @@ -591,18 +575,6 @@ public ItemStack getRandomLuckyOre(final double chanceBonus, final int buildingL return ItemStack.EMPTY; } - @Override - public boolean isFreeBlock(final Block block) - { - return freeBlocks.contains(block); - } - - @Override - public boolean isFreePos(final BlockPos block) - { - return freePositions.contains(block); - } - @Override public CreativeModeTab getCreativeTab(final ItemStorage checkItem) { @@ -992,32 +964,6 @@ private static Tuple readLeafSaplingEntryFromNBT(@NotNu return new Tuple<>(NbtUtils.readBlockState(BuiltInRegistries.BLOCK.asLookup(), compound), new ItemStorage(ItemStack.parseOptional(provider, compound.getCompound(NbtTagConstants.STACK)), false, true)); } - /** - * Load free blocks and pos from the config and add to colony. - */ - private void discoverFreeBlocksAndPos() - { - for (final String s : MinecoloniesAPIProxy.getInstance().getConfig().getServer().freeToInteractBlocks.get()) - { - try - { - final Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(s)); - if (block != null && !(block instanceof AirBlock)) - { - freeBlocks.add(block); - } - } - catch (final Exception ex) - { - final BlockPos pos = BlockPosUtil.getBlockPosOfString(s); - if (pos != null) - { - freePositions.add(pos); - } - } - } - } - /** * Inits compats */ diff --git a/src/main/java/com/minecolonies/api/compatibility/ICompatibilityManager.java b/src/main/java/com/minecolonies/api/compatibility/ICompatibilityManager.java index 5ea4abe477d..45271e75c32 100755 --- a/src/main/java/com/minecolonies/api/compatibility/ICompatibilityManager.java +++ b/src/main/java/com/minecolonies/api/compatibility/ICompatibilityManager.java @@ -6,7 +6,6 @@ import com.minecolonies.api.util.Disease; import com.minecolonies.api.util.Tuple; import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.RegistryFriendlyByteBuf; @@ -249,20 +248,6 @@ public interface ICompatibilityManager */ ItemStack getRandomLuckyOre(final double chanceBonus, final int buildingLevel); - /** - * Check if the block is configured to bypass the colony restrictions. - * @param block the block to check. - * @return true if so. - */ - boolean isFreeBlock(Block block); - - /** - * Check if the position is configured to bypass the colony restrictions. - * @param block the position to check. - * @return true if so. - */ - boolean isFreePos(BlockPos block); - /** * Get the creative tab for a stack. * @param checkItem the storage wrapper. diff --git a/src/main/java/com/minecolonies/api/configuration/ServerConfiguration.java b/src/main/java/com/minecolonies/api/configuration/ServerConfiguration.java index b12da3e1d0a..dc64cb66d8c 100755 --- a/src/main/java/com/minecolonies/api/configuration/ServerConfiguration.java +++ b/src/main/java/com/minecolonies/api/configuration/ServerConfiguration.java @@ -97,7 +97,6 @@ public class ServerConfiguration extends AbstractConfiguration public final BooleanValue enableColonyProtection; public final EnumValue turnOffExplosionsInColonies; - public final ConfigValue> freeToInteractBlocks; /* -------------------------------------------------------------------------------- * * ------------------- ######## Compatibility Settings ######## ------------------- * @@ -201,7 +200,6 @@ public ServerConfiguration(final Builder builder) enableColonyProtection = defineBoolean("enablecolonyprotection", true); turnOffExplosionsInColonies = defineEnum("turnoffexplosionsincolonies", Explosions.DAMAGE_ENTITIES); - freeToInteractBlocks = defineList("freetointeractblocks", () -> "block ID or position (x y z)", stringValidator, "dirt", "0 0 0"); swapToCategory("compatibility"); diff --git a/src/main/java/com/minecolonies/core/colony/permissions/ColonyPermissionEventHandler.java b/src/main/java/com/minecolonies/core/colony/permissions/ColonyPermissionEventHandler.java index 95aecaef483..055e315aa16 100755 --- a/src/main/java/com/minecolonies/core/colony/permissions/ColonyPermissionEventHandler.java +++ b/src/main/java/com/minecolonies/core/colony/permissions/ColonyPermissionEventHandler.java @@ -451,7 +451,7 @@ public void onRightClickItem(final PlayerInteractEvent.RightClickItem event) */ private boolean isFreeToInteractWith(@Nullable final Block block, final BlockPos pos) { - return (block != null && (IColonyManager.getInstance().getCompatibilityManager().isFreeBlock(block) || colony.getFreeBlocks().contains(block) || block.defaultBlockState().is(ModTags.colonyProtectionException))) || colony.getFreePositions().contains(pos) || IColonyManager.getInstance().getCompatibilityManager().isFreePos(pos); + return (block != null && (colony.getFreeBlocks().contains(block) || block.defaultBlockState().is(ModTags.colonyProtectionException))) || colony.getFreePositions().contains(pos); } /** From 2776c21904d7e791b16a5cc083efacd99abbd6be Mon Sep 17 00:00:00 2001 From: someaddons <38401808+someaddons@users.noreply.github.com> Date: Wed, 30 Oct 2024 15:44:47 +0100 Subject: [PATCH 06/23] Fix citizenskillhandler npe (#10374) Fix citizen skill handler npe Fix colony stat command not always caculating the right average level Improve entity navigator performance --- .../CommandColonyPrintStats.java | 25 +++++++++++++------ .../citizenhandlers/CitizenSkillHandler.java | 8 ++++++ .../MinecoloniesAdvancedPathNavigate.java | 19 ++++++++------ 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/minecolonies/core/commands/colonycommands/CommandColonyPrintStats.java b/src/main/java/com/minecolonies/core/commands/colonycommands/CommandColonyPrintStats.java index dbe519a9580..de81e9f319d 100644 --- a/src/main/java/com/minecolonies/core/commands/colonycommands/CommandColonyPrintStats.java +++ b/src/main/java/com/minecolonies/core/commands/colonycommands/CommandColonyPrintStats.java @@ -2,6 +2,7 @@ import com.minecolonies.api.colony.IColony; import com.minecolonies.api.colony.IColonyManager; +import com.minecolonies.api.colony.buildings.IBuilding; import com.minecolonies.api.util.Log; import com.minecolonies.core.colony.events.raid.RaidManager; import com.minecolonies.core.commands.commandTypes.IMCCommand; @@ -82,16 +83,24 @@ public int onExecute(final CommandContext context) context.getSource().sendSuccess(() -> literalAndRemember(last.toString()), false); } - if (colony.getBuildingManager().getBuildings().size() > 0) + if (!colony.getBuildingManager().getBuildings().isEmpty()) { + int count = 0; + int levels = 0; + + for (final IBuilding building : colony.getBuildingManager().getBuildings().values()) + { + if (building.getBuildingLevel() != 0) + { + count++; + levels += building.getBuildingLevel(); + } + } + + final double average = (double) levels / count; + context.getSource() - .sendSuccess(() -> literalAndRemember("Buildings:" + colony.getBuildingManager().getBuildings().size() + " average level:" + colony.getBuildingManager() - .getBuildings() - .values() - .stream() - .filter(iBuilding -> iBuilding.getBuildingLevel() != 0) - .collect( - Collectors.summingInt(ibuilding -> ibuilding.getBuildingLevel())) / colony.getBuildingManager().getBuildings().size()), false); + .sendSuccess(() -> literalAndRemember("Buildings:" + colony.getBuildingManager().getBuildings().size() + " average level:" + average), false); context.getSource() .sendSuccess(() -> literalAndRemember(colony.getBuildingManager() .getBuildings() diff --git a/src/main/java/com/minecolonies/core/entity/citizen/citizenhandlers/CitizenSkillHandler.java b/src/main/java/com/minecolonies/core/entity/citizen/citizenhandlers/CitizenSkillHandler.java index 91d70be5cf2..ca38135e183 100755 --- a/src/main/java/com/minecolonies/core/entity/citizen/citizenhandlers/CitizenSkillHandler.java +++ b/src/main/java/com/minecolonies/core/entity/citizen/citizenhandlers/CitizenSkillHandler.java @@ -36,6 +36,14 @@ public class CitizenSkillHandler implements ICitizenSkillHandler */ public Map skillMap = new EnumMap<>(Skill.class); + public CitizenSkillHandler() + { + for (final Skill skill : Skill.values()) + { + skillMap.put(skill, new SkillData(1, 0.0D)); + } + } + @Override public void init(final int levelCap) { diff --git a/src/main/java/com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java b/src/main/java/com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java index 7e7df618649..58afbeb0a51 100644 --- a/src/main/java/com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java +++ b/src/main/java/com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java @@ -111,6 +111,11 @@ public class MinecoloniesAdvancedPathNavigate extends AbstractAdvancedPathNaviga */ private BlockPos.MutableBlockPos tempPos = new BlockPos.MutableBlockPos(); + /** + * wanted position for movecontrol + */ + private Vec3 wantedPosition = null; + /** * Instantiates the navigation of an ourEntity. * @@ -368,19 +373,19 @@ else if (this.path != null && !this.path.isDone()) DebugPackets.sendPathFindingPacket(this.level, this.mob, this.path, this.maxDistanceToWaypoint); - if (!this.isDone()) + if ((wantedPosition == null || path != null && currentPathIndex != path.getNextNodeIndex() && path.getNextNodeIndex() < path.getNodeCount())) { Vec3 vector3d2 = path.getNextEntityPos(mob); tempPos.set(Mth.floor(vector3d2.x), Mth.floor(vector3d2.y), Mth.floor(vector3d2.z)); - if (ChunkPos.asLong(tempPos) == mob.chunkPosition().toLong() || WorldUtil.isEntityBlockLoaded(level, tempPos)) + if (wantedPosition == null || ChunkPos.asLong(tempPos) == mob.chunkPosition().toLong() || WorldUtil.isEntityBlockLoaded(level, tempPos)) { - mob.getMoveControl() - .setWantedPosition(vector3d2.x, + wantedPosition = new Vec3(vector3d2.x, getSmartGroundY(this.level, tempPos, vector3d2.y), - vector3d2.z, - speedModifier); + vector3d2.z); } } + + mob.getMoveControl().setWantedPosition(wantedPosition.x, wantedPosition.y, wantedPosition.z, speedModifier); } // End of super.tick. @@ -398,7 +403,7 @@ else if (this.path != null && !this.path.isDone()) * * @param world the world. * @param pos the position to check. - * @param y + * @param orgY original y level * @return the next y level to go to. */ public static double getSmartGroundY(final BlockGetter world, final BlockPos.MutableBlockPos pos, final double orgY) From 8b774ffa8524004edeb357d951dc1c1720156b17 Mon Sep 17 00:00:00 2001 From: Thom van den Akker Date: Thu, 31 Oct 2024 13:50:37 +0100 Subject: [PATCH 07/23] Upload crowdin files (#10382) Crowdin upload was being ignored in the build actions, re-enabled it by giving the appropriate flags to OPC --- gradle.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4c9690af47a..4b8f8b88c24 100755 --- a/gradle.properties +++ b/gradle.properties @@ -79,7 +79,6 @@ usesSonarQube=true usesCrowdInTranslationManagement=true crowdInDownloadDirectory=src/main/resources/assets/minecolonies/lang -usesCrowdInBuildingWithFilteredBranches=true -usesCrowdInUploadWithFilteredBranches=true +usesCrowdInUploadWithFilteredBranchesSpec=(version|release)\/.+ additionalModsInDataGen=structurize;domum_ornamentum \ No newline at end of file From a43ebc556cc89d9e320011d76269db52e3b737e8 Mon Sep 17 00:00:00 2001 From: someaddons <38401808+someaddons@users.noreply.github.com> Date: Thu, 31 Oct 2024 21:46:15 +0100 Subject: [PATCH 08/23] Fix npe (#10384) Fix npe when the path gets removed during pathfollow/advance --- .../MinecoloniesAdvancedPathNavigate.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java b/src/main/java/com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java index 58afbeb0a51..40054c8c14a 100644 --- a/src/main/java/com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java +++ b/src/main/java/com/minecolonies/core/entity/pathfinding/navigation/MinecoloniesAdvancedPathNavigate.java @@ -18,7 +18,6 @@ import com.minecolonies.core.util.WorkerUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.network.protocol.game.DebugPackets; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Mob; @@ -371,21 +370,22 @@ else if (this.path != null && !this.path.isDone()) } } - DebugPackets.sendPathFindingPacket(this.level, this.mob, this.path, this.maxDistanceToWaypoint); - - if ((wantedPosition == null || path != null && currentPathIndex != path.getNextNodeIndex() && path.getNextNodeIndex() < path.getNodeCount())) + if (this.path != null && !this.path.isDone()) { - Vec3 vector3d2 = path.getNextEntityPos(mob); - tempPos.set(Mth.floor(vector3d2.x), Mth.floor(vector3d2.y), Mth.floor(vector3d2.z)); - if (wantedPosition == null || ChunkPos.asLong(tempPos) == mob.chunkPosition().toLong() || WorldUtil.isEntityBlockLoaded(level, tempPos)) + if ((wantedPosition == null || currentPathIndex != path.getNextNodeIndex() && path.getNextNodeIndex() < path.getNodeCount())) { - wantedPosition = new Vec3(vector3d2.x, - getSmartGroundY(this.level, tempPos, vector3d2.y), - vector3d2.z); + Vec3 vector3d2 = path.getNextEntityPos(mob); + tempPos.set(Mth.floor(vector3d2.x), Mth.floor(vector3d2.y), Mth.floor(vector3d2.z)); + if (wantedPosition == null || ChunkPos.asLong(tempPos) == mob.chunkPosition().toLong() || WorldUtil.isEntityBlockLoaded(level, tempPos)) + { + wantedPosition = new Vec3(vector3d2.x, + getSmartGroundY(this.level, tempPos, vector3d2.y), + vector3d2.z); + } } - } - mob.getMoveControl().setWantedPosition(wantedPosition.x, wantedPosition.y, wantedPosition.z, speedModifier); + mob.getMoveControl().setWantedPosition(wantedPosition.x, wantedPosition.y, wantedPosition.z, speedModifier); + } } // End of super.tick. From 566df971041c3dfe65df2dd616c96b4edf4ab883 Mon Sep 17 00:00:00 2001 From: Ray Neiheiser Date: Fri, 1 Nov 2024 10:37:01 +0100 Subject: [PATCH 09/23] holiday setting hotfix --- src/main/java/com/minecolonies/core/colony/Colony.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/minecolonies/core/colony/Colony.java b/src/main/java/com/minecolonies/core/colony/Colony.java index cc670f39f11..2b5b26b03f2 100644 --- a/src/main/java/com/minecolonies/core/colony/Colony.java +++ b/src/main/java/com/minecolonies/core/colony/Colony.java @@ -1920,8 +1920,8 @@ public void setTextureStyle(final String style) public String getTextureStyleId() { if (MineColonies.getConfig().getServer().holidayFeatures.get() && - (LocalDateTime.now().getDayOfMonth() >= 29 && LocalDateTime.now().getMonth() == Month.OCTOBER) - || (LocalDateTime.now().getDayOfMonth() <= 2 && LocalDateTime.now().getMonth() == Month.NOVEMBER)) + ((LocalDateTime.now().getDayOfMonth() >= 29 && LocalDateTime.now().getMonth() == Month.OCTOBER) + || (LocalDateTime.now().getDayOfMonth() <= 2 && LocalDateTime.now().getMonth() == Month.NOVEMBER))) { return "nether"; } From 0da5bcbceb797ab55b1b212facac92f8e9e45aa3 Mon Sep 17 00:00:00 2001 From: MotionlessTrain Date: Sun, 3 Nov 2024 16:59:31 +0100 Subject: [PATCH 10/23] Changes to the Shire alt forester (#10396) Changes to levels 3-5 of the Shire alt forester's hut --- .../shire/fundamentals/foresteralt1.blueprint | Bin 1224 -> 1218 bytes .../shire/fundamentals/foresteralt2.blueprint | Bin 2341 -> 2346 bytes .../shire/fundamentals/foresteralt3.blueprint | Bin 2998 -> 2994 bytes .../shire/fundamentals/foresteralt4.blueprint | Bin 3913 -> 4112 bytes .../shire/fundamentals/foresteralt5.blueprint | Bin 4323 -> 5021 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/blueprints/minecolonies/shire/fundamentals/foresteralt1.blueprint b/src/main/resources/blueprints/minecolonies/shire/fundamentals/foresteralt1.blueprint index 6bf01a3d4c583e425f9bcbeea290194fdae3a6de..c2bdb75c250edbafa5705c522415691f0a88184f 100644 GIT binary patch delta 1216 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 diff --git a/src/main/resources/blueprints/minecolonies/shire/fundamentals/foresteralt2.blueprint b/src/main/resources/blueprints/minecolonies/shire/fundamentals/foresteralt2.blueprint index 58bd1ae32f297245e4515a26746340abf0e585c8..03a0d8c3b12cdefa540721d421626acc91c84f1e 100644 GIT binary patch literal 2346 zcmV+_3Dx!=iwFP!00000|Lt5`bKAxhKD>h$U6({wUz zXY$Bd5=#*k2p|hkw|~&L{=EKzPJcsZTK6mf;=T|svdC4qJ0u8vyL-MpXV2MP0Fnw& zg{Es<)7~{aXoJS+&l7`Dy*IXXR{;+1==OLr?%B*DV`_PmF?7d)nhUBqVI|EO{2YL&omi6jl*nPjXn=?gs@@m$mz+E7zwSc|Xh_=RBI*eLJ+^ zvlN=PIuv5R4v%Tu9$>57?nPLT1KUEO{ib#=!Zvolt-OzV{=DFNx4_!7U_2j$-v|CU z6P3C@xmuDdPzy`da<%w()6e-9W2_0geiqkDW3>>g6<`(rI?tc`*lr5jjVzn28T6tU ztAtoB%tcr_r!kQ>*AXkTaz59gfx2$trvXZ+xhV#CRr9Yj6LEElsqnx*{~#50r}ZFL zFF*r%pCsfpA`B4i`YkI^iRye2VsWZO=ogstSmj16Xm$4VRe1c30RMWf)`Ijxa9zWE zT+(LDX_Wnsx`rvKAxJU4wiw8LW>P1`|^|vE3n*^Q(lsMhfL~`gTFR zWU7>6VzjJYdHQX5{G9-QQc|}JJ6ZsH6&_#1xBl_l@RLt@t52_2(YLt%JH8#d8C3Q4 z&n?l+t)^7;%^)cSSZwz^#^pUt$ZMof9s}yRTB}aK&m32oZi7n@uY>uvNY`a{m>t`J z$M}h{q`b#y_s6N4Pooyo^;VfwI7HugF6`?!C3?7h><#MZ_gZ?3+)wR zd!haI3b38f?nTzk*UO^oF(!W5sn|L}DzjhK-_zI=A;wWLwn^)e%B&~0`})NBUwRT- zVaNBsVx0T!M*{1X*&Q}^mmrDf+nth_T<+7N*2?~B+K?T3Bp`k$4(BZ4>>wRy>#G}k0rg_z4)T5W) zgps~URp9RB z%S>LAnS4_7UD?QMGLsJ+wkq@7R+Tf(Yci8hYF@f%qsUCYEi-vdX7WkROBd%gnaQ_& z@-;apDMe=TZJEidGL!GfOuj2K`DTK=bPF@>zL0OpOkR-mBMjP6O zb&h?v*%f~&XukptI(ED({&&usUkcQ{D~H0Kuio(go4qwB<3447BZIRVw9YAW4cp?% z#L^C4gy(O*(e>A_PmT}Yob>78%U7?C4*SQ)!$WdH$gBQIzkhN)#t z>0iFPrcoo_2tFLz42J+^#Pp7y_st1)m|=M;Jc@qvvG^mi&kdb26<;KywEpicVq-{)8?A-DEi&OOEaS zm7M-S96pvRDm1ZUKiY06uM$#v7s}(quY)CcQ-3sE&#$ET+VETNoHBc2=_WnL@w}*Z zvD-B#pnyvGSJ>qjfmZ(gkCc1)9#soGYCmQ2z+?Io!_*DyGLxtg6`YA#$YhjxO) zo$tE<((aQ9cCqm}7#bg<@t3pXR=|HZWqgLiZWAbP_!S32U#ShzgtcAzc4KqyYPV|s z?Tz_w$NcTQQtv!2B@Mf?2Jv}S9J*`3p_1URyCM#?wc*h6IaJng6S5r_I5mlzHeV~b zK9YfUD?xj;E40;eNa|s=k#Myf0zD{eFdkORA*qMej)#?Tz}+O5BHHP;q2&;hdLHGg zy|-A}-;ru@W5i%Ez5LAe*kpiwjB6S&aBb7j-AUi|3~%D`bhj9yDBg;*I9)!V(I*pmQtC z*Kr*UPKDz9K18RM%@U`9NWXq0_-W2b{6XX(Yj%O2a=SWSWRxtf;>9hxaR25v>a=Qg zf*q{mbt{w;HIv_@3YrjVmm9K&d(FW}R8_1haos}QD7u0Dv<4I^M+&G8-^O7)w6fza zqZ^ZwbLvLu2QjJ}%hR6zV1&dQqADQAObS`C+8n6I?I!2F!L{?6N5Kq$1zEt%QTI!Gdr) zqZbC$7axwrQg8BsWu-1Np`}CJT=PqMa#+gDOV3lHS@Pz2s;=7?*22BWc~(NU>)<+? zmU@a%`!me1nMrCv_2VL8;Wi4#T4!Key1};!#GFnqSzG&$EE^+?Rq;~&QBJsHqfM6< z8O|>&6NwuO!+PH$qX=?`GK1yi;sR%lTB>1Ll=XsD#WHbgR)L*BAX`3CF6SWipC?4W z4J!uC@s5jT71t#FY*Vds!VH27j;_D#;}4mzkHTsGS$>tAyuu0=%DLc~xJ`mnm4VZy z-V-b~B6eF5JO5FS&|nMjo8Jw6k#`$yGBWSP_0w^DCXrJ(aU;BNdRx*--{T#Z;y5&m z!1&=~r3UTsAbJw1{appkb^;~$bm9>eI*HqFDr`B-7!!8Yvxh^Mdf|iOYWSeI89pek Q@n^;V2ZCj=78!8>0OZrO{{R30 literal 2341 zcmV+=3EK7_iwFP!00000|Lt5`bKAxhKD>h(A>i==3*qrghH(OWc>@MHaaVcZURlZ+FkP=j=JV3qaBV zs?hYUE84q)`)x27{c&tDYW7C1>1)8@9n&3+M?IH0WJH}{Jc91Xa_GRdUB{w+8#KIX z1^5#HlJ+j)K?jHhGiREI*N4e+EhV6rSeLZVJuUjIhUH&LW@VXAg6P zeO@B9yx#TLUP{6y&yr`cJLK%%&0rM?_PBs$?Y>tcby>SVTe&{f$WKImTJUIY_ibUp zUuDp&)u9yojW}j)yN9iEyO&{6j%*91_M6zf4BOcKrt%Zi^YfDH-4bihg7Lg3zW2g$ zCM$J!a&=0sKuwgY6>9PCW|)gDCRiT5u3k-GGI_NyKQF<49a}cvI~i6HSWVQ3rGpUdpK_#y9nZS}%iP6t67qQB|n`H0)pj?6o+)fp5a&H{w%FMXOJ)SJAh){yU)^x;a!2_0KKQEUcz<^vx(~ zC0JtjBF5!?l9JcRpgacD3$<3AzRVq0nQnqh6tAQCwoKR4>@YjF1CQ{NU}<@e(C&{i zH9v`4%+_0F(qSKcoF#N-l^O=QJQAIyuW9$$5M==a%_{YQ+N4d|q->Ji!QG@gkS6clUBFfwjKH#K zZ}MKAj_`L?s9b=C-BL8~dyAcT}vxse9_81N5MKEThZ&MvQ(Fy$n z35W(y!nXh!IS$^1Z~1-YlGC1N6X(>22MLy3)!dMFIDehQefcrQK%od4&|Lg z^34?arfTH75&1SWz76PT@~ULglbuxSgfVJI)eM#UoHkfnHS(IuFu8>!5VU{MZ=)$b7<|NftnY^wt`HsruyDF16R3;xqn}(W` zR5c{uEWRvKmAx!df#%3!%w_niV>y2#j1JwgPx=2t2>(;pC2yk*ZOb{szPs#_zZCSe z0u4Iyf=m8)&YNEv)PqZp!lO{V;{Thyv&W-8Wq&7w(;BqSDDy4X;mX9)9$thOZ@)Ip zH*by(_un4%>He$NuMhV7hlj`e zm3r%ODQ(!DHHgov;?P|K4wV##dn@8lTN@6okV9n+HzC_effJkfS@X5h>mwCtw^FoM zyFyznhqNA68wpp-A<~1k2IFD19MXDN?RZ!j2i#3^DX^Q~!6rN1Hncoq(;%RHwf7E7 zhdWXuX^dD5CYPW40UHmHk99>O2EJ=sra$icffbAczAl=S{kT}RteE6(kPbTT_&v(_ zUvXjCA+e947Py`UopY`%+dVmO4FY#GcMlrAI}V0(c3}yHozuA$7V5Z; z2B%VSVISgC$7QM0NMu+)7W}N>B;g?PkTp9;Pq|qgFEUCNSMlN&UATYq8+B5(I>rvx z@wy}A#LW~psgfq7+U17q;a+nvlvS0hN?x~AH=1c-Kb--E%7F&D$G34951stD%jw3Z zv5H247mFn0!_y z5;qo>^Pxq?;pG-(M$5~^1qSeBWrEtQ0y~jFwtN^}&Oz!wj){2_R*ahC z9hXfxzD@f1rdnr&Sp-)j-Ed9FA2MMdrE7ra#U*t53M*Mf7b0uwHVMvS7S5?=PqGq; z*=@z_!bd$)gDt>sem4w7-fpzX$-EWU&&KhYL{8w;jquXxZAmBnfOlNVq L(G2&R8F2srX$H4E diff --git a/src/main/resources/blueprints/minecolonies/shire/fundamentals/foresteralt3.blueprint b/src/main/resources/blueprints/minecolonies/shire/fundamentals/foresteralt3.blueprint index 818f0342ef0d7d70fcee5e16e8c4c38d0032bbab..60c1b722dbdc75bf37e00e4ed59d58d26dc3dadd 100644 GIT binary patch literal 2994 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 literal 2998 zcmV;n3rX}JiwFP!00000|LtAta@)8SKDtn%NXu~&C%fG^ahpxIX}8HHagvSG>$cl& zlU^p%cBVg7NQ5oc6v-tiJN6s&0s3xzf=-{IGi?fj6bW9S3niLDR^V8a_z^fC&N(;$ zNRUd6-qEblc+|5T6OFLxjYqIG(oH?QJ1nB$|YC>)eW}Akt0$aAUY5c3!<2r5)xWm!UJ(#5L z!Y8nwLLWh#(m4a{I^7xxSx?CZa1dfoBjhPOi%Lu9Yru1|O~ankGJ`tY%fYgi_n9>4 zXVv zC-4A!99ec=EI=P~Y!F~Po$;{xnqpborW1=bK_a?tlRpXM6b|I*Ha*hHM*%wDftnf5E|jPX4~& zU|-NJn|{eTf17N-BKu#@r?Vh!@ewl{U+SMg4cBaI{ceI#dcRxb`Q|NZaa`? zKY(lD{%Q_3%kFo%c8AQdbx1!-?W;_y;8F*b+Mz}5u$4kpa@4o#HL_nFmX;?a&>zAB zc$mpmb^0;L!#M9b*u!tVv4i>sRzMAY;4hJf zWcY}#0(8)k_mZyi`^-WoJ=;L$i3__i79W*iKb=KG&Pk8ScOyPwVD*Vm*RxFQSB{Wx zG2~kUk#9iTL&tx5b%A|5)j-wFzaR$>t+9(ifrf3l4ZnUs?=GK*`-{-31W>aTzsfGb zeCeRUNe4Q*c}kREIp@B?Z`DA;BilRo@7`{{)u4Tf9ap!^6&Pe|V~~{^getWwX!Fj* zrjBUj+aig+^>up=2)wwG&d5Iyv zEgE@QeDZaXCk=HmM-^R>$+Malu5W9LOui#B`L4+1n+$nDheY*aL!!Evql&J`jBy99nL!M4rdKoBi(T zs&}$R+8B@e*!de8oHUrFz~G;4lY{W^#Uo97{`~OZ!HdH_e(?0!vnLPw2M0$F&>=$4 z`iK4g;URu)4b4AdeTbdpqHbD?qJ45WmIFV}AkoyLa#Y=Pv*!`~Ub0z{&o<5S{WQTqCZAYs99s5Q7PIo<; zNv7JMrK`t|H8wQ^pAvsAs$FJTJWv|D?!HHK`No!}}%a}{J07ci@2Acfmf1D0T(fIWmep)?-O08@BFk!a?Qbr$L?T;b$gcf`^?G$=6VtIO88jjVb+H$SWCa04+}w95sk1a8e!Il%e?njiVq7x zSP_k|DjH$dhbwrpW;q`gg0LbQVO2E3tPhuY$F&q67J{%M8evs5!mJNp`aSApeOL&> zifDvY(Fh0E-4roy#z-QOWi`9@H)AA`$g-MU`fuKmpzNhGqYX4n2^j3g4- zIzx8tZv!+1AuB`Ervo?H=icJy<2ul`k%2uA`>Tt8OU|axv3293knX_b@Lkt)#sflJ zzrcZH*D`d?9rs;N_r{*T4tH|y?d-XEr*WRnRX};;ST=V2|EWaI9U|ih8lGj#pq}|! zHLT-ftbufd3>V8FxkF@Qkcm*F9}hhlT1RN$Kls+f$n_#|A7*Ui4#`rpB>P|mr--Dg7~A+x(DN*3Fyv+B+m)YpWsRrwrpnXH6lsAaFQ&z|RF+&)vZfOO z<^V(Oi42PEKZ!xQ7&G03Q=|-xPI0LXX)Y~9-Vwy0DBjS#lV@;ftQn5I_yPKKF_Pa} zFfSrQIPm+*M`mJ~Gaw+l3HPNdBGgl3J&7_B#OEZ4={aG#8Tire>X)g_XFP0D}2Rn=fT$@Z$ab7^2w_U2bX=116l%~5?gocs{D1i=wfk3&on`6qc zO0VC`y*M$6t&_8^$7gA}e95-`Dml>bT)gp5Z zsSYet)BOud$e4_76Q-QJ4oe!6-YTBD-pJJ3w%m;SEiN)tOJyQ$1L7auK8X^%!X-cv-%%J_)y+czQD{ z8kyOsnky_Q-S5JAU8rlI{-UGr)GV>U*f`U%Gq*s9E9hj_rS&*-)!9S$R7Y8W-;y!0 zi0>>elGgHadz+NZO9}nSeta&G6PS4^Lol+6-xpJBKxZ_FULMo^y8>Oy4jA+_RkaOO%j*eXHh41#Mhwt`jh41!h_^o#kJ;U~`8AyO4NP-kC^P-ap_+&~v1n}dWgL4i* zkX8_?qn525;roj)At^>{pv#2ne&Qt?jB;5>yNqs-I(vdTZ=zcSjhH`*r^-J< zKlVP+vJX&@q9rNqnwNQ+Oxn9iD7%bylf&`pytZgL8GS}_8tpT$PO6{EoVGou#U<|| z+4laHC382Y$=yw-$wwr2KZ#_!i1s$g@j4ZBo1obij%fw)DO~nJh$bh{u0?3ugwM)c z?(Q*YD^2c?NM589yG(bL2+gI&t(7Zr_v+mkrO4bQysitR;P(HFkk4T`EJr&dY_ZO= z6rsvqxiiADVW}e_%`dqdLbA)`9;F5S_GQb<52et2o!Dg-KT3NREsb}6_%-bb+= zD>Ju3xs5vHU;pxZbbZ zFDG*x^jq}XyB{jS>+3^KFZnD=zTD5EO~UJQfY$@jUD7IEf)~lP~v8 zk}sea$!Bve0so3XeisBayvdF~5YR3}jzQY==V_f2*Np}XFCR2^wa{J$C$%eGvB>Mb3p&AorIR$o(}z z>8tGcJuWKplV9$g7=_AxCnEQNiel$hA^k3LtTN?+rG+js$-94Fj!-WW>+eeSDmjX2 zXbIXT^Y4Cpn<45i&@a)iVx_81U!mWVvGE7=#{}A6N~Y~3(2kQXqDx*D@%kd0yDXyp z5WR)A$VWtTDc3nF-=0g^^r%6}U$fSt<-*COZV4$xr9Y+6`X$r$Q)uNTv2ZOz9PRp&+^P28e z4Pc$tX`R;TIZmyr0jyJT$=`SP6rGY$&(U<;_xI(w`w;$7N42M@P5vID8u@#KPzTku z5qdMaz3<*cb+DzWx_;QVu!EmEGfN%lSV3L-1AnACY6rdS?EWp-Lw^b!`VMIH)J@buuLswGu3>hc8}v}u z_3A*Emf9tuFLYfGD)V{Ofj6t^fkw~s9$sYK28~_@jlKsOeUn2Ebxu}aZcbJQI;-h{ zMlW&b;mv9~pwUw|(EvIp>wrctgGR4_M&IJlL!A#pMbGoT4i0@6GWq-*TTE|&;gB}MhZ=!5pw6bK@Ts! z=h4H9?|Hq47w5>J(JP?QcR{1y0FAx}8a=f+5>Ri2JoK%?@7HdI(YtR(=l1%|qM zD7rMnY9L^19N1O78=JJNnZd79`0?Fp_0-*J64+kXP-~)DmT5&FoNb_%_x!8(yzKhn z*VJzv)N~G~n6cS^YFM952H5&W9X@Vw568NDbDC3f61{!*-O=d1_jYdIxVtmJH@5HG zxpiZ3`}W=qbw^e240Z;CogMtp92=iwZH%q(W6oYB&KOeSVxrh;0eV~!9cwljJ_to?>afoJhjs3|1vNEn&5762%B7YXtL0h7UUl~^b7qWm z{Dc^pWp##o{GH(bCu8hQ+L3>~8?t%)CXP!XMW%LOFw^vrX6(l;UXeRL3VI5KcT=ml zd18T^l3>H=N5Bj*y))JpkrdrNXf2!%aYK4}(Du*F+Fp9j(#TnnJscZHakNN|hgp$0GRZ0Sr ztQ_6S5%2=(Rf0gN96`5A1Sfut7jIxrtzYAn&uhG-qy@3lsS9GQV;9R+{HNFA&qw@n zoT;nfriuiUErvO>8Zk_TFlY$gF8szsp)=#vg?~D@U|(15@V>y+g}s35H4Z+kTP2)7 z1Ph<%{whAOm!R`fNw5oDZEizdu9aZJ=iL;*CB#Na@C#kQ1C7cKTyiJ;9PsC)&tau_@}DxV8h4ue{$4%Asm6E^%B2Or?9M1l>U=RUyr zSb`0ow>$s?%qDF3Z4Q3rF+t@pcy3f46I2d^&Yk4KooX)I6B;FfEp($15MJ|&QKY}m z@$m~FV0q3Kxlo!rXICC9&)FiQq}(~X@?d$+uKXU!79_AW4(!VB53E-QRuBSIxzbuC z0tu4Jv^lU9yrxAA_YxPV`TrR^g1ZA0w*nM*7btFCzbkkZPA>Wl3AX|icNZvbUcZan zZ(O8)L&B{9#oYypo7e9OUZ<6denY~o0L9$}iksK(A~$3gso#)rD?o8~f#T-%yU6<} zMd~*s+zL?KU7)z>`k(^irjY~*EYI1MziA{v0?TuD5EkihbsUHO|v5+txZXIK8F zkpu~Boddh_w=0^Ez{(uhBG=5*!juf#VuT@)pbJGViOzr=8zpt2$oXqY zT_|#jQcM>*sOf@Cdf}vu+EZ1>j)UEIIvC_??-h!@pfXjnkbn9r0X7?w?r2At!mv$U z8`-mg?P$)-ao>KRAmx!|PO;@^n9Q(Rd+N}A^`T^&GiN-n>D3qqN9K$$tUt6&+s314 zHBI%YW_w#RSp`=F++w@?baOumMRQ~x7)yhg*K$BOnZ1@dKb5a+vx=a_(^IAG1bk&+-Cnn6Xs_&uJz;qmQ z(m~w=ckmFY?UR~lf8Fkn)hX#W;hC!KkDVm$$2WJ{4pG@y$7q`k$DAfK80xwITH5B` zOxMW|QjZZ8#f2DCrm8_Wo^NMEa>&|QVI%D+5x9=YD7rbXkTV)KR{QjdY_*M5W8Xta zlsaI_*`PvVfJm{JUN00xR%W~u0r21@nTwUXeCRpnDE3+~=_G7jm7Gc(blGng4 z+>C^Jm#sCbCr4>^H;b$3j5N}KF~q2LtAmuO`#!x)9<%rLJL#&b1e~ie;?VEo8n`RBiqA_riNI&eAGkNqy=JNd$o6GhS)zZlH8Etq*$9?@O0g@DkT#bhk{25CS zP0SlOHE+Osk7-hLnWYK;+G}ykiM4&)Pg{0k^F@PPkseYs$Pfu43VJ=8EYcsY9Sn2) zW#P(KKY7ZS&vfeb7#p6bhWm^+)2jZ^oJ`fc*TzDMu`Gn>7(5qSc3Nf-3SE3_XzuN~ zb|!DPK3|`T7^55(sD$xk9v#VQ$GVzfV5@Hxrha*t(t-gflm|3UC|3PN%Nqq6j>}?u z#e9)})s+M*o2PxHKVs%JGNO)cUo#A?aBz{w*h-p)FMA7!js2yTn_^*pHUk?il_@mJ zQ}9dsRbj*3p=pdX_tuxH`-=lYA0drNkQA&oo{tOMv}2?A_)YTGyox62JfYww!vm|F zHtE9b@(t!062*g4w#ePz(^aSMO~8t5KW?`9_KS2Y)wR3~&(j)gyT;}~JxrW~CwJA> z)j__)w)yQ$9TlL^LQB{j5T}&jbxsm2)7o9XoD}qAW}Gi0=fI4}DC~HTC!<9Z;)nt) zF(ZyeeIfV8ZO0Kf*~PQzNavTpcM_{xw2nsB-wIOFRJRsFP>x#*$0)fqnQY`vGJvQT zqH$g7EgKr`6%+?%jz+^ULhC#fQw}hW%Z&V2n@$cRV8#h1WqHCVTQztMT?R$)Z<}fj zBu|F(|KZg8n}T}gln(v=NOe>Nb-4|E3OY5lw25jR_Q~Yb#t!=zTXps?wp#38Y&G2f Ovh_cwZFapc?f?M53@xJo literal 3913 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 literal 4323 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 R;rw5r{{g1yR)Mw*0RUGxr~Uu{ From 94f4d34886fb7bd48f7cd3d8ed89dc781f80671a Mon Sep 17 00:00:00 2001 From: Ray Neiheiser Date: Mon, 4 Nov 2024 10:00:55 +0100 Subject: [PATCH 11/23] Pathing debug additions (#10357) * Reworked debug tracking, now also allows tracking path jobs by type and can add players to a specific pathresult for direct tracking --- .../formatter/intellij/Minecolonies.xml | 6 +- .../api/entity/pathfinding/IPathJob.java | 11 +- .../core/commands/EntryPoint.java | 133 +++++++++--------- .../citizencommands/CommandTrackType.java | 61 ++++++++ .../commands/colonycommands/CommandRaid.java | 49 ++++--- .../agriculture/EntityAIWorkFisherman.java | 17 +-- .../entity/pathfinding/PathfindingUtils.java | 33 ++--- .../MinecoloniesAdvancedPathNavigate.java | 5 +- .../pathfinding/pathjobs/AbstractPathJob.java | 90 +++++++----- .../pathjobs/PathJobFindWater.java | 5 +- .../pathjobs/PathJobRaiderPathing.java | 2 +- .../pathfinding/pathresults/PathResult.java | 111 ++++++++++++++- 12 files changed, 364 insertions(+), 159 deletions(-) create mode 100644 src/main/java/com/minecolonies/core/commands/citizencommands/CommandTrackType.java diff --git a/documentation/formatter/intellij/Minecolonies.xml b/documentation/formatter/intellij/Minecolonies.xml index 7a4d1b49b2a..4ad74daf113 100644 --- a/documentation/formatter/intellij/Minecolonies.xml +++ b/documentation/formatter/intellij/Minecolonies.xml @@ -15,6 +15,8 @@