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 delta 2838 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 literal 2848 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 diff --git a/kubejs/data/tfg/structures/dino_nests/sniffer.nbt b/kubejs/data/tfg/structures/dino_nests/sniffer.nbt index 78141f4cf8b8312c0f1e42648c57e5f58c2816a0..f50982b8ac80b72ac168111e89ef71ac69fbac08 100644 GIT binary patch literal 1393 zcmb2|=3sD{@iv3u|J$(W44F^~yUoVC@7~?w`zCbB%Dpxo3(a!1g2GI8&o<3e$h~%B zZF$>f>-6&enKO;&S}neoO@@g(-EVa) zWjh+hC_HWYEjOLDy;8qsY}iwCM#ygB11tTHi`lNbXEFD=wGSz-VvN~Q?mPN&cl;YHAm#0e8|w?^5UDk$)YE>S;E0!reM?MB;N`VQ~Rs3 z+$+NtOqet6TV&3hhzb4gtXd=tm!xj={$*!do)^XTk#~E1eni@`lWHY>Z@DsOE&X1- zQZ?WahjGSCr>Chks%=SfA7^fyZsi|a@p)F4ka9q@PVl4#z9phu&Xy;?&em1uI)3M1 zt-QKd|Gc`jzs2VtY70Ek7ik^C?tjC&>&&{H+<(lbO0J&}vRJ=V_S<8NJAYI3{Quef zxVKDL_k*n54bdYPSGR<%ays7Ts5*UF=Y3_3Pq!4S_oO+U+L0kN#pR;TaS=AFJi+e5 z8H_hSo;z%+x2g1|zJSo_iOW2vNK7dFwUOENhFN2->}^#o?^u-^qIs`oO0`awODJt{-dOh8s_P#;Ia=%4PB1 z-px7xqt$22?J|;iHLZE=)%eyMN2b2M_4mU3qv1?mT$Xyxu76Uu21Y-)z%@N*hpf<% zPips08_YYpZ0h8%0RhL8*Ql+kye47!V_%9!__sq#PFd*gKH+p^IG4)b3pt0cz7hU)<;VQw_bwC67;2tB4;7K#)b7Z#$07FY zUPbendaw8#JKI0cbnkn`&&Rhaqjp|lHYOZ-wyeF z|1j_F|JV2H9sk??c(^z^=6_t}M*+Li%7nK+@9*39m6L$bxDwc0RSt_yygG^ literal 1525 zcmb2|=3oGW|8K*hJETJ;>?Y4#;#qb(wp#S%wK%yY0lW8hOzFs*9&PC-=oEMtX5xg@-dN6 zZckW}_Rl-{Sz#Y*^0SYTf<2s%g*hJyb00hNSeXBq%Pk9czLlH%1Dy3O(Z;IyEpVPwJX@r>nvGWnMn!vRNzTG&(0$y5%0);Wx*kYg+HDbqh5NbK~57 zpO^0Y%#vnyaoW?}OJ91gycT_|%~9v7Ld6`5z4r>a&vi=f@SD-RK#FKKh zTSJ~bJ2EBZK&*4K%OuHjGvn42>Wd!LKlyCuBnO^DUoQDg?h_XN6ec@cK(}p*PMOF3 z^ylYd1>Ar4&CV;;2|m0)SnF_DtI3^9yKS5}r&xHH?p@>D?oy-KmK4`?Ia$AS?yeu# zd?i)g7O+Pw(PNPH&=hGaYI<${+Fzv4qS@Nsb4uU*y0y>6=O20%cw+9X*|O695wp9m ztgIqYB@888$ZOu2o&L~{1UaqG8ZKv7~IsP{VNvlH_g|CV^I%^rX9M$_1to9ffUQq zFym?oQ=YbWLA@`pc)q-5A)&GQ@Z8P!Yg?q&m9rNdYKuK;^s3DMs^MLOE0gSJUbxOH zGhHp%@2*y(!`5Tj7p54CZm-~awMFu37K63h%7@PxwN1Tt-Y)&Fb?5)LlgB>4<7qB> zmSFsQwL_=Hp>;Mqx!JYq3ocFg#T0SG{B+()#kA(u2$sS(0_w}QbI5I%Fx?`v?z~yt zg)=&4XXcz>HuF|ijmcLj@pY2zzbLi-*-GnG53-qRS3lx&|9JLq;FZ8*YC3XhR_m)> z1G4xEyLtYXNzV1OPLOALtJZtsPRS0(=w<%jIJ-Z$VITji=>|0a970ego(z?g$2wzbCp6GSEE{BJ?@2~iJ z^6kI(7F`WpWgYhW+Tu=Sw9fEeKPyP&D4#&ihpcbB8zrvJDijM`R~nE+b@6oFW;{#e}8rPxtxf7bNqD`pG!X7ds*K1??kz` xzg`vn`*qs5KYnjrt=p2j)8>@lk+f{LSaieP)wK1+8k^>SY*Dsyx&^`v3;=|h@KFE& diff --git a/kubejs/data/tfg/structures/dino_nests/soarer.nbt b/kubejs/data/tfg/structures/dino_nests/soarer.nbt index 7ce5b1fc75ca246ace0b3817cb26a5e787522392..273dfe19c55bd6f9201c0ad3d3d21e59cb9ff2d7 100644 GIT binary patch literal 1425 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 HWMBXQy$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 zcmb2|=3tmL<821R|F>bWJ;I?P`!3JCw(azxLz}V$INI2in!5R=F7w{pw)S>FG<%(F$vW8+p^7dMVhZLV;aJHi^%u4g7r zpWCv0t5Mf2nPR5hTL7bN{yZj%B!n{L@qo-Q0w<)vmpTPjv64XQ*i!#5`Kbc}6EFn}a}PUu=`(kiQikB_`7JAAfV_;O*dfwU*T zdGAd-Z>j7v|94*A=E0b>L``CwMXHwO^yjSkvm4}$=1x1!a)?QKwu9Jm8I@dtFe!Dl z>nssp1m38=+oB}?VD3AKq(|BBLzk$^+kDJ7mA<^#`B#im|U(4V>=R zedO5{70u<`rlK0j5ic}CX1cwdlGb;aDb@5x^Tp?XRIYBnCw+kPbr|dE6^D1O-fa>a z&K=i!;bpaj-W$)GrkfciWt~vJdfnRS%z`!Y%dUqvo;V^_pFgEnefqu&6{;7ME}pL3 z(6L>|dTuk%Orye?$2Lcp|8kAxoKh0RQ=DY+xGZjNu7{+w^gHqXbbE{A>(1x=%=zDX z?(Xtq%i8uBUMW9r7HGIFVzI$8{r)xi_p6=W*Y16Lyt#c>nAZx~wE4|;{gKL3iY!i@ zYB+XcZM4vBkhzL4%))mIhyXJ6Fq2-5I@dU@~U3{_UW=>mQ6h1f5 z|HtX{^Ujif(wDjTB`dZ^DMmb>DiO5lhT6+BOHN<7z2(z4U)5EwOPo?~=m_WEW($#b zPZHM6Qsvd?z7xcAG-j`#yv5gBhrY+nYx2u)EN*l4W?8VX|8-v7&tv~`59`ZC*j9e} z9d2*=EHJ`|Yx3e_TDK1gKU-yEy84^W{-vrHv-~?A#6K=rzxkEz-t;tqWv`p3?@V~H zlr=T`DOY&m#uYms7jFCU{MzkJS_?8u=14dlNKjew;^{66)6yeT{Y*}8NNZ~0VcNvl zUvQ79G_^6bC+OXj_Zl12-_G6c>KuA(v#DX=hl0aJ{uQ^4x17?pbaz^`*Xig!A?3d3 z=_YDxyBD!CKbZAbK}0csdke>oq}d<7?z-A2{`6H`N!?@b{qt=rzxez*nH{fN|K#($ z&$su-8ttIf$q#V`Lp@427n^EjqsvY-6@?OzYi z-xpzCTjlxX&}?h@7pCjh*zEfk_4a&m(98L+mb{PiFJC_Yg7ch`XG!VjFXnI3?%VtK z^?CQOI}84Es-LZ^Dfxc?(GuI|Q(~uoubnPe`r3B?-w)@S`)jxST3;L_xwTVxQ|OB5 TjD@xOznJr$z4`P_kbwaJXqU*1 literal 1582 zcmb2|=3oGW|8K)`J48}t>eJH8?%v&f`SNEipQ9g|Q*KFy9FZ-m*1zjLXV=`h?pi+Q z-`VW8wlqHf<;>>tb*!?k6BR`l9%^lhN^|0P7_C_NsQr@u!i(E`_WVf-2$4Ud-}ra_ z%(;8T(~pa)Op207E1P%!|NsAg@2htPFlqMfYd*oDSm^q&tD~Cfs1e)Qyy8h8@|X53 z;yXU)fU(C3v(g&I|LO~GCo3sRtZbUqHnGXDh(k^2$Z{^Vp8ozoCxhU9q1&G(ANp}Z zRCoJ!(PQo_6~*n;&Xmg=H~XttEKiiMj}PLV;lV4R%JTR*_tgf@$8Ua{HTT!7et#)v z|Eh$v7lBQNMICZ0AJv!I1_{j9nqjbiiGp3|7Y)T39s=o>62{HNCKAG8hdl(IYi*k% z&=bR)ZrQO}sE4zAa}0C(PPTJiyrnCy9B^Ox!E=G7nHk4(m!7{7GMcY9dIkuee;WOn z$J(#EbLQeKtH&qoYc5>Tos?>EJlfrGbLX-{y{q4SThTDf_=wUB@fr^Ogn7CufktOn z_)1*w6n4KjC-91?i0ZPl-Yb-T2e?iPTC3X5+Z?gV@dHO;luha8FGqM{l+HL_N)9bG z^O<own`YaM}7>SEVf zBaR3h^S;CDYL!q{mD$mG{F}Cizg^Ln)^8{0KiAu}t6nE`|I(kQ-^cBrCzRA77*vY`gSACR7UxIT3Il~ayKJx%O?=ycBFT_xBa+`VO&qV~!M@@>t>awfjKl6iHlpv8hU zEb+>*@3ce2Y84uU&E7Cg3tU_szWrs}!n9g`McwbkbM9VzHASamw$tz%3n$J z;+3~smRagfHr!$#`%}#qEZD8=Z^Qm*?hS+8 zt(B}tea@6>zfV*8EXi|lN%rRX!k5=7mdm>b#`4YHwJ>>Ex0l$&xz=x{zErDdw{?F# z!N}ywecdH~^+j#5v+sPk`mWgbc0Ygb_n(oaYn@!K2L`fkeCcXgn3+&|_}pT*-_fP} z-`u^vC&aDTrOfu)q!y_KT$d*tQLJtV;wvf*C}a7wTX3JE>kcK4mlq{>Rt7uyX1;K| z`;cXkp@+hE9xj1nk$oA-sl|d*UWm>8JBM#Cd#J?ygs(;(Guh6cob$qh`Ae3EOH1*x z^sYOvSFO0ep?mqS2!q6`Z-K)3;oL0Jdjy=l)XO|pEzUVF9#yqEpihcTHdJ!krz7Ig zkEc5%$zJ_3hwmN7?I50`d#=sAQT*rZPWioNd^hhhd}iz};5x8HX3egTXK(Lr{~dpG zbIqF@{`ob9H$Hq?f7EHCD_T~;f5e`-%=$C0VW&0Iccazcgss)87cSCz z;3_BaD5v>$)xHCvYch9Dj|yL6lwUJ3mCin&^OS zYK^B_Za&LfUu1f?Lwd=b()(+FZJToc*XLhdJ>}C}>Jq=t*mgbBFe~Hkj*`uPnkO!u zsG~Qv^_=&Lca>33TDL^cU*M`~bwqQyQ%U4fL#20duP@BpqSf`PI>ETa`C#X_&v$wc zJXtTid$rBE#Cyw5fByF7R``Fb+BX+YUfCSJKlaa&>$&OX|2HHR{F`=CqwDL=qn9(e zpB6rBh@a<~xbV0}XWZ1lHTR_&R!p@v^p!mBCf>u>+ZQ$O=dq$Jm%h-rO`KjiKIJ^? z!{@(yTe{e++Azc}WSMSTNXpTt&F3oi{4LkFTgj?D|IYF6@p}#*ZAjB?XA;?i^cErYIoe-v**i+ zSF4v=$MSrBcPVMYyWXQ89&QcsekG}#V(1f>k!Ag*_W7j4@Be?i-Kcu~Wqp!iNnKsW z@BMX#TjmCCi@o(VIqQOPb=l{CYpds5ZT&Mpn&*PeB4P7RJ;Bn;8-)Mzp82@p(Mn+k F1_08w3{C(5 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',