From 26840fe47af9b0c8539a3cfbd19e8cbf0830c728 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sat, 13 Apr 2013 20:52:12 +0300 Subject: [PATCH] Remove rubber trees since they are in moretrees now --- init.lua | 5 +- rubber.lua | 104 ------------------------- textures/farming_bucket_rubber.png | Bin 317 -> 0 bytes textures/farming_rubber_sapling.png | Bin 333 -> 0 bytes textures/farming_rubber_tree_empty.png | Bin 835 -> 0 bytes textures/farming_rubber_tree_full.png | Bin 808 -> 0 bytes 6 files changed, 1 insertion(+), 108 deletions(-) delete mode 100644 rubber.lua delete mode 100644 textures/farming_bucket_rubber.png delete mode 100644 textures/farming_rubber_sapling.png delete mode 100755 textures/farming_rubber_tree_empty.png delete mode 100755 textures/farming_rubber_tree_full.png diff --git a/init.lua b/init.lua index 41d2c17..9ddded1 100644 --- a/init.lua +++ b/init.lua @@ -154,14 +154,11 @@ for lvl = 1, 6, 1 do }) end + minetest.register_alias("farming:cotton", "farming:cotton_3") minetest.register_alias("farming:wheat_harvested", "farming:wheat") minetest.register_alias("farming:dough", "farming:flour") - --- ========= RUBBER ========= -dofile(minetest.get_modpath("farming_plus").."/rubber.lua") - -- ========= STRAWBERRIES ========= dofile(minetest.get_modpath("farming_plus").."/strawberries.lua") diff --git a/rubber.lua b/rubber.lua deleted file mode 100644 index 4b7e413..0000000 --- a/rubber.lua +++ /dev/null @@ -1,104 +0,0 @@ -minetest.register_node("farming_plus:rubber_sapling", { - description = "Rubber Tree Sapling", - drawtype = "plantlike", - tiles = {"farming_rubber_sapling.png"}, - inventory_image = "farming_rubber_sapling.png", - wield_image = "farming_rubber_sapling.png", - paramtype = "light", - walkable = false, - groups = {dig_immediate=3,flammable=2}, - sounds = default.node_sound_defaults(), -}) - -minetest.register_node("farming_plus:rubber_tree_full", { - description = "Rubber Tree", - tiles = {"default_tree_top.png", "default_tree_top.png", "farming_rubber_tree_full.png"}, - groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2}, - drop = "default:tree", - sounds = default.node_sound_wood_defaults(), - - on_dig = function(pos, node, digger) - minetest.node_dig(pos, node, digger) - minetest.env:remove_node(pos) - end, - - after_destruct = function(pos, oldnode) - oldnode.name = "farming_plus:rubber_tree_empty" - minetest.env:set_node(pos, oldnode) - end -}) - - -minetest.register_node("farming_plus:rubber_tree_empty", { - tiles = {"default_tree_top.png", "default_tree_top.png", "farming_rubber_tree_empty.png"}, - groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2, not_in_creative_inventory=1}, - drop = "default:tree", - sounds = default.node_sound_wood_defaults(), -}) - -minetest.register_abm({ - nodenames = {"farming_plus:rubber_tree_empty"}, - interval = 60, - chance = 15, - action = function(pos, node) - node.name = "farming_plus:rubber_tree_full" - minetest.env:set_node(pos, node) - end -}) - -minetest.register_node("farming_plus:rubber_leaves", { - drawtype = "allfaces_optional", - visual_scale = 1.3, - tiles = {"default_leaves.png"}, - paramtype = "light", - groups = {snappy=3, leafdecay=3, flammable=2, not_in_creative_inventory=1}, - drop = { - max_items = 1, - items = { - { - items = {'farming_plus:rubber_sapling'}, - rarity = 20, - }, - } - }, - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_abm({ - nodenames = {"farming_plus:rubber_sapling"}, - interval = 60, - chance = 20, - action = function(pos, node) - farming:generate_tree(pos, "farming_plus:rubber_tree_full", "farming_plus:rubber_leaves", {"default:dirt", "default:dirt_with_grass"}) - end -}) - -minetest.register_on_generated(function(minp, maxp, blockseed) - if math.random(1, 100) > 5 then - return - end - local tmp = {x=(maxp.x-minp.x)/2+minp.x, y=(maxp.y-minp.y)/2+minp.y, z=(maxp.z-minp.z)/2+minp.z} - local pos = minetest.env:find_node_near(tmp, maxp.x-minp.x, {"default:dirt_with_grass"}) - if pos ~= nil then - farming:generate_tree({x=pos.x, y=pos.y+1, z=pos.z}, "farming_plus:rubber_tree_full", "farming_plus:rubber_leaves", {"default:dirt", "default:dirt_with_grass"}) - end -end) - -minetest.register_craftitem("farming_plus:bucket_rubber", { - description = "Bucket with Caoutchouc", - inventory_image = "farming_bucket_rubber.png", - stack_max = 1, -}) - -local bucket_tmp = { - source = "farming_plus:rubber_tree_full", - itemname = "farming_plus:bucket_rubber" -} -bucket.liquids["farming_plus:rubber_tree_full"] = bucket_tmp - --- ========= FUEL ========= -minetest.register_craft({ - type = "fuel", - recipe = "farming_plus:rubber_sapling", - burntime = 10 -}) diff --git a/textures/farming_bucket_rubber.png b/textures/farming_bucket_rubber.png deleted file mode 100644 index effdcac6668055ea457970d96759feec677d797b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<4n6@6vB)*o^npTqJzX3_EKZ-D zbda~jfQRM!i(L+laW7QXE)ncDtGK{rq*3~&mVwnnK&an(|00du^GbRC>{?QAez}w; z=gGzG9&zgF8)x2C+MZi|!HcunIBOQ$XPfy)Z~h1gU8NOn%(P(U#WNfYiY!&{XPW(f zV$h!G&?CrT(5Jj>oim4`^h&RZd%jO+KfUSA^UPTbRZWr$W&fX4dV9Zep8KWPduuj5c>jv~)Oo+hjj!xa06oIs>FVdQ I&MBb@0M0#oCjbBd diff --git a/textures/farming_rubber_sapling.png b/textures/farming_rubber_sapling.png deleted file mode 100644 index e5c9f5de0c191c2fb3c9e113a113ed69138bff8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^JsM z;N)AjnLrWF0*}aI1_o|n5N2eUHAey{$X?><>&kwIgHJ$?^Mp+vFHq>Lr;B5V#p$g< z2f3OYL~61hX)Wn)ymZfq<$bNw{EPixrq((-z0v*jXz3c&8G2$$%T_!K%CI}PN1uVgq>(Mx+ekjBKx1jbBbMLh9IxaUnTDVm=wso0n|R zT%5b~qx==U4)bC!=~>TRm%6J@>^OCG(&eAuDtZ^~>pbejcFwRwGUdSnzXi9yeq;99 W5#n{Q?w1qLV+@|IelF{r5}E)?uYE%R diff --git a/textures/farming_rubber_tree_empty.png b/textures/farming_rubber_tree_empty.png deleted file mode 100755 index 1792951edd5e5783c39432d545a82be85c54fbaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 835 zcmV-J1HAl+P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyn_ z5CR+B@r3A6mdXN25~mJai_QxT^b`9rl-2QKJUG+i;m|HoR8<2 zCub9NE@3>%`Rw2a0It9EEItO3Y{30{_t|>v4D-_!!#pPu!@OL9QRd|ei9nhqG)>R` z)4Kp%eg0)2k~v{sF3Ho3)H$4UsIhe3W353$M8rUvS;Ps(7;av_#)X|dX4~h98i}gZ zb<4QOiNUj|Rsi&U00V*%oU>RfBx3pN&p!Zo`_}vP3aLw|>W0pH+NL9F1R#V+R1kyW zePA>k(8oaE^#JT&-Nkn;o0AR7MTHZgY8#?P5^HJN0D!0}O&2i6(D#9e@WzYJP}LP} z(=je`FhbRIbalt4UmQ}k9Wi*&hZP3ak~+t7S)oxuz>09^^KTdq60A{%gB1TTe%-c+ z5yXHqs)!Tns=)_O3?8wLFTekZqr-1eE2t_#m28l$`^P}Q5Mhlm%M!|ELs8^3Z3nEK zcJ?k)E-TumC(AN6i=3M`Ugx``U+@|bz!?;^%IRXsx!I$1ZHuDpU)g0golq_ow0=Eo znq}O2?*m?a;R;zcpldrsF$h9lq)avniaf_+@V>{Tj?Q9|$e@RP5JG14|Iy$={Ms47kbfafk>Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyn_ z5CJtR2^p@NZCU9<}q5?q+?yqS0J zJzY%Rl=LjmIscDy{_3^*I`RF08xvCi9C&v-QJBLxOAyvD{cM_-*RNw{c9AQ;jRLU$ zt<9i>nYl%@18z)AF*bS&0OuU#qyjiXUo$heK$HtJFhF7qo~ID&&|0OFT>XK%+rOcJxU?j`nYZ3N)VsV{Ki2t1E+Yyr?BDZ%4EA7lh)zrMu4_umnh z6AHBvRhP+fLLncq6el=qKtNZA|2+ANt(zJ$k|W2u>AzMYUlZV|RK$qGTFY`Aqm@Q0 z&}zlO4?kbWSVMQ$p;iA7Pg8Xn)`aQ(&SIU#K^o)TiQ9~i-r_<}FO%bAD?j-LfVqVw z;&KImp_`Kwua@}Z?jwv?G~g?Qug-nR)4!iHGIk&BRg?IXuJ%^u=I4n`WtFQB+qMyg zH6(F@78DxIorh2O{FA-ZMp3rt=X_>gERgek1_v(F-`fL#=LdwjR7t=7Mk7C7{T+bb zE5od-D`b%>QRLU;0cdUO$cX!X8lg}d;Y3iczEUU3Q*78!PjT>iYJbl*ibExiw(nwk zVV=M#taId}5Nj+0zovpMjSXl)uoc6JQ|B{<;!r6~K!hmpQA)8~j)}rB16NCn2%TNW zd9$fGYaV`YXFAlH#pQ&xg<3qVFaihLcKioc3az!K>$7eECdWqUczX*P`1qX`#1nET m%9RAq4=~28Qs20#k$(Z;HXch*gveL`0000