mirror of
https://codeberg.org/tenplus1/farming.git
synced 2024-12-25 18:20:19 +01:00
dont register decoration if ethereal active
This commit is contained in:
parent
d59efa22d7
commit
a23866a487
@ -82,6 +82,7 @@ farming.registered_plants["farming:artichoke"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -96,7 +97,8 @@ minetest.register_decoration({
|
||||
},
|
||||
y_min = 1,
|
||||
y_max = 13,
|
||||
decoration = {"farming:artichoke_5"},
|
||||
decoration = "farming:artichoke_5",
|
||||
spawn_by = "group:tree",
|
||||
num_spawn_by = 1
|
||||
})
|
||||
end
|
||||
|
@ -89,6 +89,7 @@ farming.registered_plants["farming:asparagus"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
name = "farming:asparagus_5",
|
||||
deco_type = "simple",
|
||||
@ -107,3 +108,4 @@ minetest.register_decoration({
|
||||
decoration = "farming:asparagus_5",
|
||||
param2 = 3
|
||||
})
|
||||
end
|
||||
|
@ -235,6 +235,7 @@ minetest.register_node("farming:beanbush", {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -251,3 +252,4 @@ minetest.register_decoration({
|
||||
y_max = 38,
|
||||
decoration = "farming:beanbush"
|
||||
})
|
||||
end
|
||||
|
@ -85,6 +85,7 @@ farming.registered_plants["farming:beetroot"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -101,3 +102,4 @@ minetest.register_decoration({
|
||||
y_max = 20,
|
||||
decoration = "farming:beetroot_5"
|
||||
})
|
||||
end
|
||||
|
@ -80,6 +80,7 @@ farming.registered_plants["farming:blackberry"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -96,3 +97,4 @@ minetest.register_decoration({
|
||||
y_max = 20,
|
||||
decoration = "farming:blackberry_4"
|
||||
})
|
||||
end
|
||||
|
@ -79,6 +79,7 @@ farming.registered_plants["farming:blueberries"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -95,3 +96,4 @@ minetest.register_decoration({
|
||||
y_max = 15,
|
||||
decoration = "farming:blueberry_4"
|
||||
})
|
||||
end
|
||||
|
@ -87,6 +87,7 @@ farming.registered_plants["farming:cabbage"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -103,3 +104,4 @@ minetest.register_decoration({
|
||||
y_max = 15,
|
||||
decoration = "farming:cabbage_6"
|
||||
})
|
||||
end
|
||||
|
@ -115,6 +115,7 @@ def = {
|
||||
num = mg and 1 or -1,
|
||||
}
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -133,3 +134,4 @@ minetest.register_decoration({
|
||||
spawn_by = def.near,
|
||||
num_spawn_by = def.num
|
||||
})
|
||||
end
|
||||
|
@ -98,6 +98,7 @@ farming.registered_plants["farming:chili_pepper"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {
|
||||
@ -115,7 +116,8 @@ minetest.register_decoration({
|
||||
},
|
||||
y_min = 5,
|
||||
y_max = 35,
|
||||
decoration = {"farming:chili_8"},
|
||||
decoration = "farming:chili_8",
|
||||
spawn_by = "group:tree",
|
||||
num_spawn_by = 1
|
||||
})
|
||||
end
|
||||
|
@ -89,6 +89,7 @@ def = {
|
||||
"mcl_core:dirt_with_grass"}
|
||||
}
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = def.spawn_on,
|
||||
@ -105,3 +106,4 @@ minetest.register_decoration({
|
||||
y_max = def.y_max,
|
||||
decoration = "farming:coffee_5"
|
||||
})
|
||||
end
|
||||
|
@ -111,6 +111,7 @@ farming.registered_plants["farming:corn"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -127,3 +128,4 @@ minetest.register_decoration({
|
||||
y_max = 25,
|
||||
decoration = "farming:corn_7"
|
||||
})
|
||||
end
|
||||
|
@ -180,6 +180,7 @@ def = {
|
||||
biome = mg and {"jungle"} or {"savanna"}
|
||||
}
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
name = "farming:cotton_wild",
|
||||
deco_type = "simple",
|
||||
@ -198,7 +199,7 @@ minetest.register_decoration({
|
||||
y_min = 1,
|
||||
decoration = "farming:cotton_wild"
|
||||
})
|
||||
|
||||
end
|
||||
|
||||
--[[ Cotton using api
|
||||
farming.register_plant("farming:cotton", {
|
||||
|
@ -87,6 +87,7 @@ def = {
|
||||
num = mg and 1 or -1,
|
||||
}
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -105,3 +106,4 @@ minetest.register_decoration({
|
||||
spawn_by = def.near,
|
||||
num_spawn_by = def.num
|
||||
})
|
||||
end
|
||||
|
@ -84,6 +84,7 @@ farming.registered_plants["farming:eggplant"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -102,3 +103,4 @@ minetest.register_decoration({
|
||||
decoration = "farming:eggplant_4",
|
||||
param2 = 3
|
||||
})
|
||||
end
|
||||
|
@ -82,6 +82,7 @@ farming.registered_plants["farming:garlic"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -100,3 +101,4 @@ minetest.register_decoration({
|
||||
spawn_by = "group:tree",
|
||||
num_spawn_by = 1
|
||||
})
|
||||
end
|
||||
|
@ -83,6 +83,7 @@ farming.registered_plants["farming:ginger"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
name = "farming:ginger_4",
|
||||
deco_type = "simple",
|
||||
@ -101,3 +102,4 @@ minetest.register_decoration({
|
||||
decoration = "farming:ginger_3",
|
||||
param2 = 3
|
||||
})
|
||||
end
|
||||
|
@ -248,6 +248,7 @@ minetest.register_node("farming:grapebush", {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -264,3 +265,4 @@ minetest.register_decoration({
|
||||
y_max = 50,
|
||||
decoration = "farming:grapebush"
|
||||
})
|
||||
end
|
||||
|
@ -136,6 +136,7 @@ farming.registered_plants["farming:hemp"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {
|
||||
@ -157,3 +158,4 @@ minetest.register_decoration({
|
||||
spawn_by = "group:tree",
|
||||
num_spawn_by = 1
|
||||
})
|
||||
end
|
||||
|
@ -81,6 +81,7 @@ farming.registered_plants["farming:lettuce"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -97,3 +98,4 @@ minetest.register_decoration({
|
||||
y_max = 35,
|
||||
decoration = "farming:lettuce_5"
|
||||
})
|
||||
end
|
||||
|
@ -115,6 +115,7 @@ def = {
|
||||
num = mg and 1 or -1,
|
||||
}
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = def.spawn_on,
|
||||
@ -133,3 +134,4 @@ minetest.register_decoration({
|
||||
spawn_by = def.near,
|
||||
num_spawn_by = def.num
|
||||
})
|
||||
end
|
||||
|
@ -101,6 +101,7 @@ farming.registered_plants["farming:mint"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {
|
||||
@ -122,3 +123,4 @@ minetest.register_decoration({
|
||||
spawn_by = {"group:water", "group:sand"},
|
||||
num_spawn_by = 1
|
||||
})
|
||||
end
|
||||
|
@ -94,6 +94,7 @@ farming.registered_plants["farming:onion"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -110,3 +111,4 @@ minetest.register_decoration({
|
||||
y_max = 28,
|
||||
decoration = "farming:onion_5"
|
||||
})
|
||||
end
|
||||
|
@ -73,6 +73,7 @@ farming.registered_plants["farming:parsley"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -89,3 +90,4 @@ minetest.register_decoration({
|
||||
y_max = 40,
|
||||
decoration = "farming:parsley_3"
|
||||
})
|
||||
end
|
||||
|
@ -92,6 +92,7 @@ farming.registered_plants["farming:pea_pod"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -108,3 +109,4 @@ minetest.register_decoration({
|
||||
y_max = 55,
|
||||
decoration = "farming:pea_5"
|
||||
})
|
||||
end
|
||||
|
@ -159,6 +159,7 @@ def = {
|
||||
"default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass"}
|
||||
}
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = def.grow_on,
|
||||
@ -177,3 +178,4 @@ minetest.register_decoration({
|
||||
spawn_by = "group:tree",
|
||||
num_spawn_by = 1
|
||||
})
|
||||
end
|
||||
|
@ -126,6 +126,7 @@ def = {
|
||||
num = mg and 1 or -1
|
||||
}
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = def.grow_on,
|
||||
@ -140,7 +141,8 @@ minetest.register_decoration({
|
||||
},
|
||||
y_min = 11,
|
||||
y_max = 30,
|
||||
decoration = {"farming:pineapple_8"},
|
||||
decoration = "farming:pineapple_8",
|
||||
spawn_by = def.grow_near,
|
||||
num_spawn_by = def.num
|
||||
})
|
||||
end
|
||||
|
@ -100,6 +100,7 @@ farming.registered_plants["farming:potato"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -116,3 +117,4 @@ minetest.register_decoration({
|
||||
y_max = 40,
|
||||
decoration = "farming:potato_3"
|
||||
})
|
||||
end
|
||||
|
@ -116,6 +116,7 @@ def = {
|
||||
num = mg and 1 or -1,
|
||||
}
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -134,3 +135,4 @@ minetest.register_decoration({
|
||||
spawn_by = def.near,
|
||||
num_spawn_by = def.num
|
||||
})
|
||||
end
|
||||
|
@ -80,6 +80,7 @@ farming.registered_plants["farming:raspberries"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -96,3 +97,4 @@ minetest.register_decoration({
|
||||
y_max = 15,
|
||||
decoration = "farming:raspberry_4"
|
||||
})
|
||||
end
|
||||
|
@ -85,6 +85,7 @@ farming.registered_plants["farming:rhubarb"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -101,3 +102,4 @@ minetest.register_decoration({
|
||||
y_max = 20,
|
||||
decoration = "farming:rhubarb_3"
|
||||
})
|
||||
end
|
||||
|
@ -118,6 +118,7 @@ def = {
|
||||
"mcl_core:dirt_with_grass"}
|
||||
}
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = def.spawn_on,
|
||||
@ -134,3 +135,4 @@ minetest.register_decoration({
|
||||
y_max = 50,
|
||||
decoration = "farming:soy_6"
|
||||
})
|
||||
end
|
||||
|
@ -84,6 +84,7 @@ farming.registered_plants["farming:spinach"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -102,3 +103,4 @@ minetest.register_decoration({
|
||||
decoration = "farming:spinach_4",
|
||||
param2 = 3
|
||||
})
|
||||
end
|
||||
|
@ -112,6 +112,7 @@ farming.registered_plants["ethereal:strawberry"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -128,3 +129,4 @@ minetest.register_decoration({
|
||||
y_max = 55,
|
||||
decoration = "ethereal:strawberry_7"
|
||||
})
|
||||
end
|
||||
|
@ -130,6 +130,7 @@ farming.registered_plants["farming:sunflower"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -146,3 +147,4 @@ minetest.register_decoration({
|
||||
y_max = 40,
|
||||
decoration = "farming:sunflower_8"
|
||||
})
|
||||
end
|
||||
|
@ -109,6 +109,7 @@ farming.registered_plants["farming:tomato"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -125,3 +126,4 @@ minetest.register_decoration({
|
||||
y_max = 25,
|
||||
decoration = "farming:tomato_7"
|
||||
})
|
||||
end
|
||||
|
@ -107,6 +107,7 @@ farming.registered_plants["farming:vanilla"] = {
|
||||
|
||||
-- mapgen
|
||||
|
||||
if not farming.eth then
|
||||
minetest.register_decoration({
|
||||
deco_type = "simple",
|
||||
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
|
||||
@ -123,3 +124,4 @@ minetest.register_decoration({
|
||||
y_max = 35,
|
||||
decoration = "farming:vanilla_7"
|
||||
})
|
||||
end
|
||||
|
3
init.lua
3
init.lua
@ -12,7 +12,7 @@ local S = minetest.get_translator("farming")
|
||||
|
||||
farming = {
|
||||
mod = "redo",
|
||||
version = "20240912",
|
||||
version = "20240919",
|
||||
path = minetest.get_modpath("farming"),
|
||||
select = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}},
|
||||
select_final = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -2.5/16, 0.5}},
|
||||
@ -21,6 +21,7 @@ farming = {
|
||||
mapgen = minetest.get_mapgen_setting("mg_name"),
|
||||
use_utensils = minetest.settings:get_bool("farming_use_utensils") ~= false,
|
||||
mtg = minetest.get_modpath("default"),
|
||||
eth = minetest.get_modpath("ethereal"),
|
||||
mcl = minetest.get_modpath("mcl_core"),
|
||||
mcl_hardness = 0.01,
|
||||
translate = S
|
||||
|
Loading…
Reference in New Issue
Block a user