mirror of
https://codeberg.org/tenplus1/farming.git
synced 2025-06-29 23:01:00 +02:00
separate food /non-food items from crop files, tidy code
This commit is contained in:
tenplus1
@ -1,27 +1,24 @@
|
||||
|
||||
local S = farming.translate
|
||||
local a = farming.recipe_items
|
||||
local S = minetest.get_translator("farming")
|
||||
|
||||
-- place trellis helper
|
||||
|
||||
-- place trellis
|
||||
local function place_grapes(itemstack, placer, pointed_thing, plantname)
|
||||
|
||||
local pt = pointed_thing
|
||||
|
||||
-- check if pointing at a node
|
||||
if not pt or pt.type ~= "node" then
|
||||
return
|
||||
end
|
||||
if not pt or pt.type ~= "node" then return end
|
||||
|
||||
local under = minetest.get_node(pt.under)
|
||||
|
||||
-- return if any of the nodes are not registered
|
||||
if not minetest.registered_nodes[under.name] then
|
||||
return
|
||||
end
|
||||
if not minetest.registered_nodes[under.name] then return end
|
||||
|
||||
-- am I right-clicking on something that has a custom on_place set?
|
||||
-- thanks to Krock for helping with this issue :)
|
||||
local def = minetest.registered_nodes[under.name]
|
||||
|
||||
if placer and itemstack and def and def.on_rightclick then
|
||||
return def.on_rightclick(pt.under, under, placer, itemstack, pt)
|
||||
end
|
||||
@ -30,19 +27,15 @@ local function place_grapes(itemstack, placer, pointed_thing, plantname)
|
||||
local name = placer and placer:get_player_name() or ""
|
||||
|
||||
-- check for protection
|
||||
if minetest.is_protected(pt.under, name) then
|
||||
return
|
||||
end
|
||||
if minetest.is_protected(pt.under, name) then return end
|
||||
|
||||
-- check if pointing at trellis
|
||||
if under.name ~= "farming:trellis" then
|
||||
return
|
||||
end
|
||||
if under.name ~= "farming:trellis" then return end
|
||||
|
||||
-- add the node and remove 1 item from the itemstack
|
||||
minetest.set_node(pt.under, {name = plantname})
|
||||
|
||||
minetest.sound_play("default_place_node", {pos = pt.under, gain = 1.0})
|
||||
minetest.sound_play("default_place_node", {pos = pt.under, gain = 1.0}, true)
|
||||
|
||||
if placer and not farming.is_creative(placer:get_player_name()) then
|
||||
|
||||
@ -51,11 +44,8 @@ local function place_grapes(itemstack, placer, pointed_thing, plantname)
|
||||
-- check for refill
|
||||
if itemstack:get_count() == 0 then
|
||||
|
||||
minetest.after(0.20,
|
||||
farming.refill_plant,
|
||||
placer,
|
||||
"farming:grapes",
|
||||
placer:get_wield_index()
|
||||
minetest.after(0.20, farming.refill_plant, placer,
|
||||
"farming:grapes", placer:get_wield_index()
|
||||
)
|
||||
end
|
||||
end
|
||||
@ -63,14 +53,14 @@ local function place_grapes(itemstack, placer, pointed_thing, plantname)
|
||||
return itemstack
|
||||
end
|
||||
|
||||
-- grapes
|
||||
-- item/seed
|
||||
|
||||
minetest.register_craftitem("farming:grapes", {
|
||||
description = S("Grapes"),
|
||||
inventory_image = "farming_grapes.png",
|
||||
groups = {compostability = 48, seed = 2, food_grapes = 1},
|
||||
on_use = minetest.item_eat(2),
|
||||
groups = {
|
||||
compostability = 48, seed = 2, food_grapes = 1
|
||||
},
|
||||
|
||||
on_place = function(itemstack, placer, pointed_thing)
|
||||
return place_grapes(itemstack, placer, pointed_thing, "farming:grapes_1")
|
||||
end
|
||||
@ -78,13 +68,8 @@ minetest.register_craftitem("farming:grapes", {
|
||||
|
||||
farming.add_eatable("farming:grapes", 2)
|
||||
|
||||
-- grapes can be used for violet dye
|
||||
minetest.register_craft({
|
||||
output = a.dye_violet,
|
||||
recipe = {{"farming:grapes"}}
|
||||
})
|
||||
|
||||
-- trellis
|
||||
|
||||
minetest.register_node("farming:trellis", {
|
||||
description = S("Trellis (place on soil before planting grapes)"),
|
||||
drawtype = "plantlike",
|
||||
@ -106,20 +91,17 @@ minetest.register_node("farming:trellis", {
|
||||
local pt = pointed_thing
|
||||
|
||||
-- check if pointing at a node
|
||||
if not pt or pt.type ~= "node" then
|
||||
return
|
||||
end
|
||||
if not pt or pt.type ~= "node" then return end
|
||||
|
||||
local under = minetest.get_node(pt.under)
|
||||
|
||||
-- return if any of the nodes are not registered
|
||||
if not minetest.registered_nodes[under.name] then
|
||||
return
|
||||
end
|
||||
if not minetest.registered_nodes[under.name] then return end
|
||||
|
||||
-- am I right-clicking on something that has a custom on_place set?
|
||||
-- thanks to Krock for helping with this issue :)
|
||||
local def = minetest.registered_nodes[under.name]
|
||||
|
||||
if def and def.on_rightclick then
|
||||
return def.on_rightclick(pt.under, under, placer, itemstack, pt)
|
||||
end
|
||||
@ -130,9 +112,7 @@ minetest.register_node("farming:trellis", {
|
||||
|
||||
local nodename = under.name
|
||||
|
||||
if minetest.get_item_group(nodename, "soil") < 2 then
|
||||
return
|
||||
end
|
||||
if minetest.get_item_group(nodename, "soil") < 2 then return end
|
||||
|
||||
local top = {
|
||||
x = pointed_thing.above.x,
|
||||
@ -142,9 +122,7 @@ minetest.register_node("farming:trellis", {
|
||||
|
||||
nodename = minetest.get_node(top).name
|
||||
|
||||
if nodename ~= "air" then
|
||||
return
|
||||
end
|
||||
if nodename ~= "air" then return end
|
||||
|
||||
minetest.set_node(pointed_thing.above, {name = "farming:trellis"})
|
||||
|
||||
@ -156,22 +134,8 @@ minetest.register_node("farming:trellis", {
|
||||
end
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "farming:trellis",
|
||||
recipe = {
|
||||
{"group:stick", "group:stick", "group:stick"},
|
||||
{"group:stick", "group:stick", "group:stick"},
|
||||
{"group:stick", "group:stick", "group:stick"}
|
||||
}
|
||||
})
|
||||
-- crop definition
|
||||
|
||||
minetest.register_craft({
|
||||
type = "fuel",
|
||||
recipe = "farming:trellis",
|
||||
burntime = 15
|
||||
})
|
||||
|
||||
-- grapes definition
|
||||
local def = {
|
||||
drawtype = "plantlike",
|
||||
tiles = {"farming_grapes_1.png"},
|
||||
@ -196,33 +160,41 @@ local def = {
|
||||
}
|
||||
|
||||
-- stage 1
|
||||
|
||||
minetest.register_node("farming:grapes_1", table.copy(def))
|
||||
|
||||
-- stage2
|
||||
|
||||
def.tiles = {"farming_grapes_2.png"}
|
||||
minetest.register_node("farming:grapes_2", table.copy(def))
|
||||
|
||||
-- stage 3
|
||||
|
||||
def.tiles = {"farming_grapes_3.png"}
|
||||
minetest.register_node("farming:grapes_3", table.copy(def))
|
||||
|
||||
-- stage 4
|
||||
|
||||
def.tiles = {"farming_grapes_4.png"}
|
||||
minetest.register_node("farming:grapes_4", table.copy(def))
|
||||
|
||||
-- stage 5
|
||||
|
||||
def.tiles = {"farming_grapes_5.png"}
|
||||
minetest.register_node("farming:grapes_5", table.copy(def))
|
||||
|
||||
-- stage 6
|
||||
|
||||
def.tiles = {"farming_grapes_6.png"}
|
||||
minetest.register_node("farming:grapes_6", table.copy(def))
|
||||
|
||||
-- stage 7
|
||||
|
||||
def.tiles = {"farming_grapes_7.png"}
|
||||
minetest.register_node("farming:grapes_7", table.copy(def))
|
||||
|
||||
-- stage 8 (final)
|
||||
|
||||
def.tiles = {"farming_grapes_8.png"}
|
||||
def.groups.growing = nil
|
||||
def.selection_box = farming.select_final
|
||||
@ -237,6 +209,7 @@ def.drop = {
|
||||
minetest.register_node("farming:grapes_8", table.copy(def))
|
||||
|
||||
-- add to registered_plants
|
||||
|
||||
farming.registered_plants["farming:grapes"] = {
|
||||
trellis = "farming:trellis",
|
||||
crop = "farming:grapes",
|
||||
@ -247,6 +220,7 @@ farming.registered_plants["farming:grapes"] = {
|
||||
}
|
||||
|
||||
-- wild grape vine (this is what you find on the map)
|
||||
|
||||
minetest.register_node("farming:grapebush", {
|
||||
drawtype = "plantlike",
|
||||
tiles = {"farming_grapebush.png"},
|
||||
@ -272,6 +246,7 @@ minetest.register_node("farming:grapebush", {
|
||||
})
|
||||
|
||||
-- mapgen
|
||||
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
|
||||
Reference in New Issue
Block a user