From 1314e31abc619db2f53674b4e4da7a197dc25209 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 31 Jan 2017 12:35:59 +0100 Subject: [PATCH] Rename farming mod to mcl_farming --- mods/default/crafting.lua | 8 +-- mods/default/functions.lua | 32 ++++----- mods/default/nodes.lua | 4 +- mods/mcl_cake/depends.txt | 3 + mods/mcl_cake/init.lua | 2 +- mods/{farming => mcl_farming}/README.txt | 0 mods/{farming => mcl_farming}/carrots.lua | 34 ++++----- mods/{farming => mcl_farming}/depends.txt | 0 mods/{farming => mcl_farming}/hoes.lua | 38 +++++----- mods/{farming => mcl_farming}/init.lua | 26 +++---- mods/{farming => mcl_farming}/melon.lua | 68 +++++++++--------- mods/mcl_farming/mod.conf | 1 + mods/{farming => mcl_farming}/mushrooms.lua | 10 +-- mods/{farming => mcl_farming}/potatoes.lua | 30 ++++---- mods/{farming => mcl_farming}/pumpkin.lua | 54 +++++++------- mods/{farming => mcl_farming}/soil.lua | 8 +-- .../textures/farming_bread.png | Bin .../textures/farming_carrot.png | Bin .../textures/farming_carrot_1.png | Bin .../textures/farming_carrot_2.png | Bin .../textures/farming_carrot_3.png | Bin .../textures/farming_carrot_4.png | Bin .../textures/farming_carrot_gold.png | Bin .../textures/farming_cookie.png | Bin .../textures/farming_melon.png | Bin .../textures/farming_melon_seed.png | Bin .../textures/farming_melon_side.png | Bin .../textures/farming_melon_top.png | Bin .../textures/farming_mushroom_brown.png | Bin .../textures/farming_mushroom_red.png | Bin .../textures/farming_mushroom_stew.png | Bin .../textures/farming_potato.png | Bin .../textures/farming_potato_1.png | Bin .../textures/farming_potato_2.png | Bin .../textures/farming_potato_3.png | Bin .../textures/farming_potato_baked.png | Bin .../textures/farming_potato_poison.png | Bin .../textures/farming_pumpkin_face.png | Bin .../textures/farming_pumpkin_face_light.png | Bin .../textures/farming_pumpkin_seed.png | Bin .../textures/farming_pumpkin_side.png | Bin .../textures/farming_pumpkin_top.png | Bin .../textures/farming_soil.png | Bin .../textures/farming_soil_wet.png | Bin .../textures/farming_tige_1.png | Bin .../textures/farming_tige_2.png | Bin .../textures/farming_tige_connnect.png | Bin .../textures/farming_tige_end.png | Bin .../textures/farming_tool_diamondhoe.png | Bin .../textures/farming_tool_goldhoe.png | Bin .../textures/farming_tool_steelhoe.png | Bin .../textures/farming_tool_stonehoe.png | Bin .../textures/farming_tool_woodhoe.png | Bin .../textures/farming_wheat.png | Bin .../textures/farming_wheat_1.png | Bin .../textures/farming_wheat_2.png | Bin .../textures/farming_wheat_3.png | Bin .../textures/farming_wheat_harvested.png | Bin .../textures/farming_wheat_seed.png | Bin mods/{farming => mcl_farming}/wheat.lua | 42 +++++------ mods/mcl_flowers/init.lua | 2 +- mods/mcl_potions/depends.txt | 2 +- mods/mcl_potions/init.lua | 4 +- mods/mcl_throwing/README.txt | 12 ++-- 64 files changed, 193 insertions(+), 187 deletions(-) rename mods/{farming => mcl_farming}/README.txt (100%) rename mods/{farming => mcl_farming}/carrots.lua (65%) rename mods/{farming => mcl_farming}/depends.txt (100%) rename mods/{farming => mcl_farming}/hoes.lua (82%) rename mods/{farming => mcl_farming}/init.lua (64%) rename mods/{farming => mcl_farming}/melon.lua (74%) create mode 100644 mods/mcl_farming/mod.conf rename mods/{farming => mcl_farming}/mushrooms.lua (81%) rename mods/{farming => mcl_farming}/potatoes.lua (65%) rename mods/{farming => mcl_farming}/pumpkin.lua (80%) rename mods/{farming => mcl_farming}/soil.lua (87%) rename mods/{farming => mcl_farming}/textures/farming_bread.png (100%) rename mods/{farming => mcl_farming}/textures/farming_carrot.png (100%) rename mods/{farming => mcl_farming}/textures/farming_carrot_1.png (100%) rename mods/{farming => mcl_farming}/textures/farming_carrot_2.png (100%) rename mods/{farming => mcl_farming}/textures/farming_carrot_3.png (100%) rename mods/{farming => mcl_farming}/textures/farming_carrot_4.png (100%) rename mods/{farming => mcl_farming}/textures/farming_carrot_gold.png (100%) rename mods/{farming => mcl_farming}/textures/farming_cookie.png (100%) rename mods/{farming => mcl_farming}/textures/farming_melon.png (100%) rename mods/{farming => mcl_farming}/textures/farming_melon_seed.png (100%) rename mods/{farming => mcl_farming}/textures/farming_melon_side.png (100%) rename mods/{farming => mcl_farming}/textures/farming_melon_top.png (100%) rename mods/{farming => mcl_farming}/textures/farming_mushroom_brown.png (100%) rename mods/{farming => mcl_farming}/textures/farming_mushroom_red.png (100%) rename mods/{farming => mcl_farming}/textures/farming_mushroom_stew.png (100%) rename mods/{farming => mcl_farming}/textures/farming_potato.png (100%) rename mods/{farming => mcl_farming}/textures/farming_potato_1.png (100%) rename mods/{farming => mcl_farming}/textures/farming_potato_2.png (100%) rename mods/{farming => mcl_farming}/textures/farming_potato_3.png (100%) rename mods/{farming => mcl_farming}/textures/farming_potato_baked.png (100%) rename mods/{farming => mcl_farming}/textures/farming_potato_poison.png (100%) rename mods/{farming => mcl_farming}/textures/farming_pumpkin_face.png (100%) rename mods/{farming => mcl_farming}/textures/farming_pumpkin_face_light.png (100%) rename mods/{farming => mcl_farming}/textures/farming_pumpkin_seed.png (100%) rename mods/{farming => mcl_farming}/textures/farming_pumpkin_side.png (100%) rename mods/{farming => mcl_farming}/textures/farming_pumpkin_top.png (100%) rename mods/{farming => mcl_farming}/textures/farming_soil.png (100%) rename mods/{farming => mcl_farming}/textures/farming_soil_wet.png (100%) rename mods/{farming => mcl_farming}/textures/farming_tige_1.png (100%) rename mods/{farming => mcl_farming}/textures/farming_tige_2.png (100%) rename mods/{farming => mcl_farming}/textures/farming_tige_connnect.png (100%) rename mods/{farming => mcl_farming}/textures/farming_tige_end.png (100%) rename mods/{farming => mcl_farming}/textures/farming_tool_diamondhoe.png (100%) rename mods/{farming => mcl_farming}/textures/farming_tool_goldhoe.png (100%) rename mods/{farming => mcl_farming}/textures/farming_tool_steelhoe.png (100%) rename mods/{farming => mcl_farming}/textures/farming_tool_stonehoe.png (100%) rename mods/{farming => mcl_farming}/textures/farming_tool_woodhoe.png (100%) rename mods/{farming => mcl_farming}/textures/farming_wheat.png (100%) rename mods/{farming => mcl_farming}/textures/farming_wheat_1.png (100%) rename mods/{farming => mcl_farming}/textures/farming_wheat_2.png (100%) rename mods/{farming => mcl_farming}/textures/farming_wheat_3.png (100%) rename mods/{farming => mcl_farming}/textures/farming_wheat_harvested.png (100%) rename mods/{farming => mcl_farming}/textures/farming_wheat_seed.png (100%) rename mods/{farming => mcl_farming}/wheat.lua (73%) diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 531c617a13..1bf2088324 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -453,14 +453,14 @@ minetest.register_craft({ minetest.register_craft({ output = 'default:haybale', recipe = { - {'farming:wheat_harvested', 'farming:wheat_harvested', 'farming:wheat_harvested'}, - {'farming:wheat_harvested', 'farming:wheat_harvested', 'farming:wheat_harvested'}, - {'farming:wheat_harvested', 'farming:wheat_harvested', 'farming:wheat_harvested'}, + {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, + {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, + {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, } }) minetest.register_craft({ - output = 'farming:wheat_harvested 9', + output = 'mcl_farming:wheat_harvested 9', recipe = { {'default:haybale'}, } diff --git a/mods/default/functions.lua b/mods/default/functions.lua index 95a4096f76..d7795b87a7 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -463,46 +463,46 @@ function default.duengen(pointed_thing) minetest.add_node(pos, {name="air"}) generate_tree(pos, "default:tree", "default:leaves", 1) return true - elseif string.find(n.name, "farming:wheat_") ~= nil then + elseif string.find(n.name, "mcl_farming:wheat_") ~= nil then stage = string.sub(n.name, 15) if stage == "3" then - minetest.add_node(pos, {name="farming:wheat"}) + minetest.add_node(pos, {name="mcl_farming:wheat"}) elseif math.random(1,5) < 3 then - minetest.add_node(pos, {name="farming:wheat"}) + minetest.add_node(pos, {name="mcl_farming:wheat"}) else - minetest.add_node(pos, {name="farming:wheat_"..math.random(2,3)}) + minetest.add_node(pos, {name="mcl_farming:wheat_"..math.random(2,3)}) end return true - elseif string.find(n.name, "farming:potato_") ~= nil then + elseif string.find(n.name, "mcl_farming:potato_") ~= nil then stage = tonumber(string.sub(n.name, 16)) if stage == 1 then - minetest.add_node(pos, {name="farming:potato_"..math.random(stage,2)}) + minetest.add_node(pos, {name="mcl_farming:potato_"..math.random(stage,2)}) else - minetest.add_node(pos, {name="farming:potato"}) + minetest.add_node(pos, {name="mcl_farming:potato"}) end return true - elseif string.find(n.name, "farming:carrot_") ~= nil then + elseif string.find(n.name, "mcl_farming:carrot_") ~= nil then stage = tonumber(string.sub(n.name, 16)) if stage == 1 then - minetest.add_node(pos, {name="farming:carrot_"..math.random(stage,2)}) + minetest.add_node(pos, {name="mcl_farming:carrot_"..math.random(stage,2)}) else - minetest.add_node(pos, {name="farming:carrot"}) + minetest.add_node(pos, {name="mcl_farming:carrot"}) end return true - elseif string.find(n.name, "farming:pumpkin_") ~= nil then + elseif string.find(n.name, "mcl_farming:pumpkin_") ~= nil then stage = tonumber(string.sub(n.name, 17)) if stage == 1 then - minetest.add_node(pos, {name="farming:pumpkin_"..math.random(stage,2)}) + minetest.add_node(pos, {name="mcl_farming:pumpkin_"..math.random(stage,2)}) else - minetest.add_node(pos, {name="farming:pumpkintige_unconnect"}) + minetest.add_node(pos, {name="mcl_farming:pumpkintige_unconnect"}) end return true - elseif string.find(n.name, "farming:melontige_") ~= nil then + elseif string.find(n.name, "mcl_farming:melontige_") ~= nil then stage = tonumber(string.sub(n.name, 18)) if stage == 1 then - minetest.add_node(pos, {name="farming:melontige_"..math.random(stage,2)}) + minetest.add_node(pos, {name="mcl_farming:melontige_"..math.random(stage,2)}) else - minetest.add_node(pos, {name="farming:melontige_unconnect"}) + minetest.add_node(pos, {name="mcl_farming:melontige_unconnect"}) end return true elseif n.name ~= "" and n.name == "default:junglesapling" then diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index be09fdc664..a6763b8f37 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -867,7 +867,7 @@ minetest.register_node("default:junglegrass", { max_items = 1, items = { { - items = {'farming:wheat_seed'}, + items = {'mcl_farming:wheat_seed'}, rarity = 24, }, } @@ -1412,7 +1412,7 @@ minetest.register_node("default:grass", { max_items = 1, items = { { - items = {'farming:wheat_seed'}, + items = {'mcl_farming:wheat_seed'}, rarity = 24, }, } diff --git a/mods/mcl_cake/depends.txt b/mods/mcl_cake/depends.txt index 4ad96d5159..0272d0d9a9 100644 --- a/mods/mcl_cake/depends.txt +++ b/mods/mcl_cake/depends.txt @@ -1 +1,4 @@ default +bucket +mcl_farming +mcl_mobitems diff --git a/mods/mcl_cake/init.lua b/mods/mcl_cake/init.lua index cc8026aeee..92972b6d8b 100644 --- a/mods/mcl_cake/init.lua +++ b/mods/mcl_cake/init.lua @@ -16,7 +16,7 @@ minetest.register_craft({ recipe = { {'mcl_mobitems:milk_bucket', 'mcl_mobitems:milk_bucket', 'mcl_mobitems:milk_bucket'}, {'default:sugar', 'mcl_throwing:egg', 'default:sugar'}, - {'farming:wheat_harvested', 'farming:wheat_harvested', 'farming:wheat_harvested'}, + {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, }, replacements = { {"mcl_mobitems:milk_bucket", "bucket:bucket_empty"}, diff --git a/mods/farming/README.txt b/mods/mcl_farming/README.txt similarity index 100% rename from mods/farming/README.txt rename to mods/mcl_farming/README.txt diff --git a/mods/farming/carrots.lua b/mods/mcl_farming/carrots.lua similarity index 65% rename from mods/farming/carrots.lua rename to mods/mcl_farming/carrots.lua index c5624737ac..9112535bf2 100644 --- a/mods/farming/carrots.lua +++ b/mods/mcl_farming/carrots.lua @@ -1,8 +1,8 @@ -minetest.register_node("farming:carrot_1", { +minetest.register_node("mcl_farming:carrot_1", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "farming:carrot_item", + drop = "mcl_farming:carrot_item", tiles = {"farming_carrot_1.png"}, selection_box = { type = "fixed", @@ -14,11 +14,11 @@ minetest.register_node("farming:carrot_1", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:carrot_2", { +minetest.register_node("mcl_farming:carrot_2", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "farming:carrot_item", + drop = "mcl_farming:carrot_item", tiles = {"farming_carrot_2.png"}, selection_box = { type = "fixed", @@ -30,11 +30,11 @@ minetest.register_node("farming:carrot_2", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:carrot_3", { +minetest.register_node("mcl_farming:carrot_3", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "farming:carrot_item", + drop = "mcl_farming:carrot_item", tiles = {"farming_carrot_3.png"}, selection_box = { type = "fixed", @@ -46,7 +46,7 @@ minetest.register_node("farming:carrot_3", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:carrot", { +minetest.register_node("mcl_farming:carrot", { paramtype = "light", walkable = false, drawtype = "plantlike", @@ -54,27 +54,27 @@ minetest.register_node("farming:carrot", { drop = { max_items = 1, items = { - { items = {'farming:carrot_item 4'}, rarity = 5 }, - { items = {'farming:carrot_item 3'}, rarity = 2 }, - { items = {'farming:carrot_item 2'}, rarity = 2 }, - { items = {'farming:carrot_item 1'} }, + { items = {'mcl_farming:carrot_item 4'}, rarity = 5 }, + { items = {'mcl_farming:carrot_item 3'}, rarity = 2 }, + { items = {'mcl_farming:carrot_item 2'}, rarity = 2 }, + { items = {'mcl_farming:carrot_item 1'} }, } }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1}, sounds = default.node_sound_leaves_defaults(), }) -minetest.register_craftitem("farming:carrot_item", { +minetest.register_craftitem("mcl_farming:carrot_item", { description = "Carrot", inventory_image = "farming_carrot.png", on_use = minetest.item_eat(3), groups = { food = 2, eatable = 3 }, on_place = function(itemstack, placer, pointed_thing) - return farming:place_seed(itemstack, placer, pointed_thing, "farming:carrot_1") + return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:carrot_1") end }) -minetest.register_craftitem("farming:carrot_item_gold", { +minetest.register_craftitem("mcl_farming:carrot_item_gold", { description = "Golden Carrot", inventory_image = "farming_carrot_gold.png", on_use = minetest.item_eat(3), @@ -82,12 +82,12 @@ minetest.register_craftitem("farming:carrot_item_gold", { }) minetest.register_craft({ - output = "farming:carrot_item_gold", + output = "mcl_farming:carrot_item_gold", recipe = { {'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'}, - {'default:gold_nugget', 'farming:carrot_item', 'default:gold_nugget'}, + {'default:gold_nugget', 'mcl_farming:carrot_item', 'default:gold_nugget'}, {'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'}, } }) -farming:add_plant("farming:carrot", {"farming:carrot_1", "farming:carrot_2", "farming:carrot_3"}, 50, 20) +mcl_farming:add_plant("mcl_farming:carrot", {"mcl_farming:carrot_1", "mcl_farming:carrot_2", "mcl_farming:carrot_3"}, 50, 20) diff --git a/mods/farming/depends.txt b/mods/mcl_farming/depends.txt similarity index 100% rename from mods/farming/depends.txt rename to mods/mcl_farming/depends.txt diff --git a/mods/farming/hoes.lua b/mods/mcl_farming/hoes.lua similarity index 82% rename from mods/farming/hoes.lua rename to mods/mcl_farming/hoes.lua index 2d3f575dac..67df5871d9 100644 --- a/mods/farming/hoes.lua +++ b/mods/mcl_farming/hoes.lua @@ -7,7 +7,7 @@ local function create_soil(pos, inv) local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}) if minetest.get_item_group(name, "cultivatable") == 2 then if above.name == "air" then - node.name = "farming:soil" + node.name = "mcl_farming:soil" minetest.set_node(pos, node) return true end @@ -21,7 +21,7 @@ local function create_soil(pos, inv) return false end -minetest.register_tool("farming:hoe_wood", { +minetest.register_tool("mcl_farming:hoe_wood", { description = "Wood Hoe", inventory_image = "farming_tool_woodhoe.png", on_place = function(itemstack, user, pointed_thing) @@ -40,7 +40,7 @@ minetest.register_tool("farming:hoe_wood", { }) minetest.register_craft({ - output = "farming:hoe_wood", + output = "mcl_farming:hoe_wood", recipe = { {"group:wood", "group:wood"}, {"", "default:stick"}, @@ -48,7 +48,7 @@ minetest.register_craft({ } }) minetest.register_craft({ - output = "farming:hoe_wood", + output = "mcl_farming:hoe_wood", recipe = { {"group:wood", "group:wood"}, {"default:stick", ""}, @@ -57,11 +57,11 @@ minetest.register_craft({ }) minetest.register_craft({ type = "fuel", - recipe = "farming:hoe_wood", + recipe = "mcl_farming:hoe_wood", burntime = 10, }) -minetest.register_tool("farming:hoe_stone", { +minetest.register_tool("mcl_farming:hoe_stone", { description = "Stone Hoe", inventory_image = "farming_tool_stonehoe.png", on_place = function(itemstack, user, pointed_thing) @@ -80,7 +80,7 @@ minetest.register_tool("farming:hoe_stone", { }) minetest.register_craft({ - output = "farming:hoe_stone", + output = "mcl_farming:hoe_stone", recipe = { {"default:cobble", "default:cobble"}, {"", "default:stick"}, @@ -88,7 +88,7 @@ minetest.register_craft({ } }) minetest.register_craft({ - output = "farming:hoe_stone", + output = "mcl_farming:hoe_stone", recipe = { {"default:cobble", "default:cobble"}, {"default:stick", ""}, @@ -96,7 +96,7 @@ minetest.register_craft({ } }) -minetest.register_tool("farming:hoe_steel", { +minetest.register_tool("mcl_farming:hoe_steel", { description = "Iron Hoe", inventory_image = "farming_tool_steelhoe.png", on_place = function(itemstack, user, pointed_thing) @@ -116,7 +116,7 @@ minetest.register_tool("farming:hoe_steel", { }) minetest.register_craft({ - output = "farming:hoe_steel", + output = "mcl_farming:hoe_steel", recipe = { {"default:steel_ingot", "default:steel_ingot"}, {"", "default:stick"}, @@ -124,7 +124,7 @@ minetest.register_craft({ } }) minetest.register_craft({ - output = "farming:hoe_steel", + output = "mcl_farming:hoe_steel", recipe = { {"default:steel_ingot", "default:steel_ingot"}, {"default:stick", ""}, @@ -135,11 +135,11 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", output = "default:iron_nugget", - recipe = "farming:hoe_steel", + recipe = "mcl_farming:hoe_steel", cooktime = 10, }) -minetest.register_tool("farming:hoe_gold", { +minetest.register_tool("mcl_farming:hoe_gold", { description = "Golden Hoe", inventory_image = "farming_tool_goldhoe.png", on_place = function(itemstack, user, pointed_thing) @@ -158,7 +158,7 @@ minetest.register_tool("farming:hoe_gold", { }) minetest.register_craft({ - output = "farming:hoe_gold", + output = "mcl_farming:hoe_gold", recipe = { {"default:gold_ingot", "default:gold_ingot"}, {"", "default:stick"}, @@ -166,7 +166,7 @@ minetest.register_craft({ } }) minetest.register_craft({ - output = "farming:hoe_gold", + output = "mcl_farming:hoe_gold", recipe = { {"default:gold_ingot", "default:gold_ingot"}, {"default:stick", ""}, @@ -179,11 +179,11 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", output = "default:gold_nugget", - recipe = "farming:hoe_gold", + recipe = "mcl_farming:hoe_gold", cooktime = 10, }) -minetest.register_tool("farming:hoe_diamond", { +minetest.register_tool("mcl_farming:hoe_diamond", { description = "Diamond Hoe", inventory_image = "farming_tool_diamondhoe.png", on_place = function(itemstack, user, pointed_thing) @@ -202,7 +202,7 @@ minetest.register_tool("farming:hoe_diamond", { }) minetest.register_craft({ - output = "farming:hoe_diamond", + output = "mcl_farming:hoe_diamond", recipe = { {"default:diamond", "default:diamond"}, {"", "default:stick"}, @@ -210,7 +210,7 @@ minetest.register_craft({ } }) minetest.register_craft({ - output = "farming:hoe_diamond", + output = "mcl_farming:hoe_diamond", recipe = { {"default:diamond", "default:diamond"}, {"default:stick", ""}, diff --git a/mods/farming/init.lua b/mods/mcl_farming/init.lua similarity index 64% rename from mods/farming/init.lua rename to mods/mcl_farming/init.lua index 3d6c384f89..ae70790b61 100644 --- a/mods/farming/init.lua +++ b/mods/mcl_farming/init.lua @@ -1,14 +1,14 @@ local init = os.clock() -farming = {} +mcl_farming = {} -function farming:add_plant(full_grown, names, interval, chance) +function mcl_farming:add_plant(full_grown, names, interval, chance) minetest.register_abm({ nodenames = names, interval = interval, chance = chance, action = function(pos, node) pos.y = pos.y-1 - if minetest.get_node(pos).name ~= "farming:soil_wet" and math.random(0, 9) > 0 then + if minetest.get_node(pos).name ~= "mcl_farming:soil_wet" and math.random(0, 9) > 0 then return end pos.y = pos.y+1 @@ -38,7 +38,7 @@ function farming:add_plant(full_grown, names, interval, chance) end -function farming:place_seed(itemstack, placer, pointed_thing, plantname) +function mcl_farming:place_seed(itemstack, placer, pointed_thing, plantname) local pt = pointed_thing if not pt then return @@ -53,7 +53,7 @@ function farming:place_seed(itemstack, placer, pointed_thing, plantname) local place_s = minetest.get_node(pos) - if string.find(farmland.name, "farming:soil") and string.find(place_s.name, "air") then + if string.find(farmland.name, "mcl_farming:soil") and string.find(place_s.name, "air") then minetest.add_node(pos, {name=plantname}) else return @@ -68,28 +68,28 @@ end -- ========= SOIL ========= -dofile(minetest.get_modpath("farming").."/soil.lua") +dofile(minetest.get_modpath("mcl_farming").."/soil.lua") -- ========= HOES ========= -dofile(minetest.get_modpath("farming").."/hoes.lua") +dofile(minetest.get_modpath("mcl_farming").."/hoes.lua") -- ========= WHEAT ========= -dofile(minetest.get_modpath("farming").."/wheat.lua") +dofile(minetest.get_modpath("mcl_farming").."/wheat.lua") -- ========= PUMPKIN ========= -dofile(minetest.get_modpath("farming").."/pumpkin.lua") +dofile(minetest.get_modpath("mcl_farming").."/pumpkin.lua") -- ========= MELON ========= -dofile(minetest.get_modpath("farming").."/melon.lua") +dofile(minetest.get_modpath("mcl_farming").."/melon.lua") -- ========= CARROT ========= -dofile(minetest.get_modpath("farming").."/carrots.lua") +dofile(minetest.get_modpath("mcl_farming").."/carrots.lua") -- ========= POTATOES ========= -dofile(minetest.get_modpath("farming").."/potatoes.lua") +dofile(minetest.get_modpath("mcl_farming").."/potatoes.lua") -- ========= MUSHROOMS ========= -dofile(minetest.get_modpath("farming").."/mushrooms.lua") +dofile(minetest.get_modpath("mcl_farming").."/mushrooms.lua") local time_to_load= os.clock() - init print(string.format("[MOD] "..minetest.get_current_modname().." loaded in %.4f s", time_to_load)) diff --git a/mods/farming/melon.lua b/mods/mcl_farming/melon.lua similarity index 74% rename from mods/farming/melon.lua rename to mods/mcl_farming/melon.lua index a23e402f6f..7dba9c7d90 100644 --- a/mods/farming/melon.lua +++ b/mods/mcl_farming/melon.lua @@ -1,4 +1,4 @@ -minetest.register_node("farming:melon", { +minetest.register_node("mcl_farming:melon", { description = "Melon", paramtype2 = "facedir", stack_max = 64, @@ -7,11 +7,11 @@ minetest.register_node("farming:melon", { drop = { max_items = 1, items = { - { items = {'farming:melon_item 7'}, rarity = 14 }, - { items = {'farming:melon_item 6'}, rarity = 10 }, - { items = {'farming:melon_item 5'}, rarity = 5 }, - { items = {'farming:melon_item 4'}, rarity = 2 }, - { items = {'farming:melon_item 3'} }, + { items = {'mcl_farming:melon_item 7'}, rarity = 14 }, + { items = {'mcl_farming:melon_item 6'}, rarity = 10 }, + { items = {'mcl_farming:melon_item 5'}, rarity = 5 }, + { items = {'mcl_farming:melon_item 4'}, rarity = 2 }, + { items = {'mcl_farming:melon_item 3'} }, } }, after_dig_node = function(pos, oldnode, oldmetadata, user) @@ -21,7 +21,7 @@ minetest.register_node("farming:melon", { local n = minetest.get_node(p) if string.find(n.name, "melontige_linked_") and have_change == 0 then have_change = 1 - minetest.add_node(p, {name="farming:melontige_unconnect"}) + minetest.add_node(p, {name="mcl_farming:melontige_unconnect"}) end end if have_change == 0 then @@ -30,14 +30,14 @@ minetest.register_node("farming:melon", { local n = minetest.get_node(p) if string.find(n.name, "melontige_linked_") and have_change == 0 then have_change = 1 - minetest.add_node(p, {name="farming:melontige_unconnect"}) + minetest.add_node(p, {name="mcl_farming:melontige_unconnect"}) end end end end }) -minetest.register_node("farming:melontige_1", { +minetest.register_node("mcl_farming:melontige_1", { paramtype = "light", walkable = false, drawtype = "plantlike", @@ -54,7 +54,7 @@ minetest.register_node("farming:melontige_1", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:melontige_2", { +minetest.register_node("mcl_farming:melontige_2", { paramtype = "light", walkable = false, drawtype = "plantlike", @@ -71,7 +71,7 @@ minetest.register_node("farming:melontige_2", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:melontige_unconnect", { +minetest.register_node("mcl_farming:melontige_unconnect", { paramtype = "light", walkable = false, sunlight_propagates = true, @@ -82,7 +82,7 @@ minetest.register_node("farming:melontige_unconnect", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:melontige_linked_r", { +minetest.register_node("mcl_farming:melontige_linked_r", { paramtype = "light", sunlight_propagates = true, walkable = false, @@ -112,7 +112,7 @@ minetest.register_node("farming:melontige_linked_r", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:melontige_linked_l", { +minetest.register_node("mcl_farming:melontige_linked_l", { paramtype = "light", walkable = false, sunlight_propagates = true, @@ -142,7 +142,7 @@ minetest.register_node("farming:melontige_linked_l", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:melontige_linked_t", { +minetest.register_node("mcl_farming:melontige_linked_t", { paramtype = "light", walkable = false, sunlight_propagates = true, @@ -172,7 +172,7 @@ minetest.register_node("farming:melontige_linked_t", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:melontige_linked_b", { +minetest.register_node("mcl_farming:melontige_linked_b", { paramtype = "light", walkable = false, sunlight_propagates = true, @@ -202,17 +202,17 @@ minetest.register_node("farming:melontige_linked_b", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_craftitem("farming:melon_seed", { +minetest.register_craftitem("mcl_farming:melon_seed", { description = "Melon Seeds", stack_max = 64, groups = { craftitem=1 }, inventory_image = "farming_melon_seed.png", on_place = function(itemstack, placer, pointed_thing) - return farming:place_seed(itemstack, placer, pointed_thing, "farming:melontige_1") + return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:melontige_1") end, }) -minetest.register_craftitem("farming:melon_item", { +minetest.register_craftitem("mcl_farming:melon_item", { description = "Melon", stack_max = 64, inventory_image = "farming_melon.png", @@ -221,7 +221,7 @@ minetest.register_craftitem("farming:melon_item", { }) minetest.register_abm({ - nodenames = {"farming:melontige_unconnect"}, + nodenames = {"mcl_farming:melontige_unconnect"}, neighbors = {"air"}, interval = 25, chance = 15, @@ -237,13 +237,13 @@ minetest.register_abm({ local nod = minetest.get_node(newpos) if n.name=="default:dirt_with_grass" and nod.name=="air" and have_change == 0 or n.name=="default:dirt" and nod.name=="air" and have_change == 0 - or string.find(n.name, "farming:soil") and nod.name=="air" and have_change == 0 then + or string.find(n.name, "mcl_farming:soil") and nod.name=="air" and have_change == 0 then have_change = 1 - minetest.add_node(newpos, {name="farming:melon"}) + minetest.add_node(newpos, {name="mcl_farming:melon"}) if x == 1 then - minetest.add_node(pos, {name="farming:melontige_linked_r" }) + minetest.add_node(pos, {name="mcl_farming:melontige_linked_r" }) else - minetest.add_node(pos, {name="farming:melontige_linked_l"}) + minetest.add_node(pos, {name="mcl_farming:melontige_linked_l"}) end end end @@ -255,13 +255,13 @@ minetest.register_abm({ local nod2 = minetest.get_node(newpos) if n.name=="default:dirt_with_grass" and nod2.name=="air" and have_change == 0 or n.name=="default:dirt" and nod2.name=="air" and have_change == 0 - or string.find(n.name, "farming:soil") and nod2.name=="air" and have_change == 0 then + or string.find(n.name, "mcl_farming:soil") and nod2.name=="air" and have_change == 0 then have_change = 1 - minetest.add_node(newpos, {name="farming:melon"}) + minetest.add_node(newpos, {name="mcl_farming:melon"}) if z == 1 then - minetest.add_node(pos, {name="farming:melontige_linked_t" }) + minetest.add_node(pos, {name="mcl_farming:melontige_linked_t" }) else - minetest.add_node(pos, {name="farming:melontige_linked_b" }) + minetest.add_node(pos, {name="mcl_farming:melontige_linked_b" }) end end end @@ -270,20 +270,20 @@ minetest.register_abm({ end, }) -farming:add_plant("farming:melontige_unconnect", {"farming:melontige_1", "farming:melontige_2"}, 50, 20) +mcl_farming:add_plant("mcl_farming:melontige_unconnect", {"mcl_farming:melontige_1", "mcl_farming:melontige_2"}, 50, 20) minetest.register_craft({ type = "shapeless", - output = "farming:melon_seed", - recipe = {"farming:melon_item"} + output = "mcl_farming:melon_seed", + recipe = {"mcl_farming:melon_item"} }) minetest.register_craft({ - output = 'farming:melon', + output = 'mcl_farming:melon', recipe = { - {'farming:melon_item', 'farming:melon_item', 'farming:melon_item'}, - {'farming:melon_item', 'farming:melon_item', 'farming:melon_item'}, - {'farming:melon_item', 'farming:melon_item', 'farming:melon_item'}, + {'mcl_farming:melon_item', 'mcl_farming:melon_item', 'mcl_farming:melon_item'}, + {'mcl_farming:melon_item', 'mcl_farming:melon_item', 'mcl_farming:melon_item'}, + {'mcl_farming:melon_item', 'mcl_farming:melon_item', 'mcl_farming:melon_item'}, } }) diff --git a/mods/mcl_farming/mod.conf b/mods/mcl_farming/mod.conf new file mode 100644 index 0000000000..4805e95db9 --- /dev/null +++ b/mods/mcl_farming/mod.conf @@ -0,0 +1 @@ +name = mcl_farming diff --git a/mods/farming/mushrooms.lua b/mods/mcl_farming/mushrooms.lua similarity index 81% rename from mods/farming/mushrooms.lua rename to mods/mcl_farming/mushrooms.lua index b118fc1c7c..a6d59338a2 100644 --- a/mods/farming/mushrooms.lua +++ b/mods/mcl_farming/mushrooms.lua @@ -1,4 +1,4 @@ -minetest.register_node("farming:mushroom_brown", { +minetest.register_node("mcl_farming:mushroom_brown", { description = "Brown Mushroom", drawtype = "plantlike", tiles = { "farming_mushroom_brown.png" }, @@ -16,7 +16,7 @@ minetest.register_node("farming:mushroom_brown", { }, }) -minetest.register_node("farming:mushroom_red", { +minetest.register_node("mcl_farming:mushroom_red", { description = "Red Mushroom", drawtype = "plantlike", tiles = { "farming_mushroom_red.png" }, @@ -33,7 +33,7 @@ minetest.register_node("farming:mushroom_red", { }, }) -minetest.register_craftitem("farming:mushroom_stew", { +minetest.register_craftitem("mcl_farming:mushroom_stew", { description = "Mushroom Stew", inventory_image = "farming_mushroom_stew.png", on_use = minetest.item_eat(6, "default:bowl"), @@ -43,6 +43,6 @@ minetest.register_craftitem("farming:mushroom_stew", { minetest.register_craft({ type = "shapeless", - output = "farming:mushroom_stew", - recipe = {'default:bowl', 'farming:mushroom_brown', 'farming:mushroom_red'} + output = "mcl_farming:mushroom_stew", + recipe = {'default:bowl', 'mcl_farming:mushroom_brown', 'mcl_farming:mushroom_red'} }) diff --git a/mods/farming/potatoes.lua b/mods/mcl_farming/potatoes.lua similarity index 65% rename from mods/farming/potatoes.lua rename to mods/mcl_farming/potatoes.lua index e3689b77d2..9ed1b75226 100644 --- a/mods/farming/potatoes.lua +++ b/mods/mcl_farming/potatoes.lua @@ -1,8 +1,8 @@ -minetest.register_node("farming:potato_1", { +minetest.register_node("mcl_farming:potato_1", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "farming:potato_item", + drop = "mcl_farming:potato_item", tiles = {"farming_potato_1.png"}, selection_box = { type = "fixed", @@ -14,11 +14,11 @@ minetest.register_node("farming:potato_1", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:potato_2", { +minetest.register_node("mcl_farming:potato_2", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "farming:potato_item", + drop = "mcl_farming:potato_item", tiles = {"farming_potato_2.png"}, selection_box = { type = "fixed", @@ -30,7 +30,7 @@ minetest.register_node("farming:potato_2", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:potato", { +minetest.register_node("mcl_farming:potato", { paramtype = "light", walkable = false, drawtype = "plantlike", @@ -38,27 +38,27 @@ minetest.register_node("farming:potato", { drop = { max_items = 1, items = { - { items = {'farming:potato_item 2'} }, - { items = {'farming:potato_item 3'}, rarity = 2 }, - { items = {'farming:potato_item 4'}, rarity = 5 } + { items = {'mcl_farming:potato_item 2'} }, + { items = {'mcl_farming:potato_item 3'}, rarity = 2 }, + { items = {'mcl_farming:potato_item 4'}, rarity = 5 } } }, groups = {snappy=3, flammable=2, not_in_creative_inventory=1,dig_by_water=1}, sounds = default.node_sound_leaves_defaults(), }) -minetest.register_craftitem("farming:potato_item", { +minetest.register_craftitem("mcl_farming:potato_item", { description = "Potato", inventory_image = "farming_potato.png", on_use = minetest.item_eat(1), groups = { food = 2, eatable = 1 }, stack_max = 64, on_place = function(itemstack, placer, pointed_thing) - return farming:place_seed(itemstack, placer, pointed_thing, "farming:potato_1") + return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:potato_1") end, }) -minetest.register_craftitem("farming:potato_item_baked", { +minetest.register_craftitem("mcl_farming:potato_item_baked", { description = "Baked Potato", stack_max = 64, inventory_image = "farming_potato_baked.png", @@ -66,7 +66,7 @@ minetest.register_craftitem("farming:potato_item_baked", { groups = { food = 2, eatable = 6 }, }) -minetest.register_craftitem("farming:potato_item_poison", { +minetest.register_craftitem("mcl_farming:potato_item_poison", { description = "Poisonous Potato", stack_max = 64, inventory_image = "farming_potato_poison.png", @@ -76,8 +76,8 @@ minetest.register_craftitem("farming:potato_item_poison", { minetest.register_craft({ type = "cooking", - output = "farming:potato_item_baked", - recipe = "farming:potato_item", + output = "mcl_farming:potato_item_baked", + recipe = "mcl_farming:potato_item", }) -farming:add_plant("farming:potato", {"farming:potato_1", "farming:potato_2"}, 50, 20) +mcl_farming:add_plant("mcl_farming:potato", {"mcl_farming:potato_1", "mcl_farming:potato_2"}, 50, 20) diff --git a/mods/farming/pumpkin.lua b/mods/mcl_farming/pumpkin.lua similarity index 80% rename from mods/farming/pumpkin.lua rename to mods/mcl_farming/pumpkin.lua index 88d2e8f036..f4b3c92065 100644 --- a/mods/farming/pumpkin.lua +++ b/mods/mcl_farming/pumpkin.lua @@ -1,4 +1,4 @@ -minetest.register_craftitem("farming:pumpkin_seed", { +minetest.register_craftitem("mcl_farming:pumpkin_seed", { description = "Pumpkin Seed", stack_max = 64, inventory_image = "farming_pumpkin_seed.png", @@ -6,7 +6,7 @@ minetest.register_craftitem("farming:pumpkin_seed", { on_place = function(itemstack, placer, pointed_thing) local above = minetest.get_node(pointed_thing.above) if above.name == "air" then - above.name = "farming:pumpkin_1" + above.name = "mcl_farming:pumpkin_1" minetest.set_node(pointed_thing.above, above) itemstack:take_item(1) return itemstack @@ -14,7 +14,7 @@ minetest.register_craftitem("farming:pumpkin_seed", { end }) -minetest.register_node("farming:pumpkin_1", { +minetest.register_node("mcl_farming:pumpkin_1", { paramtype = "light", walkable = false, drawtype = "plantlike", @@ -31,7 +31,7 @@ minetest.register_node("farming:pumpkin_1", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:pumpkin_2", { +minetest.register_node("mcl_farming:pumpkin_2", { paramtype = "light", walkable = false, drawtype = "plantlike", @@ -49,7 +49,7 @@ minetest.register_node("farming:pumpkin_2", { }) -minetest.register_node("farming:pumpkin_face", { +minetest.register_node("mcl_farming:pumpkin_face", { description = "Pumpkin", stack_max = 64, paramtype2 = "facedir", @@ -62,7 +62,7 @@ minetest.register_node("farming:pumpkin_face", { local n = minetest.get_node(p) if string.find(n.name, "pumpkintige_linked_") and have_change == 0 then have_change = 1 - minetest.add_node(p, {name="farming:pumpkintige_unconnect"}) + minetest.add_node(p, {name="mcl_farming:pumpkintige_unconnect"}) end end if have_change == 0 then @@ -71,7 +71,7 @@ minetest.register_node("farming:pumpkin_face", { local n = minetest.get_node(p) if string.find(n.name, "pumpkintige_linked_") and have_change == 0 then have_change = 1 - minetest.add_node(p, {name="farming:pumpkintige_unconnect"}) + minetest.add_node(p, {name="mcl_farming:pumpkintige_unconnect"}) end end end @@ -79,7 +79,7 @@ minetest.register_node("farming:pumpkin_face", { sounds = default.node_sound_wood_defaults(), }) -minetest.register_node("farming:pumpkintige_unconnect", { +minetest.register_node("mcl_farming:pumpkintige_unconnect", { paramtype = "light", walkable = false, sunlight_propagates = true, @@ -91,7 +91,7 @@ minetest.register_node("farming:pumpkintige_unconnect", { }) -minetest.register_node("farming:pumpkintige_linked_r", { +minetest.register_node("mcl_farming:pumpkintige_linked_r", { paramtype = "light", sunlight_propagates = true, walkable = false, @@ -121,7 +121,7 @@ minetest.register_node("farming:pumpkintige_linked_r", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:pumpkintige_linked_l", { +minetest.register_node("mcl_farming:pumpkintige_linked_l", { paramtype = "light", walkable = false, sunlight_propagates = true, @@ -151,7 +151,7 @@ minetest.register_node("farming:pumpkintige_linked_l", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:pumpkintige_linked_t", { +minetest.register_node("mcl_farming:pumpkintige_linked_t", { paramtype = "light", walkable = false, sunlight_propagates = true, @@ -181,7 +181,7 @@ minetest.register_node("farming:pumpkintige_linked_t", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming:pumpkintige_linked_b", { +minetest.register_node("mcl_farming:pumpkintige_linked_b", { paramtype = "light", walkable = false, sunlight_propagates = true, @@ -211,11 +211,11 @@ minetest.register_node("farming:pumpkintige_linked_b", { sounds = default.node_sound_leaves_defaults(), }) -farming:add_plant("farming:pumpkintige_unconnect", {"farming:pumpkin_1", "farming:pumpkin_2"}, 80, 20) +mcl_farming:add_plant("mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2"}, 80, 20) minetest.register_abm({ - nodenames = {"farming:pumpkintige_unconnect"}, + nodenames = {"mcl_farming:pumpkintige_unconnect"}, neighbors = {"air"}, interval = 30, chance = 15, @@ -231,13 +231,13 @@ minetest.register_abm({ local nod = minetest.get_node(newpos) if n.name=="default:dirt_with_grass" and nod.name=="air" and have_change == 0 or n.name=="default:dirt" and nod.name=="air" and have_change == 0 - or string.find(n.name, "farming:soil") and nod.name=="air" and have_change == 0 then + or string.find(n.name, "mcl_farming:soil") and nod.name=="air" and have_change == 0 then have_change = 1 - minetest.add_node(newpos, {name="farming:pumpkin_face"}) + minetest.add_node(newpos, {name="mcl_farming:pumpkin_face"}) if x == 1 then - minetest.add_node(pos, {name="farming:pumpkintige_linked_r" }) + minetest.add_node(pos, {name="mcl_farming:pumpkintige_linked_r" }) else - minetest.add_node(pos, {name="farming:pumpkintige_linked_l"}) + minetest.add_node(pos, {name="mcl_farming:pumpkintige_linked_l"}) end end end @@ -249,13 +249,13 @@ minetest.register_abm({ local nod2 = minetest.get_node(newpos) if n.name=="default:dirt_with_grass" and nod2.name=="air" and have_change == 0 or n.name=="default:dirt" and nod2.name=="air" and have_change == 0 - or string.find(n.name, "farming:soil") and nod2.name=="air" and have_change == 0 then + or string.find(n.name, "mcl_farming:soil") and nod2.name=="air" and have_change == 0 then have_change = 1 - minetest.add_node(newpos, {name="farming:pumpkin_face"}) + minetest.add_node(newpos, {name="mcl_farming:pumpkin_face"}) if z == 1 then - minetest.add_node(pos, {name="farming:pumpkintige_linked_t" }) + minetest.add_node(pos, {name="mcl_farming:pumpkintige_linked_t" }) else - minetest.add_node(pos, {name="farming:pumpkintige_linked_b" }) + minetest.add_node(pos, {name="mcl_farming:pumpkintige_linked_b" }) end end end @@ -266,7 +266,7 @@ minetest.register_abm({ -minetest.register_node("farming:pumpkin_face_light", { +minetest.register_node("mcl_farming:pumpkin_face_light", { description = "Jack o'Lantern", stack_max = 64, paramtype2 = "facedir", @@ -277,14 +277,14 @@ minetest.register_node("farming:pumpkin_face_light", { }) minetest.register_craft({ - output = "farming:pumpkin_face_light", - recipe = {{"farming:pumpkin_face"}, + output = "mcl_farming:pumpkin_face_light", + recipe = {{"mcl_farming:pumpkin_face"}, {"default:torch"}} }) minetest.register_craft({ type = "shapeless", - output = "farming:pumpkin_seed 4", - recipe = {"farming:pumpkin_face"} + output = "mcl_farming:pumpkin_seed 4", + recipe = {"mcl_farming:pumpkin_face"} }) diff --git a/mods/farming/soil.lua b/mods/mcl_farming/soil.lua similarity index 87% rename from mods/farming/soil.lua rename to mods/mcl_farming/soil.lua index 45a859a220..e1f5a5260f 100644 --- a/mods/farming/soil.lua +++ b/mods/mcl_farming/soil.lua @@ -1,4 +1,4 @@ -minetest.register_node("farming:soil", { +minetest.register_node("mcl_farming:soil", { tiles = {"farming_soil.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png"}, description = "Farmland", drop = "default:dirt", @@ -15,7 +15,7 @@ minetest.register_node("farming:soil", { sounds = default.node_sound_dirt_defaults(), }) -minetest.register_node("farming:soil_wet", { +minetest.register_node("mcl_farming:soil_wet", { tiles = {"farming_soil_wet.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png"}, description = "Hydrated Farmland", drop = "default:dirt", @@ -32,12 +32,12 @@ minetest.register_node("farming:soil_wet", { }) minetest.register_abm({ - nodenames = {"farming:soil"}, + nodenames = {"mcl_farming:soil"}, interval = 15, chance = 3, action = function(pos, node) if minetest.find_node_near(pos, 3, {"default:water_source", "default:water_flowing"}) then - node.name = "farming:soil_wet" + node.name = "mcl_farming:soil_wet" minetest.set_node(pos, node) end end, diff --git a/mods/farming/textures/farming_bread.png b/mods/mcl_farming/textures/farming_bread.png similarity index 100% rename from mods/farming/textures/farming_bread.png rename to mods/mcl_farming/textures/farming_bread.png diff --git a/mods/farming/textures/farming_carrot.png b/mods/mcl_farming/textures/farming_carrot.png similarity index 100% rename from mods/farming/textures/farming_carrot.png rename to mods/mcl_farming/textures/farming_carrot.png diff --git a/mods/farming/textures/farming_carrot_1.png b/mods/mcl_farming/textures/farming_carrot_1.png similarity index 100% rename from mods/farming/textures/farming_carrot_1.png rename to mods/mcl_farming/textures/farming_carrot_1.png diff --git a/mods/farming/textures/farming_carrot_2.png b/mods/mcl_farming/textures/farming_carrot_2.png similarity index 100% rename from mods/farming/textures/farming_carrot_2.png rename to mods/mcl_farming/textures/farming_carrot_2.png diff --git a/mods/farming/textures/farming_carrot_3.png b/mods/mcl_farming/textures/farming_carrot_3.png similarity index 100% rename from mods/farming/textures/farming_carrot_3.png rename to mods/mcl_farming/textures/farming_carrot_3.png diff --git a/mods/farming/textures/farming_carrot_4.png b/mods/mcl_farming/textures/farming_carrot_4.png similarity index 100% rename from mods/farming/textures/farming_carrot_4.png rename to mods/mcl_farming/textures/farming_carrot_4.png diff --git a/mods/farming/textures/farming_carrot_gold.png b/mods/mcl_farming/textures/farming_carrot_gold.png similarity index 100% rename from mods/farming/textures/farming_carrot_gold.png rename to mods/mcl_farming/textures/farming_carrot_gold.png diff --git a/mods/farming/textures/farming_cookie.png b/mods/mcl_farming/textures/farming_cookie.png similarity index 100% rename from mods/farming/textures/farming_cookie.png rename to mods/mcl_farming/textures/farming_cookie.png diff --git a/mods/farming/textures/farming_melon.png b/mods/mcl_farming/textures/farming_melon.png similarity index 100% rename from mods/farming/textures/farming_melon.png rename to mods/mcl_farming/textures/farming_melon.png diff --git a/mods/farming/textures/farming_melon_seed.png b/mods/mcl_farming/textures/farming_melon_seed.png similarity index 100% rename from mods/farming/textures/farming_melon_seed.png rename to mods/mcl_farming/textures/farming_melon_seed.png diff --git a/mods/farming/textures/farming_melon_side.png b/mods/mcl_farming/textures/farming_melon_side.png similarity index 100% rename from mods/farming/textures/farming_melon_side.png rename to mods/mcl_farming/textures/farming_melon_side.png diff --git a/mods/farming/textures/farming_melon_top.png b/mods/mcl_farming/textures/farming_melon_top.png similarity index 100% rename from mods/farming/textures/farming_melon_top.png rename to mods/mcl_farming/textures/farming_melon_top.png diff --git a/mods/farming/textures/farming_mushroom_brown.png b/mods/mcl_farming/textures/farming_mushroom_brown.png similarity index 100% rename from mods/farming/textures/farming_mushroom_brown.png rename to mods/mcl_farming/textures/farming_mushroom_brown.png diff --git a/mods/farming/textures/farming_mushroom_red.png b/mods/mcl_farming/textures/farming_mushroom_red.png similarity index 100% rename from mods/farming/textures/farming_mushroom_red.png rename to mods/mcl_farming/textures/farming_mushroom_red.png diff --git a/mods/farming/textures/farming_mushroom_stew.png b/mods/mcl_farming/textures/farming_mushroom_stew.png similarity index 100% rename from mods/farming/textures/farming_mushroom_stew.png rename to mods/mcl_farming/textures/farming_mushroom_stew.png diff --git a/mods/farming/textures/farming_potato.png b/mods/mcl_farming/textures/farming_potato.png similarity index 100% rename from mods/farming/textures/farming_potato.png rename to mods/mcl_farming/textures/farming_potato.png diff --git a/mods/farming/textures/farming_potato_1.png b/mods/mcl_farming/textures/farming_potato_1.png similarity index 100% rename from mods/farming/textures/farming_potato_1.png rename to mods/mcl_farming/textures/farming_potato_1.png diff --git a/mods/farming/textures/farming_potato_2.png b/mods/mcl_farming/textures/farming_potato_2.png similarity index 100% rename from mods/farming/textures/farming_potato_2.png rename to mods/mcl_farming/textures/farming_potato_2.png diff --git a/mods/farming/textures/farming_potato_3.png b/mods/mcl_farming/textures/farming_potato_3.png similarity index 100% rename from mods/farming/textures/farming_potato_3.png rename to mods/mcl_farming/textures/farming_potato_3.png diff --git a/mods/farming/textures/farming_potato_baked.png b/mods/mcl_farming/textures/farming_potato_baked.png similarity index 100% rename from mods/farming/textures/farming_potato_baked.png rename to mods/mcl_farming/textures/farming_potato_baked.png diff --git a/mods/farming/textures/farming_potato_poison.png b/mods/mcl_farming/textures/farming_potato_poison.png similarity index 100% rename from mods/farming/textures/farming_potato_poison.png rename to mods/mcl_farming/textures/farming_potato_poison.png diff --git a/mods/farming/textures/farming_pumpkin_face.png b/mods/mcl_farming/textures/farming_pumpkin_face.png similarity index 100% rename from mods/farming/textures/farming_pumpkin_face.png rename to mods/mcl_farming/textures/farming_pumpkin_face.png diff --git a/mods/farming/textures/farming_pumpkin_face_light.png b/mods/mcl_farming/textures/farming_pumpkin_face_light.png similarity index 100% rename from mods/farming/textures/farming_pumpkin_face_light.png rename to mods/mcl_farming/textures/farming_pumpkin_face_light.png diff --git a/mods/farming/textures/farming_pumpkin_seed.png b/mods/mcl_farming/textures/farming_pumpkin_seed.png similarity index 100% rename from mods/farming/textures/farming_pumpkin_seed.png rename to mods/mcl_farming/textures/farming_pumpkin_seed.png diff --git a/mods/farming/textures/farming_pumpkin_side.png b/mods/mcl_farming/textures/farming_pumpkin_side.png similarity index 100% rename from mods/farming/textures/farming_pumpkin_side.png rename to mods/mcl_farming/textures/farming_pumpkin_side.png diff --git a/mods/farming/textures/farming_pumpkin_top.png b/mods/mcl_farming/textures/farming_pumpkin_top.png similarity index 100% rename from mods/farming/textures/farming_pumpkin_top.png rename to mods/mcl_farming/textures/farming_pumpkin_top.png diff --git a/mods/farming/textures/farming_soil.png b/mods/mcl_farming/textures/farming_soil.png similarity index 100% rename from mods/farming/textures/farming_soil.png rename to mods/mcl_farming/textures/farming_soil.png diff --git a/mods/farming/textures/farming_soil_wet.png b/mods/mcl_farming/textures/farming_soil_wet.png similarity index 100% rename from mods/farming/textures/farming_soil_wet.png rename to mods/mcl_farming/textures/farming_soil_wet.png diff --git a/mods/farming/textures/farming_tige_1.png b/mods/mcl_farming/textures/farming_tige_1.png similarity index 100% rename from mods/farming/textures/farming_tige_1.png rename to mods/mcl_farming/textures/farming_tige_1.png diff --git a/mods/farming/textures/farming_tige_2.png b/mods/mcl_farming/textures/farming_tige_2.png similarity index 100% rename from mods/farming/textures/farming_tige_2.png rename to mods/mcl_farming/textures/farming_tige_2.png diff --git a/mods/farming/textures/farming_tige_connnect.png b/mods/mcl_farming/textures/farming_tige_connnect.png similarity index 100% rename from mods/farming/textures/farming_tige_connnect.png rename to mods/mcl_farming/textures/farming_tige_connnect.png diff --git a/mods/farming/textures/farming_tige_end.png b/mods/mcl_farming/textures/farming_tige_end.png similarity index 100% rename from mods/farming/textures/farming_tige_end.png rename to mods/mcl_farming/textures/farming_tige_end.png diff --git a/mods/farming/textures/farming_tool_diamondhoe.png b/mods/mcl_farming/textures/farming_tool_diamondhoe.png similarity index 100% rename from mods/farming/textures/farming_tool_diamondhoe.png rename to mods/mcl_farming/textures/farming_tool_diamondhoe.png diff --git a/mods/farming/textures/farming_tool_goldhoe.png b/mods/mcl_farming/textures/farming_tool_goldhoe.png similarity index 100% rename from mods/farming/textures/farming_tool_goldhoe.png rename to mods/mcl_farming/textures/farming_tool_goldhoe.png diff --git a/mods/farming/textures/farming_tool_steelhoe.png b/mods/mcl_farming/textures/farming_tool_steelhoe.png similarity index 100% rename from mods/farming/textures/farming_tool_steelhoe.png rename to mods/mcl_farming/textures/farming_tool_steelhoe.png diff --git a/mods/farming/textures/farming_tool_stonehoe.png b/mods/mcl_farming/textures/farming_tool_stonehoe.png similarity index 100% rename from mods/farming/textures/farming_tool_stonehoe.png rename to mods/mcl_farming/textures/farming_tool_stonehoe.png diff --git a/mods/farming/textures/farming_tool_woodhoe.png b/mods/mcl_farming/textures/farming_tool_woodhoe.png similarity index 100% rename from mods/farming/textures/farming_tool_woodhoe.png rename to mods/mcl_farming/textures/farming_tool_woodhoe.png diff --git a/mods/farming/textures/farming_wheat.png b/mods/mcl_farming/textures/farming_wheat.png similarity index 100% rename from mods/farming/textures/farming_wheat.png rename to mods/mcl_farming/textures/farming_wheat.png diff --git a/mods/farming/textures/farming_wheat_1.png b/mods/mcl_farming/textures/farming_wheat_1.png similarity index 100% rename from mods/farming/textures/farming_wheat_1.png rename to mods/mcl_farming/textures/farming_wheat_1.png diff --git a/mods/farming/textures/farming_wheat_2.png b/mods/mcl_farming/textures/farming_wheat_2.png similarity index 100% rename from mods/farming/textures/farming_wheat_2.png rename to mods/mcl_farming/textures/farming_wheat_2.png diff --git a/mods/farming/textures/farming_wheat_3.png b/mods/mcl_farming/textures/farming_wheat_3.png similarity index 100% rename from mods/farming/textures/farming_wheat_3.png rename to mods/mcl_farming/textures/farming_wheat_3.png diff --git a/mods/farming/textures/farming_wheat_harvested.png b/mods/mcl_farming/textures/farming_wheat_harvested.png similarity index 100% rename from mods/farming/textures/farming_wheat_harvested.png rename to mods/mcl_farming/textures/farming_wheat_harvested.png diff --git a/mods/farming/textures/farming_wheat_seed.png b/mods/mcl_farming/textures/farming_wheat_seed.png similarity index 100% rename from mods/farming/textures/farming_wheat_seed.png rename to mods/mcl_farming/textures/farming_wheat_seed.png diff --git a/mods/farming/wheat.lua b/mods/mcl_farming/wheat.lua similarity index 73% rename from mods/farming/wheat.lua rename to mods/mcl_farming/wheat.lua index 25cb0036b1..232f3c48aa 100644 --- a/mods/farming/wheat.lua +++ b/mods/mcl_farming/wheat.lua @@ -1,19 +1,19 @@ -minetest.register_craftitem("farming:wheat_seed", { +minetest.register_craftitem("mcl_farming:wheat_seed", { description = "Wheat Seeds", groups = { craftitem=1 }, inventory_image = "farming_wheat_seed.png", on_place = function(itemstack, placer, pointed_thing) - return farming:place_seed(itemstack, placer, pointed_thing, "farming:wheat_1") + return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:wheat_1") end }) -minetest.register_node("farming:wheat_1", { +minetest.register_node("mcl_farming:wheat_1", { paramtype = "light", sunlight_propagates = true, walkable = false, drawtype = "nodebox", paramtype = "light", - drop = "farming:wheat_seed", + drop = "mcl_farming:wheat_seed", tiles = {"farming_wheat_1.png"}, selection_box = { type = "fixed", @@ -34,13 +34,13 @@ minetest.register_node("farming:wheat_1", { }, }) -minetest.register_node("farming:wheat_2", { +minetest.register_node("mcl_farming:wheat_2", { sunlight_propagates = true, paramtype = "light", walkable = false, drawtype = "nodebox", paramtype = "light", - drop = "farming:wheat_seed", + drop = "mcl_farming:wheat_seed", tiles = {"farming_wheat_2.png"}, selection_box = { type = "fixed", @@ -61,13 +61,13 @@ minetest.register_node("farming:wheat_2", { }, }) -minetest.register_node("farming:wheat_3", { +minetest.register_node("mcl_farming:wheat_3", { sunlight_propagates = true, paramtype = "light", walkable = false, drawtype = "nodebox", paramtype = "light", - drop = "farming:wheat_seed", + drop = "mcl_farming:wheat_seed", tiles = {"farming_wheat_3.png"}, selection_box = { type = "fixed", @@ -88,7 +88,7 @@ minetest.register_node("farming:wheat_3", { }, }) -minetest.register_node("farming:wheat", { +minetest.register_node("mcl_farming:wheat", { sunlight_propagates = true, paramtype = "light", walkable = false, @@ -98,10 +98,10 @@ minetest.register_node("farming:wheat", { drop = { max_items = 4, items = { - { items = {'farming:wheat_seed'} }, - { items = {'farming:wheat_seed'}, rarity = 2}, - { items = {'farming:wheat_seed'}, rarity = 5}, - { items = {'farming:wheat_harvested'} } + { items = {'mcl_farming:wheat_seed'} }, + { items = {'mcl_farming:wheat_seed'}, rarity = 2}, + { items = {'mcl_farming:wheat_seed'}, rarity = 5}, + { items = {'mcl_farming:wheat_harvested'} } } }, selection_box = { @@ -123,29 +123,29 @@ minetest.register_node("farming:wheat", { }, }) -farming:add_plant("farming:wheat", {"farming:wheat_1", "farming:wheat_2", "farming:wheat_3"}, 50, 20) +mcl_farming:add_plant("mcl_farming:wheat", {"mcl_farming:wheat_1", "mcl_farming:wheat_2", "mcl_farming:wheat_3"}, 50, 20) -minetest.register_craftitem("farming:wheat_harvested", { +minetest.register_craftitem("mcl_farming:wheat_harvested", { description = "Wheat", inventory_image = "farming_wheat_harvested.png", groups = { craftitem = 1 }, }) minetest.register_craft({ - output = "farming:bread", + output = "mcl_farming:bread", recipe = { - {'farming:wheat_harvested', 'farming:wheat_harvested', 'farming:wheat_harvested'}, + {'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested', 'mcl_farming:wheat_harvested'}, } }) minetest.register_craft({ - output = "farming:cookie 8", + output = "mcl_farming:cookie 8", recipe = { - {'farming:wheat_harvested', 'mcl_dye:brown', 'farming:wheat_harvested'}, + {'mcl_farming:wheat_harvested', 'mcl_dye:brown', 'mcl_farming:wheat_harvested'}, } }) -minetest.register_craftitem("farming:cookie", { +minetest.register_craftitem("mcl_farming:cookie", { description = "Cookie", inventory_image = "farming_cookie.png", groups = {food=2, eatable=2}, @@ -153,7 +153,7 @@ minetest.register_craftitem("farming:cookie", { }) -minetest.register_craftitem("farming:bread", { +minetest.register_craftitem("mcl_farming:bread", { description = "Bread", inventory_image = "farming_bread.png", groups = {food=2, eatable=5}, diff --git a/mods/mcl_flowers/init.lua b/mods/mcl_flowers/init.lua index 44a23bf456..447dd742ec 100644 --- a/mods/mcl_flowers/init.lua +++ b/mods/mcl_flowers/init.lua @@ -208,7 +208,7 @@ minetest.register_node("mcl_flowers:fern", { max_items = 1, items = { { - items = {'farming:wheat_seed'}, + items = {'mcl_farming:wheat_seed'}, rarity = 24, }, } diff --git a/mods/mcl_potions/depends.txt b/mods/mcl_potions/depends.txt index 8bb82f2104..8a9c10aa0f 100644 --- a/mods/mcl_potions/depends.txt +++ b/mods/mcl_potions/depends.txt @@ -1,3 +1,3 @@ default -farming +mcl_farming mcl_mobitems diff --git a/mods/mcl_potions/init.lua b/mods/mcl_potions/init.lua index a1c76ff870..52a7aab958 100644 --- a/mods/mcl_potions/init.lua +++ b/mods/mcl_potions/init.lua @@ -9,7 +9,7 @@ minetest.register_craftitem("mcl_potions:fermented_spider_eye", { minetest.register_craft({ type = "shapeless", output = "mcl_potions:fermented_spider_eye", - recipe = { "farming:mushroom_brown", "default:sugar", "mcl_mobitems:spider_eye" }, + recipe = { "mcl_farming:mushroom_brown", "default:sugar", "mcl_mobitems:spider_eye" }, }) minetest.register_craftitem("mcl_potions:glass_bottle", { @@ -38,7 +38,7 @@ minetest.register_craft({ output = "mcl_potions:speckled_melon", recipe = { {'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'}, - {'default:gold_nugget', 'farming:melon_item', 'default:gold_nugget'}, + {'default:gold_nugget', 'mcl_farming:melon_item', 'default:gold_nugget'}, {'default:gold_nugget', 'default:gold_nugget', 'default:gold_nugget'}, } }) diff --git a/mods/mcl_throwing/README.txt b/mods/mcl_throwing/README.txt index ed6745957d..06894cd2ac 100644 --- a/mods/mcl_throwing/README.txt +++ b/mods/mcl_throwing/README.txt @@ -14,17 +14,19 @@ For further information or help see: http://wiki.minetest.com/wiki/Installing_Mods How to use the mod: -Craft a bow with the strings from the farming mod: - wood string -wood string - wood string +Craft a bow with strings: + stick string +stick string + stick string + Craft arrows with: flint stick paper + Select the bow and shoot with left mouse click. Every shoot will take 1 arrow from your inventory and wears out the bow (you have around 385 -shoots). +shots). License: This mod was originally published by Jeija.