From 6ffe8c79d7ae6b9f1558e68de2953da6850ab002 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 14 Oct 2025 01:08:43 +0100 Subject: [PATCH] swap surfer entity IDs, fix dino nest structure so it doesn't spawn over water, some other tweaks --- .../quests/chapters/space_survival.snbt | 2 +- defaultconfigs/createhorsepower-server.toml | 2 +- .../tfg/loot_tables/chests/cruncher_nest.json | 4 +- .../tfg/structures/dino_nests/cruncher.nbt | Bin 2848 -> 2859 bytes .../data/tfg/structures/dino_nests/eater.nbt | Bin 2904 -> 2397 bytes .../data/tfg/structures/dino_nests/glider.nbt | Bin 1672 -> 1473 bytes .../tfg/structures/dino_nests/sniffer.nbt | Bin 1525 -> 1393 bytes .../data/tfg/structures/dino_nests/soarer.nbt | Bin 1533 -> 1425 bytes .../tfg/structures/dino_nests/springling.nbt | Bin 1557 -> 1479 bytes .../data/tfg/structures/dino_nests/surfer.nbt | Bin 1833 -> 1467 bytes .../tfg/structures/dino_nests/wraptor.nbt | Bin 1582 -> 1449 bytes .../tfg/worldgen/biome/mars/amber_edge.json | 2 +- .../tfg/worldgen/biome/mars/amber_hills.json | 6 +- .../tfg/worldgen/biome/mars/amber_plains.json | 6 +- .../biome/mars/martian_mountains.json | 2 +- .../worldgen/biome/mars/martian_river.json | 8 +- .../worldgen/biome/mars/rusticus_edge.json | 15 +- .../worldgen/biome/mars/rusticus_hills.json | 6 +- .../worldgen/biome/mars/rusticus_plains.json | 6 +- .../tfg/worldgen/biome/mars/sangnum_edge.json | 2 +- .../worldgen/biome/mars/sangnum_hills.json | 6 +- .../worldgen/biome/mars/sangnum_plains.json | 6 +- .../mars/terrain/dino_nests.json | 182 ++++++++++++++++++ .../mars/terrain/dino_nests.json | 23 +++ .../worldgen/structure/mars/dino_nests.json | 15 -- .../worldgen/structure/mars/surfer_nest.json | 15 -- .../structure_set/mars/dino_nests.json | 17 -- .../structure_set/mars/surfer_nest.json | 17 -- .../template_pool/mars/dino_nests.json | 96 --------- .../template_pool/mars/surfer_nest.json | 15 -- kubejs/server_scripts/ad_astra/tags.js | 12 +- .../server_scripts/wan_ancient_beasts/loot.js | 4 +- .../wan_ancient_beasts/constants.js | 7 - 33 files changed, 258 insertions(+), 218 deletions(-) create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/terrain/dino_nests.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/terrain/dino_nests.json delete mode 100644 kubejs/data/tfg/worldgen/structure/mars/dino_nests.json delete mode 100644 kubejs/data/tfg/worldgen/structure/mars/surfer_nest.json delete mode 100644 kubejs/data/tfg/worldgen/structure_set/mars/dino_nests.json delete mode 100644 kubejs/data/tfg/worldgen/structure_set/mars/surfer_nest.json delete mode 100644 kubejs/data/tfg/worldgen/template_pool/mars/dino_nests.json delete mode 100644 kubejs/data/tfg/worldgen/template_pool/mars/surfer_nest.json diff --git a/config/ftbquests/quests/chapters/space_survival.snbt b/config/ftbquests/quests/chapters/space_survival.snbt index 818155c15..ef93e14ad 100644 --- a/config/ftbquests/quests/chapters/space_survival.snbt +++ b/config/ftbquests/quests/chapters/space_survival.snbt @@ -1155,7 +1155,7 @@ observe_type: 5 timer: 0L title: "{quests.space_survival.surfer.task}" - to_observe: "wan_ancient_beasts:surfer" + to_observe: "tfg:surfer" type: "observation" }] title: "{quests.space_survival.surfer.title}" diff --git a/defaultconfigs/createhorsepower-server.toml b/defaultconfigs/createhorsepower-server.toml index 1b2676355..84f77de94 100644 --- a/defaultconfigs/createhorsepower-server.toml +++ b/defaultconfigs/createhorsepower-server.toml @@ -26,7 +26,7 @@ #Creature Category [workers] #Valid "Small" creatures - small_creatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca", "tfg:glacian_ram", "tfg:wraptor", "species:springaling", "wan_ancient_beasts:surfer"] + small_creatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca", "tfg:glacian_ram", "tfg:wraptor", "species:springaling", "tfg:surfer"] #Valid "Medium" creatures medium_creatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer"] #Valid "Large" creatures diff --git a/kubejs/data/tfg/loot_tables/chests/cruncher_nest.json b/kubejs/data/tfg/loot_tables/chests/cruncher_nest.json index bd728cd64..bbbe7e297 100644 --- a/kubejs/data/tfg/loot_tables/chests/cruncher_nest.json +++ b/kubejs/data/tfg/loot_tables/chests/cruncher_nest.json @@ -421,8 +421,8 @@ ], "rolls": { "type": "minecraft:uniform", - "max": 12, - "min": 9 + "max": 15, + "min": 12 } } ] diff --git a/kubejs/data/tfg/structures/dino_nests/cruncher.nbt b/kubejs/data/tfg/structures/dino_nests/cruncher.nbt index 38d73cc773fdaee9f4e2f9eb4e74de53bfc1f08c..a3bffd609d91e4b400ba15433ba89b24bd4c9a86 100644 GIT binary patch literal 2859 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 literal 2848 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 OSp5_>XWih~v3~-yp0afS diff --git a/kubejs/data/tfg/structures/dino_nests/glider.nbt b/kubejs/data/tfg/structures/dino_nests/glider.nbt index 01b602b4110d2854b00653fc278e2ce8a227a101..6d5042fdc5dec02914713cd1693e046cd08d763e 100644 GIT binary patch literal 1473 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 literal 1525 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 literal 1533 zcmV@j1yH9zVp*=Tfkib7tvMr!3T&+(0!t6w%uL!hv06r zxDdoRx$WGx6K3X)Gq<~TiIJG_fEqRaJZMaOP&XzTBL;&HB#T7j3nqrdV0Z!oK9PVX zAR@_n?o6lccBiugMjwn#nznbobI*6r`OY`f6hcWPJK8Lf5JLPNgSW^(lPI3oX+sG5`xc;nlWN9 zMvAbH9I}rPA(xL4BVeQmm@qzmFT(iv7$E{CjI$IWmvjsJ$RWLuBjoZiVds+TyDXn8 zj1Q{!qX{DgV}uA8F#={etqQH2rKS2=!dVW+2qC$AOxO$xL7dz03F9mVaTbCxi#W%E zF=EKs#URdYFkzgfAkK0yCalg<1kO?r=Qezno3G{cEC+FxgE3)xmV-FA;Uk0pcUV{_ zj1hiYj3LcVpCc~{)JVBW|D%9i!6;byT06=CnmwHoG#d!;ZRfY zVpAxUv#CXFrV%HBVnw~8sVGJai&arQcuk(?w~48y3wW9+`HIsTnNT%2idi5?*qT5o zSa)E7m<-9xu8_7{-xIL4QpCDW%$5vs9amvjBs|h~v-@VSsQ?KL@+x_P9pt6KmhY~lCV1Vm_jJ>~T);XaAv0>tR`DbANNoxh&?`qJeW`>%Kglz1RA{guqT~=S|5F;!gpCpt=7>!zrYZ<1wSyGdC^l6BCqiA>yhCk^ zY1GUbfM9&*BuZr&v$cGMc@*n9=xMaO1Rb`u!e#?MuapVaSvij60ql?r&3FX;p!=5w z6{)V%8O6qCiTGh#yr?8fK1o%rs6q94ZXu519<~0X@1Ht2_sS;{N=`ssF(=IdE08=j zH8#Zcdud*b?fQ1$r_W~2y}J3av(%@sdJ+yyjb6vXGiGm|niZ$PZ*7sNM#jRI_K ziR%q0Hk~F0mz!e|qWT<J;qgNJ1(ql~(BSWy`KRy0$oU+~W@p*w@G zrO;hERUs)g>*WT$Vz|&%sMs2H(waF97pPr@$MZpV3DrXH4&a1!tBfVo<$fyrG+kE; zzKB6c>!8T9X{QQ4p(@S!YBZ&6$?cYaI(BM|X=aJf<|JjVwA_CRgF6rQc$;-)Z7AUo zjPzicJCDP!%TItdn%_yNE*!T7Ci<5px6DANmKi!TfOTVtlj2jyQ;acUxXPD3ZY%cC z3M=QRD|d;T5%dVIbb{+=HCuQHCWhy%$BB)0x*Ipm#|Pa%lrO%S{o>PgW7l80c6C%h zYjVDK7RV%le%Y=stQ-bY9P&-pEkOK9>Z!cxS#X<9Nx^zV_%JprH5$uO=JgirF zu|<^NQuJMF6&P3!^fG1bpp*fL_^9hEgR}1cl3a@qW+uIy$M>RbuiblnlZfPDV85^+ zq4=1&1181m@*O#9Gpr9%s;hLy^k{a~#+dto!m1WQ$(_0E?r~+?$cXFEt&WWR+i{a4 z_h0BZ_QIE!H~5a+fAfL2zWVdb@qfXQrQ0@%zhPvNjPidIx^)v;SonBtmwoc0XrA=+oql)k&;N)C4fHNDA%FB6 zCNyCj-q`idEtpVrn>l~};kUP=6a6<&p8S#9%r$NIgXcB{*-VqMAipzBm1nUFN46gt z?>YL%mG2Ln{_VR(9cmri<;ob)pTz^*X3pB&N?Kp7L(o`nG@(|Q%w%6*UxqiK`1FUl j{d=045K#AKx%2!h__tkLfc$ZC)gkm3F)h!AH532<1a0#y diff --git a/kubejs/data/tfg/structures/dino_nests/springling.nbt b/kubejs/data/tfg/structures/dino_nests/springling.nbt index 5caaf38dfaf64a1db3af180ecee071fb6fa7d9a3..028d5024ad495b7ffbfd88ee0f76208aeddc4700 100644 GIT binary patch literal 1479 zcmV;&1vvU2iwFQynC)l)|Ls;?h#OTDzVnl8lI^zJ?Y6F3?6L}C5x1p21tgo@?fzi5 zn{M5TR2Xh1H_6bMx#OLiY|}z*Q3|D4E$V~5R79nUwlBpOg)LPdWLXsvu|8D9H%0V8 zx-UXKcaoXxZYI+_)CaMFA(^?~J?A^;eD}+w5K1D|HI5MlAtbICT(bC1qIlk<`Vlt; zcRLjnb2;V&e!~vMp{~Ed|48We7$pKDtwIGDDIC*D95o`29LBi~M(zNkM(}CY-#(6y ziRz(`kvqUd@liX- z?Kmr8oRx4)6lW!ja~nQUeO5b|yBfwP7LHNC2f7?=63&UR{X_z(`>{pP7G5l+OANd2 zu!Whc6%59azj(i8*hFWz$kR6AWx})t%(&+Ldjz0ud14dH%W0h%mP>7omoeANDU`}F z>JY{a;wDh6XjY5@iV@4=m1W;4m0eM371AnrFDVSGB%4SX3_=1Ae2`vl6E!2 z+~e$9|r?)PKA=<~rEr#DTJnQkiSGP%s3S#+G1Q{+7XzrqL>~AfX1LAq79z zmv4yAn=p+H({{CD0v6{@0`rcIGHigh6Be;30~ra?Y?`VtK3Wqa2P3c?x$9uEzpQv|20D$*Fqu(oTH~S#;`E3V)0|kIg4H^=?q_I)mvhvUE!cO~VA7+Y zc9AE*%FPja!B%Pem#*rbSC*gr{loK1i&M*o;23P4!AJKVHZDR9A0Je1_I_3{73UxH5F&?2Vg?SNdYtUViqG z#fvw-`(t@POCT9Mw6E1OWt0$ltQ$}a#iu+^7q1|(H}hx1fmiw;Iy=)p@_%*U z51!xi?)9Bcgahvw`u@Rz>iF#IUCY0o%6@VEt^?n7V9z>7Kgyi`k2~-uJH9%-bbNZ# zl^y5Ly=Y}_wsGK|JLABaSGO*|_u0z5z5{38pL%&c1|I@DYOebiha>6 zf;daTm@v*#5a$kj!tyMyqV94KpGYu90v+fwu|^mpT=ruzB=5mGK^s`Hlq^};wuf|V z*-AmR81feH)K!DzEnH+tgRnBOlsRlM#rb;ppiMbq5X{QSyrt?kH569HEMHEbM8={f zv6xEi7>X3NidsMsqMNLS{LKRm58n1-#VA#5AJNl5VAb+p4|-nbC@l;Xv8EA2(Fm>* zd&sr4fi(K%v)DJNPaY;Tyk z!!v_5vyAgVRM9JT*`id3GQ^0%RBkCzZ?Tw@&P==hy3!rxuTwu<=s(`HlWaOBD z;-lD@H4D%Kf{5Z{JTs4~Kn02)n=vLVS}_WOfD*e&kxgQwKp=S3o6gzPGMP$^vrFbn4yL=O}aX~rxyS7CL+5iiKijk=T|LQBm*pyR_znP82TqevdXHW_}tLG^6T((YWv1XlLFHWBEq=MYEn5SUMyo^zhYBx0)4Xro38;FKDE z+Mo+DEcE6pmP+lUYE)r?S~d9Z9CcnHck4g^Cud|N)azW8L#n1Jd9O90A#P(hed4?&Ha z&p2ck!d(Fqy=BQsGthB8LuE#=rjKz_e0sQxDMoasgXKE6?#F0_l{3_7TafRxY66ZhNLc>UmiSm`s%fX`M${IXCJ?B z;r!LFe_t9$19uTSwbkMB1n^MLlF5^nvr5z_G zF2K$3-b+p~FCBbk@2|(XfwgUsL2~4Ah~@fq2}P%j-7rJ-`mfDUi(ze)QmsJejQZ^L zx`WCmUSTzpp!mK_`oJD#*Te)5woQTkzpiElULO4GTwk>}^@pp#%l-G9p6(z1zbf!s zPwssE$~H4Zfwv5PbN4`XZ05zTrC&~@Ke=*Cfp00WBb_7frcVCH75IZKpPyVjI<;#1uU6u9T+C~)fejZ1HQw0yg#z^OMUUmYwj=WezFZ-3^?_tt)UZa9lv1CJRjVDH^1A@yOc|K&nff|G6P~^ HJQM%`t-a`6 diff --git a/kubejs/data/tfg/structures/dino_nests/surfer.nbt b/kubejs/data/tfg/structures/dino_nests/surfer.nbt index 12030c6c47b949c19b1c843a73bedff4103779fc..32a3e3b7948f53f7c17b59031e0d88dfc3eeceda 100644 GIT binary patch literal 1467 zcmV;s1w{HEiwFSHnC)l)|Ls>>h}={dKDo?vCflvsZf{DJmHJ{)dl3}I%I@s!)$L{6 zc3VX;oSB@N2~Bd+lQX-Wt$h$5>aFylP^lnT6?|w{!7ha&*kY;rqEJB}e5e#(1&dhJ zr~02{lD%cqv9u~;AY^mS_y7NQ{>wL64WTSjJ#&&M2qAH&;FiTRi_#^FmiKuYylqfW z%Hx<5_!}$~mwKT=cu8m$MvBMCEnt)cj5G^%Gt3-5C?1oN3nd;Swctl?!B5iJLyVf>M{a?$9LG5wkC7Aj$Z?!g@fbA$qr`Du z1d~*EC64nVev}scB;{FcfsY!;XAz77^RmRn7U7%-*JDrZw2D`%IR?K58>~V&3{<`jA$C%j^wytTBjWe4X(u$0_gmII28I-nggD?+CThJ|; zZN4?LM`z61ZPOuThATXWO%^TRJAoY?J7tqNTrUwgqnGpQtU{Phs?~XZQ#H)XH6(2k zvXcP|Q><%2%Vzu^(_&2j2c<}hlI6bwyJQq(mT_q}-HR89jLRppM`~o#}(a`X0 zvg)3mygK;d%7YPj&BDWAW>eP0qwtFGp5x`n0hk57f-OroOqe;ROcuj;#blU{6I(Q# z=MrLs#Lk@%*ISX{J;5nFPF$#mS*>v$8-^*8G(VPxQoRhDj)pQe0q)S1qGgs2JL7c= zV&alT0F)gN9t+roI;@Ln{QY$kJ_jMODq3y9iq7F(Hyu6N2m>l;dHkM+R$0^_9;Z%J z0BC0n8y)33GpUy|9T;3rSpz;m3;vSSG+i6R30rOrE2zVN>ibN{csXoqXstCImnU;x z0}5d1v*Lw9e^;3@Z1uxHIfc*+L^)q2&HbS|lS%leyJ|;kRlt4up2n)!}05tf3)i9kZ{M)cpy!AD^J)ouT7L5vZ z+)jhGgp{5?Japx!Yj^*0etJdfv!l;Hc;0k(wcVesW{_+eNE7NE2rQWQia0XLh$4hK z*A5a`gq9j}w^7O=ZhFWUqrz(cW3L!0Y1jJk6YcN5*E1S)Ee(Vyd=0n!%}002BI&!_+Z literal 1833 zcmV+^2iEu>iwFP!00000|Ls_7j1yH9zVm2lyDTn(fV!F$_@PEc(fFvEw%grhS6C=3 z3yR8k+qrE=rZdCL?JmVfVtn8OMMDB2@oj=e&D2bCav%T}(bH01N^O$Y~p)e9HWeE`wLhKWO56|vl6ilmnW}y{I|= zU{Op7{0%zYObBr6Ph2V|hhGB;vh8@4NI~dW&4nGXeycg%7H-`7&!+UWKcwUf7<@!8K0{yxsFx82RtcqqwfzwxB+kSIf{vrvT-1bVFePW= z9->M;L@Qdzc{~Qo61J#`qvdtU!kS!t$o3kFN~TmFMo=VW>IN~XLaY!9s<=c<3vpA? zVQo9-@V1>>-Bw>vG?FoKmPWB+y2~f^VokzYMj;xN(geJ}&h^b`GD&WOZo?w;cgGg+~7Kx{~+H9Ro zClB6~)m2sRl}xPVh_mf%dsi5RJ9SyfDj*5-%>_}=rWRYY|ANbsFTM_0ISYb}8EFQn zLt=M#M+?i_XFd|fuDgEvGtaH-;Z{yvev3ol*e*D|UTCrm+^aREb(X9yzp+`}%#mnW zppwKA8txTVu}w>MO?!6i^)7h);KN|EpqmvuaxNEdX;zdhhFXxaSXCuiftu4YWGH-- zM}+krQeX*Z8HC6Vv6oh}>p^$p3HB*0N(|6L$>phpWm#cC8t5y60?j5?vr+s0FzSrWBMpouKi`m4}9rW}P_mVXW&B)=Jd3@Z8)cU@6?x;1RnfO6cb>Cy z)61vNYkPGJhsLC!vY`qHoU4m~_$IU^Xi{xZ9&KugISHVV>|0BvR&2iF9G2!Fd8ckC zH5`1)()KUE`{DSXwrn~!@Y?dLPurpxm)D&V&V>-K$msYXyERyAW^Q>DV)8jnvmW|s z3X-wgn4#+wXaw8Koh>=8{N|W)+H%vRp4Ih_KN0V;lVs~vg_)7W^nE-M+u$^PeGttK zZ3dLBtFZc-LTU6u7-%|6a3JD}~j1c%HlgnDbJR50sN5-k~U*vnIic{8QfY17I% zHE?9OuNJiF^^YFukrDiFjEuFbS6;Gxbg$3In2z^8wyky6 ziVZhU3XNRyZs6Y^8Hdox4|{6-KLU>M2uQ|f-)*lSnGtZue`f^zwsiN!XTCN4#mC-U zaLLA(woUkZM?kD=qp<7AcS`OESbEPL`}#W8|HC6-QtC@;9GF`j0gX32w4Gn^Z;gO{ zzZycV#VanL@5O#(l@7le4(#5uVEGQOUkx=)-<7;Zxt|;Eo45DW_V}_r+ZFWi4HNq* zJh)r<2i!x^{@rAVq933)8sZvQaMksyXcI?YGq?VW^Wt5>Y&OqCyV{t4+t#ORMDx(8 zwvaqEaR1vJTwDa270h>ka$IV}V^MQOA8od4OSGTU&(s|(nlULophMfDt z(XPQsD|&vHHcyCmHB}0y)Trh+6#k+Ho^>#)IA{KeeVbhk{@DA}BjZ1bAG!t?wO;($ zD;pB|Tf25PhO=h{j&=_x#iI{f0G76tp;`X-nH$jMNc`sC_XaL zy5RH4=+HG-Hs#~Q#zu31UeDcmi(Ex@% X`)e*6rtH18{!a8K8dY)5!5IJmy$Fa9 diff --git a/kubejs/data/tfg/structures/dino_nests/wraptor.nbt b/kubejs/data/tfg/structures/dino_nests/wraptor.nbt index 1b1318e1f5296a4bb89167a8a03259bdc58895c0..e2c17a9d3613c6366b78d0d6bf167c30f8eda71d 100644 GIT binary patch literal 1449 zcmV;a1y=eWiwFRknC)l)|Ls;?j1yH9zSEi3w#&l8vT6_rh6f^oiw_#p4cWH4?vGiZ zt}a9%8E@O$c4TJmc;|MPqKO-gMhuC@0LdnhAc{z0cmYI1%n}|{UJMxD#K_7ECK~kt zc`?CrXF9XpWjgf1_!Dh1nNII_&-u(j4axtc_>ndcHp^kH+%Dnf2aLdg+Q;zQUh z3JRzrlea0exJJ#4L8~TrePzM0IbPLG!f;+ED2WmSl$A*zwt(0232ds^gi=kI6u~yP zQ_oj5c-=!#1>LQ~FDi#;RWnt8!RL(@2d^bjmrjes=F}u9rwcU|C}UXYC{&q7?UZJY z!vbYB_=C~s{3O-4-W$LP>sAHJsKdFdyEI)_3tolL>3cXX>`B=*vjCE6$S2j;J2K3m ztRJS=SAodH7JqM)jVG7B(0C=#BGJovu!y%TJDr0JnKE&i#ayZJ$fX2wJTN3KbfzCCX6JR|`U>FP(5kZN5abBL*K+zzC z_!e`JLDz~7UCx=7uX0zNQBU~GXU{_!P8-t-4;gs3S|M2Hl^9a8*e2=Bq|4CTwDR^% zC93OmLS@)26K~rFR3ArT6D?{b4JeD;QVhjhy-puE_1ePsUY>$ZZ-H}$MN0&rp^xis ze)-1!ZNo1fSUq|2`&U0X=22KO3X`M8D%-*n=Bhk3tM)9vr6tj7Pl(`O<8ZID>OH+@ zW)P<9gO|Br=%oc^Yvl@8aj~em<8ik5=hoY@Dxhg}oESpDU?imI<+?aEb;OlUG|RAN zf`kkLvH_29-U4-HfmMuB?v(E+uqW-Ew?#u$#Rxny<4eDvJ$dv@`pIiwEq~YliVOpKO*6~DH#TgJKqp-C3v-lltoKo>7wLrQ zrthe?Tg*-6HH)CcQ@PBx&FbTWgH9*ro2LH~Z!pbtWX+X#?5TL~FK(mKOV&Pmh#$W6 zziIyaOcQjn%~j%7%rxxMZE%2_+uu5~V={B;{pXC|ZcO7`h?7nq-?#O{pT1Z(eR@gs z!karE=ryjaJih)~?ay;k>7VMP?_N)Lr=QS6oOI@5XV1}ZvMY|g{p-(1R@|Wf2`9~d ze02BU;-o$2lwFtieU~0}>pj2y@XmveeYE)AK4!#qfh<+8I>D9ddgw-AkOh zot;N2OwaB-yE{2E&-Bc*cdi8;MUf#Dp~8iNT4q8B;aeeb;)l{Nq0zUDy!>KNR3FSQ zf&HJEoxK-l#}y=!S{P<_p5Oof|NY-5iBJM5j=qD)2qAGr;fjcR0>v^0&2Dp&@NcDz zq7KKLz%xk5Hg$Xf|0ki_VN2wtfJ|@g}A2WkbBsiyG7(ZW94VXv`7$pSb=L^+<3FGYhHiM6RtMAfmzp7wn z=uv_(a)=(O;(v8LQV^dim@vPjAU;*}C?S|g5NA0UGlO$97!wx5ND${Lwv-TzTmxr0 zh_e!m35&B_182Dg&Pok+sMNqmsqjglIW{&3=R}PCSR5(qu}M%9&*fY53_DJXiJ7Bn zI^)Pce9+V_l4Ur@TSqaoiKfDhtM2xwfSNPJBA6F^2rposEhJGg&8STn*NGEH(VS7# zH54VL%}b~v`%p!eQmrM24TD&!LGTE1T0C{L^u!EYBFsV3V^wuFOp(SqtGsS4b*lGcb(8YdRl1z5xo#!K7{MLJ-1dTEG> z$M!2oPd;+=h4#sx=PtUse=JqMrTNS6UcZt=vX$WyN_1gs$kxENq@cLXs8-AZfyxw# z<%y*c28YoMWT#NJ@Q#F%10=`$Fq{Hk)Yy@6D6_dvtqzkGE$)fe_gf=H!y*i441$s< z(L-6DbYUBuSUid?6Xa;qn>yW|`%_T8AJkz=4WE4i0>(_rx}gHP3Sf{p;uA?(du-v$)2{@Y zCqg_67V(c|H=v-qBTqaB;+@zqyM=iL#Z1g~EAM6^^BD}mq-(RE6Vt6BcOOSlT@IVN zp<||tN*0lwJM5L|CU}QEN9&L>G}PZMq)vZwhFzQ7@YU{fP1}zTjraLkb*(}~*HKXg zvFSxQacN+6!_K2d`&)It?A_PAR7P_|c0JaTgc_g<(~!g=dw^07a&=I41oFEPz9B`p zB1q}c8M%2=LQQGtLEYg5qA^Gy_Y4XU##xSNV`Xy@l;{?n{hSWH2UQr~VD&OcnFi0v zoai_M^lC^%gmb26irnj}sNb-Qr}|hhVS4sa6K_`w1RJ~%LrN!hNUEc3&lg&Ht5A*_ z1|3xyw(`UmTjQ5NVjb1=oDS{?+foe0yw;i6bNtP@AH6mX+1&v10gG@7z_c8!y7A51 zyNCN<*|U7?*iUbKaoDG@U=XT>n#&v;k6Ozz)G9ht{1)a!n*5%CxjO>)GOP9zJ0^Rf zqAK7;9vI?mgWGz(z*Veix|dp4q%v=Ok!1lvqa(x=y#xc0XuhorHNI->v$#l;8UE`ihKqmPCGG_n5ZVX)$VO-MDnK{DYCDkt{Bi zh0aT;?s;0|g|u6rphYP<#3`pjbXlb_BJN)6(3!L^Zu=S gpE|YtpIZ#jJfagfi7pX!)36i$4b1Vd;;9n=0MfP$P5=M^ diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json index 30ce3d627..7853a4284 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_edge.json @@ -165,7 +165,7 @@ "water_ambient": [], "water_creature": [ { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 3, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 280fb90d7..4e347cb58 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -30,7 +30,9 @@ "tfc:random_empty_hot_spring" ], [], - [], + [ + "tfg:mars/terrain/dino_nests" + ], [], "#tfg:mars_veins", "#tfg:mars_underground_decoration", @@ -189,7 +191,7 @@ "weight": 100 }, { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 2, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index f72c1f9de..15fd11f88 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -29,7 +29,9 @@ "tfg:mars/terrain/venus_sand_disc" ], [], - [], + [ + "tfg:mars/terrain/dino_nests" + ], [], "#tfg:mars_veins", "#tfg:mars_underground_decoration", @@ -190,7 +192,7 @@ "weight": 100 }, { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 2, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index b764745be..364c3610e 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -186,7 +186,7 @@ "weight": 100 }, { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 2, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 968f20962..1a9215d7d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -23,12 +23,12 @@ "tfc:erosion" ], [], + [], + [], [ - + "tfg:mars/terrain/dino_nests" ], [], - [], - [], "#tfg:mars_veins", "#tfg:mars_underground_decoration", [ @@ -183,7 +183,7 @@ "weight": 100 }, { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 3, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json index 38afead75..680384cef 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_edge.json @@ -163,7 +163,20 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:toxlacanth", + "maxCount": 5, + "minCount": 2, + "weight": 100 + }, + { + "type": "tfg:surfer", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 43eb9f5c7..8080bd92c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -30,7 +30,9 @@ "tfc:random_empty_hot_spring" ], [], - [], + [ + "tfg:mars/terrain/dino_nests" + ], [], "#tfg:mars_veins", "#tfg:mars_underground_decoration", @@ -189,7 +191,7 @@ "weight": 100 }, { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 2, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 40f8d9518..f797440be 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -29,7 +29,9 @@ "tfg:mars/terrain/venus_sand_disc" ], [], - [], + [ + "tfg:mars/terrain/dino_nests" + ], [], "#tfg:mars_veins", "#tfg:mars_underground_decoration", @@ -190,7 +192,7 @@ "weight": 100 }, { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 2, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json index 7b0313d66..b9f379283 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_edge.json @@ -165,7 +165,7 @@ "water_ambient": [], "water_creature": [ { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 3, "minCount": 2, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 2b14b2fc0..3f406a7c0 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -30,7 +30,9 @@ "tfc:random_empty_hot_spring" ], [], - [], + [ + "tfg:mars/terrain/dino_nests" + ], [], "#tfg:mars_veins", "#tfg:mars_underground_decoration", @@ -189,7 +191,7 @@ "weight": 100 }, { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 2, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index b9ce5b374..ad4170e08 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -29,7 +29,9 @@ "tfg:mars/terrain/venus_sand_disc" ], [], - [], + [ + "tfg:mars/terrain/dino_nests" + ], [], "#tfg:mars_veins", "#tfg:mars_underground_decoration", @@ -190,7 +192,7 @@ "weight": 100 }, { - "type": "wan_ancient_beasts:surfer", + "type": "tfg:surfer", "maxCount": 2, "minCount": 1, "weight": 100 diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/dino_nests.json b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/dino_nests.json new file mode 100644 index 000000000..53ac9faf1 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/terrain/dino_nests.json @@ -0,0 +1,182 @@ +{ + "type": "lithostitched:select", + "config": { + "features": [ + { + "predicate": { + "type": "minecraft:matching_blocks", + "offset": [ 0, -1, 0 ], + "blocks": "ad_astra:venus_sand" + }, + "feature": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/surfer", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "predicate": { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "tfg:mars_soil" + }, + "feature": { + "feature": { + "type": "lithostitched:weighted_selector", + "config": { + "features": [ + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/cruncher", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/crusher", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/eater", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/glider", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/goober", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/sniffer", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/soarer", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/springling", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/walker", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + }, + { + "weight": 1, + "data": { + "feature": { + "type": "lithostitched:structure_template", + "config": { + "template": "tfg:dino_nests/wraptor", + "projection": "terrain_matching", + "processors": "minecraft:empty" + } + }, + "placement": [] + } + } + ] + } + }, + "placement": [] + } + } + ] + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/dino_nests.json b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/dino_nests.json new file mode 100644 index 000000000..543a49be0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/terrain/dino_nests.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:mars/terrain/dino_nests", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 150 + }, + { + "type": "tfc:climate", + "min_temperature": -105 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure/mars/dino_nests.json b/kubejs/data/tfg/worldgen/structure/mars/dino_nests.json deleted file mode 100644 index 01ad32dab..000000000 --- a/kubejs/data/tfg/worldgen/structure/mars/dino_nests.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:jigsaw", - "biomes": "#tfg:has_structure/dino_nests", - "max_distance_from_center": 1, - "project_start_to_heightmap": "OCEAN_FLOOR", - "size": 1, - "spawn_overrides": {}, - "start_height": { - "absolute": 0 - }, - "start_pool": "tfg:mars/dino_nests", - "step": "surface_structures", - "terrain_adaptation": "none", - "use_expansion_hack": false -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure/mars/surfer_nest.json b/kubejs/data/tfg/worldgen/structure/mars/surfer_nest.json deleted file mode 100644 index d75e84549..000000000 --- a/kubejs/data/tfg/worldgen/structure/mars/surfer_nest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:jigsaw", - "biomes": "#tfg:has_structure/surfer_nest", - "max_distance_from_center": 1, - "project_start_to_heightmap": "OCEAN_FLOOR", - "size": 1, - "spawn_overrides": {}, - "start_height": { - "absolute": 0 - }, - "start_pool": "tfg:mars/surfer_nest", - "step": "surface_structures", - "terrain_adaptation": "none", - "use_expansion_hack": false -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure_set/mars/dino_nests.json b/kubejs/data/tfg/worldgen/structure_set/mars/dino_nests.json deleted file mode 100644 index d8879dfb4..000000000 --- a/kubejs/data/tfg/worldgen/structure_set/mars/dino_nests.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "structures": [ - { - "structure": "tfg:mars/dino_nests", - "weight": 1 - } - ], - "placement": { - "type": "tfc:climate", - "salt": 25635345, - "spacing": 10, - "separation": 7, - "climate": { - "min_temperature": -105 - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure_set/mars/surfer_nest.json b/kubejs/data/tfg/worldgen/structure_set/mars/surfer_nest.json deleted file mode 100644 index 562b5e805..000000000 --- a/kubejs/data/tfg/worldgen/structure_set/mars/surfer_nest.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "structures": [ - { - "structure": "tfg:mars/surfer_nest", - "weight": 1 - } - ], - "placement": { - "type": "tfc:climate", - "salt": 25635345, - "spacing": 25, - "separation": 18, - "climate": { - "min_temperature": -105 - } - } -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/mars/dino_nests.json b/kubejs/data/tfg/worldgen/template_pool/mars/dino_nests.json deleted file mode 100644 index fe2866cd2..000000000 --- a/kubejs/data/tfg/worldgen/template_pool/mars/dino_nests.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "name": "tfg:mars/dino_nests", - "fallback": "minecraft:empty", - "elements": [ - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/cruncher", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - }, - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/crusher", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - }, - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/eater", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - }, - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/glider", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - }, - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/goober", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - }, - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/sniffer", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - }, - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/soarer", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - }, - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/springling", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - }, - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/walker", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - }, - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/wraptor", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/template_pool/mars/surfer_nest.json b/kubejs/data/tfg/worldgen/template_pool/mars/surfer_nest.json deleted file mode 100644 index 8b676a67c..000000000 --- a/kubejs/data/tfg/worldgen/template_pool/mars/surfer_nest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "tfg:mars/surfer_nest", - "fallback": "minecraft:empty", - "elements": [ - { - "weight": 1, - "element": { - "location": "tfg:dino_nests/surfer", - "projection": "terrain_matching", - "processors": "minecraft:empty", - "element_type": "minecraft:single_pool_element" - } - } - ] -} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 442d50e2d..9a8e8fe52 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -414,14 +414,6 @@ const registerAdAstraBiomeTags = (event) => { event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_dunes') event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_deep_desert') - event.add('tfg:has_structure/dino_nests', 'tfg:mars/amber_plains') - event.add('tfg:has_structure/dino_nests', 'tfg:mars/rusticus_plains') - event.add('tfg:has_structure/dino_nests', 'tfg:mars/sangnum_plains') - event.add('tfg:has_structure/dino_nests', 'tfg:mars/amber_hills') - event.add('tfg:has_structure/dino_nests', 'tfg:mars/rusticus_hills') - event.add('tfg:has_structure/dino_nests', 'tfg:mars/sangnum_hills') - event.add('tfg:has_structure/surfer_nest', 'tfg:mars/martian_river') - event.add('tfg:has_dark_sand_particles', 'tfg:mars/martian_dunes') event.add('tfg:has_dark_sand_particles', 'tfg:mars/martian_deep_desert') event.add('tfg:has_dark_sand_particles', 'tfg:mars/martian_mountains') @@ -489,7 +481,7 @@ const registerAdAstraEntityTypeTags = (event) => { 'wan_ancient_beasts:soarer', 'wan_ancient_beasts:glider', 'wan_ancient_beasts:toxlacanth', - 'wan_ancient_beasts:surfer' + 'tfg:surfer' ] COLD_ENTITIES.forEach(entity => { @@ -520,7 +512,7 @@ const registerAdAstraEntityTypeTags = (event) => { event.add('tfg:ignores_gravity', 'wan_ancient_beasts:soarer') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:glider') // swimming mobs - event.add('tfg:ignores_gravity', 'wan_ancient_beasts:surfer') + event.add('tfg:ignores_gravity', 'tfg:surfer') event.add('tfg:ignores_gravity', 'wan_ancient_beasts:toxlacanth') } diff --git a/kubejs/server_scripts/wan_ancient_beasts/loot.js b/kubejs/server_scripts/wan_ancient_beasts/loot.js index 6b5bea147..417d497fe 100644 --- a/kubejs/server_scripts/wan_ancient_beasts/loot.js +++ b/kubejs/server_scripts/wan_ancient_beasts/loot.js @@ -57,12 +57,12 @@ function registerWansAncientBeastsLoots(event) { .addWeightedLoot([5, 7], ['wan_ancient_beasts:raw_ancient_meat']) - event.addEntityLootModifier('wan_ancient_beasts:surfer') + event.addEntityLootModifier('tfg:surfer') .addLoot('tfc:medium_raw_hide') .addWeightedLoot([1, 3], ['minecraft:bone']) .addWeightedLoot([6, 8], ['tfg:food/raw_surfer_steak']) - event.addEntityLootModifier('wan_ancient_beasts:surfer') + event.addEntityLootModifier('tfg:surfer') .matchMainHand('#forge:tools/butchery_knives') .addWeightedLoot([3, 4], ['tfg:food/raw_surfer_steak']) } \ No newline at end of file diff --git a/kubejs/startup_scripts/wan_ancient_beasts/constants.js b/kubejs/startup_scripts/wan_ancient_beasts/constants.js index 709f844d9..cd4186842 100644 --- a/kubejs/startup_scripts/wan_ancient_beasts/constants.js +++ b/kubejs/startup_scripts/wan_ancient_beasts/constants.js @@ -22,18 +22,11 @@ global.WAB_DISABLED_ITEMS = [ 'wan_ancient_beasts:suspicious_red_sand', 'wan_ancient_beasts:suspicious_ice', 'wan_ancient_beasts:chisel', - //'wan_ancient_beasts:eater_tooth', 'wan_ancient_beasts:ancient_club', - //'wan_ancient_beasts:crusher_spike', 'wan_ancient_beasts:ancient_upgrade_smithing_template', - //'wan_ancient_beasts:glider_feather', 'wan_ancient_beasts:hang_glider', //'wan_ancient_beasts:surfer_armor', 'wan_ancient_beasts:frozen_ancient_meat', - //'wan_ancient_beasts:raw_ancient_meat', - //'wan_ancient_beasts:cooked_ancient_meat', - //'wan_ancient_beasts:sniff_armor_trim_smithing_template', - //'wan_ancient_beasts:spike_armor_trim_smithing_template', 'wan_ancient_beasts:jaw_pottery_sherd', 'wan_ancient_beasts:spike_pottery_sherd', 'wan_ancient_beasts:stroll_pottery_sherd',