From 23603e7f4119245227f4ec0d15a8ecb6a444c5cd Mon Sep 17 00:00:00 2001 From: Zefram Date: Sat, 7 Jun 2014 21:16:15 +0100 Subject: [PATCH] Full glooptest support To support the glooptest mod (successor of gloopores), define the gloopores lump->dust grinding recipes if either of the mods is available. (Formerly only "gloopores" was supported.) Define kalite dust item, which was previously missing. Make gloop ingots grindable to dust as the non-gloop ingots already are; incidentally refactor this to automatically make ingots grindable whenever the ingot can be made by cooking dust. Add textures for all the gloop dusts. Do the "Steel"->"Iron" renaming for glooptest-defined tools and items. --- technic/machines/register/grinder_recipes.lua | 19 ++++-------------- technic/textures/technic_akalin_dust.png | Bin 0 -> 240 bytes technic/textures/technic_alatro_dust.png | Bin 0 -> 241 bytes technic/textures/technic_arol_dust.png | Bin 0 -> 227 bytes technic/textures/technic_kalite_dust.png | Bin 0 -> 191 bytes technic/textures/technic_talinite_dust.png | Bin 0 -> 226 bytes .../technicx32/technic_akalin_dust.png | Bin 0 -> 1156 bytes .../technicx32/technic_alatro_dust.png | Bin 0 -> 1134 bytes .../textures/technicx32/technic_arol_dust.png | Bin 0 -> 1101 bytes .../technicx32/technic_kalite_dust.png | Bin 0 -> 809 bytes .../technicx32/technic_talinite_dust.png | Bin 0 -> 1088 bytes technic_worldgen/crafts.lua | 17 ++++++++++++++-- 12 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 technic/textures/technic_akalin_dust.png create mode 100644 technic/textures/technic_alatro_dust.png create mode 100644 technic/textures/technic_arol_dust.png create mode 100644 technic/textures/technic_kalite_dust.png create mode 100644 technic/textures/technic_talinite_dust.png create mode 100644 technic/textures/technicx32/technic_akalin_dust.png create mode 100644 technic/textures/technicx32/technic_alatro_dust.png create mode 100644 technic/textures/technicx32/technic_arol_dust.png create mode 100644 technic/textures/technicx32/technic_kalite_dust.png create mode 100644 technic/textures/technicx32/technic_talinite_dust.png diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 4ae24f8..cde68b6 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -41,35 +41,22 @@ end -- Sorted alphebeticaly local recipes = { - {"default:bronze_ingot", "technic:bronze_dust 1"}, {"default:coal_lump", "technic:coal_dust 2"}, {"default:cobble", "default:gravel"}, - {"default:copper_ingot", "technic:copper_dust 1"}, {"default:copper_lump", "technic:copper_dust 2"}, {"default:desert_stone", "default:desert_sand"}, - {"default:gold_ingot", "technic:gold_dust 1"}, {"default:gold_lump", "technic:gold_dust 2"}, {"default:gravel", "default:dirt"}, {"default:iron_lump", "technic:wrought_iron_dust 2"}, {"default:stone", "default:sand"}, - {"moreores:mithril_ingot", "technic:mithril_dust 1"}, {"moreores:mithril_lump", "technic:mithril_dust 2"}, - {"moreores:silver_ingot", "technic:silver_dust 1"}, {"moreores:silver_lump", "technic:silver_dust 2"}, - {"moreores:tin_ingot", "technic:tin_dust 1"}, {"moreores:tin_lump", "technic:tin_dust 2"}, - {"technic:cast_iron_ingot", "technic:cast_iron_dust 1"}, - {"technic:chromium_ingot", "technic:chromium_dust 1"}, {"technic:chromium_lump", "technic:chromium_dust 2"}, - {"technic:wrought_iron_ingot", "technic:wrought_iron_dust 1"}, - {"technic:carbon_steel_ingot", "technic:carbon_steel_dust 1"}, - {"technic:stainless_steel_ingot", "technic:stainless_steel_dust 1"}, - {"technic:zinc_ingot", "technic:zinc_dust 1"}, {"technic:zinc_lump", "technic:zinc_dust 2"}, - {"technic:brass_ingot", "technic:brass_dust 1"}, } -if minetest.get_modpath("gloopores") then +if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then table.insert(recipes, {"gloopores:alatro_lump", "technic:alatro_dust 2"}) table.insert(recipes, {"gloopores:kalite_lump", "technic:kalite_dust 2"}) table.insert(recipes, {"gloopores:arol_lump", "technic:arol_dust 2"}) @@ -99,6 +86,7 @@ local function register_dust(name, ingot) recipe = "technic:"..lname.."_dust", output = ingot, }) + technic.register_grinder_recipe({ input = ingot, output = "technic:"..lname.."_dust 1" }) end end @@ -117,10 +105,11 @@ register_dust("Stainless Steel", "technic:stainless_steel_ingot") register_dust("Tin", "moreores:tin_ingot") register_dust("Wrought Iron", "technic:wrought_iron_ingot") register_dust("Zinc", "technic:zinc_ingot") -if minetest.get_modpath("gloopores") then +if minetest.get_modpath("gloopores") or minetest.get_modpath("glooptest") then register_dust("Akalin", "glooptest:akalin_ingot") register_dust("Alatro", "glooptest:alatro_ingot") register_dust("Arol", "glooptest:arol_ingot") + register_dust("Kalite", nil) register_dust("Talinite", "glooptest:talinite_ingot") end diff --git a/technic/textures/technic_akalin_dust.png b/technic/textures/technic_akalin_dust.png new file mode 100644 index 0000000000000000000000000000000000000000..052b0ac909cd8f4b86f83a0e07bc3cf77ab90702 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP;il_ zi(`mI@7tb@djnXo4etU^tRuV!_EmuAC8`SHtXBwzmqbjy;j)5Aac(5rEAQ5)mq^RI?Lm0on`vc z_lo&5C?y*(eZM6beRy$MkJIV3Rg+b@Gi8=UuG<>kChPrFRNF~}WBMW$lS4ahKV9ne kcB(_mCCjqcI~i&i?ABSaK6RUN3g}t}Pgg&ebxsLQ0Hc;z$N&HU literal 0 HcmV?d00001 diff --git a/technic/textures/technic_alatro_dust.png b/technic/textures/technic_alatro_dust.png new file mode 100644 index 0000000000000000000000000000000000000000..172af25895a54106c6a82e54f7c03f27bb74a79a GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP;jxQ zi(`mI@7o@GK1N3g_xt9?Wv+i#itxD{QdN<1pAeA0@cN{JPG1v0Wv!_bB9os5bLVYX zU$cL@{FN(L7*6b8I74=;SLe2^dqN`Lx!K>=-#KgAtx~=Q_b#4IYSWi5Pu1yu`(gEe zf!RMj_3trX*uvIb&^@tl>z(8!&tz@+OMFc&t;~n&EeQ7ac-)*vD5yE n!XccqHYoj=q46!5v4UAH&Wbhh(prC@a~V8c{an^LB{Ts5KH6H& literal 0 HcmV?d00001 diff --git a/technic/textures/technic_arol_dust.png b/technic/textures/technic_arol_dust.png new file mode 100644 index 0000000000000000000000000000000000000000..1a575ed6a05c6a24e9164c403189993e1150a814 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP;jcJ zi(`mI@7o@0zNP>X*5|PfpEek*>viH)jM`y*<%UG;OcAdsd(Lm&p!9-oM$x&G2aX(J zY4~ZLb8f5E`Wt5iMEqVqdtR<`dRdUQFhkXPo#&dl&rb#)PBiV~Ir4AU(;P6Rpf z?1?#&=Ja0as87Wn;$JXmv&(CgPUs>WaNEV_G{+c#PXA; zPBkTE7AX0yFkBpa;@=GSAlaJZjLKRj^`GL8%`{=l-+0J$-Hya|?qB_JAMaVYCmfQJ l<~dkx^LVNdf62vK#>t6dtO{Dahk=$ec)I$ztaD0e0suzELKgr4 literal 0 HcmV?d00001 diff --git a/technic/textures/technic_talinite_dust.png b/technic/textures/technic_talinite_dust.png new file mode 100644 index 0000000000000000000000000000000000000000..f228206418462073a9972bc121df8fb60dd771d6 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP;iQ; zi(`mI@7o?jz9t6|*5{ui1>QR)K8^IbaI8W{$~md0{GwC8lfsF2@z%mk_Zl>x@8!|a z(P22TKe2e<5do%inrR;_-qh8lZ(1|^MG>n)#o~zPU+y+6-c{|%BF*Iey$Gc7D^NxEl*opI7 VuwFSm;WN;E44$rjF6*2UngB~vRIC61 literal 0 HcmV?d00001 diff --git a/technic/textures/technicx32/technic_akalin_dust.png b/technic/textures/technicx32/technic_akalin_dust.png new file mode 100644 index 0000000000000000000000000000000000000000..90f3bac8ca322ec8a31713570604e797226184b9 GIT binary patch literal 1156 zcmV-~1bh35P)7E!A*t_Q3S>_W*EkeEN;qcIT&(tFqnie1CZS zROgli#H}0}fA@!-MOSV=U2m|m+)E?P_$>^-)5g9uHZnMUGqo0-z=8D@01l2%zgTqT z_At#D2m+EkryeKty6!{E3&GUT@WhIn5mHcY1WUlRCm?}>pZ&*!j~f>LN}NOD6_N*Za(nS~}oz=~3dqEhz9 zT0I8teQ#v&{EZxL_zMp0JGBXza~)v=Dbdyd(4!QsOcUpZWr0t>?-NLeUz!a81i&{I z=yU(M{&f@h^s#=P`l806eW%u5Y@*kN;uS$gkI03ooO0LiUTMqIooVq zE@PD=gf{lRv5~fV{rroN|NOUS2~=o zEl^a7{=nytD5mUroNczK`W}F7B;&^WDtH9Kuw>CxdvAI^@lZ{oj9Idlsbn@p) z;IHgaiX2Nb$te3SN;tH&rYI#jmWyErUnyE?%0QvOLXuE&T?($^#N0dvD0wc4)?~)o zOTE6_c=w7;Pj6dw#lV5?Q);U$*BQut{C?+=+Ap{aZ$#WS9 ze2T71M{6p+Pinfi!cz`X2%=0Q9f5L$kU|hBXTz}zv-!~Q#B*0AFf=?N9vtXDP*7@X zEl$X-#gh)zz$eXfJSj1zyU&-G5TKc4gjt3IR05wc)7{2ebFtk)I-;A3Qq+?Ki)FwM zY+GwlPtpTpBZJ%2o1>Gf3Q9c_X8Oq_&nf#Z5@FAUZPDj-r}t#Hv7|eFPFE&1hJsQ= zT5~>Z1JLLDcv8~qd4ySp5Q16~Q;>>gn(=!S3F(L#*AYjqS;C>=iOQPWZ`&N_`3tUe z*8JKG)g3)W=A)Rh@8e2`DASaEmn=6#I=_;ZKwzvP&J9usO0HsNp+P|@ln_>1D>^!h z1>)_UudjdYy0-w}e<{()2#sYIHBme^!XmMm!@7` zEFgrSlW722Y07+@Q1)D0$00N3vnbbJ#oD|-HZm9r!2X@UU)jB`%qz#5SAE+tI{EOj zLXgh3I~P_}E8)4Y{YaYUs-7gQURG_LoUctOM^+N8=QCqlVaGBmM-V WIq5l-giXo-0000S_(U5F;=fXa%86g4C2O=pxyWj4eVmKXP+-c4l_w{Wu?8>?oL)9|RH1@AAO&KmX@{ zp7TJD9zFig?Ami=-l2tL)+F?+fO%_~Gbs|#QgOQ7x+3GXKp4;c z_l&7906qTl+G?R^4JW$jDi8W;2`|e$bpRO)l_xz5v zR~<-LST2K;bA0&9;r*#|%X4yJG-Br%2tthaOs6r{djtX{1VtTC4I>IVpluD6AR_gi zrpbt;L;`J-p@cvSL^rvoj?Y}OW5W|KU6a7r@Pt@Z8rYqeYGfu$u-+3&#Xt~}I!h=O z&M(aKl_3OZn2eS+NT3o#w5&k^9cQ@^chFs*A3y=@I+;GW$|F_+=f7i)n_{MdTFk}@r?#dMg8zvnAm`zg(I-sHh&Ud?B66Fy>(7w7AGyX^u%0WmV1ey1r zb*woWJNN#0ZKx#x|91xd%J|BD#!fY_IomdJ;IYMFF1--9&#x$!TW90;Q_n zL@KQYH@T6ZZiycWV+BDV1wn*uifChGrq1M@xgYP>^U>lRg~>`Cf(Y(!_3*$s=YRg^ zJP!;QFyQ~po?|=i9h+`yfG6({mz6`^Zor|bl>qELHStEfYran+Rqpy=`-wB(l*-Vkrs}*`QmHq*gZ4Z`tEje-LeBOJ{1G7_teC$IF$Wa?pRUR z80+b#mLv)u7-{HpW7EyGw_cb+V_0Hmeot~+9XaWcA0NRbwf(t3vLnxUE|41`O+=K>_amma7`%MkF&)5*2s z8{6IT)1q)*DUoY_DJAq%OB@Q37L)?5ptO}URL-v3e7NZ!d#AbKp9Cx!!K=-LH(MD1 zdyefm8;0uPg`V-l^+1gASPx1d)PgY{t%VC$a^g@iR128z8R|*E<*NmaBmnUJ%(g}N z)_Gn7&Yj)&VcJRkjRN*>NjPvkW82a3pBi<&J`NSmd-|E9o+y+O^1^ZLzP(TqhKe+I z3^z2r)R060ai}=|TZ#vgSYeFESnn5WeSY8i;Z1Kn@vd7kfg01LjAMPM zD_y1W4Alaxg-*}l7SkvZk~mQ92qmjdh-^uxKqPfueATK%kIC=N|vze9w+e zH^-MaFgD$kyVoQ~qDW12`xfs#IuIJQ0As83;_h8vLV$ke$O?-B8g)%pIFvwMI@%pW z5D0Ooh(e*4Iy{~gwZLbkmtJO%%uKeP*W*XW?}y&Aj>Tx&`m9ouEsUrw<5xiI*^$gmT+vkIl5tO zeQQy=om$I-v+Yuk4r#i5L#?LKO32GgC}2j|MkCo1pxcDBpf`RvHiVg*EN#h(S^QQSTz!DO*1s zLmGghtadBS9i6_R76<4+FxH zcGvuR=jymSw@^M(8mD`yW8Ip#^Yf+bToA~pF@DZi-L@qdn49-gKGFYGc$>0TEs#C?w0%X~jbeu8sncL|W~X3^Ws)tUJP6KLWR z-)wSxp7ZyTYsU_}8}~Vm)tOnt7;;?05RZjTYS{zOmATgHJIbns0Hsa-e##l9UW}Ma}&Qtq6e{u;zwGTJjr3ytY#3dnX zXiKeVNRIrLSnBw?z{qX@PHl-lzQpG(iZWTxt}?ENNrrt>DyNFofb5-)JOHZ!QkFJr4^DzE%1j;Lq4RuNd5r@#o>}9mJnSw}Tp}Be>Z>7K zimT^e9&l~^9q&eB{!p|h!-}mVyG&N%LY2?hwh5_HKrQ4K^1V6j4D ngXNsn`7OPE^rIjB`0vF(bQHw$?$S6Z00000NkvXXu0mjfUZ{7F literal 0 HcmV?d00001 diff --git a/technic/textures/technicx32/technic_talinite_dust.png b/technic/textures/technicx32/technic_talinite_dust.png new file mode 100644 index 0000000000000000000000000000000000000000..39f933093cb9dd21253ed06d0c923a180d385a0b GIT binary patch literal 1088 zcmV-G1i$-Q-;eXv;*Nr7IZ6=0{FVpK|NNi-^E?NZ zS!S94GnTV5CeVC&4WH*}^B_&ShxEYU}r z(qU}&bgPqJ7@wSa_+AVwIf3o7$89}mJ~X+08<5~4DJERw0Psy<)!0ZXuJxsZ-mqnAbQN$DhFh=8>KnQ`nonu=$T5EdO`vSCpZvd?QXZ<@Su;Z0cPJdRgeRg(p z*)P8~)+A%J0K^ngqG+lHlN)>!aP_baN-O&FgBvnQDI`XonCnjbv?K#N_l$Dtcmcqs zBS*i|Ms2AU>Xdh^#E?iafq*uO7!pbge_rWhj3#eeszFVb8~XDDY%2puu5$AT=TqWc z;KDEO>@Vvw-frOe-J_g2S+HUH;Lo;g*O^R{Qo_}qEH@}ocpuP4ky4`URcNDewWqZr zA0}cA#u%>uF;4E)Xa6bwI?GbanS9Q*V{3~8MTAwcOKia#1L_fLm7n#c;^u%D22!{xgD2&y%NSJr(U}y zf$_;HS+jQ4v@v>bT{WbbP+F0E}O-6IjV(PM9Ggz$rrZ`;rQg#>amB`>rN1rV){pQWEcc1@h7NZ|!^U zj#~im-0o4%o-BCklS7Z#R<^Ak)J12sy~kBZN;hosHa|P#4E!=XpVfx^vypuO&uljw}*hqh&7;KFp zn!0qXeqf|Gf2p{jlv*8pxEf>X&2=Z1@F_2|%reXTNBjk?8s0Rsfm#Rv0000