From 346e82535189ecc6d87a52ce1e975b38c5854fe0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 5 Jul 2025 01:40:59 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/assets/tfg/lang/en_us.json | 2 + .../tfg/textures/entity/moon_rabbit/cyan.png | Bin 0 -> 1109 bytes .../textures/entity/moon_rabbit/female.png | Bin 709 -> 0 bytes .../tfg/textures/entity/moon_rabbit/grey.png | Bin 0 -> 1741 bytes .../tfg/textures/entity/moon_rabbit/male.png | Bin 709 -> 0 bytes .../tfg/textures/entity/moon_rabbit/pink.png | Bin 0 -> 1024 bytes .../textures/entity/moon_rabbit/purple.png | Bin 0 -> 1015 bytes .../tfg/textures/entity/moon_rabbit/sofu.png | Bin 0 -> 1330 bytes .../tfg/textures/entity/moon_rabbit/white.png | Bin 0 -> 1109 bytes .../loot_tables/entities/moon_rabbit.json} | 0 .../biome/moon/lunar_asurine_sparse.json | 6 +-- .../biome/moon/lunar_chorus_sparse.json | 6 +-- .../biome/moon/lunar_corals_sparse.json | 4 +- .../biome/moon/lunar_lights_sparse.json | 4 +- .../tfg/worldgen/biome/moon/lunar_plains.json | 10 ++--- .../tfg/worldgen/biome/moon/lunar_sands.json | 4 +- kubejs/server_scripts/ad_astra/tags.js | 2 +- kubejs/server_scripts/tfg/data.js | 2 +- kubejs/startup_scripts/tfg/entity_types.js | 40 +++++++++--------- 19 files changed, 41 insertions(+), 39 deletions(-) create mode 100644 kubejs/assets/tfg/textures/entity/moon_rabbit/cyan.png delete mode 100644 kubejs/assets/tfg/textures/entity/moon_rabbit/female.png create mode 100644 kubejs/assets/tfg/textures/entity/moon_rabbit/grey.png delete mode 100644 kubejs/assets/tfg/textures/entity/moon_rabbit/male.png create mode 100644 kubejs/assets/tfg/textures/entity/moon_rabbit/pink.png create mode 100644 kubejs/assets/tfg/textures/entity/moon_rabbit/purple.png create mode 100644 kubejs/assets/tfg/textures/entity/moon_rabbit/sofu.png create mode 100644 kubejs/assets/tfg/textures/entity/moon_rabbit/white.png rename kubejs/data/{minecraft/loot_tables/entities/rabbit.json => tfg/loot_tables/entities/moon_rabbit.json} (100%) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 2f4e70d36..43a9ea221 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -360,6 +360,8 @@ "tfg.tooltip.food_trait.refrigerating": "§bRefrigerating", "tfg.tooltip.foodtrait.freeze_dried": "Cryodesiccated", "tfg.tooltip.extraterrestrial_farming": "§4Temperature:§r An oxygenated environment provides 15°C", + "entity.tfg.moon_rabbit.male": "Moon Rabbit", + "entity.tfg.moon_rabbit.female": "Moon Rabbit", "tfg.tooltip.moon_rabbit_variant.pink": "Pink Fur", "tfg.tooltip.moon_rabbit_variant.white": "White Fur", "tfg.tooltip.moon_rabbit_variant.grey": "Stony Fur", diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/cyan.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/cyan.png new file mode 100644 index 0000000000000000000000000000000000000000..fd63d0ddad1b038d0a52e9a1fe424164d68a655e GIT binary patch literal 1109 zcmV-b1giUqP)#jZxt_$B7$=gU3q6Z7}4 z@Ykogbzr?NLU*G+P?E44^-D5XDjce~iR-B9(*-li!@hQ7X*u$JhoLMmZ|WN*fM!>2k34E67XCze{}y9 zUp;t_NB3WG>%lwLn5_L!pVWe-tY2jHywOvPOi1ST16V8#$3VTR^t^psnC z$O`(rP!#s!_DOH)9a6d7rnk|aqdSC|wTIPL{- z_wfNUGDFpNx}q}M)MjGCQQYf){rZ2f3e?@ zW2IVaJtF5b)mN~A1$Y(ke7D69AAF)-9&4SQ!uwySjgu$Aokg+(w(?_gzUD1pNe+Oz z_xxBVNn%BLUuFk&ziTsJT%!r!{WIkJ1mYd&#W46dj07`_l>PbwxMYVhEX|NAc-1pI zU(oRdurYZxcb)POuCR-)DR|8Vge^1Lm&m;q;7frA^tPH5y-vii%=0Hj#soX#lhZ8~ zwF63%m6#DaNs`WS;Uckg0c;}nqn(<9O}=hg$*4H1#{bWX3o3s()TesNoS$F(36#;< zoVae>g!}rED`y=x{apyE@HiyK&74fE8^5ejF6&L^E@N)L@02d31%MsN-8|pd-d6GB zO`_+%nWxOFXl{L-LH;Dy*7q-d16C(T7a?a8bgBxw zkP|kGAtAE1A*U;X3L@o|c@Bh;@MIw)RL&*{vHl;_2=ls{EW{^LT#b_x`f^j5w(x`wK4A(6@;0T3;@2jm|hl!76vb;Jq}i|Qm&Df0C-m908scSivqzH zKWMa3S65q7V3K|*-9frVY`^H6`@7rLczXl@F8C<)Zl!H8sI)}~CJcB8fX`EAmNas2 zXUiH+#~9=5;s|~}IWi*vUK;s4CANeFKKv$1YXGzkrQz}zlV8Z0<6HL;wo3{_SMj4{ z{POzi<+KE%F#t`Gn4mYk8JS7{v0326WCx6=_WAJGnAh_n39mGKngsxblV2pySE}<+A8AK6a+GAr%1VcP_(xpkhXUV*p?z z^^L9u2S;8?CuRVGa2criy1WiGd}9E};6bCODOPviw_>EOG;0Nb%bKR#zXMP=t?^#W zj;wP4v>>PXyH=Fw6ad%m4p#uV*T=Tb1HdAOE6LH?TqQA|8_6O^Xz41r4wwo+CP283 z;|4@Nr{xWGaU|4u)TdPdu3~3Qo4i*CAXK#CYpaP+s`v_|se=27)&S(F-ZstZa`m%z z06fiOiy$rloJMyF00zy!?q}@)r0+KcAOmct0Oa@=kgK1y1K<^)X@qV&(zgmAhvK>V rX$1f#B{BH`?jmDKW!nFO+yH(70t?a`Ozq^X00000NkvXXu0mjfBv3*) diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/grey.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/grey.png new file mode 100644 index 0000000000000000000000000000000000000000..7dce9f917ca0fe123f00c64a1d476ebc84d283fe GIT binary patch literal 1741 zcmV;;1~U1HP)%DoqacxgfFplH6hw$@zQlwnC=F9;O+>j885K1D02oMD&JS1c!P!61P$v?n>$gJ19-ks@3{i=&Yb@lf2 z?s{i-ybFA#R(HLBRlj$2#De(d`ga__AdUdo-F^f>tWvaAjK>)OgDgWt_~=*nqDANK zW8;-OuFCUvJ^f-jbV^w46+P8 z8Z*3bk;oV#W2l>_EX|=~&1^=M=RE(LpS02gkX>5i8}I*^L6#9GNn5}00l+?2BBfAD z5yc7sXKPQmwMUL!7Ev6x&oT&{|2kPKIpO_PlDRrlRV=Im&KRVwnNAA;&Yd3vpa%m0 z%Dp|r3ge5HRz8Sy?70pgvnf`DU=yZO{|+{%kHFmme-JK7P)Wk>=D+zTRXb0>!Uqs3 zwLeI!xwfv3F1z`w>l@C`=}8GUmbJhs6*^EIPEoHUE%ArI&|FgeP124Y+*?~4^En@u|QCQ2I%=;{S z0OuOc1Pro_0Z`eRsxnaI*s?&cO_S4+eG+& z^pz6_PXRB#_J&ImZA zRyqWm=h!@_%JbGvL`qRqB}G+oZZw`#Q4OAZI`W0uTDsa4bggf6X!^!V%}ppG)Yj77 z{FAWihWl7H1V5kx(uhsb=-TA+GrqprST`n*m7+GDvvbi^$7LSHdDXoC+lT?OW>aDX zQF&zcQ}WJF~d z!_gR-O#vUT&+?o>mN5zk2uydj0nhoOC`bnh=^#14d0ReNHO>mHzP$X}8?LsN?FSD4 zZ=Jgxk8AH@{l-lf0+(T$^6_s!Tu3i(zxB2Y2VCX(!sAv!YXc%Z9jwaMkV_76XJ@6@?;n$TU56Os1hMFg#N z8%uYMVYhr3y4>q$Ur$2S*p#zG+|QYVCGXaSAgEgx`u@Kox^nHh3lU&#ExS8A01O9% zHU;iRfWgOi^MBZvj37zfI`C2v#WAJ{m6Op3SJwx0{_(c=BEg1)xkCFYca4W37Aps$ zJln~(LPXc+d}t3zOjVZ0W`VA*5B)w2B7!N)xdiAmpp&6L*{uhgSZf)LQnd2dP|jMS zBq3>{JQ2a=Ibww{F4XUAZKIUp(%Qwj1p?>#obHz&ZTf63-1L|xm`a9OyZ&iF?`Lt| z7{;-i@6ZcbgBz4iw=Bz0jcWAsg1Bd6jxHaxF zbd1t*o9&$hiv4u^nP;C}g`}mik_6a>XrT*(M4b2KkDGgdlR%umCs0||{{1~G9P4h@ zZ`^dIEQy+6B>Wcd#|P8hU53LUm!EqM09RFWiBoO-U*$Z{vDV^hJ2y}NqU8MA1eIvY jogK8+ZNT)jv(NtktcJ(oS;ARi00000NkvXXu0mjf4G37f literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/male.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/male.png deleted file mode 100644 index 6f649f851bd47a163f1fcd271f827cd61e0a3f32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 709 zcmV;$0y_PPP)l;_2=ls{EW{^LT#b_x`f^j5w(x`wK4A(6@;0T3;@2jm|hl!76vb;Jq}i|Qm&Df0C-m908scSivqzH zKWMa3S65q7V3K|*-9frVY`^H6`@7rLczXl@F8C<)Zl!H8sI)}~CJcB8fX`EAmNas2 zXUiH+#~9=5;s|~}IWi*vUK;s4CANeFKKv$1YXGzkrQz}zlV8Z0<6HL;wo3{_SMj4{ z{POzi<+KE%F#t`Gn4mYk8JS7{v0326WCx6=_WAJGnAh_n39mGKngsxblV2pySE}<+A8AK6a+GAr%1VcP_(xpkhXUV*p?z z^^L9u2S;8?CuRVGa2criy1WiGd}9E};6bCODOPviw_>EOG;0Nb%bKR#zXMP=t?^#W zj;wP4v>>PXyH=Fw6ad%m4p#uV*T=Tb1HdAOE6LH?TqQA|8_6O^Xz41r4wwo+CP283 z;|4@Nr{xWGaU|4u)TdPdu3~3Qo4i*CAXK#CYpaP+s`v_|se=27)&S(F-ZstZa`m%z z06fiOiy$rloJMyF00zy!?q}@)r0+KcAOmct0Oa@=kgK1y1K<^)X@qV&(zgmAhvK>V rX$1f#B{BH`?jmDKW!nFO+yH(70t?a`Ozq^X00000NkvXXu0mjfBv3*) diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/pink.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/pink.png new file mode 100644 index 0000000000000000000000000000000000000000..cf867f2782c0fd58efc6d8b4e002b5a046eb4aa0 GIT binary patch literal 1024 zcmV+b1poVqP)?aywEd)LW3Mxw8GD{#aD+G>3jjbI$%*7z zKKD0(L8vcIIoRuM=1SYzYcv%u>#Ft;mx(~efrM+kh|yGF5CU-s^h2<%m_^Q9k>LFh z$apaZfRqR$VTXH+9qutqUI06>{yBTTd`} zfoc2`e0Bv4A0Z4w?7TT@r35XDBz}p{kO5JkWrs{lan(3)W_DHH-Bd!#i?t2H1M&tq z%62QTO@IU@X!uH_Z3nBXc?{5IGPXmCw@-Mfv_v<*N+k{>Vq$N3b-MFjf#~mUtYi7)IyFgK6yDIbp z33YW~;^bUdjSWKCygEnG0w`}`nNh=RZn)I=#w}~pYb-;6jN5`!J^&PgX2!|Wc$&!Z zMbc~%s=!Ucr(DvU=Xz-E7&7paFlLEqmYr4W)Nxa<&b71CVaZ#EsJ4o8om1OkLOLe;MFqELByDT%FE*mOl_75KNsRnQ5??b`}Sc{g-C(QZdIWVT`cLUD3yRzkZQ zKu*eRVXsQ73p$=?uWmILXhQ?&=062bw7UVScW%o((OR<-+9?3&CPdv~-=Hzvi1AF| uB57<#1E}vS(!WU#jZ%%4N(bFnpZ@`^Ui@jTp~&I@0000j0+|dH84M(aT~vS&$sfvfpwA*H+9E^6X&xZZq!{w<>3Da%2smPNLj(Z5ec8_+ zW&7z15GDHDvH+4}AzarsQHT2z$S zpKXZ8)7n_)ZnBnjJ?0}AE6ybJ2eQu!hbpcj>Q|2s`0Fkg%eA81cDh0vn@>ClP!$IB z-+)wpmir023F|YudVEM=OYDef-RJgcQFkrQK0sACN^~=t<&|~#S^+ye)1*fimpJ`? zh0(<&POh)Ccf9xHw(cx>|6y0uWEmz@8*?Urh2+gm5*R8OF33_zuI5NHV3hyD$y~Od zvub{mpE*2}9)B?^U9N}=NM-Jyu#UVsRS?H#pKUUG<_?uf89RDEVFIK!Esq7({}aMY6msXQvB@NY4&qpe|q^^~}!ZbgT}nsOB~)4}>dh z!Z!u49RX%b_4a@y#byDv6u3WVHz|5a#6ac1X1N~5)UO*Qk^~i-tVH$Dy?uYbuuEu1 zKqX@Mv992zv#wgn^uBukKP%2ypO<1xl%>Gm)g9vWTt7=q?^T#F*o?hx|6K^ycY!DY z1|K$0YK!4d%}8%yHXSdXp9a=$_on^KJdMiXX3uj(KO!QoYE*tvSYX-#WzP zmdGq@Fl^)M7)J}hUc#zXc8oY$W@vLo-SQ!gOuou9|1_p9-=`9@b} z6$wqsn;9h&-8N$0Ky4Z3wR6)vwLfUM(z<+g+ukpQc-t+`b&M}lz;;LK3$8%FWI`2m zo;YmX-OB#9 z)y6u$2rh}W5u$9NcvlFr0M$E(3eRipnuH(%fObOEYt{`K!_8t!ls+_(iQ*! literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/sofu.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/sofu.png new file mode 100644 index 0000000000000000000000000000000000000000..e66eeaf0003ec40510f2ccf39e0043c853da15c2 GIT binary patch literal 1330 zcmV-21V?5xhj`At+*M@nETxO2o?2He}Fbx4+5E z?s(YzW`8p~vpbX7r1cAd-8a8|^WOWt|ItW@=7l*Az^qgN5S9hNM6HHynt`*f5bQtv zl9rTr81u{5y)bR2x-@Vu?j84kzUsNQ%^y!)3dnNsgI_$|G+BM-H*~`wS9w}XETr}8 zM;?G~7`V3W(~G4NfNum>h@rwI!Tj=dPc^D5L}CLRc<=iG;|+tJR=8ZDfDX8}jcyop z9fw?@;42Q$b)2+pgF=NoN;k~`S{&Ye@)%yHGxUrr1iERW<@4lH31%3;wh;`2T%iE; z70#--3N4@a|I$EJUS5iNIV#O*wUT>)sxT1v3_ayt+ol+z?*v*t?;9Hkgxn~o%BtVP zbpKsR8Mm&T^J7alO`oAuT;>KTc=^c7iFnI|r@FY7&vWsn;L+Lve){Vljvq85Z#K%~ zWUlz4`vR>SH+)*7S!e&DL%f*#(m&g1*3;zxRdMyR3e^ZnAalqom2c5alSZ?S*Xi)h z&zJf1=sItIJ;|{rj{1tYLeOZ|W5Z1veqrUbS1gwS_+;}m#WFbUHsuq+i%FdXN8aGfGu)NCT&%?op$>@C81CJY&F(CN2Xk9z! z$s3EiEr4?M44sw(W{%C@*Syk0Q<;t63c>C5bw5wYTy=YWeIR#fYKt4F^P$czF6o4g z<_gh&@d)LC#G$fV7zhEWkeclQTn3F0WhhA>XH&GB(4jxzxV8;S8IvupY(*E98~||k zf#u%sLSCX)0kcvW=>>NZI`lKDYKUT~G;q67xk077z}Dub|NL%NT*8k(nY7-&^aucR z&p#H3%~8))giEF@Iis-C-(`WH19a1bArsfA=l@q|(&`d%?k=B&>Bha!4cwA?lQY$& z$TLw;Wob0)d*T6saX4yh9QHkK!jeeS5RLPEivyD&}DG{es*Kuex>;613QL6#)=HvH`H3Tv-TUc510M@Tw z1%@|Ad%o{y}C#o#Mt9ypMHbOQJP^v>#q+OudIC1B9j4NJTw2D+#8H6Hw!Ck-qyy($aORf o-z&;xWRgXx$}8Mmj(bA<54D%uQGWkwH~;_u07*qoM6N<$f_k%urT_o{ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/entity/moon_rabbit/white.png b/kubejs/assets/tfg/textures/entity/moon_rabbit/white.png new file mode 100644 index 0000000000000000000000000000000000000000..441d061af16f5455afdd6bf470616e57c9d2c01f GIT binary patch literal 1109 zcmV-b1giUqP)zEX$O;_`aVr#$ekv zT-SwVS(e@OQpC9Hy5O9PF|cHqgb>GZQ<7^T3)O_?VzJ1hC{pOm=W|7%S(YJ+A}kh* zyk~l`zT?1kT>wjAq)8$!Nf)KLO`&TPW32R9hj+g`W$bw#J|v#FE5S$r#5f6|?>GQf z47X)mhHcy8F+rAP0DuSXic$I<_SL!b^Yi8ckQoM`{0ElIbIy$}TLrRFdQ5~snwb7w zjRD~F^c2CLlCzo;mKkP@DQd(y7usQ}1?2E_m40#j4R4;^$BW}{czvL%GoAfqIxRR$ zI{){b;$61y0_hKR&Pcyx#&sbOWMMQxnk48uj^aqOEW^?JkKhL$j^2O7tH=9df1RIs zxVvisSUSF~EoE((M;KhJ6U+<@#V&ty)S%$AK_Y3cI zYHm$8mNCv4gCB;1aRTKCO(5RoTxdfTWX7w`ppfTzOS6$fBCyO6qA0>(Ft7liak8Sv zQo_l}N$LK>!^6h3-+s^YpBeCcY;Bx85h&U5JWpXhj$>?ZZ;P>IEzhzhlSw`vjTA3m zme~PCyKAzaOrr|!qo+7e0rwVgy9YeE*G>p>7D@LlbKsO6+Q3Q;$#umNQ|p{gnFEXC zSnRE19%#?74$~C8-~&invbP78LMhXLvJ|-QIGrX%mkAqK<@ua*Kni2>*JX@B4|-Kv zB75lZXk_FRuNuMx096o!;jqA9m95KKG7m$s{y#HL5ccBxex4=?K7IZSpyzI$@7-0|~O%f%vb`2X?m85!!sh6Eq`)KR}Kuxc% z$yYBs`?6qnk*rWL1*~_Zrl1b=*=#0Et!uQhCkk6s5}TC3mqBL}7`Me`&=;1QA#G@N zLB|xvEioBsk|4ZrplvQ627&m0)k0{c0mAtiG(p$V>Vl3bT4?~VsvO%~odnr;oK|!; zK`RZABgndDrU|XKbWG7o06;f2|8@2aYQxQZKF`A-sBK3BYCfR1%cvRIq){r { // moon const MOON_ENTITIES = [ 'tfc:rat', - 'minecraft:rabbit', + 'tfg:moon_rabbit', 'minecraft:enderman', 'minecraft:shulker', 'minecraft:shulker_bullet', diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index ba232d06f..0fb018dee 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -127,5 +127,5 @@ const registerTFGFoodData = (event) => { const registerTFGFauna = (event) => { - event.fauna(climate => { }, fauna => { fauna.chance(0) }, 'tfg:moon_rabbit') + //event.fauna(climate => { }, fauna => { fauna.chance(0) }, 'tfg:moon_rabbit') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/entity_types.js b/kubejs/startup_scripts/tfg/entity_types.js index 930a6b1b2..1b0bbb218 100644 --- a/kubejs/startup_scripts/tfg/entity_types.js +++ b/kubejs/startup_scripts/tfg/entity_types.js @@ -2,24 +2,24 @@ function registerTFGEntityTypes(event) { - event.create('tfg:moon_rabbit', 'tfc:mammal') - .withFaunaDefinition('on_ground', 'world_surface_wg') - .foodTag('tfc:rabbit_food') - .sized(1, 1) - .modelSize(1, 1) - .updateInterval(3) - .setDeathSound("minecraft:entity.rabbit.death") - .setAmbientSound("minecraft:entity.rabbit.ambient") - .setHurtSound(context => "minecraft:entity.rabbit.hurt") - .canJump(true) - .setBlockJumpFactor(entity => 0.42) - // these are the same as tfc rabbits - .configs(config => { - config.gestationDays(19) - config.daysToAdult(80) - config.childCount(6) - config.uses(40) - config.maxFamiliarity(0.35) - config.eatsRottenFood(true) - }) + //event.create('tfg:moon_rabbit', 'tfc:mammal') + // .withFaunaDefinition('on_ground', 'world_surface_wg') + // .foodTag('tfc:rabbit_food') + // .sized(1, 1) + // .modelSize(1, 1) + // .updateInterval(3) + // .setDeathSound("minecraft:entity.rabbit.death") + // .setAmbientSound("minecraft:entity.rabbit.ambient") + // .setHurtSound(context => "minecraft:entity.rabbit.hurt") + // .canJump(true) + // .setBlockJumpFactor(entity => 0.42) + // // these are the same as tfc rabbits + // .configs(config => { + // config.gestationDays(19) + // config.daysToAdult(80) + // config.childCount(6) + // config.uses(40) + // config.maxFamiliarity(0.35) + // config.eatsRottenFood(true) + // }) } \ No newline at end of file