From 88cdc9baf38edf10c13a0c0ba604a0b0b1593f8b Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Thu, 7 Jul 2022 20:46:33 -0600 Subject: [PATCH] Add Fish Buckets --- mods/ITEMS/mcl_fishing/init.lua | 27 ++++++++++++++++++ mods/ITEMS/mcl_fishing/locale/template.txt | 6 ++++ mods/ITEMS/mcl_fishing/mod.conf | 2 +- .../ITEMS/mcl_fishing/textures/cod_bucket.png | Bin 0 -> 14810 bytes .../textures/pufferfish_bucket.png | Bin 0 -> 14766 bytes .../mcl_fishing/textures/salmon_bucket.png | Bin 0 -> 14792 bytes .../textures/tropical_fish_bucket.png | Bin 0 -> 14788 bytes 7 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 mods/ITEMS/mcl_fishing/textures/cod_bucket.png create mode 100644 mods/ITEMS/mcl_fishing/textures/pufferfish_bucket.png create mode 100644 mods/ITEMS/mcl_fishing/textures/salmon_bucket.png create mode 100644 mods/ITEMS/mcl_fishing/textures/tropical_fish_bucket.png diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index 20f4e6f26..80351e7db 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -516,3 +516,30 @@ minetest.register_on_item_eat(function (hp_change, replace_with_item, itemstack, end end ) + +-- Fish Buckets +fish_names = { + { techname = "cod", name = "Cod" }, + { techname = "salmon", name = "Salmon" } + --{ techname = "pufferfish", name = "Pufferfish" } FIXME: Uncomment when pufferfish mobs are added. + --{ techname = "tropical_fish", name = "Tropical Fish" } FIXME: Uncomment when pufferfish mobs are added. +} + +for _, fish in pairs(fish_names) do + mcl_buckets.register_liquid({ + bucketname = "mcl_fishing:bucket_" .. fish.techname, + source_place = function(pos) + minetest.add_entity(pos, "extra_mobs:" .. fish.techname) + return "mcl_core:water_source" + end, + source_take = {"extra_mobs:" .. fish.techname}, + inventory_image = fish.techname .. "_bucket.png", + name = S("Bucket of @1", S(fish.name)), + longdesc = S("This bucket is filled with water and @1.", S(fish.name)), + usagehelp = S("Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.", S(fish.name), S(fish.name)), + tt_help = S("Places a water source and a @1 fish.", S(fish.name)), + extra_check = function(pos, placer) + return true, true + end, + }) +end diff --git a/mods/ITEMS/mcl_fishing/locale/template.txt b/mods/ITEMS/mcl_fishing/locale/template.txt index a1544666b..32e3d8740 100644 --- a/mods/ITEMS/mcl_fishing/locale/template.txt +++ b/mods/ITEMS/mcl_fishing/locale/template.txt @@ -16,3 +16,9 @@ Pufferfish= Pufferfish are a common species of fish and can be obtained by fishing. They can technically be eaten, but they are very bad for humans. Eating a pufferfish only restores 1 hunger point and will poison you very badly (which drains your health non-fatally) and causes serious food poisoning (which increases your hunger).= Catches fish in water= Very poisonous= +Cod= +Salmon= +Bucket of @1= +This bucket is filled with water and @1.= +Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.= +Places a water source and a @1 fish.= \ No newline at end of file diff --git a/mods/ITEMS/mcl_fishing/mod.conf b/mods/ITEMS/mcl_fishing/mod.conf index c4e5f5f2e..71bde6146 100644 --- a/mods/ITEMS/mcl_fishing/mod.conf +++ b/mods/ITEMS/mcl_fishing/mod.conf @@ -1,3 +1,3 @@ name = mcl_fishing description = Adds fish and fishing poles to go fishing. -depends = mcl_core, mcl_sounds, mcl_loot, mcl_mobs, mcl_enchanting, mcl_throwing, mcl_colors +depends = mcl_core, mcl_sounds, mcl_loot, mcl_mobs, mcl_enchanting, mcl_throwing, mcl_colors, mcl_buckets diff --git a/mods/ITEMS/mcl_fishing/textures/cod_bucket.png b/mods/ITEMS/mcl_fishing/textures/cod_bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..582207cb0d10d0c223942037ab66da32163b06b7 GIT binary patch literal 14810 zcmeI3eQXnD9LJx@+cw0EOq?+wm!cxZ_U_tsYtL)vSU0*zVHpF4uUzk*b_cx|?{4dD zQ5hhKWDyq<%uoy=(UB0vmp=rD2@C^-KzvJxXw)bKql5&+ENBogckSA1_Yxix{(C-2 zm*sh$@Ar52eSXig{nM>2%a+V4f1n%yFsnHlX$1gOSfA4A0D$>_-QoZMWomSd4#3Px z>r(>W+I2qwfrrGlcB4JEl;IW0!wE_pdQ3?L7HplVa{PK|5OJ6k<&f+0p~Egh6hf}m z{umWg8(@bR?a|?Owf zkgMJ*NVLaVhz3Q2gx^!+=4qNHYJ(oyAMknoj}u;s_LEeQq$xK=Gc?6`DI$w2Tuu-K zs|g9FHPVzVrwNIWtHUr6Y~c8Iw_; z2-JB^R1Hy)3Cov@E1gEj<+2Lp$iA1P<_gJrHalLCNRv}Z+C!1!i3C2UQ9HGi{b&MD z!W5LCZ0IEIp~uy!9g3mo9m)hHbJG(RHYGI{%hewDc_nGw(z?;uWlXNr+qzXqwnAO$ z)Ogs~1!ZHwcyDiriTvgiJcBhe;j=?ioIqyHWMpfxObii#jV{IEnGk%)!S-&$B)N5ZD0dPGrR68_p?90mezUxKQ3$9>g4 zH&;^~bl22)g+whU#Qni)JH%Lle2jHO;XAF5PtsU|)*2^_9Dau^RvBr9O)Dq*^ zj42frbwkm*9TTH>&!qbv5BrEj5Mdg`XrQ%+d1nQ*FssbJxf}* ze@ZNz$cz^5&uGVv-A~rK)T~~BvccJVK(qEmS1^{ZoLS#)?P;phUSI2_D2gI!>t|N# zoGzBGnOy3eE|%t%D`n9Ld$ZMwh8-&F=FOb{6)MNWaE;&Z^RxDa>>Msuw1_55wMRq= z%DUB+bWK)MJTb0t%|t@SL{^yDD#xF5dm=O18fglbvt;fcl~K)|CI3cu5L^Ta92XKe zE+lYVNZ`1Tz;Pjg<3a+*g#?ZZ2^<#^I4&e`Tu9)!kic;vf#X5~$Atur3ke(-5;!g- za9l{>xRAhcA%WvU0>^~}jtdDK7ZNxwBye0v;JA>$aUp@@LITHy1da;{92XKeE+lYV zNZ`1Tz;Pjg<3eK6xXSZi{e!X)a;05$;df@Vo&f+5e6%$NK+nSf^lk>=pIZR*{sBNI z1;E9%05AgpR4LnEIMxI}3Dq2_Z!>>*_nX6go2h$eT)CDEFi%}NXFPYcN|-%l{C>`C zQTsi^^;6x^s`LSQ$IY@vxpe2D`CC5SaN^pVeeJK$eRhfx{pIDK->3jR3!nEajcWgv z*0&R-GY_)EH(uGxoxW>nG`@KIsmiI`#t$zq-1JfJ`6Yqf+XB0{eZ6nW?Aevy-qUer z_(Iv;=dMm=_UnrYfcl5;I(V=x8?|=Hr!Qr8G zzq${YVR>NMKtFl%`l&hBPt9TFidUx%^miRO-O+#Su`l8~Mt1D%zfn4}XV+aLdoERt zy!7KEdscq8a6{AEi~9FIakk=vp_^3~8@94PeP8lS)!@F8<0mVL<>|{)2K#6#wfnWf z-tM_w^y(YS*B5uI{RiMf BGM)ec literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fishing/textures/pufferfish_bucket.png b/mods/ITEMS/mcl_fishing/textures/pufferfish_bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..2c88bac3531fadc761233627591552f5e9280b88 GIT binary patch literal 14766 zcmeI3TWl0n9L5hI7Z*?xnn*OtFvV!KyK`A~+Z}fo$}Xj=ZYkR}wBf-{XU?``cP`FM z*=Z?}LJSx+foiyjCSV{)yhL~~8Wp@Xh>4mQdGLn8M7$7#2^uk8YG(E}yX`g{6W-1* z**={A`M&?mcP`tPeXOH>?LyDZ9st0?L|Z%s09a&y=FI^BEWJFz0|2hq+PVz@<}bEC zGr%*?E&-riQyOQ^Ff-3uXQSF63OV)r*c%`NB!T>ahUf3ro5%SWTr$|B)Bjkoa zl1^$d*e|sW>#%dUJuM6m2qBSN8TEuM&XP45nml32S;gS22jiabsF6YbneX8C^F`-b1qFIV%y}Fq38bgZ7TVBPe&zlr|;?NLu zNi!u?A#7j1R~YJ#LUw{GQx>mLjE||g- z#WX0!$4sfy`c+dk`qdgOOXZr4Em=z@OTDLjURj>9wPCK=WKOR%(nA`gQqWKbbpfu~ z1QoM>s<$_#OnGrCp24ove0FF_HDq=rFLSm+p0FirTug_&sp@G}%|`RPtfLqq5sNvy zinw!wq=;(HXb4l)lJa_&-C&$IVU(qrX0N>&o6k{Jp6l`v1umoNGH*sDneT&?ru2oW@}O&GX;*PE zHLL1LRfJK0xV+h1!!DJx)3}6Un7ksuL_BKAnop8ME(jSh*p%^m=?o)!gTe~GmuH!b zH^62@J`h|X^umA>VzNR$$vUnIgZ61DSc{0(F8L(ub-L6iDSXy7$9{U$7E{$aUp@@ zLITHy1da;{92XKeE+lYVNZ`1Tz;Pjg<3a+*g#?ZZ2^<#^I4&e`Tu9)!kic;vf#X5~ z$Atur3ke(-5;!g-a9l{>xRAhcA%WvU0>^~}jtdDK7ZNxwBye0v;JA>$aUp@@LITHy z1da=dY2)&gfBFX%F+%3ZmC>_%^_KwvgwU2s0x*0#09&^M@aF^oTYmyzkOtuA9ssy~ z0NkXGJviP9z>Mn>@s_mp<>Akmhu){_=JY)G{H|N-I%l5S)^zK^FHU66ETPZ6Rkv__ z`yJFLFPuH_Zmj*__zC486C0Uz>5(1ep?md>W9LVI+ja7f`Z(CtcUOOZ`=QYI#S619 z58n83!@si^t=@T|uKvD5q4AM#g#Dh!pJ;q^?7P2+Wf!*|=-KaS?Bq8m_H0}Zp03+; zqG8tS4P%X`M@}vCEbqQ8p4+|qh_!iQ=d9SbEs4=z&M!{v5ppO0?mF=H*i5-|$EvSB zr#~DyHT%fnSNDE;RG623DZXHRs^`ah7Hrw^+OhS=*&9Ac?K?K-S8DF6@sEC(@zi^B zzrOO~(lhIh2me|3&X)O0ul#=Z=|vOYZx~&BaR8k6zwu<-(bTB@i^{~B_V_ESd$#=t DWxyMu literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fishing/textures/salmon_bucket.png b/mods/ITEMS/mcl_fishing/textures/salmon_bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..b9ac22fd9040ed378a2d3397ea687d787d4898f5 GIT binary patch literal 14792 zcmeI3TWl0n9L7(BV7rK*U<;@)9UuX9cV@QTwmaF~0=qyfY^h}ltqEzTGiSO3I~QlB z-EB<>h}VE2QH+Rv0E0q&Pzi=01ylqR9tfxr6`x8BRUZU3Dhj4%W^c3GZo@I*?fjDM z!}*`@`_FvmvVGZ?T3c34bIo-D0H!rJMcM!WGptYf6ac{d-$ywBK!w)SVE{07ru8WU zdk1F&(6CU7wVUnHH7u{n9!^lZp(iD4z#`C?(l~xIG>LB5BPl`h+R(=&AqhcpgD*-) zwJ?lJO#?byH_#H}2R8G5fou%90x32nYce!BA|)pjgG~iV+m}@g)*7Zr!k%Jo4wB2P zhD3X`l?bakBz&GaH_tE(QSbLKzJ?mF?=iwlGd_y;Qw;5<8J3}0FHK}1LoR|K0=giw zZIP9kcDf)2$+&51EJY=gNl&uIqv|~rtom&#!c6=H0>}+&n)tYs)8i; z7kV_ryfjPuS)bSG;h0(M0ZmTeOzyT^oO2yM0?&%7E^}r`lDQs8X-ZFk$`3kb=5`eu zRuifoRRtKT3FJ4MW7wgxcN*KQ7$&FiusIS+$(l!!1eUL1peT0Ny2Vv_p&*$j4YmRKC|bEg5S8(b^#&W4%_FdL)HQIObSSkJ@4!n=!4L zB*Rqoen%mD2d#ro6^>>L3CX^bG)_05b>f0#_Q*N6e~y5Ca#@bIZnF??9SA4{sDjb_ zW97)mr2o5sX@7^jbdO{lDia;3w3R)pw27gLW|Gt4vL2|Iw{zChu7$E<`v7I#{t2nD zkRB~upX`nuyPg5-QnU5~R7}oZ114Z!bOmGi&guE>)|w`I?fLaynx<)rvHoVH&T_G| zV`8bZTrABi*DI14@@Bdf4LelU&6_^|>okssp*o+h#uuwT}0#xoFm8|B@l7FK+2yTJ|jtdDK7ZNxw zBye0v;JA>$aUp@@LITHy1da;{92XKeE+lYVNZ`1Tz;Pjg<3a+*g#?ZZ2^<#^I4&e` zTu9)!kic;vf#X5~$Atur3ke(-5;!g-a9l{>xRAhcA%WvU0>^~}jtdDK7ZNxwBye0v z;JA>$aUn5bT(102|DYlS$t2kr^1Mi$2LKR!Q(F{(fkgmp-44LtqX2CE34mT2fS0(#7;>@d6PoGPic>9Mrk-PW5zIe`+ksCv?)2|7xmxn8dZ~pSlcXxr04i0Xod%iuo zD)Ie-(}TkwcFr6+0jke{ijf<)_THoWcO4sCwRnkk`Tg@l_wGBebm`QEgQJf>@m2Zs z3)jlyWs4@C*s5%~Is3jN^D0Kljpx4>U#MRFMKHL$Q$4mq-U#F zGs2QhbF23~H~(UCXUDERf0W0$?h6-o&-(H5=aY{gWp?aUHXPhN>zy}Fo;vo){zrzx zyJuZ})Reb}*Z))2=?bo&)OTdkL+}2!W$D2Ww)NjSJO5nE;o5)KcAc8~Aknz1>U#B` gSF5&-Uiu5b({EKC=bt=e{noO1MN8zpgm=#; z>0Ug)=llKLeV;$wo9=FHd197pp$h;otGOxG1^}3Ce`Ztx03NwL#sdImYE2sr0IKKO zpK0Lrg9`u%ERhoJW_$cePEchJFRGo$W62t@3DsK~FKk67)rqrx=_)%+OSJin%pR zH`ooS_IN85Rdq!9J+*FuWm&2&=wbZ4Ahx{V&iVhZRXTUBhjNFrVSZtw=ST@ zZAdW}S9*I>N){KV{m@IsDdIp}wKIA)f6Ad?q)lfNSu=Uj)6C~!$tmw7WH$$S@LG^H!V6bBtM3%iPo zs%ce^t0Ic{LdDJI7cM$pncamRG>+bA? zyxZ3)LT{imC4Rp_=)OWs<ZLF>@7rK978w3NM*G+sB5ed5CO_>psN{{o@x$>n&#zReodM%C$4A6zSQi!fE1I@t^pg$UUVg6#m>3;?e?0cyR-A_ybwaju=d}))LAZ< zZk$@`ESF1*%BK{`jCk|i%7z^(`{vD^|8*KKph&IX@AHSU7qWA>T+u37DBT{DWTY7O zu4HTTn({(L;l{~?jzV6TTPnxbdA5)nZHujrxI#?fAC+;<-KF?OcM;MA3lbL=BrYsS zTv(8}upn_^LE^%K#DxWk3kwn#79=h#NL*NuxUe8`VL{@;g2aUdi34xZL`1 zx{&%~c+rAAmpX0?j#Q`i%|GNH__brs`GeK}*6fKbyWn2Z|M84Z*Pecu2Is>_oxQ4k zM7S7z|LoXR_{!YYHU9c=q~l_A$7jpo&gTY?)f^dy`!@H@d&t!~)3f~rX|QAWdtc3L zI`ebm+mRKci;nIZInfokwVs=`X2-#oreD0LVbhI)Z&$LTi@rX!zh%zZ=O1iU|2&+y za(nxW*L(L~@7+szh8ve28BQG-sv0`_!vI%v|N7=L-M4=n{l4lQ??Cmw{N^ YT>9wE{=NVlv43aT+}IL3zN(}DKg{zbN&o-= literal 0 HcmV?d00001